X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/5627bf1a83323d2b0364cb069564998eb8c6ca7a..d861bd54089e9279cd03b2e4561869ee877b9559:/src/store/project-panel/project-panel-middleware-service.ts diff --git a/src/store/project-panel/project-panel-middleware-service.ts b/src/store/project-panel/project-panel-middleware-service.ts index da7f5b33..be569b49 100644 --- a/src/store/project-panel/project-panel-middleware-service.ts +++ b/src/store/project-panel/project-panel-middleware-service.ts @@ -2,24 +2,35 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { DataExplorerMiddlewareService, getDataExplorerColumnFilters, dataExplorerToListParams, listResultsToDataExplorerItemsMeta } from '../data-explorer/data-explorer-middleware-service'; -import { ProjectPanelColumnNames, ProjectPanelFilter } from "~/views/project-panel/project-panel"; -import { RootState } from "../store"; -import { DataColumns } from "~/components/data-table/data-table"; -import { ServiceRepository } from "~/services/services"; -import { SortDirection } from "~/components/data-table/data-column"; -import { OrderBuilder, OrderDirection } from "~/common/api/order-builder"; -import { FilterBuilder } from "~/common/api/filter-builder"; -import { GroupContentsResourcePrefix, GroupContentsResource } from "~/services/groups-service/groups-service"; -import { updateFavorites } from "../favorites/favorites-actions"; -import { projectPanelActions, PROJECT_PANEL_CURRENT_UUID } from './project-panel-action'; +import { + DataExplorerMiddlewareService, + dataExplorerToListParams, + getDataExplorerColumnFilters, + listResultsToDataExplorerItemsMeta +} from 'store/data-explorer/data-explorer-middleware-service'; +import { ProjectPanelColumnNames } from "views/project-panel/project-panel"; +import { RootState } from "store/store"; +import { DataColumns } from "components/data-table/data-table"; +import { ServiceRepository } from "services/services"; +import { SortDirection } from "components/data-table/data-column"; +import { OrderBuilder, OrderDirection } from "services/api/order-builder"; +import { FilterBuilder, joinFilters } from "services/api/filter-builder"; +import { GroupContentsResource, GroupContentsResourcePrefix } from "services/groups-service/groups-service"; +import { updateFavorites } from "store/favorites/favorites-actions"; +import { IS_PROJECT_PANEL_TRASHED, projectPanelActions, getProjectPanelCurrentUuid } from 'store/project-panel/project-panel-action'; import { Dispatch, MiddlewareAPI } from "redux"; -import { ProjectResource } from "~/models/project"; -import { updateResources } from "~/store/resources/resources-actions"; -import { getProperty } from "~/store/properties/properties"; -import { snackbarActions } from '../snackbar/snackbar-actions'; -import { DataExplorer, getDataExplorer } from '../data-explorer/data-explorer-reducer'; -import { ListResults } from '~/common/api/common-resource-service'; +import { ProjectResource } from "models/project"; +import { updateResources } from "store/resources/resources-actions"; +import { getProperty } from "store/properties/properties"; +import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions'; +import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions'; +import { DataExplorer, getDataExplorer } from 'store/data-explorer/data-explorer-reducer'; +import { ListResults } from 'services/common-service/common-service'; +import { loadContainers } from 'store/processes/processes-actions'; +import { ResourceKind } from 'models/resource'; +import { getSortColumn } from "store/data-explorer/data-explorer-reducer"; +import { serializeResourceTypeFilters, ProcessStatusFilter } from 'store/resource-type-filters/resource-type-filters'; +import { updatePublicFavorites } from 'store/public-favorites/public-favorites-actions'; export class ProjectPanelMiddlewareService extends DataExplorerMiddlewareService { constructor(private services: ServiceRepository, id: string) { @@ -29,51 +40,113 @@ export class ProjectPanelMiddlewareService extends DataExplorerMiddlewareService async requestItems(api: MiddlewareAPI) { const state = api.getState(); const dataExplorer = getDataExplorer(state.dataExplorer, this.getId()); - const projectUuid = getProperty(PROJECT_PANEL_CURRENT_UUID)(state.properties); + const projectUuid = getProjectPanelCurrentUuid(state); + const isProjectTrashed = getProperty(IS_PROJECT_PANEL_TRASHED)(state.properties); if (!projectUuid) { api.dispatch(projectPanelCurrentUuidIsNotSet()); } else if (!dataExplorer) { api.dispatch(projectPanelDataExplorerIsNotSet()); } else { try { - const response = await this.services.groupsService.contents(projectUuid, getParams(dataExplorer)); - api.dispatch(updateFavorites(response.items.map(item => item.uuid))); + api.dispatch(progressIndicatorActions.START_WORKING(this.getId())); + const response = await this.services.groupsService.contents(projectUuid, getParams(dataExplorer, !!isProjectTrashed)); + const resourceUuids = response.items.map(item => item.uuid); + api.dispatch(updateFavorites(resourceUuids)); + api.dispatch(updatePublicFavorites(resourceUuids)); api.dispatch(updateResources(response.items)); + await api.dispatch(loadMissingProcessesInformation(response.items)); api.dispatch(setItems(response)); } catch (e) { + api.dispatch(projectPanelActions.SET_ITEMS({ + items: [], + itemsAvailable: 0, + page: 0, + rowsPerPage: dataExplorer.rowsPerPage + })); api.dispatch(couldNotFetchProjectContents()); + } finally { + api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId())); } } } } -const setItems = (listResults: ListResults) => +export const loadMissingProcessesInformation = (resources: GroupContentsResource[]) => + async (dispatch: Dispatch) => { + const containerUuids = resources.reduce((uuids, resource) => { + return resource.kind === ResourceKind.CONTAINER_REQUEST + ? resource.containerUuid + ? [...uuids, resource.containerUuid] + : uuids + : uuids; + }, []); + if (containerUuids.length > 0) { + await dispatch(loadContainers( + new FilterBuilder().addIn('uuid', containerUuids).getFilters() + )); + } + }; + +export const setItems = (listResults: ListResults) => projectPanelActions.SET_ITEMS({ ...listResultsToDataExplorerItemsMeta(listResults), items: listResults.items.map(resource => resource.uuid), }); -const getParams = (dataExplorer: DataExplorer) => ({ +export const getParams = (dataExplorer: DataExplorer, isProjectTrashed: boolean) => ({ ...dataExplorerToListParams(dataExplorer), order: getOrder(dataExplorer), filters: getFilters(dataExplorer), + includeTrash: isProjectTrashed }); -const getFilters = (dataExplorer: DataExplorer) => { - const columns = dataExplorer.columns as DataColumns; - const typeFilters = getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.TYPE); - const statusFilters = getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.STATUS); - return new FilterBuilder() - .addIsA("uuid", typeFilters.map(f => f.type)) - .addIn("state", statusFilters.map(f => f.type), GroupContentsResourcePrefix.PROCESS) +export const getFilters = (dataExplorer: DataExplorer) => { + const columns = dataExplorer.columns as DataColumns; + const typeFilters = serializeResourceTypeFilters(getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.TYPE)); + const statusColumnFilters = getDataExplorerColumnFilters(columns, 'Status'); + const activeStatusFilter = Object.keys(statusColumnFilters).find( + filterName => statusColumnFilters[filterName].selected + ); + + // TODO: Extract group contents name filter + const nameFilters = new FilterBuilder() .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.COLLECTION) .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.PROCESS) .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.PROJECT) .getFilters(); + + // Filter by container status + const fb = new FilterBuilder(); + switch (activeStatusFilter) { + case ProcessStatusFilter.COMPLETED: { + fb.addEqual('container.state', 'Complete', GroupContentsResourcePrefix.PROCESS); + fb.addEqual('container.exit_code', '0', GroupContentsResourcePrefix.PROCESS); + break; + } + case ProcessStatusFilter.FAILED: { + fb.addEqual('container.state', 'Complete', GroupContentsResourcePrefix.PROCESS); + fb.addDistinct('container.exit_code', '0', GroupContentsResourcePrefix.PROCESS); + break; + } + case ProcessStatusFilter.CANCELLED: + case ProcessStatusFilter.LOCKED: + case ProcessStatusFilter.QUEUED: + case ProcessStatusFilter.RUNNING: { + fb.addEqual('container.state', activeStatusFilter, GroupContentsResourcePrefix.PROCESS); + break; + } + } + const statusFilters = fb.getFilters(); + + return joinFilters( + statusFilters, + typeFilters, + nameFilters, + ); }; -const getOrder = (dataExplorer: DataExplorer) => { - const sortColumn = dataExplorer.columns.find(c => c.sortDirection !== SortDirection.NONE); +export const getOrder = (dataExplorer: DataExplorer) => { + const sortColumn = getSortColumn(dataExplorer); const order = new OrderBuilder(); if (sortColumn) { const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC @@ -93,15 +166,18 @@ const getOrder = (dataExplorer: DataExplorer) => { const projectPanelCurrentUuidIsNotSet = () => snackbarActions.OPEN_SNACKBAR({ - message: 'Project panel is not opened.' + message: 'Project panel is not opened.', + kind: SnackbarKind.ERROR }); const couldNotFetchProjectContents = () => snackbarActions.OPEN_SNACKBAR({ - message: 'Could not fetch project contents.' + message: 'Could not fetch project contents.', + kind: SnackbarKind.ERROR }); const projectPanelDataExplorerIsNotSet = () => snackbarActions.OPEN_SNACKBAR({ - message: 'Project panel is not ready.' + message: 'Project panel is not ready.', + kind: SnackbarKind.ERROR });