X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/5627bf1a83323d2b0364cb069564998eb8c6ca7a..9efef4484a8c28b97dae64e785e2dd7c38687cca:/src/store/side-panel-tree/side-panel-tree-actions.ts

diff --git a/src/store/side-panel-tree/side-panel-tree-actions.ts b/src/store/side-panel-tree/side-panel-tree-actions.ts
index 574bda95..23c5ea22 100644
--- a/src/store/side-panel-tree/side-panel-tree-actions.ts
+++ b/src/store/side-panel-tree/side-panel-tree-actions.ts
@@ -7,18 +7,19 @@ import { treePickerActions } from "~/store/tree-picker/tree-picker-actions";
 import { createTreePickerNode, TreePickerNode } from '~/store/tree-picker/tree-picker';
 import { RootState } from '../store';
 import { ServiceRepository } from '~/services/services';
-import { FilterBuilder } from '~/common/api/filter-builder';
+import { FilterBuilder } from '~/services/api/filter-builder';
 import { resourcesActions } from '../resources/resources-actions';
 import { getTreePicker, TreePicker } from '../tree-picker/tree-picker';
 import { TreeItemStatus } from "~/components/tree/tree";
-import { getNodeAncestors, getNodeValue, getNodeAncestorsIds } from '~/models/tree';
+import { getNodeAncestors, getNodeValue, getNodeAncestorsIds, getNode } from '~/models/tree';
 import { ProjectResource } from '~/models/project';
+import { progressIndicatorActions } from '../progress-indicator/progress-indicator-actions';
 
 export enum SidePanelTreeCategory {
     PROJECTS = 'Projects',
     SHARED_WITH_ME = 'Shared with me',
     WORKFLOWS = 'Workflows',
-    RECENT_OPEN = 'Recent open',
+    RECENT_OPEN = 'Recently open',
     FAVORITES = 'Favorites',
     TRASH = 'Trash'
 }
@@ -71,19 +72,23 @@ export const initSidePanelTree = () =>
 
 export const loadSidePanelTreeProjects = (projectUuid: string) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-        dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ nodeId: projectUuid, pickerId: SIDE_PANEL_TREE }));
-        const params = {
-            filters: new FilterBuilder()
-                .addEqual('ownerUuid', projectUuid)
-                .getFilters()
-        };
-        const { items } = await services.projectService.list(params);
-        dispatch(treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({
-            nodeId: projectUuid,
-            pickerId: SIDE_PANEL_TREE,
-            nodes: items.map(item => createTreePickerNode({ nodeId: item.uuid, value: item })),
-        }));
-        dispatch(resourcesActions.SET_RESOURCES(items));
+        const treePicker = getTreePicker(SIDE_PANEL_TREE)(getState().treePicker);
+        const node = treePicker ? getNode(projectUuid)(treePicker) : undefined;
+        if (node || projectUuid === '') {
+            dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ nodeId: projectUuid, pickerId: SIDE_PANEL_TREE }));
+            const params = {
+                filters: new FilterBuilder()
+                    .addEqual('ownerUuid', projectUuid)
+                    .getFilters()
+            };
+            const { items } = await services.projectService.list(params);
+            dispatch(treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({
+                nodeId: projectUuid,
+                pickerId: SIDE_PANEL_TREE,
+                nodes: items.map(item => createTreePickerNode({ nodeId: item.uuid, value: item })),
+            }));
+            dispatch(resourcesActions.SET_RESOURCES(items));
+        }
     };
 
 export const activateSidePanelTreeItem = (nodeId: string) =>
@@ -143,14 +148,14 @@ export const expandSidePanelTreeItem = (nodeId: string) =>
         }
     };
 
-const getSidePanelTreeNode = (nodeId: string) => (treePicker: TreePicker) => {
+export const getSidePanelTreeNode = (nodeId: string) => (treePicker: TreePicker) => {
     const sidePanelTree = getTreePicker(SIDE_PANEL_TREE)(treePicker);
     return sidePanelTree
         ? getNodeValue(nodeId)(sidePanelTree)
         : undefined;
 };
 
-const getSidePanelTreeNodeAncestorsIds = (nodeId: string) => (treePicker: TreePicker) => {
+export const getSidePanelTreeNodeAncestorsIds = (nodeId: string) => (treePicker: TreePicker) => {
     const sidePanelTree = getTreePicker(SIDE_PANEL_TREE)(treePicker);
     return sidePanelTree
         ? getNodeAncestorsIds(nodeId)(sidePanelTree)