X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/8e6af2106e745285c5cda437d5856a99111686f8..e8dae47a3dead0a49cb60c1075b96a95ef8142e5:/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 c7ad91bd..22a83dda 100644 --- a/src/store/side-panel-tree/side-panel-tree-actions.ts +++ b/src/store/side-panel-tree/side-panel-tree-actions.ts @@ -13,8 +13,7 @@ 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 { ProgressIndicatorData } from '~/store/progress-indicator/progress-indicator-reducer'; +import { OrderBuilder } from '../../services/api/order-builder'; export enum SidePanelTreeCategory { PROJECTS = 'Projects', @@ -80,7 +79,10 @@ export const loadSidePanelTreeProjects = (projectUuid: string) => const params = { filters: new FilterBuilder() .addEqual('ownerUuid', projectUuid) - .getFilters() + .getFilters(), + order: new OrderBuilder() + .addAsc('name') + .getOrder() }; const { items } = await services.projectService.list(params); dispatch(treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({ @@ -101,7 +103,6 @@ export const activateSidePanelTreeItem = (nodeId: string) => if (!isSidePanelTreeCategory(nodeId)) { await dispatch(activateSidePanelTreeProject(nodeId)); } - dispatch(progressIndicatorActions.STOP_SUBMIT({ id: ProgressIndicatorData.SIDE_PANEL_PROGRESS })); }; export const activateSidePanelTreeProject = (nodeId: string) => @@ -150,14 +151,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)