From fc16e2ad191f91e78f5e5b89486894a8aacbfaf0 Mon Sep 17 00:00:00 2001
From: Lisa Knox <lisaknox83@gmail.com>
Date: Fri, 2 Dec 2022 15:38:23 -0500
Subject: [PATCH] remodified_by_user_uuid column up, minor readablity changes
 Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox@curii.com>

---
 .../data-explorer/renderers.tsx                 | 17 ++++++++++-------
 src/views/project-panel/project-panel.tsx       | 11 ++++++++++-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx
index e0ac2667..db2425ab 100644
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -673,25 +673,28 @@ export const ResourceContainerUuid = connect(
 export const ResourceOutputUuid = connect(
     (state: RootState, props: { uuid: string }) => {
         const process = getProcess(props.uuid)(state.resources)
-        const outputUuid = process?.containerRequest.outputUuid
-        return { uuid: outputUuid ? outputUuid : '' };
+        return { uuid: process?.containerRequest.outputUuid || '' };
     })((props: { uuid: string }) => renderUuid({ uuid: props.uuid }));
 
 export const ResourceLogUuid = connect(
     (state: RootState, props: { uuid: string }) => {
         const process = getProcess(props.uuid)(state.resources)
-        const logUuid = process?.containerRequest.logUuid
-        return { uuid: logUuid ? logUuid : '' };
+        return { uuid: process?.containerRequest.logUuid || '' };
     })((props: { uuid: string }) => renderUuid({ uuid: props.uuid }));
 
 export const ResourceParentProcess = connect(
     (state: RootState, props: { uuid: string }) => {
         const process = getProcess(props.uuid)(state.resources)
-        const parentProcessUuid = process?.containerRequest?.requestingContainerUuid
-        return { parentProcess: parentProcessUuid || '' };
+        return { parentProcess: process?.containerRequest?.requestingContainerUuid || '' };
     })((props: { parentProcess: string }) => renderUuid({uuid: props.parentProcess}));
 
-export const ResourceCreatedAtDate = connect(
+export const ResourceModifiedByUserUuid = connect(
+    (state: RootState, props: { uuid: string }) => {
+        const process = getProcess(props.uuid)(state.resources)
+        return { userUuid: process?.containerRequest?.modifiedByUserUuid || '' };
+    })((props: { userUuid: string }) => renderUuid({uuid: props.userUuid}));
+
+    export const ResourceCreatedAtDate = connect(
     (state: RootState, props: { uuid: string }) => {
         const resource = getResource<GroupContentsResource>(props.uuid)(state.resources);
         return { date: resource ? resource.createdAt : '' };
diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx
index 61d55548..2b32eaa9 100644
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -29,6 +29,7 @@ import {
     ResourceOutputUuid,
     ResourceLogUuid,
     ResourceParentProcess,
+    ResourceModifiedByUserUuid,
     ResourcePortableDataHash,
     ResourceCreatedAtDate,
     ResourceLastModifiedDate,
@@ -84,6 +85,7 @@ export enum ProjectPanelColumnNames {
     OUTPUT_UUID = "Output UUID",
     LOG_UUID = "Log 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",
@@ -163,7 +165,7 @@ export const projectPanelColumns: DataColumns<string> = [
     },
     {
         name: ProjectPanelColumnNames.CONTAINER_UUID,
-        selected: false,
+        selected: true,
         configurable: true,
         filters: createTree(),
         render: uuid => <ResourceContainerUuid uuid={uuid}/>
@@ -189,6 +191,13 @@ export const projectPanelColumns: DataColumns<string> = [
         filters: createTree(),
         render: uuid => <ResourceParentProcess uuid={uuid}/>
     },
+    {
+        name: ProjectPanelColumnNames.MODIFIED_BY_USER_UUID,
+        selected: false,
+        configurable: true,
+        filters: createTree(),
+        render: uuid => <ResourceModifiedByUserUuid uuid={uuid}/>
+    },
     {
         name: ProjectPanelColumnNames.PORTABLE_DATA_HASH,
         selected: false,
-- 
2.30.2