projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
bea6758
)
21412: fixed nav to aonther user root project Arvados-DCO-1.1-Signed-off-by: Lisa...
21412-user-profile-bugs
author
Lisa Knox <lisaknox83@gmail.com>
Tue, 5 Mar 2024 16:59:21 +0000
(11:59 -0500)
committer
Lisa Knox <lisaknox83@gmail.com>
Tue, 5 Mar 2024 16:59:21 +0000
(11:59 -0500)
services/workbench2/src/store/breadcrumbs/breadcrumbs-actions.ts
patch
|
blob
|
history
services/workbench2/src/store/navigation/navigation-action.ts
patch
|
blob
|
history
services/workbench2/src/store/workbench/workbench-actions.ts
patch
|
blob
|
history
diff --git
a/services/workbench2/src/store/breadcrumbs/breadcrumbs-actions.ts
b/services/workbench2/src/store/breadcrumbs/breadcrumbs-actions.ts
index 067d79766fec2d0d43503dc2144ccf5a6b7a50af..c3f7d8f531f8d28041b2ddb498a2f831fbffdd7c 100644
(file)
--- a/
services/workbench2/src/store/breadcrumbs/breadcrumbs-actions.ts
+++ b/
services/workbench2/src/store/breadcrumbs/breadcrumbs-actions.ts
@@
-277,7
+277,6
@@
export const setUserProfileBreadcrumbs = (userUuid: string) =>
try {
const user = getResource<UserResource>(userUuid)(getState().resources)
|| await services.userService.get(userUuid, false);
try {
const user = getResource<UserResource>(userUuid)(getState().resources)
|| await services.userService.get(userUuid, false);
- const currentCrumbs = getState().properties.breadcrumbs as Breadcrumb[] || [];
const userProfileBreadcrumbs: Breadcrumb[] = [
{ label: USERS_PANEL_LABEL, uuid: USERS_PANEL_LABEL },
{ label: user ? `${user.firstName} ${user.lastName}` : userUuid, uuid: userUuid },
const userProfileBreadcrumbs: Breadcrumb[] = [
{ label: USERS_PANEL_LABEL, uuid: USERS_PANEL_LABEL },
{ label: user ? `${user.firstName} ${user.lastName}` : userUuid, uuid: userUuid },
diff --git
a/services/workbench2/src/store/navigation/navigation-action.ts
b/services/workbench2/src/store/navigation/navigation-action.ts
index 82598e288c81c64384b595caa2a7f5629d05b101..e797dcf7ab40d157be9c8f219da08584389d66ba 100644
(file)
--- a/
services/workbench2/src/store/navigation/navigation-action.ts
+++ b/
services/workbench2/src/store/navigation/navigation-action.ts
@@
-40,7
+40,6
@@
export const navigateTo = (uuid: string) => async (dispatch: Dispatch, getState:
return;
case ResourceKind.WORKFLOW:
dispatch<any>(pushOrGoto(getNavUrl(uuid, getState().auth)));
return;
case ResourceKind.WORKFLOW:
dispatch<any>(pushOrGoto(getNavUrl(uuid, getState().auth)));
- // dispatch<any>(openDetailsPanel(uuid));
return;
}
return;
}
diff --git
a/services/workbench2/src/store/workbench/workbench-actions.ts
b/services/workbench2/src/store/workbench/workbench-actions.ts
index 83c51f978a6250a704850176479ee1dac4967f32..83c457f94ddb68ded6ce919ae499a5c08b8d879f 100644
(file)
--- a/
services/workbench2/src/store/workbench/workbench-actions.ts
+++ b/
services/workbench2/src/store/workbench/workbench-actions.ts
@@
-105,7
+105,6
@@
import { deselectOne } from "store/multiselect/multiselect-actions";
import { treePickerActions } from "store/tree-picker/tree-picker-actions";
import { workflowProcessesPanelColumns } from "views/workflow-panel/workflow-processes-panel-root";
import { workflowProcessesPanelActions } from "store/workflow-panel/workflow-panel-actions";
import { treePickerActions } from "store/tree-picker/tree-picker-actions";
import { workflowProcessesPanelColumns } from "views/workflow-panel/workflow-processes-panel-root";
import { workflowProcessesPanelActions } from "store/workflow-panel/workflow-panel-actions";
-import { Breadcrumb } from "components/breadcrumbs/breadcrumbs";
export const WORKBENCH_LOADING_SCREEN = "workbenchLoadingScreen";
export const WORKBENCH_LOADING_SCREEN = "workbenchLoadingScreen";
@@
-248,10
+247,7
@@
export const loadProject = (uuid: string) =>
if (extractUuidKind(uuid) === ResourceKind.USER && userUuid !== uuid) {
// Load another users home projects
dispatch(finishLoadingProject(uuid));
if (extractUuidKind(uuid) === ResourceKind.USER && userUuid !== uuid) {
// Load another users home projects
dispatch(finishLoadingProject(uuid));
- const prevBreadcrumbs = getState().properties.breadcrumbs as Breadcrumb[] || [];
- if (prevBreadcrumbs.length === 0) {
- dispatch<any>(setSidePanelBreadcrumbs(uuid));
- }
+ dispatch<any>(setSidePanelBreadcrumbs(uuid));
} else if (userUuid !== uuid) {
await dispatch(finishLoadingProject(uuid));
const match = await loadGroupContentsResource({
} else if (userUuid !== uuid) {
await dispatch(finishLoadingProject(uuid));
const match = await loadGroupContentsResource({