[arvados-workbench2] updated: 2.4.0-359-g2d2d4230
git repository hosting
git at public.arvados.org
Wed Nov 30 23:40:58 UTC 2022
Summary of changes:
src/views-components/data-explorer/renderers.tsx | 13 ++++++++++---
src/views/project-panel/project-panel.tsx | 21 +++++++++++++++------
2 files changed, 25 insertions(+), 9 deletions(-)
via 2d2d42308a636998aa7f10e01283722e30ab20f5 (commit)
from 4ec72c3bb23a8f50aa52c2ea75addf2ad789f354 (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 2d2d42308a636998aa7f10e01283722e30ab20f5
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Wed Nov 30 18:39:45 2022 -0500
process parent uuid column up, minor fixes 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 30b59c8b..9ea80cbc 100644
--- 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 465178e7..ff530ef5 100644
--- 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}/>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list