[arvados-workbench2] updated: 2.4.0-366-gfc16e2ad

[git repository hosting]

Summary of changes:
 src/views-components/data-explorer/renderers.tsx | 25 ++++++++++--------------
 src/views/project-panel/project-panel.tsx        | 20 +++++++++----------
 2 files changed, 20 insertions(+), 25 deletions(-)

       via  fc16e2ad191f91e78f5e5b89486894a8aacbfaf0 (commit)
       via  18ad190b02ff4975f36c5c7357875d54389d028e (commit)
      from  63b6ab236bbe65ffd9f57c64172a8950d4dc9826 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit fc16e2ad191f91e78f5e5b89486894a8aacbfaf0
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Fri Dec 2 15:38:23 2022 -0500

    remodified_by_user_uuid column up, minor readablity changes Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

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,

commit 18ad190b02ff4975f36c5c7357875d54389d028e
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Fri Dec 2 15:01:39 2022 -0500

    removed redubdant "state" column
    
    Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx
index db97f891..e0ac2667 100644
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -664,14 +664,6 @@ export const ResourceWorkflowStatus = connect(
         };
     })((props: { ownerUuid?: string, uuidPrefix: string }) => renderWorkflowStatus(props.uuidPrefix, props.ownerUuid));
 
-const renderProcessState = (processState: string) => <Typography>{processState || '-'}</Typography>
-
-export const ResourceProcessState = connect(
-    (state: RootState, props: { uuid: string }) => {
-        const process = getProcess(props.uuid)(state.resources)
-        return { state: process?.container?.state ? process?.container?.state : '' };
-    })((props: { state: string }) => renderProcessState(props.state));
-
 export const ResourceContainerUuid = connect(
     (state: RootState, props: { uuid: string }) => {
         const process = getProcess(props.uuid)(state.resources)
diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx
index bc5a170f..61d55548 100644
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -18,7 +18,6 @@ import { ResourceKind, Resource } from 'models/resource';
 import {
     ResourceName,
     ProcessStatus as ResourceStatus,
-    ResourceProcessState,
     ResourceType,
     ResourceOwnerWithName,
     ResourceVersion,
@@ -74,7 +73,6 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
 export enum ProjectPanelColumnNames {
     NAME = "Name",
     STATUS = "Status",
-    STATE = 'State',
     TYPE = "Type",
     OWNER = "Owner",
     VERSION = "Version",
@@ -114,13 +112,6 @@ export const projectPanelColumns: DataColumns<string> = [
         filters: getInitialProcessStatusFilters(),
         render: uuid => <ResourceStatus uuid={uuid} />,
     },
-    {
-        name: ProjectPanelColumnNames.STATE,
-        selected: false,
-        configurable: true,
-        filters: createTree(),
-        render: uuid => <ResourceProcessState uuid={uuid}/>
-    },
     {
         name: ProjectPanelColumnNames.TYPE,
         selected: true,

-----------------------------------------------------------------------


hooks/post-receive
--