feat: refactor create new project to use rtk

SwissDataScienceCenter · Dec 8, 2022 · 3a52f26 · 3a52f26
1 parent 8a7ffd3
commit 3a52f26
Show file tree

Hide file tree

Showing 9 changed files with 233 additions and 226 deletions.
diff --git a/client/src/App.js b/client/src/App.js
@@ -50,6 +50,7 @@ import { AddDataset } from "./dataset/addtoproject/DatasetAdd.container";
 import { DatasetCoordinator } from "./dataset/Dataset.state";
 import AppContext from "./utils/context/appContext";
 import { setupWebSocket } from "./websocket";
+import { NewProjectCoordinator } from "./project/new/ProjectNew.state";
 
 export const ContainerWrap = ({ children, fullSize = false }) => {
   const classContainer = !fullSize ? "container-xxl py-4 mt-2 renku-container" : "w-100";
@@ -113,6 +114,9 @@ function CentralContentContainer(props) {
             key="newProject"
             model={props.model}
             user={props.user}
+            coordinator={
+              new NewProjectCoordinator(
+                props.client, props.model.subModel("newProject"), props.model.subModel("projects"))}
             {...p}
           /></ContainerWrap>}
         />

diff --git a/client/src/dataset/addtoproject/addDatasetNewProject.js b/client/src/dataset/addtoproject/addDatasetNewProject.js
@@ -26,6 +26,7 @@ import { NewProject } from "../../project/new";
 import { Loader } from "../../utils/components/Loader";
 import { WarnAlert } from "../../utils/components/Alert";
 import AppContext from "../../utils/context/appContext";
+import { NewProjectCoordinator } from "../../project/new/ProjectNew.state";
 
 /**
  *  incubator-renku-ui
@@ -86,6 +87,7 @@ const AddDatasetNewProject = (
         importingDataset={true}
         startImportDataset={startImportDataset}
         user={user}
+        coordinator={new NewProjectCoordinator(client, model.subModel("newProject"), model.subModel("projects"))}
       />
     );
 

diff --git a/client/src/features/projects/ProjectApi.ts b/client/src/features/projects/ProjectApi.ts
@@ -36,7 +36,7 @@ export const projectApi = createApi({
   baseQuery: fetchBaseQuery({ baseUrl: "/ui-server/api" }),
   endpoints: (builder) => ({
     getNamespaces: builder.query({
-      query: (arg) => ({ url: "/namespaces", method: "GET" }),
+      query: (ownerOnly?: boolean) => ({ url: `/namespaces${ownerOnly ? "?owned_only=true" : ""}`, method: "GET" }),
     }),
     getGroupByPath: builder.query<any, string>({
       query: (projectPath) => {