21225: Add project workflow runs tab.

[arvados.git] / services / workbench2 / src / store / project-panel / project-panel-data-middleware-service.ts

diff --git a/services/workbench2/src/store/project-panel/project-panel-data-middleware-service.ts b/services/workbench2/src/store/project-panel/project-panel-data-middleware-service.ts
index 6e599f5c3499c57e0e0356e7dfe9e9376bbb0ef4..98f2625cfa3c947b831e9ec2a691062ed2f02723 100644 (file)
--- a/services/workbench2/src/store/project-panel/project-panel-data-middleware-service.ts
+++ b/services/workbench2/src/store/project-panel/project-panel-data-middleware-service.ts
@@ -27,14 +27,11 @@ 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, buildProcessStatusFilters } from "store/resource-type-filters/resource-type-filters";
 import { updatePublicFavorites } from "store/public-favorites/public-favorites-actions";
 import { selectedFieldsOfGroup } from "models/group";
 import { defaultCollectionSelectedFields } from "models/collection";
-import { containerRequestFieldsNoMounts } from "models/container-request";
 import { ContextMenuActionNames } from "views-components/context-menu/context-menu-action-set";
 import { removeDisabledButton } from "store/multiselect/multiselect-actions";
 import { dataExplorerActions } from "store/data-explorer/data-explorer-action";
@@ -62,7 +59,6 @@ export class ProjectPanelDataMiddlewareService extends DataExplorerMiddlewareSer
                 api.dispatch<any>(updateFavorites(resourceUuids));
                 api.dispatch<any>(updatePublicFavorites(resourceUuids));
                 api.dispatch(updateResources(response.items));
-                await api.dispatch<any>(loadMissingProcessesInformation(response.items));
                 api.dispatch(setItems(response));
             } catch (e) {
                 api.dispatch(
@@ -89,17 +85,6 @@ export class ProjectPanelDataMiddlewareService extends DataExplorerMiddlewareSer
     }
 }
 
-export const loadMissingProcessesInformation = (resources: GroupContentsResource[]) => async (dispatch: Dispatch) => {
-    const containerUuids = resources.reduce((uuids, resource) => {
-        return resource.kind === ResourceKind.CONTAINER_REQUEST && resource.containerUuid && !uuids.includes(resource.containerUuid)
-            ? [...uuids, resource.containerUuid]
-            : uuids;
-    }, [] as string[]);
-    if (containerUuids.length > 0) {
-        await dispatch<any>(loadContainers(containerUuids, false));
-    }
-};
-
 export const setItems = (listResults: ListResults<GroupContentsResource>) =>
     projectPanelDataActions.SET_ITEMS({
         ...listResultsToDataExplorerItemsMeta(listResults),
@@ -111,7 +96,7 @@ export const getParams = (dataExplorer: DataExplorer, isProjectTrashed: boolean)
     order: getOrder(dataExplorer),
     filters: getFilters(dataExplorer),
     includeTrash: isProjectTrashed,
-    select: selectedFieldsOfGroup.concat(defaultCollectionSelectedFields, containerRequestFieldsNoMounts),
+    select: selectedFieldsOfGroup.concat(defaultCollectionSelectedFields),
 });
 
 export const getFilters = (dataExplorer: DataExplorer) => {
@@ -123,7 +108,6 @@ export const getFilters = (dataExplorer: DataExplorer) => {
     // 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();
 
@@ -142,9 +126,9 @@ const getOrder = (dataExplorer: DataExplorer) => {
         // Use createdAt as a secondary sort column so we break ties consistently.
         return order
             .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.COLLECTION)
-            .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROCESS)
             .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROJECT)
-            .addOrder(OrderDirection.DESC, "createdAt", GroupContentsResourcePrefix.PROCESS)
+            .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.WORKFLOW)
+            .addOrder(OrderDirection.DESC, "createdAt")
             .getOrder();
     } else {
         return order.getOrder();