process parent uuid column up, minor fixes Arvados-DCO-1.1-Signed-off-by: Lisa Knox...

diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx
index 30b59c8b4e352f3cbe8b80609cd78535a71a6621..9ea80cbcdafff00ca67738b7c54857d480b37275 100644 (file)
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -227,7 +227,7 @@ export const UserResourceFullName = connect(
 const renderUuid = (item: { uuid: string }) =>
     <Typography data-cy="uuid" noWrap>
         {item.uuid}
-        <CopyToClipboardSnackbar value={item.uuid} />
+        {(item.uuid && <CopyToClipboardSnackbar value={item.uuid} />) || '-' }
     </Typography>;
 
 export const ResourceUuid = connect((state: RootState, props: { uuid: string }) => (
@@ -669,8 +669,15 @@ const renderProcessState = (processState: string) => <Typography>{processState |
 export const ResourceProcessState = connect(
     (state: RootState, props: { uuid: string }) => {
         const process = getProcess(props.uuid)(state.resources)
-        return { process: process?.container?.state ? process?.container?.state : '' };
-    })((props: { process: string }) => renderProcessState(props.process));
+        return { state: process?.container?.state ? process?.container?.state : '' };
+    })((props: { state: string }) => renderProcessState(props.state));
+
+export const ResourceParentProcess = connect(
+    (state: RootState, props: { uuid: string }) => {
+        const process = getProcess(props.uuid)(state.resources)
+        const parentProcessUuid = process?.containerRequest?.requestingContainerUuid
+        return { parentProcess: parentProcessUuid || '' };
+    })((props: { parentProcess: string }) => renderUuid({uuid: props.parentProcess}));
 
 export const ResourceCreatedAtDate = connect(
     (state: RootState, props: { uuid: string }) => {

diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx
index 465178e7ffeca7b608bd13d594e749adb641901a..ff530ef58e9b48cc313e6d06d8f713197f639a35 100644 (file)
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -26,6 +26,7 @@ import {
     ResourceType,
     ResourceUUID,
     ResourceProcessState,
+    ResourceParentProcess,
     ResourcePortableDataHash,
     ResourceVersion,
     ResourceDescription,
@@ -76,6 +77,7 @@ export enum ProjectPanelColumnNames {
     FILE_COUNT = "File count",
     UUID = "UUID",
     STATE = 'State',
+    PARENT_PROCESS = 'Parent process',
     CREATED_AT = "Date created",
     LAST_MODIFIED = "Last modified",
     TRASH_AT = "Trash at",
@@ -99,7 +101,7 @@ export const projectPanelColumns: DataColumns<string> = [
         render: uuid => <ResourceName uuid={uuid} />
     },
     {
-        name: "Status",
+        name: ProjectPanelColumnNames.STATUS,
         selected: true,
         configurable: true,
         mutuallyExclusiveFilters: true,
@@ -122,21 +124,21 @@ export const projectPanelColumns: DataColumns<string> = [
     },
     {
         name: ProjectPanelColumnNames.FILE_SIZE,
-        selected: true,
+        selected: false,
         configurable: true,
         filters: createTree(),
         render: uuid => <ResourceFileSize uuid={uuid} />
     },
     {
         name: ProjectPanelColumnNames.FILE_COUNT,
-        selected: true,
+        selected: false,
         configurable: true,
         filters: createTree(),
         render: uuid =><ResourceFileCount uuid={uuid}/>
     },
     {
         name: ProjectPanelColumnNames.UUID,
-        selected: true,
+        selected: false,
         configurable: true,
         filters: createTree(),
         render: uuid => <ResourceUUID uuid={uuid}/>
@@ -148,9 +150,16 @@ export const projectPanelColumns: DataColumns<string> = [
         filters: createTree(),
         render: uuid => <ResourceProcessState uuid={uuid}/>
     },
+    {
+        name: ProjectPanelColumnNames.PARENT_PROCESS,
+        selected: false,
+        configurable: true,
+        filters: createTree(),
+        render: uuid => <ResourceParentProcess uuid={uuid}/>
+    },
     {
         name: ProjectPanelColumnNames.PORTABLE_DATA_HASH,
-        selected: true,
+        selected: false,
         configurable: true,
         filters: createTree(),
         render: uuid => <ResourcePortableDataHash uuid={uuid}/>
@@ -188,7 +197,7 @@ export const projectPanelColumns: DataColumns<string> = [
     },
     {
         name: ProjectPanelColumnNames.DESCRIPTION,
-        selected: true,
+        selected: false,
         configurable: true,
         filters: createTree(),
         render: uuid =><ResourceDescription uuid={uuid}/>