X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/4ee2be435af08b2d7b4ff07fb41f190fa41e35f7..cba2e466c8708c1a89ae2d766d31fa9d04d6f3be:/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 3351e9d3..684fd448 100644
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -16,26 +16,27 @@ import { ContainerRequestState } from 'models/container-request';
 import { SortDirection } from 'components/data-table/data-column';
 import { ResourceKind, Resource } from 'models/resource';
 import {
+    ResourceName,
+    ProcessStatus as ResourceStatus,
+    ResourceType,
+    ResourceOwnerWithName,
+    ResourcePortableDataHash,
     ResourceFileSize,
     ResourceFileCount,
-    ResourceCreatedAtDate,
-    ResourceLastModifiedDate,
-    ResourceTrashDate,
-    ResourceDeleteDate,
-    ProcessStatus,
-    ResourceType,
     ResourceUUID,
+    ResourceContainerUuid,
+    ContainerRunTime,
     ResourceOutputUuid,
-    ResourceProcessUuid,
-    ResourceProcessState,
+    ResourceLogUuid,
     ResourceParentProcess,
-    ResourcePortableDataHash,
+    ResourceModifiedByUserUuid,
     ResourceVersion,
-    ResourceDescription,
-    ResourceOwnerWithName
+    ResourceCreatedAtDate,
+    ResourceLastModifiedDate,
+    ResourceTrashDate,
+    ResourceDeleteDate,
 } from 'views-components/data-explorer/renderers';
 import { ProjectIcon } from 'components/icon/icon';
-import { ResourceName } from 'views-components/data-explorer/renderers';
 import {
     ResourcesState,
     getResource
@@ -58,6 +59,7 @@ import { GroupContentsResource } from 'services/groups-service/groups-service';
 import { GroupClass, GroupResource } from 'models/group';
 import { CollectionResource } from 'models/collection';
 import { resourceIsFrozen } from 'common/frozen-resources';
+import { ProjectResource } from 'models/project';
 
 type CssRules = 'root' | "button";
 
@@ -75,32 +77,33 @@ export enum ProjectPanelColumnNames {
     STATUS = "Status",
     TYPE = "Type",
     OWNER = "Owner",
-    FILE_SIZE = "File size",
-    FILE_COUNT = "File count",
+    PORTABLE_DATA_HASH = "Portable Data Hash",
+    FILE_SIZE = "File Size",
+    FILE_COUNT = "File Count",
     UUID = "UUID",
-    STATE = 'State',
     CONTAINER_UUID = "Container UUID",
+    RUNTIME = "Runtime",
     OUTPUT_UUID = "Output UUID",
-    PARENT_PROCESS = 'Parent process',
-    CREATED_AT = "Date created",
-    LAST_MODIFIED = "Last modified",
+    LOG_UUID = "Log UUID",
+    PARENT_PROCESS = 'Parent Process UUID',
+    MODIFIED_BY_USER_UUID = 'Modified by User UUID',
+    VERSION = "Version",
+    CREATED_AT = "Date Created",
+    LAST_MODIFIED = "Last Modified",
     TRASH_AT = "Trash at",
     DELETE_AT = "Delete at",
-    DESCRIPTION = "Description",
-    PORTABLE_DATA_HASH = "Portable Data Hash",
-    VERSION = "Version"
 }
 
 export interface ProjectPanelFilter extends DataTableFilterItem {
     type: ResourceKind | ContainerRequestState;
 }
 
-export const projectPanelColumns: DataColumns<string> = [
+export const projectPanelColumns: DataColumns<string, ProjectResource> = [
     {
         name: ProjectPanelColumnNames.NAME,
         selected: true,
         configurable: true,
-        sortDirection: SortDirection.NONE,
+        sort: {direction: SortDirection.NONE, field: "name"},
         filters: createTree(),
         render: uuid => <ResourceName uuid={uuid} />
     },
@@ -110,7 +113,7 @@ export const projectPanelColumns: DataColumns<string> = [
         configurable: true,
         mutuallyExclusiveFilters: true,
         filters: getInitialProcessStatusFilters(),
-        render: uuid => <ProcessStatus uuid={uuid} />,
+        render: uuid => <ResourceStatus uuid={uuid} />,
     },
     {
         name: ProjectPanelColumnNames.TYPE,
@@ -127,10 +130,17 @@ export const projectPanelColumns: DataColumns<string> = [
         render: uuid => <ResourceOwnerWithName uuid={uuid} />
     },
     {
-        name: ProjectPanelColumnNames.FILE_SIZE,
+        name: ProjectPanelColumnNames.PORTABLE_DATA_HASH,
         selected: false,
         configurable: true,
         filters: createTree(),
+        render: uuid => <ResourcePortableDataHash uuid={uuid} />
+    },
+    {
+        name: ProjectPanelColumnNames.FILE_SIZE,
+        selected: true,
+        configurable: true,
+        filters: createTree(),
         render: uuid => <ResourceFileSize uuid={uuid} />
     },
     {
@@ -138,96 +148,97 @@ export const projectPanelColumns: DataColumns<string> = [
         selected: false,
         configurable: true,
         filters: createTree(),
-        render: uuid =><ResourceFileCount uuid={uuid}/>
+        render: uuid => <ResourceFileCount uuid={uuid} />
     },
     {
         name: ProjectPanelColumnNames.UUID,
         selected: false,
         configurable: true,
         filters: createTree(),
-        render: uuid => <ResourceUUID uuid={uuid}/>
+        render: uuid => <ResourceUUID uuid={uuid} />
     },
     {
         name: ProjectPanelColumnNames.CONTAINER_UUID,
         selected: false,
         configurable: true,
         filters: createTree(),
-        render: uuid => <ResourceProcessUuid uuid={uuid}/>
+        render: uuid => <ResourceContainerUuid uuid={uuid} />
     },
     {
-        name: ProjectPanelColumnNames.OUTPUT_UUID,
+        name: ProjectPanelColumnNames.RUNTIME,
         selected: false,
         configurable: true,
         filters: createTree(),
-        render: uuid => <ResourceOutputUuid uuid={uuid}/>
+        render: uuid => <ContainerRunTime uuid={uuid} />
     },
     {
-        name: ProjectPanelColumnNames.STATE,
-        selected: true,
+        name: ProjectPanelColumnNames.OUTPUT_UUID,
+        selected: false,
         configurable: true,
         filters: createTree(),
-        render: uuid => <ResourceProcessState uuid={uuid}/>
+        render: uuid => <ResourceOutputUuid uuid={uuid} />
     },
     {
-        name: ProjectPanelColumnNames.PARENT_PROCESS,
+        name: ProjectPanelColumnNames.LOG_UUID,
         selected: false,
         configurable: true,
         filters: createTree(),
-        render: uuid => <ResourceParentProcess uuid={uuid}/>
+        render: uuid => <ResourceLogUuid uuid={uuid} />
     },
     {
-        name: ProjectPanelColumnNames.PORTABLE_DATA_HASH,
+        name: ProjectPanelColumnNames.PARENT_PROCESS,
         selected: false,
         configurable: true,
         filters: createTree(),
-        render: uuid => <ResourcePortableDataHash uuid={uuid}/>
+        render: uuid => <ResourceParentProcess uuid={uuid} />
     },
     {
-        name: ProjectPanelColumnNames.CREATED_AT,
+        name: ProjectPanelColumnNames.MODIFIED_BY_USER_UUID,
         selected: false,
         configurable: true,
         filters: createTree(),
-        render: uuid =><ResourceCreatedAtDate uuid={uuid}/>
+        render: uuid => <ResourceModifiedByUserUuid uuid={uuid} />
     },
     {
-        name: ProjectPanelColumnNames.LAST_MODIFIED,
+        name: ProjectPanelColumnNames.VERSION,
         selected: false,
         configurable: true,
-        sortDirection: SortDirection.DESC,
         filters: createTree(),
-        render: uuid => <ResourceLastModifiedDate uuid={uuid} />
+        render: uuid => <ResourceVersion uuid={uuid} />
     },
     {
-        name: ProjectPanelColumnNames.TRASH_AT,
+        name: ProjectPanelColumnNames.CREATED_AT,
         selected: false,
         configurable: true,
-        sortDirection: SortDirection.DESC,
+        sort: {direction: SortDirection.NONE, field: "createdAt"},
         filters: createTree(),
-        render: uuid => <ResourceTrashDate uuid={uuid} />
+        render: uuid => <ResourceCreatedAtDate uuid={uuid} />
     },
     {
-        name: ProjectPanelColumnNames.DELETE_AT,
-        selected: false,
+        name: ProjectPanelColumnNames.LAST_MODIFIED,
+        selected: true,
         configurable: true,
-        sortDirection: SortDirection.DESC,
+        sort: {direction: SortDirection.DESC, field: "modifiedAt"},
         filters: createTree(),
-        render: uuid => <ResourceDeleteDate uuid={uuid} />
+        render: uuid => <ResourceLastModifiedDate uuid={uuid} />
     },
     {
-        name: ProjectPanelColumnNames.DESCRIPTION,
+        name: ProjectPanelColumnNames.TRASH_AT,
         selected: false,
         configurable: true,
+        sort: {direction: SortDirection.NONE, field: "trashAt"},
         filters: createTree(),
-        render: uuid =><ResourceDescription uuid={uuid}/>
+        render: uuid => <ResourceTrashDate uuid={uuid} />
     },
     {
-        name: ProjectPanelColumnNames.VERSION,
+        name: ProjectPanelColumnNames.DELETE_AT,
         selected: false,
         configurable: true,
+        sort: {direction: SortDirection.NONE, field: "deleteAt"},
         filters: createTree(),
-        render: uuid =><ResourceVersion uuid={uuid}/>
-    }
-    
+        render: uuid => <ResourceDeleteDate uuid={uuid} />
+    },
+
 ];
 
 export const PROJECT_PANEL_ID = "projectPanel";