Merge branch '19783-picking-tweak' refs #19783

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

diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx
index dcf6c40cbf5fcabcc3d9566a21342af148165ce1..67fc4b351e8f1012741d33c6a83026407ab65972 100644 (file)
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -20,16 +20,17 @@ import {
     ProcessStatus as ResourceStatus,
     ResourceType,
     ResourceOwnerWithName,
-    ResourceVersion,
+    ResourcePortableDataHash,
     ResourceFileSize,
     ResourceFileCount,
     ResourceUUID,
     ResourceContainerUuid,
+    ContainerRunTime,
     ResourceOutputUuid,
     ResourceLogUuid,
     ResourceParentProcess,
     ResourceModifiedByUserUuid,
-    ResourcePortableDataHash,
+    ResourceVersion,
     ResourceCreatedAtDate,
     ResourceLastModifiedDate,
     ResourceTrashDate,
@@ -75,18 +76,19 @@ export enum ProjectPanelColumnNames {
     STATUS = "Status",
     TYPE = "Type",
     OWNER = "Owner",
-    VERSION = "Version",
-    FILE_SIZE = "File size",
-    FILE_COUNT = "File count",
+    PORTABLE_DATA_HASH = "Portable Data Hash",
+    FILE_SIZE = "File Size",
+    FILE_COUNT = "File Count",
     UUID = "UUID",
     CONTAINER_UUID = "Container UUID",
+    RUNTIME = "Runtime",
     OUTPUT_UUID = "Output UUID",
     LOG_UUID = "Log UUID",
-    PARENT_PROCESS = 'Parent process UUID',
+    PARENT_PROCESS = 'Parent Process UUID',
     MODIFIED_BY_USER_UUID = 'Modified by User UUID',
-    PORTABLE_DATA_HASH = "Portable data hash",
-    CREATED_AT = "Date created",
-    LAST_MODIFIED = "Last modified",
+    VERSION = "Version",
+    CREATED_AT = "Date Created",
+    LAST_MODIFIED = "Last Modified",
     TRASH_AT = "Trash at",
     DELETE_AT = "Delete at",
 }
@@ -127,11 +129,11 @@ export const projectPanelColumns: DataColumns<string> = [
         render: uuid => <ResourceOwnerWithName uuid={uuid} />
     },
     {
-        name: ProjectPanelColumnNames.VERSION,
+        name: ProjectPanelColumnNames.PORTABLE_DATA_HASH,
         selected: false,
         configurable: true,
         filters: createTree(),
-        render: uuid =><ResourceVersion uuid={uuid}/>
+        render: uuid => <ResourcePortableDataHash uuid={uuid}/>
     },
     {
         name: ProjectPanelColumnNames.FILE_SIZE,
@@ -161,6 +163,13 @@ export const projectPanelColumns: DataColumns<string> = [
         filters: createTree(),
         render: uuid => <ResourceContainerUuid uuid={uuid}/>
     },
+    {
+        name: ProjectPanelColumnNames.RUNTIME,
+        selected: false,
+        configurable: true,
+        filters: createTree(),
+        render: uuid => <ContainerRunTime uuid={uuid} />
+    },
     {
         name: ProjectPanelColumnNames.OUTPUT_UUID,
         selected: false,
@@ -190,11 +199,11 @@ export const projectPanelColumns: DataColumns<string> = [
         render: uuid => <ResourceModifiedByUserUuid uuid={uuid}/>
     },
     {
-        name: ProjectPanelColumnNames.PORTABLE_DATA_HASH,
+        name: ProjectPanelColumnNames.VERSION,
         selected: false,
         configurable: true,
         filters: createTree(),
-        render: uuid => <ResourcePortableDataHash uuid={uuid}/>
+        render: uuid =><ResourceVersion uuid={uuid}/>
     },
     {
         name: ProjectPanelColumnNames.CREATED_AT,