Merge branch '17595-Selecting-multiple-collections-as-inputs-to-a-workflow'

[arvados-workbench2.git] / src / views / all-processes-panel / all-processes-panel.tsx

diff --git a/src/views/all-processes-panel/all-processes-panel.tsx b/src/views/all-processes-panel/all-processes-panel.tsx
index 79575c74626455579ee60d44c75e420209b2c6ef..d9a0fd90a392f9d2d1197e07043084244e082cf1 100644 (file)
--- a/src/views/all-processes-panel/all-processes-panel.tsx
+++ b/src/views/all-processes-panel/all-processes-panel.tsx
@@ -15,20 +15,23 @@ import { ArvadosTheme } from '~/common/custom-theme';
 import { ALL_PROCESSES_PANEL_ID } from '~/store/all-processes-panel/all-processes-panel-action';
 import {
     ProcessStatus,
-    ResourceLastModifiedDate,
     ResourceName,
     ResourceOwner,
-    ResourceType
+    ResourceType,
+    ContainerRunTime,
+    ResourceCreatedAtDate
 } from '~/views-components/data-explorer/renderers';
 import { ProcessIcon } from '~/components/icon/icon';
-import { openContextMenu, resourceKindToContextMenuKind } from '~/store/context-menu/context-menu-actions';
+import { openProcessContextMenu } from '~/store/context-menu/context-menu-actions';
 import { loadDetailsPanel } from '~/store/details-panel/details-panel-action';
 import { navigateTo } from '~/store/navigation/navigation-action';
 import { ContainerRequestState } from "~/models/container-request";
 import { RootState } from '~/store/store';
 import { DataTableDefaultView } from '~/components/data-table-default-view/data-table-default-view';
 import { createTree } from '~/models/tree';
-import { getSimpleObjectTypeFilters, getInitialProcessStatusFilters } from '~/store/resource-type-filters/resource-type-filters';
+import { getInitialProcessStatusFilters, getInitialProcessTypeFilters } from '~/store/resource-type-filters/resource-type-filters';
+import { getProcess } from '~/store/processes/process';
+import { ResourcesState } from '~/store/resources/resources';
 
 type CssRules = "toolbar" | "button";
 
@@ -47,7 +50,8 @@ export enum AllProcessesPanelColumnNames {
     STATUS = "Status",
     TYPE = "Type",
     OWNER = "Owner",
-    LAST_MODIFIED = "Last modified"
+    CREATED_AT = "Created at",
+    RUNTIME = "Run Time"
 }
 
 export interface AllProcessesPanelFilter extends DataTableFilterItem {
@@ -75,8 +79,7 @@ export const allProcessesPanelColumns: DataColumns<string> = [
         name: AllProcessesPanelColumnNames.TYPE,
         selected: true,
         configurable: true,
-        // TODO: Only filter by process type (main, subprocess)
-        filters: getSimpleObjectTypeFilters(),
+        filters: getInitialProcessTypeFilters(),
         render: uuid => <ResourceType uuid={uuid} />
     },
     {
@@ -87,17 +90,24 @@ export const allProcessesPanelColumns: DataColumns<string> = [
         render: uuid => <ResourceOwner uuid={uuid} />
     },
     {
-        name: AllProcessesPanelColumnNames.LAST_MODIFIED,
+        name: AllProcessesPanelColumnNames.CREATED_AT,
         selected: true,
         configurable: true,
         sortDirection: SortDirection.DESC,
         filters: createTree(),
-        render: uuid => <ResourceLastModifiedDate uuid={uuid} />
+        render: uuid => <ResourceCreatedAtDate uuid={uuid} />
+    },
+    {
+        name: AllProcessesPanelColumnNames.RUNTIME,
+        selected: true,
+        configurable: true,
+        filters: createTree(),
+        render: uuid => <ContainerRunTime uuid={uuid} />
     }
 ];
 
 interface AllProcessesPanelDataProps {
-    isAdmin: boolean;
+    resources: ResourcesState;
 }
 
 interface AllProcessesPanelActionProps {
@@ -106,7 +116,7 @@ interface AllProcessesPanelActionProps {
     onItemDoubleClick: (item: string) => void;
 }
 const mapStateToProps = (state : RootState): AllProcessesPanelDataProps => ({
-    isAdmin: state.auth.user!.isAdmin
+    resources: state.resources
 });
 
 type AllProcessesPanelProps = AllProcessesPanelDataProps & AllProcessesPanelActionProps & DispatchProp
@@ -116,15 +126,9 @@ export const AllProcessesPanel = withStyles(styles)(
     connect(mapStateToProps)(
         class extends React.Component<AllProcessesPanelProps> {
             handleContextMenu = (event: React.MouseEvent<HTMLElement>, resourceUuid: string) => {
-                const menuKind = resourceKindToContextMenuKind(resourceUuid, this.props.isAdmin);
-                if (menuKind) {
-                    this.props.dispatch<any>(openContextMenu(event, {
-                        name: '',
-                        uuid: resourceUuid,
-                        ownerUuid: '',
-                        kind: ResourceKind.NONE,
-                        menuKind
-                    }));
+                const process = getProcess(resourceUuid)(this.props.resources);
+                if (process) {
+                    this.props.dispatch<any>(openProcessContextMenu(event, process));
                 }
                 this.props.dispatch<any>(loadDetailsPanel(resourceUuid));
             }
@@ -134,7 +138,7 @@ export const AllProcessesPanel = withStyles(styles)(
             }
 
             handleRowClick = (uuid: string) => {
-                this.props.dispatch(loadDetailsPanel(uuid));
+                this.props.dispatch<any>(loadDetailsPanel(uuid));
             }
 
             render() {
@@ -147,7 +151,7 @@ export const AllProcessesPanel = withStyles(styles)(
                     dataTableDefaultView={
                         <DataTableDefaultView
                             icon={ProcessIcon}
-                            messages={['All Processes list empty.']}
+                            messages={['Processes list empty.']}
                             />
                     } />;
             }