Fix filters used to obtain uer's projects

Feature #13747

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

diff --git a/src/index.tsx b/src/index.tsx
index 21ecdab1ca0c5cf70dc84893501154d7601a3235..be01e0a0769505e43b55a9e320bad63949a32bbe 100644 (file)
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -23,22 +23,21 @@ const history = createBrowserHistory();
 const store = configureStore(history);
 
 store.dispatch(authActions.INIT());
-const rootUuid = authService.getRootUuid();
-store.dispatch<any>(getProjectList(rootUuid));
+store.dispatch<any>(getProjectList(authService.getUuid()));
 
 const App = () =>
     <MuiThemeProvider theme={CustomTheme}>
         <Provider store={store}>
             <ConnectedRouter history={history}>
                 <div>
-                    <Route path="/" component={Workbench}/>
-                    <Route path="/token" component={ApiToken}/>
+                    <Route path="/" component={Workbench} />
+                    <Route path="/token" component={ApiToken} />
                 </div>
             </ConnectedRouter>
         </Provider>
     </MuiThemeProvider>;
 
 ReactDOM.render(
-    <App/>,
+    <App />,
     document.getElementById('root') as HTMLElement
 );

diff --git a/src/store/project/project-action.ts b/src/store/project/project-action.ts
index 4cc219799e8cfcb371f14927925faf00555ddffb..516934969310fa7c5331d49719b190c5fc8d990b 100644 (file)
--- a/src/store/project/project-action.ts
+++ b/src/store/project/project-action.ts
@@ -3,10 +3,11 @@
 // SPDX-License-Identifier: AGPL-3.0
 import { default as unionize, ofType, UnionOf } from "unionize";
 
-import { Project } from "../../models/project";
-import { groupsService } from "../../services/services";
+import { Project, ProjectResource } from "../../models/project";
+import { projectService } from "../../services/services";
 import { Dispatch } from "redux";
 import { getResourceKind } from "../../models/resource";
+import FilterBuilder from "../../common/api/filter-builder";
 
 const actions = unionize({
     CREATE_PROJECT: ofType<Project>(),
@@ -20,17 +21,21 @@ const actions = unionize({
         tag: 'type',
         value: 'payload'
     });
- 
+
 export const getProjectList = (parentUuid: string = '') => (dispatch: Dispatch) => {
-        dispatch(actions.PROJECTS_REQUEST(parentUuid));
-        return groupsService.list().then(listResults => {
-            const projects = listResults.items.map(item => ({
-                ...item,
-                kind: getResourceKind(item.kind)
-            }));
-            dispatch(actions.PROJECTS_SUCCESS({ projects, parentItemId: parentUuid }));
-            return projects;
-        });
+    dispatch(actions.PROJECTS_REQUEST(parentUuid));
+    return projectService.list({
+        filters: FilterBuilder
+            .create<ProjectResource>()
+            .addEqual("ownerUuid", parentUuid)
+    }).then(listResults => {
+        const projects = listResults.items.map(item => ({
+            ...item,
+            kind: getResourceKind(item.kind)
+        }));
+        dispatch(actions.PROJECTS_SUCCESS({ projects, parentItemId: parentUuid }));
+        return projects;
+    });
 };
 
 export type ProjectAction = UnionOf<typeof actions>;