rearranged new columns, standardized some variable namames

Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox@curii.com>

diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx
index 174cad66c7b1fe48653b54e249e5e54acba16fef..db97f891e7c6e40741121e6405de1c6342bbdadf 100644 (file)
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -672,7 +672,7 @@ export const ResourceProcessState = connect(
         return { state: process?.container?.state ? process?.container?.state : '' };
     })((props: { state: string }) => renderProcessState(props.state));
 
-export const ResourceProcessUuid = connect(
+export const ResourceContainerUuid = connect(
     (state: RootState, props: { uuid: string }) => {
         const process = getProcess(props.uuid)(state.resources)
         return { uuid: process?.container?.uuid ? process?.container?.uuid : '' };

diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx
index c7e7212b6b034db3778a4d4f7567a1bbed4ee658..bc5a170f55301dc0e5de8ca6f90e075848d431f6 100644 (file)
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -16,27 +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,
+    ResourceProcessState,
+    ResourceType,
+    ResourceOwnerWithName,
+    ResourceVersion,
+    ResourceDescription,
     ResourceFileSize,
     ResourceFileCount,
-    ResourceCreatedAtDate,
-    ResourceLastModifiedDate,
-    ResourceTrashDate,
-    ResourceDeleteDate,
-    ProcessStatus,
-    ResourceType,
     ResourceUUID,
+    ResourceContainerUuid,
     ResourceOutputUuid,
     ResourceLogUuid,
-    ResourceProcessUuid,
-    ResourceProcessState,
     ResourceParentProcess,
     ResourcePortableDataHash,
-    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
@@ -74,23 +74,23 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
 export enum ProjectPanelColumnNames {
     NAME = "Name",
     STATUS = "Status",
+    STATE = 'State',
     TYPE = "Type",
     OWNER = "Owner",
+    VERSION = "Version",
+    DESCRIPTION = "Description",
     FILE_SIZE = "File size",
     FILE_COUNT = "File count",
     UUID = "UUID",
-    STATE = 'State',
     CONTAINER_UUID = "Container UUID",
     OUTPUT_UUID = "Output UUID",
     LOG_UUID = "Log UUID",
-    PARENT_PROCESS = 'Parent process',
+    PARENT_PROCESS = 'Parent process UUID',
+    PORTABLE_DATA_HASH = "Portable data hash",
     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 {
@@ -112,7 +112,14 @@ export const projectPanelColumns: DataColumns<string> = [
         configurable: true,
         mutuallyExclusiveFilters: true,
         filters: getInitialProcessStatusFilters(),
-        render: uuid => <ProcessStatus uuid={uuid} />,
+        render: uuid => <ResourceStatus uuid={uuid} />,
+    },
+    {
+        name: ProjectPanelColumnNames.STATE,
+        selected: false,
+        configurable: true,
+        filters: createTree(),
+        render: uuid => <ResourceProcessState uuid={uuid}/>
     },
     {
         name: ProjectPanelColumnNames.TYPE,
@@ -129,10 +136,24 @@ export const projectPanelColumns: DataColumns<string> = [
         render: uuid => <ResourceOwnerWithName uuid={uuid} />
     },
     {
-        name: ProjectPanelColumnNames.FILE_SIZE,
+        name: ProjectPanelColumnNames.VERSION,
+        selected: false,
+        configurable: true,
+        filters: createTree(),
+        render: uuid =><ResourceVersion uuid={uuid}/>
+    },
+    {
+        name: ProjectPanelColumnNames.DESCRIPTION,
         selected: false,
         configurable: true,
         filters: createTree(),
+        render: uuid =><ResourceDescription uuid={uuid}/>
+    },
+    {
+        name: ProjectPanelColumnNames.FILE_SIZE,
+        selected: true,
+        configurable: true,
+        filters: createTree(),
         render: uuid => <ResourceFileSize uuid={uuid} />
     },
     {
@@ -154,7 +175,7 @@ export const projectPanelColumns: DataColumns<string> = [
         selected: false,
         configurable: true,
         filters: createTree(),
-        render: uuid => <ResourceProcessUuid uuid={uuid}/>
+        render: uuid => <ResourceContainerUuid uuid={uuid}/>
     },
     {
         name: ProjectPanelColumnNames.OUTPUT_UUID,
@@ -170,13 +191,6 @@ export const projectPanelColumns: DataColumns<string> = [
         filters: createTree(),
         render: uuid => <ResourceLogUuid uuid={uuid}/>
     },
-    {
-        name: ProjectPanelColumnNames.STATE,
-        selected: true,
-        configurable: true,
-        filters: createTree(),
-        render: uuid => <ResourceProcessState uuid={uuid}/>
-    },
     {
         name: ProjectPanelColumnNames.PARENT_PROCESS,
         selected: false,
@@ -195,12 +209,13 @@ export const projectPanelColumns: DataColumns<string> = [
         name: ProjectPanelColumnNames.CREATED_AT,
         selected: false,
         configurable: true,
+        sortDirection: SortDirection.DESC,
         filters: createTree(),
         render: uuid =><ResourceCreatedAtDate uuid={uuid}/>
     },
     {
         name: ProjectPanelColumnNames.LAST_MODIFIED,
-        selected: false,
+        selected: true,
         configurable: true,
         sortDirection: SortDirection.DESC,
         filters: createTree(),
@@ -222,20 +237,6 @@ export const projectPanelColumns: DataColumns<string> = [
         filters: createTree(),
         render: uuid => <ResourceDeleteDate uuid={uuid} />
     },
-    {
-        name: ProjectPanelColumnNames.DESCRIPTION,
-        selected: false,
-        configurable: true,
-        filters: createTree(),
-        render: uuid =><ResourceDescription uuid={uuid}/>
-    },
-    {
-        name: ProjectPanelColumnNames.VERSION,
-        selected: false,
-        configurable: true,
-        filters: createTree(),
-        render: uuid =><ResourceVersion uuid={uuid}/>
-    }
     
 ];