[arvados-workbench2] updated: 2.4.0-371-g961b23c0
git repository hosting
git at public.arvados.org
Fri Dec 9 22:58:47 UTC 2022
Summary of changes:
src/views-components/data-explorer/renderers.tsx | 23 ++++++++--------
src/views/project-panel/project-panel.tsx | 35 +++++++++++++++---------
2 files changed, 34 insertions(+), 24 deletions(-)
via 961b23c084e7f6fd6c0595b33b7988624a43f625 (commit)
via d53a42bb1223e2a54f0fd31790c64e09398cdbd6 (commit)
from b8a41cfd2d037a8d6b881ab71647c535a323f302 (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 961b23c084e7f6fd6c0595b33b7988624a43f625
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Fri Dec 9 17:58:40 2022 -0500
added runtime column, accommodated for non-process values 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 a309d1db..28728daf 100644
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -1043,6 +1043,6 @@ export const ContainerRunTime = connect((state: RootState, props: { uuid: string
}
render() {
- return renderRunTime(this.state.runtime);
+ return this.props.process ? renderRunTime(this.state.runtime) : <Typography>-</Typography>;
}
});
diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx
index 68945611..67fc4b35 100644
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -25,6 +25,7 @@ import {
ResourceFileCount,
ResourceUUID,
ResourceContainerUuid,
+ ContainerRunTime,
ResourceOutputUuid,
ResourceLogUuid,
ResourceParentProcess,
@@ -80,6 +81,7 @@ export enum ProjectPanelColumnNames {
FILE_COUNT = "File Count",
UUID = "UUID",
CONTAINER_UUID = "Container UUID",
+ RUNTIME = "Runtime",
OUTPUT_UUID = "Output UUID",
LOG_UUID = "Log UUID",
PARENT_PROCESS = 'Parent Process UUID',
@@ -161,6 +163,13 @@ export const projectPanelColumns: DataColumns<string> = [
filters: createTree(),
render: uuid => <ResourceContainerUuid uuid={uuid}/>
},
+ {
+ name: ProjectPanelColumnNames.RUNTIME,
+ selected: false,
+ configurable: true,
+ filters: createTree(),
+ render: uuid => <ContainerRunTime uuid={uuid} />
+ },
{
name: ProjectPanelColumnNames.OUTPUT_UUID,
selected: false,
commit d53a42bb1223e2a54f0fd31790c64e09398cdbd6
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Fri Dec 9 10:40:23 2022 -0500
swapped portable data hash and version columns/menu items 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 7390a6e2..a309d1db 100644
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -454,7 +454,7 @@ export const ResourceCluster = (props: { uuid: string }) => {
// Links Resources
const renderLinkName = (item: { name: string }) =>
- <Typography noWrap>{item.name || '(none)'}</Typography>;
+ <Typography noWrap>{item.name || '-'}</Typography>;
export const ResourceLinkName = connect(
(state: RootState, props: { uuid: string }) => {
@@ -788,6 +788,16 @@ export const ResourceUUID = connect(
const resource = getResource<CollectionResource>(props.uuid)(state.resources);
return { uuid: resource ? resource.uuid : '' };
})((props: { uuid: string }) => renderUuid({uuid: props.uuid}));
+
+const renderVersion = (version: number) =>{
+ return <Typography>{version ?? '-'}</Typography>
+}
+
+export const ResourceVersion = connect(
+ (state: RootState, props: { uuid: string }) => {
+ const resource = getResource<CollectionResource>(props.uuid)(state.resources);
+ return { version: resource ? resource.version: '' };
+ })((props: { version: number }) => renderVersion(props.version));
const renderPortableDataHash = (portableDataHash:string | null) =>
<Typography noWrap>
@@ -801,15 +811,6 @@ export const ResourcePortableDataHash = connect(
return { portableDataHash: resource ? resource.portableDataHash : '' };
})((props: { portableDataHash: string }) => renderPortableDataHash(props.portableDataHash));
-const renderVersion = (version: number) =>{
- return <Typography>{version ?? '-'}</Typography>
-}
-
-export const ResourceVersion = connect(
- (state: RootState, props: { uuid: string }) => {
- const resource = getResource<CollectionResource>(props.uuid)(state.resources);
- return { version: resource ? resource.version: '' };
- })((props: { version: number }) => renderVersion(props.version));
const renderFileCount = (fileCount: number) =>{
return <Typography>{fileCount ?? '-'}</Typography>
diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx
index dcf6c40c..68945611 100644
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -20,7 +20,7 @@ import {
ProcessStatus as ResourceStatus,
ResourceType,
ResourceOwnerWithName,
- ResourceVersion,
+ ResourcePortableDataHash,
ResourceFileSize,
ResourceFileCount,
ResourceUUID,
@@ -29,7 +29,7 @@ import {
ResourceLogUuid,
ResourceParentProcess,
ResourceModifiedByUserUuid,
- ResourcePortableDataHash,
+ ResourceVersion,
ResourceCreatedAtDate,
ResourceLastModifiedDate,
ResourceTrashDate,
@@ -75,18 +75,18 @@ export enum ProjectPanelColumnNames {
STATUS = "Status",
TYPE = "Type",
OWNER = "Owner",
- VERSION = "Version",
- FILE_SIZE = "File size",
- FILE_COUNT = "File count",
+ PORTABLE_DATA_HASH = "Portable Data Hash",
+ FILE_SIZE = "File Size",
+ FILE_COUNT = "File Count",
UUID = "UUID",
CONTAINER_UUID = "Container UUID",
OUTPUT_UUID = "Output UUID",
LOG_UUID = "Log UUID",
- PARENT_PROCESS = 'Parent process 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",
+ VERSION = "Version",
+ CREATED_AT = "Date Created",
+ LAST_MODIFIED = "Last Modified",
TRASH_AT = "Trash at",
DELETE_AT = "Delete at",
}
@@ -127,11 +127,11 @@ export const projectPanelColumns: DataColumns<string> = [
render: uuid => <ResourceOwnerWithName uuid={uuid} />
},
{
- name: ProjectPanelColumnNames.VERSION,
+ name: ProjectPanelColumnNames.PORTABLE_DATA_HASH,
selected: false,
configurable: true,
filters: createTree(),
- render: uuid =><ResourceVersion uuid={uuid}/>
+ render: uuid => <ResourcePortableDataHash uuid={uuid}/>
},
{
name: ProjectPanelColumnNames.FILE_SIZE,
@@ -190,11 +190,11 @@ export const projectPanelColumns: DataColumns<string> = [
render: uuid => <ResourceModifiedByUserUuid uuid={uuid}/>
},
{
- name: ProjectPanelColumnNames.PORTABLE_DATA_HASH,
+ name: ProjectPanelColumnNames.VERSION,
selected: false,
configurable: true,
filters: createTree(),
- render: uuid => <ResourcePortableDataHash uuid={uuid}/>
+ render: uuid =><ResourceVersion uuid={uuid}/>
},
{
name: ProjectPanelColumnNames.CREATED_AT,
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list