X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/0a08341c1d88b3f47d6fda46ecd9110d45aaea1d..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 36672e99..be569b49 100644 --- a/src/store/project-panel/project-panel-middleware-service.ts +++ b/src/store/project-panel/project-panel-middleware-service.ts @@ -7,32 +7,30 @@ import { dataExplorerToListParams, getDataExplorerColumnFilters, 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 "~/services/api/order-builder"; -import { FilterBuilder, joinFilters } from "~/services/api/filter-builder"; -import { GroupContentsResource, GroupContentsResourcePrefix } from "~/services/groups-service/groups-service"; -import { updateFavorites } from "../favorites/favorites-actions"; -import { PROJECT_PANEL_CURRENT_UUID, IS_PROJECT_PANEL_TRASHED, projectPanelActions } from './project-panel-action'; +} 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, SnackbarKind } from '../snackbar/snackbar-actions'; -import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions.ts'; -import { DataExplorer, getDataExplorer } from '../data-explorer/data-explorer-reducer'; -import { ListResults } from '~/services/common-service/common-resource-service'; -import { loadContainers } from '../processes/processes-actions'; -import { ResourceKind } from '~/models/resource'; -import { getResource } from "~/store/resources/resources"; -import { CollectionResource } from "~/models/collection"; -import { resourcesDataActions } from "~/store/resources-data/resources-data-actions"; -import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer"; -import { serializeResourceTypeFilters } from '../resource-type-filters/resource-type-filters'; +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) { @@ -42,7 +40,7 @@ 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()); @@ -52,15 +50,13 @@ export class ProjectPanelMiddlewareService extends DataExplorerMiddlewareService try { api.dispatch(progressIndicatorActions.START_WORKING(this.getId())); const response = await this.services.groupsService.contents(projectUuid, getParams(dataExplorer, !!isProjectTrashed)); - api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId())); const resourceUuids = response.items.map(item => item.uuid); api.dispatch(updateFavorites(resourceUuids)); + api.dispatch(updatePublicFavorites(resourceUuids)); api.dispatch(updateResources(response.items)); - api.dispatch(updateResourceData(resourceUuids)); await api.dispatch(loadMissingProcessesInformation(response.items)); api.dispatch(setItems(response)); } catch (e) { - api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId())); api.dispatch(projectPanelActions.SET_ITEMS({ items: [], itemsAvailable: 0, @@ -68,6 +64,8 @@ export class ProjectPanelMiddlewareService extends DataExplorerMiddlewareService rowsPerPage: dataExplorer.rowsPerPage })); api.dispatch(couldNotFetchProjectContents()); + } finally { + api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId())); } } } @@ -89,19 +87,6 @@ export const loadMissingProcessesInformation = (resources: GroupContentsResource } }; -export const updateResourceData = (resourceUuids: string[]) => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - resourceUuids.map(async uuid => { - const resource = getResource(uuid)(getState().resources); - if (resource && resource.kind === ResourceKind.COLLECTION) { - const files = await services.collectionService.files(uuid); - if (files) { - dispatch(resourcesDataActions.SET_FILES({ uuid, files })); - } - } - }); - }; - export const setItems = (listResults: ListResults) => projectPanelActions.SET_ITEMS({ ...listResultsToDataExplorerItemsMeta(listResults), @@ -118,6 +103,10 @@ export const getParams = (dataExplorer: DataExplorer, isProjectTrashed: boolean) 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() @@ -126,12 +115,34 @@ export const getFilters = (dataExplorer: DataExplorer) => { .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, ); - // TODO: Restore process status filters - // const statusFilters = getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.STATUS); }; export const getOrder = (dataExplorer: DataExplorer) => { @@ -155,7 +166,8 @@ export 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 = () => @@ -166,5 +178,6 @@ const couldNotFetchProjectContents = () => const projectPanelDataExplorerIsNotSet = () => snackbarActions.OPEN_SNACKBAR({ - message: 'Project panel is not ready.' + message: 'Project panel is not ready.', + kind: SnackbarKind.ERROR });