X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/cda707f957a027a484f24f44090a4e5b995572a8..c421cba83fb4d6ca6dd11ada099c7b8c1da55d27:/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 8fbc375c..22a83dda 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, getNode } from '~/models/tree'; import { ProjectResource } from '~/models/project'; +import { OrderBuilder } from '../../services/api/order-builder'; 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' } @@ -78,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({ @@ -147,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)