X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/fbbc53779fb3adf15d70936477aab771ee7caf42..b448c1c81f6e79c7afb2e99f68b152e3eb7f18e1:/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..76a67952 100644 --- a/src/store/side-panel-tree/side-panel-tree-actions.ts +++ b/src/store/side-panel-tree/side-panel-tree-actions.ts @@ -6,7 +6,7 @@ import { Dispatch } from 'redux'; import { treePickerActions } from "~/store/tree-picker/tree-picker-actions"; import { RootState } from '../store'; import { ServiceRepository } from '~/services/services'; -import { FilterBuilder } from '~/services/api/filter-builder'; +import { FilterBuilder, joinFilters } from '~/services/api/filter-builder'; import { resourcesActions } from '../resources/resources-actions'; import { getTreePicker, TreePicker } from '../tree-picker/tree-picker'; import { getNodeAncestors, getNodeAncestorsIds, getNode, TreeNode, initTreeNode, TreeNodeStatus } from '~/models/tree'; @@ -14,6 +14,7 @@ import { ProjectResource } from '~/models/project'; import { OrderBuilder } from '../../services/api/order-builder'; import { ResourceKind } from '~/models/resource'; import { GroupContentsResourcePrefix } from '../../services/groups-service/groups-service'; +import { GroupClass } from '../../models/group'; export enum SidePanelTreeCategory { PROJECTS = 'Projects', @@ -105,16 +106,16 @@ 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, }; - 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,