[arvados-workbench2] updated: 2.4.0-358-g4ec72c3b
git repository hosting
git at public.arvados.org
Wed Nov 30 17:35:57 UTC 2022
Summary of changes:
src/views-components/data-explorer/renderers.tsx | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
via 4ec72c3bb23a8f50aa52c2ea75addf2ad789f354 (commit)
from add698bee2d2b7002a99aa08ac99b93179e2a535 (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 4ec72c3bb23a8f50aa52c2ea75addf2ad789f354
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Wed Nov 30 12:35:53 2022 -0500
changed processState display to get data from getProcess rather than getResource
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 9c24a677..30b59c8b 100644
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -61,7 +61,6 @@ import { getUserUuid } from 'common/getuser';
import { VirtualMachinesResource } from 'models/virtual-machines';
import { CopyToClipboardSnackbar } from 'components/copy-to-clipboard-snackbar/copy-to-clipboard-snackbar';
import { ProjectResource } from 'models/project';
-import {ContainerRequestResource} from 'models/container-request'
const renderName = (dispatch: Dispatch, item: GroupContentsResource) => {
@@ -669,9 +668,9 @@ const renderProcessState = (processState: string) => <Typography>{processState |
export const ResourceProcessState = connect(
(state: RootState, props: { uuid: string }) => {
- const resource = getResource<ContainerRequestResource>(props.uuid)(state.resources);
- return { state: resource?.state ? resource.state: '' };
- })((props: { state: string }) => renderProcessState(props.state));
+ const process = getProcess(props.uuid)(state.resources)
+ return { process: process?.container?.state ? process?.container?.state : '' };
+ })((props: { process: string }) => renderProcessState(props.process));
export const ResourceCreatedAtDate = connect(
(state: RootState, props: { uuid: string }) => {
@@ -747,7 +746,6 @@ const renderPortableDataHash = (portableDataHash:string | null) =>
export const ResourcePortableDataHash = connect(
(state: RootState, props: { uuid: string }) => {
const resource = getResource<CollectionResource>(props.uuid)(state.resources);
- // console.log('COLLECTION_RESOIRCE', resource)
return { portableDataHash: resource ? resource.portableDataHash : '' };
})((props: { portableDataHash: string }) => renderPortableDataHash(props.portableDataHash));
@@ -780,8 +778,8 @@ export const ResourceDescription = connect(
(state: RootState, props: { uuid: string }) => {
const resource = getResource<GroupContentsResource>(props.uuid)(state.resources);
//testing---------------
- const containerRequestDescription = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
- if (resource && !resource.description && resource.kind === ResourceKind.PROCESS) resource.description = containerRequestDescription
+ // const containerRequestDescription = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+ // if (resource && !resource.description && resource.kind === ResourceKind.PROCESS) resource.description = containerRequestDescription
//testing---------------
return { description: resource ? resource.description : '' };
})((props: { description: string }) => renderDescription(props.description));
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list