From 94a845ec96ac8d68672195b49cd3088a78a10e03 Mon Sep 17 00:00:00 2001 From: Lisa Knox Date: Tue, 12 Mar 2024 12:07:09 -0400 Subject: [PATCH] 21357: publicfavorites now optimistically renders Arvados-DCO-1.1-Signed-off-by: Lisa Knox --- .../side-panel-tree/side-panel-tree-actions.ts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) 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 ea4df655fd..970f0cf2a9 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 @@ -101,10 +101,11 @@ export const loadSidePanelTreeProjects = (projectUuid: string) => const treePicker = getTreePicker(SIDE_PANEL_TREE)(getState().treePicker); const node = treePicker ? getNode(projectUuid)(treePicker) : undefined; if (projectUuid === SidePanelTreeCategory.PUBLIC_FAVORITES) { - await dispatch(loadPublicFavoritesTree()); + const unverifiedPubFaves = await dispatch(loadPublicFavoritesTree()); + verifyAndUpdateLinkNames(unverifiedPubFaves, dispatch, getState, services); } else if (projectUuid === SidePanelTreeCategory.FAVORITES) { - const unverifiedLinks = await dispatch(loadFavoritesTree()); - verifyAndUpdateLinkNames(unverifiedLinks, dispatch, getState, services); + const unverifiedFaves = await dispatch(loadFavoritesTree()); + verifyAndUpdateLinkNames(unverifiedFaves, dispatch, getState, services); } else if (node || projectUuid !== '') { await dispatch(loadProject(projectUuid)); } @@ -188,7 +189,7 @@ export const loadPublicFavoritesTree = () => async (dispatch: Dispatch, getState limit: SIDEPANEL_TREE_NODE_LIMIT, }; - const items = (await services.linkService.list(params)).items; + const { items } = await services.linkService.list(params); const uuids = items.map(it => it.headUuid); const groupItems: any = await services.groupsService.list({ @@ -214,11 +215,6 @@ export const loadPublicFavoritesTree = () => async (dispatch: Dispatch, getState const filteredItems = items.filter(item => responseItems.some(responseItem => responseItem.uuid === item.headUuid)); - // for(const item of filteredItems) { - // const verifiedName = await verifyAndUpdateLinkName(item, dispatch, getState, services); - // item.name = verifiedName; - // } - dispatch( treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({ id: SidePanelTreeCategory.PUBLIC_FAVORITES, @@ -227,7 +223,7 @@ export const loadPublicFavoritesTree = () => async (dispatch: Dispatch, getState }) ); - dispatch(resourcesActions.SET_RESOURCES(responseItems)); + return filteredItems; }; export const activateSidePanelTreeItem = (id: string) => -- 2.30.2