[arvados-workbench2] updated: 2.7.1-5-g4382b235
git repository hosting
git at public.arvados.org
Tue Dec 19 18:37:22 UTC 2023
Summary of changes:
src/views-components/data-explorer/renderers.tsx | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
via 4382b235020c3ac011170489fba4ce563b208dd0 (commit)
from 46aa19c9021558faed73dac266d9d96b1cff9ac1 (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 4382b235020c3ac011170489fba4ce563b208dd0
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Tue Dec 19 13:37:17 2023 -0500
21128: stopped new breadcrumb when navigating to home 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 16c5b379..0e0db4b8 100644
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -513,8 +513,7 @@ const getResourceDisplayName = (resource: Resource): string => {
}
};
-const renderResourceLink = (dispatch: Dispatch, item: Resource, breadcrumbs: any[] = []) => {
- console.log(item)
+const renderResourceLink = (dispatch: Dispatch, item: Resource, userUuid: string = '', breadcrumbs: any[] = []) => {
var displayName = getResourceDisplayName(item);
return (
@@ -525,7 +524,9 @@ const renderResourceLink = (dispatch: Dispatch, item: Resource, breadcrumbs: any
onClick={() => {
item.kind === ResourceKind.GROUP && (item as GroupResource).groupClass === "role"
? dispatch<any>(navigateToGroupDetails(item.uuid))
- : dispatch<any>(navigateTo(item.uuid)); setBreadcrumbs(breadcrumbs, item as any);
+ : dispatch<any>(navigateTo(item.uuid));
+ //don't add breadcrumb when navigating to 'Home Projects'
+ if (item.uuid !== userUuid) setBreadcrumbs(breadcrumbs, item as any);
}}
>
{resourceLabel(item.kind, item && item.kind === ResourceKind.GROUP ? (item as GroupResource).groupClass || "" : "")}:{" "}
@@ -537,12 +538,14 @@ const renderResourceLink = (dispatch: Dispatch, item: Resource, breadcrumbs: any
export const ResourceLinkTail = connect((state: RootState, props: { uuid: string }) => {
const resource = getResource<LinkResource>(props.uuid)(state.resources);
const tailResource = getResource<Resource>(resource?.tailUuid || "")(state.resources);
+ const userUuid = state.auth.user?.uuid
return {
item: tailResource || { uuid: resource?.tailUuid || "", kind: resource?.tailKind || ResourceKind.NONE },
- breadcrumbs: state.properties.breadcrumbs || []
+ breadcrumbs: state.properties.breadcrumbs || [],
+ userUuid
};
-})((props: { item: Resource, breadcrumbs: any[] } & DispatchProp<any>) => renderResourceLink(props.dispatch, props.item, props.breadcrumbs));
+})((props: { item: Resource, userUuid: string, breadcrumbs: any[] } & DispatchProp<any>) => renderResourceLink(props.dispatch, props.item, props.userUuid, props.breadcrumbs));
export const ResourceLinkHead = connect((state: RootState, props: { uuid: string }) => {
const resource = getResource<LinkResource>(props.uuid)(state.resources);
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list