X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/35c2b0aa20a24768ae34c7a3788b1e5b43cdfdac..1826bc21a34b983778f6e221b6c4004fdea1ad1d:/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 b26b8a51..6ad71391 100644 --- a/src/store/side-panel-tree/side-panel-tree-actions.ts +++ b/src/store/side-panel-tree/side-panel-tree-actions.ts @@ -4,22 +4,23 @@ import { Dispatch } from 'redux'; import { treePickerActions } from "~/store/tree-picker/tree-picker-actions"; -import { RootState } from '../store'; +import { RootState } from '~/store/store'; import { ServiceRepository } from '~/services/services'; import { FilterBuilder } from '~/services/api/filter-builder'; -import { resourcesActions } from '../resources/resources-actions'; -import { getTreePicker, TreePicker } from '../tree-picker/tree-picker'; +import { resourcesActions } from '~/store/resources/resources-actions'; +import { getTreePicker, TreePicker } from '~/store/tree-picker/tree-picker'; import { getNodeAncestors, getNodeAncestorsIds, getNode, TreeNode, initTreeNode, TreeNodeStatus } from '~/models/tree'; import { ProjectResource } from '~/models/project'; -import { OrderBuilder } from '../../services/api/order-builder'; +import { OrderBuilder } from '~/services/api/order-builder'; import { ResourceKind } from '~/models/resource'; -import { GroupContentsResourcePrefix } from '../../services/groups-service/groups-service'; +import { GroupContentsResourcePrefix } from '~/services/groups-service/groups-service'; +import { GroupClass } from '~/models/group'; export enum SidePanelTreeCategory { PROJECTS = 'Projects', SHARED_WITH_ME = 'Shared with me', + PUBLIC_FAVORITES = 'Public Favorites', WORKFLOWS = 'Workflows', - RECENT_OPEN = 'Recently open', FAVORITES = 'Favorites', TRASH = 'Trash' } @@ -42,8 +43,8 @@ export const getSidePanelTreeBranch = (uuid: string) => (treePicker: TreePicker) }; const SIDE_PANEL_CATEGORIES = [ + SidePanelTreeCategory.PUBLIC_FAVORITES, SidePanelTreeCategory.WORKFLOWS, - SidePanelTreeCategory.RECENT_OPEN, SidePanelTreeCategory.FAVORITES, SidePanelTreeCategory.TRASH, ]; @@ -105,16 +106,17 @@ const loadSharedRoot = async (dispatch: Dispatch, _: () => RootState, services: dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ id: SidePanelTreeCategory.SHARED_WITH_ME, pickerId: SIDE_PANEL_TREE })); const params = { - filters: new FilterBuilder() + filters: `[${new FilterBuilder() .addIsA('uuid', ResourceKind.PROJECT) - .getFilters(), + .addEqual('groupClass', GroupClass.PROJECT) + .getFilters()}]`, order: new OrderBuilder() .addAsc('name', GroupContentsResourcePrefix.PROJECT) .getOrder(), - excludeHomeProject: true, + limit: 1000 }; - const { items } = await services.groupsService.contents('', params); + const { items } = await services.groupsService.shared(params); dispatch(treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({ id: SidePanelTreeCategory.SHARED_WITH_ME,