Merge branch 'master' into 14120-rich-text-editor

[arvados.git] / 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 95e409f5c5bfcd2ca6edfc08df4377dedb24dfae..3fd2d68af6930946c933657a8d59aec8dfdcddc6 100644 (file)
--- a/src/store/side-panel-tree/side-panel-tree-actions.ts
+++ b/src/store/side-panel-tree/side-panel-tree-actions.ts
@@ -13,6 +13,8 @@ import { getTreePicker, TreePicker } from '../tree-picker/tree-picker';
 import { TreeItemStatus } from "~/components/tree/tree";
 import { getNodeAncestors, getNodeValue, getNodeAncestorsIds, getNode } from '~/models/tree';
 import { ProjectResource } from '~/models/project';
+import { progressIndicatorActions } from '../progress-indicator/progress-indicator-actions';
+import { OrderBuilder } from '../../services/api/order-builder';
 
 export enum SidePanelTreeCategory {
     PROJECTS = 'Projects',
@@ -78,7 +80,10 @@ export const loadSidePanelTreeProjects = (projectUuid: string) =>
             const params = {
                 filters: new FilterBuilder()
                     .addEqual('ownerUuid', projectUuid)
-                    .getFilters()
+                    .getFilters(),
+                order: new OrderBuilder<ProjectResource>()
+                    .addAsc('name')
+                    .getOrder()
             };
             const { items } = await services.projectService.list(params);
             dispatch(treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({
@@ -147,14 +152,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)