[ARVADOS-WORKBENCH2] updated: 2.1.0-188-gc6ccae90
Git user
git at public.arvados.org
Wed Feb 3 19:30:12 UTC 2021
Summary of changes:
src/views-components/data-explorer/renderers.tsx | 8 ++++----
src/views-components/details-panel/project-details.tsx | 2 +-
src/views/collection-panel/collection-panel.tsx | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
via c6ccae902b16d7ff421e87f1b9c3578ef8a4334e (commit)
from 676a8457983ed1660493f747cc4bb506c8ddbe9c (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 c6ccae902b16d7ff421e87f1b9c3578ef8a4334e
Author: Daniel Kutyła <daniel.kutyla at contractors.roche.com>
Date: Wed Feb 3 20:29:08 2021 +0100
17205: Fixed types
Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla at contractors.roche.com>
diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx
index 7d870bc1..6cf29fae 100644
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -20,7 +20,7 @@ import { WorkflowResource } from '~/models/workflow';
import { ResourceStatus as WorkflowStatus } from '~/views/workflow-panel/workflow-panel-view';
import { getUuidPrefix, openRunProcess } from '~/store/workflow-panel/workflow-panel-actions';
import { openSharingDialog } from '~/store/sharing-dialog/sharing-dialog-actions';
-import { UserResource } from '~/models/user';
+import { getUserFullname, User, UserResource } from '~/models/user';
import { toggleIsActive, toggleIsAdmin } from '~/store/users/users-actions';
import { LinkResource } from '~/models/link';
import { navigateTo } from '~/store/navigation/navigation-action';
@@ -440,10 +440,10 @@ export const ResourceOwnerWithName =
connect(
(state: RootState, props: { uuid: string }) => {
let ownerName = '';
- const resource = getResource<GroupContentsResource>(props.uuid)(state.resources);
+ const resource = getResource<GroupContentsResource & UserResource>(props.uuid)(state.resources);
if (resource) {
- ownerName = (resource as any).fullName || resource.name;
+ ownerName = getUserFullname(resource as User) || (resource as GroupContentsResource).name;
}
return { uuid: props.uuid, ownerName };
@@ -460,7 +460,7 @@ export const ResourceOwnerWithName =
}
return <Typography style={{ color: theme.palette.primary.main }} inline noWrap>
- {uuid} ({ownerName})
+ {ownerName} ({uuid})
</Typography>;
});
diff --git a/src/views-components/details-panel/project-details.tsx b/src/views-components/details-panel/project-details.tsx
index 34a372c9..61797373 100644
--- a/src/views-components/details-panel/project-details.tsx
+++ b/src/views-components/details-panel/project-details.tsx
@@ -61,7 +61,7 @@ const ProjectDetailsComponent = connect(null, mapDispatchToProps)(
({ classes, project, onClick }: ProjectDetailsComponentProps) => <div>
<DetailsAttribute label='Type' value={resourceLabel(ResourceKind.PROJECT)} />
<DetailsAttribute label='Owner' linkToUuid={project.ownerUuid}
- uuidEnhancer={(uuid: string) => <ResourceOwnerWithName uuid={uuid} />} lowercaseValue={true} />
+ uuidEnhancer={(uuid: string) => <ResourceOwnerWithName uuid={uuid} />} />
<DetailsAttribute label='Last modified' value={formatDate(project.modifiedAt)} />
<DetailsAttribute label='Created at' value={formatDate(project.createdAt)} />
<DetailsAttribute label='Project UUID' linkToUuid={project.uuid} value={project.uuid} />
diff --git a/src/views/collection-panel/collection-panel.tsx b/src/views/collection-panel/collection-panel.tsx
index 32e37d46..7d54992e 100644
--- a/src/views/collection-panel/collection-panel.tsx
+++ b/src/views/collection-panel/collection-panel.tsx
@@ -289,7 +289,7 @@ export const CollectionDetailsAttributes = (props: { item: CollectionResource, t
<Grid item xs={12} md={mdSize}>
<DetailsAttribute classLabel={classes.label} classValue={classes.value}
label={isOldVersion ? "This version's UUID" : "Collection UUID"}
- linkToUuid={`${item.uuid} AAAAAAAAAAAAAAAPortable data hash`} />
+ linkToUuid={item.uuid} />
</Grid>
<Grid item xs={12} md={mdSize}>
<DetailsAttribute classLabel={classes.label} classValue={classes.value}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list