refactor: Use ProjectsCoordinator.getVisibilities for new projects an…

…d fork a project form
SwissDataScienceCenter · Dec 22, 2021 · 9e5bacc · 9e5bacc
1 parent a0b2dcf
commit 9e5bacc
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 47 deletions.
diff --git a/client/src/project/new/ProjectNew.container.js b/client/src/project/new/ProjectNew.container.js
@@ -492,6 +492,13 @@ class NewProject extends Component {
     return this.coordinator.getTemplates(repositories, true);
   }
 
+  async calculateVisibilities(namespace) {
+    // temporarily reset visibility metadata
+    this.coordinator.resetVisibility(namespace);
+    const availableVisibilities = await this.projectsCoordinator.getVisibilities(namespace);
+    this.coordinator.setVisibilities(availableVisibilities, namespace);
+  }
+
   refreshUserProjects() {
     this.projectsCoordinator.getFeatured();
   }
@@ -502,7 +509,7 @@ class NewProject extends Component {
 
   setNamespace(namespace) {
     this.setProperty("namespace", namespace.full_path);
-    this.coordinator.getVisibilities(namespace);
+    this.calculateVisibilities(namespace);
   }
 
   setTemplateProperty(property, value) {

diff --git a/client/src/project/new/ProjectNew.present.js b/client/src/project/new/ProjectNew.present.js
@@ -634,7 +634,7 @@ class Visibility extends Component {
       main = (
         <Fragment>
           <br />
-          <Label className="font-italic">Verifying... <Loader inline={true} size={16} /></Label>
+          <Label className="font-italic">Determining options... <Loader inline={true} size={16} /></Label>
         </Fragment>
       );
     }

diff --git a/client/src/project/new/ProjectNew.state.js b/client/src/project/new/ProjectNew.state.js
@@ -463,55 +463,38 @@ class NewProjectCoordinator {
     return "No templates available in this repo.";
   }
 
-  async getVisibilities(namespace) {
-    // function to compute available visibilities based on the current group visibility
-    const computeVisibilities = (max) => {
-      if (max === "private")
-        return ["private"];
-      else if (max === "internal")
-        return ["private", "internal"];
-      return ["private", "internal", "public"];
-    };
+  resetVisibility(namespace) {
+    this.model.setObject({
+      meta: {
+        namespace: {
+          fetched: null,
+          fetching: true,
+          id: namespace.full_path,
+          visibility: null,
+          visibilities: { $set: null },
+        }
+      }
+    });
+  }
 
-    let visibilities, updateObject = { meta: { namespace: {} } };
-    if (namespace.kind === "user") {
-      visibilities = computeVisibilities("public");
-      updateObject.meta.namespace = {
-        visibility: "public",
-        visibilities: { $set: visibilities },
-      };
-    }
-    else {
-      // temporarily reset visibility metadata
-      this.model.setObject({
-        meta: {
+  async setVisibilities(availableVisibilities, namespace) {
+    let updateObject = {
+      meta:
+        {
           namespace: {
-            fetched: null,
-            fetching: true,
+            visibility: availableVisibilities.default,
+            visibilities: availableVisibilities.visibilities,
+            fetched: new Date(),
+            fetching: false,
             id: namespace.full_path,
-            visibility: null,
-            visibilities: { $set: [] },
           }
         }
-      });
-      // verify group visibility
-      const group = await this.client.getGroupByPath(namespace.full_path).then(r => r.data);
-      visibilities = computeVisibilities(group.visibility);
-      updateObject.meta.namespace = {
-        visibility: group.visibility,
-        visibilities: { $set: visibilities },
-      };
-    }
-
-    // set common properties
-    updateObject.meta.namespace.fetched = new Date();
-    updateObject.meta.namespace.fetching = false;
-    updateObject.meta.namespace.id = namespace.full_path;
+    };
 
     // save the model and invoke the normal setProperty
     this.model.setObject(updateObject);
-    this.setProperty("visibility", visibilities[visibilities.length - 1]);
-    return visibilities;
+    this.setProperty("visibility", availableVisibilities.default);
+    return availableVisibilities.visibilities;
   }
 
   /**

diff --git a/client/src/project/shared/Projects.state.js b/client/src/project/shared/Projects.state.js
@@ -159,7 +159,7 @@ class ProjectsCoordinator {
       });
   }
 
-  async getVisibilities(namespace, projectVisibility = "private") {
+  async getVisibilities(namespace, projectVisibility) {
     const computeVisibilities = (options) => {
       if (options.includes("private")) {
         return {
@@ -180,16 +180,19 @@ class ProjectsCoordinator {
     };
 
     let availableVisibilities = null;
-    if (!namespace || !projectVisibility)
+    let options = projectVisibility ? [projectVisibility] : [];
+    if (!namespace)
       return null;
 
     if (namespace?.kind === "user") {
-      return computeVisibilities(["public", projectVisibility]);
+      options.push("public");
+      return computeVisibilities(options);
     }
     else if (namespace?.kind === "group") {
       // get group visibility
       const group = await this.client.getGroupByPath(namespace.full_path).then(r => r.data);
-      return computeVisibilities([group.visibility, projectVisibility]);
+      options.push(group.visibility);
+      return computeVisibilities(options);
     }
     return availableVisibilities;
   }