[arvados] updated: 2.7.0-6370-g784679e627

git repository hosting git at public.arvados.org
Wed May 22 19:46:39 UTC 2024


Summary of changes:
 .../src/store/side-panel-tree/side-panel-tree-actions.ts          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

       via  784679e62761886c98ea4e8a2ea8f506d26a7a97 (commit)
      from  ea7ee1513c27ce34e7b3c66c33056bbd9b8dfa8b (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 784679e62761886c98ea4e8a2ea8f506d26a7a97
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Wed May 22 09:42:41 2024 -0400

    Merge branch '21712-favorites-overwrite-bug'
    
    closes #21712
    
    Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/services/workbench2/src/store/side-panel-tree/side-panel-tree-actions.ts b/services/workbench2/src/store/side-panel-tree/side-panel-tree-actions.ts
index d900c77abb..691b436c83 100644
--- a/services/workbench2/src/store/side-panel-tree/side-panel-tree-actions.ts
+++ b/services/workbench2/src/store/side-panel-tree/side-panel-tree-actions.ts
@@ -102,11 +102,11 @@ export const loadSidePanelTreeProjects = (projectUuid: string) =>
         const node = treePicker ? getNode(projectUuid)(treePicker) : undefined;
         if (projectUuid === SidePanelTreeCategory.PUBLIC_FAVORITES) {
             const unverifiedPubFaves = await dispatch<any>(loadPublicFavoritesTree());
-            verifyAndUpdateLinkNames(unverifiedPubFaves, dispatch, getState, services);
+            verifyAndUpdateLinkNames(projectUuid, unverifiedPubFaves, dispatch, getState, services);
         } else if (projectUuid === SidePanelTreeCategory.FAVORITES) {
             const unverifiedFaves = await dispatch<any>(loadFavoritesTree());
             await setFaves(unverifiedFaves, dispatch, getState, services);
-            verifyAndUpdateLinkNames(unverifiedFaves, dispatch, getState, services);
+            verifyAndUpdateLinkNames(projectUuid, unverifiedFaves, dispatch, getState, services);
         } else if (node || projectUuid !== '') {
             await dispatch<any>(loadProject(projectUuid));
         }
@@ -188,12 +188,12 @@ const setFaves = async(links: LinkResource[], dispatch: Dispatch, getState: () =
     dispatch(resourcesActions.SET_RESOURCES(responseItems));
 };
 
-const verifyAndUpdateLinkNames = async (links: LinkResource[], dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+const verifyAndUpdateLinkNames = async (category: SidePanelTreeCategory, links: LinkResource[], dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
     const verfifiedLinks = await verifyAndUpdateLinks(links, dispatch, getState, services);
 
     dispatch(
         treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({
-            id: SidePanelTreeCategory.FAVORITES,
+            id: category,
             pickerId: SIDE_PANEL_TREE,
             nodes: verfifiedLinks.map(item => initTreeNode({ id: item.headUuid, value: item })),
         })

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list