Implement filtering by status

Feature #13703

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

diff --git a/src/models/container-request.ts b/src/models/container-request.ts
index 44dd615e848787966c15eeb6b49240fc9b6ff3fa..4a10414dcd25aa98eabc0f83193bac9d3857ea4f 100644 (file)
--- a/src/models/container-request.ts
+++ b/src/models/container-request.ts
@@ -5,12 +5,18 @@
 import { Resource } from "../common/api/common-resource-service";
 import { ResourceKind } from "./kinds";
 
+export enum ContainerRequestState {
+    Uncommitted = "Uncommitted",
+    Committed = "Committed",
+    Final = "Final"
+}
+
 export interface ContainerRequestResource extends Resource {
     kind: ResourceKind.ContainerRequest;
     name: string;
     description: string;
     properties: any;
-    state: string;
+    state: ContainerRequestState;
     requestingContainerUuid: string;
     containerUuid: string;
     containerCountMax: number;

diff --git a/src/views/project-panel/project-panel-middleware.ts b/src/views/project-panel/project-panel-middleware.ts
index 2afc530b5e6ba46e3ab22107bc474431561852ab..0ea5f1e56f9f5ef5552a4f611c7cb0d9d74ec174 100644 (file)
--- a/src/views/project-panel/project-panel-middleware.ts
+++ b/src/views/project-panel/project-panel-middleware.ts
@@ -11,6 +11,7 @@ import { getDataExplorer, DataExplorerState } from "../../store/data-explorer/da
 import { resourceToDataItem, ProjectPanelItem } from "./project-panel-item";
 import FilterBuilder from "../../common/api/filter-builder";
 import { DataColumns } from "../../components/data-table/data-table";
+import { ProcessResource } from "../../models/process";
 
 export const projectPanelMiddleware: Middleware = store => next => {
     next(actions.SET_COLUMNS({ id: PROJECT_PANEL_ID, columns }));
@@ -39,14 +40,21 @@ export const projectPanelMiddleware: Middleware = store => next => {
             REQUEST_ITEMS: handleProjectPanelAction(() => {
                 const state = store.getState() as RootState;
                 const dataExplorer = getDataExplorer(state.dataExplorer, PROJECT_PANEL_ID);
-                const typeColumn = columns.find(c => c.name === "Type");
-                const typeFilters = getSelectedTypeFilters(dataExplorer.columns as DataColumns<ProjectPanelItem, ProjectPanelFilter>);
+                const columns = dataExplorer.columns as DataColumns<ProjectPanelItem, ProjectPanelFilter>;
+                const typeFilters = getColumnFilters(columns, "Type");
+                const statusFilters = getColumnFilters(columns, "Status");
                 if (typeFilters.length > 0) {
                     groupsService
                         .contents(state.projects.currentItemId, {
                             limit: dataExplorer.rowsPerPage,
                             offset: dataExplorer.page * dataExplorer.rowsPerPage,
-                            filters: FilterBuilder.create().addIsA("uuid", typeFilters.map(f => f.type))
+                            filters: FilterBuilder
+                                .create()
+                                .addIsA("uuid", typeFilters.map(f => f.type))
+                                .concat(FilterBuilder
+                                    .create<ProcessResource>("containerRequests")
+                                    .addIn("state", statusFilters.map(f => f.type))
+                                )
                         })
                         .then(response => {
                             store.dispatch(actions.SET_ITEMS({
@@ -72,8 +80,8 @@ export const projectPanelMiddleware: Middleware = store => next => {
     };
 };
 
-const getSelectedTypeFilters = (columns: DataColumns<ProjectPanelItem, ProjectPanelFilter>) => {
-    const typeColumn = columns.find(c => c.name === "Type");
-    return typeColumn && typeColumn.filters ? typeColumn.filters.filter(f => f.selected) : [];
+const getColumnFilters = (columns: DataColumns<ProjectPanelItem, ProjectPanelFilter>, columnName: string) => {
+    const column = columns.find(c => c.name === columnName);
+    return column && column.filters ? column.filters.filter(f => f.selected) : [];
 };
 

diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx
index 7323ce2b54e5f3b1954988e04c0ce95dd432474c..2c895ee369763fe4a0dd5348dfacf9cdd91c59c6 100644 (file)
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -14,11 +14,12 @@ import { RouteComponentProps } from 'react-router';
 import { RootState } from '../../store/store';
 import { ResourceKind } from '../../models/kinds';
 import { DataTableFilterItem } from '../../components/data-table-filters/data-table-filters';
+import { ContainerRequestState } from '../../models/container-request';
 
 export const PROJECT_PANEL_ID = "projectPanel";
 
 export interface ProjectPanelFilter extends DataTableFilterItem {
-    type: ResourceKind;
+    type: ResourceKind | ContainerRequestState;
 }
 
 type ProjectPanelProps = {
@@ -124,12 +125,12 @@ const renderOwner = (owner: string) =>
 
 
 const typeToLabel = (type: string) => {
-    switch(type){
+    switch (type) {
         case ResourceKind.Collection:
             return "Data collection";
         case ResourceKind.Project:
             return "Project";
-        case ResourceKind.Process: 
+        case ResourceKind.Process:
             return "Process";
         default:
             return "Unknown";
@@ -158,6 +159,19 @@ export const columns: DataColumns<ProjectPanelItem, ProjectPanelFilter> = [{
 }, {
     name: "Status",
     selected: true,
+    filters: [{
+        name: ContainerRequestState.Committed,
+        selected: true,
+        type: ContainerRequestState.Committed
+    }, {
+        name: ContainerRequestState.Final,
+        selected: true,
+        type: ContainerRequestState.Final
+    }, {
+        name: ContainerRequestState.Uncommitted,
+        selected: true,
+        type: ContainerRequestState.Uncommitted
+    }],
     render: renderStatus,
     width: "75px"
 }, {