Switch shared with me root item endpoint
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Tue, 13 Nov 2018 16:00:44 +0000 (17:00 +0100)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Tue, 13 Nov 2018 16:00:44 +0000 (17:00 +0100)
Feature #14473

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

src/store/side-panel-tree/side-panel-tree-actions.ts

index b26b8a51d989b1825077a15340be4563ff983e8e..76a679520aacb4a32fb549d3b217a8fe46eb7c1b 100644 (file)
@@ -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<ProjectResource>()
             .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,