unique names

Author: odeimaiz

services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js

@@ -1169,7 +1169,8 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     __newStudyBtnClicked: function(button) {
       button.setValue(false);
       const minStudyData = osparc.data.model.Study.createMinStudyObject();
-      const title = osparc.utils.Utils.getUniqueName(minStudyData.name, this._resourcesList);
+      const existingNames = this._resourcesList.map(study => study["name"]);
+      const title = osparc.utils.Utils.getUniqueName(minStudyData.name, existingNames);
       minStudyData["name"] = title;
       minStudyData["workspaceId"] = this.getCurrentWorkspaceId();
       minStudyData["folderId"] = this.getCurrentFolderId();
@@ -1189,7 +1190,8 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     __newPlanBtnClicked: function(templateData, newStudyName) {
       // do not override cached template data
       const templateCopyData = osparc.utils.Utils.deepCloneObject(templateData);
-      const title = osparc.utils.Utils.getUniqueName(newStudyName, this._resourcesList);
+      const existingNames = this._resourcesList.map(study => study["name"]);
+      const title = osparc.utils.Utils.getUniqueName(newStudyName, existingNames);
       templateCopyData.name = title;
       this._showLoadingPage(this.tr("Creating ") + (newStudyName || osparc.product.Utils.getStudyAlias()));
       const contextProps = {

services/static-webserver/client/source/class/osparc/desktop/organizations/OrganizationDetails.js

@@ -94,16 +94,8 @@ qx.Class.define("osparc.desktop.organizations.OrganizationDetails", {
 
     __openEditOrganization: function() {
       const org = this.__orgModel;
-
-      const newOrg = false;
-      const orgEditor = new osparc.editor.OrganizationEditor(newOrg);
-      org.bind("gid", orgEditor, "gid");
-      org.bind("label", orgEditor, "label");
-      org.bind("description", orgEditor, "description");
-      org.bind("thumbnail", orgEditor, "thumbnail", {
-        converter: val => val ? val : ""
-      });
       const title = this.tr("Organization Details Editor");
+      const orgEditor = new osparc.editor.OrganizationEditor(org);
       const win = osparc.ui.window.Window.popUpInWindow(orgEditor, title, 400, 200);
       orgEditor.addListener("updateOrg", () => {
         this.__updateOrganization(win, orgEditor.getChildControl("save"), orgEditor);

services/static-webserver/client/source/class/osparc/desktop/organizations/OrganizationsList.js

@@ -99,9 +99,8 @@ qx.Class.define("osparc.desktop.organizations.OrganizationsList", {
         allowGrowX: false
       });
       createOrgBtn.addListener("execute", function() {
-        const newOrg = true;
-        const orgEditor = new osparc.editor.OrganizationEditor(newOrg);
         const title = this.tr("New Organization");
+        const orgEditor = new osparc.editor.OrganizationEditor();
         const win = osparc.ui.window.Window.popUpInWindow(orgEditor, title, 400, 200);
         orgEditor.addListener("createOrg", () => {
           this.__createOrganization(win, orgEditor.getChildControl("create"), orgEditor);
@@ -211,15 +210,8 @@ qx.Class.define("osparc.desktop.organizations.OrganizationsList", {
         return;
       }
 
-      const newOrg = false;
-      const orgEditor = new osparc.editor.OrganizationEditor(newOrg);
-      org.bind("gid", orgEditor, "gid");
-      org.bind("label", orgEditor, "label");
-      org.bind("description", orgEditor, "description");
-      org.bind("thumbnail", orgEditor, "thumbnail", {
-        converter: val => val ? val : ""
-      });
       const title = this.tr("Organization Details Editor");
+      const orgEditor = new osparc.editor.OrganizationEditor(org);
       const win = osparc.ui.window.Window.popUpInWindow(orgEditor, title, 400, 200);
       orgEditor.addListener("updateOrg", () => {
         this.__updateOrganization(win, orgEditor.getChildControl("save"), orgEditor);

services/static-webserver/client/source/class/osparc/editor/OrganizationEditor.js

@@ -18,7 +18,7 @@
 qx.Class.define("osparc.editor.OrganizationEditor", {
   extend: qx.ui.core.Widget,
 
-  construct: function(newOrg = true) {
+  construct: function(organization) {
     this.base(arguments);
 
     this._setLayout(new qx.ui.layout.VBox(8));
@@ -29,7 +29,27 @@ qx.Class.define("osparc.editor.OrganizationEditor", {
     manager.add(title);
     this.getChildControl("description");
     this.getChildControl("thumbnail");
-    newOrg ? this.getChildControl("create") : this.getChildControl("save");
+    organization ? this.getChildControl("save") : this.getChildControl("create");
+
+    if (organization) {
+      organization.bind("gid", this, "gid");
+      organization.bind("label", this, "label");
+      organization.bind("description", this, "description");
+      organization.bind("thumbnail", this, "thumbnail", {
+        converter: val => val ? val : ""
+      });
+    } else {
+      osparc.store.Store.getInstance().getGroupsOrganizations()
+        .then(orgs => {
+          const existingNames = orgs.map(org => org["label"]);
+          const defaultName = osparc.utils.Utils.getUniqueName("New Organization", existingNames)
+          title.setValue(defaultName);
+        })
+        .catch(err => {
+          console.error(err);
+          title.setValue("New Organization");
+        });
+    }
 
     this.addListener("appear", () => {
       title.focus();

services/static-webserver/client/source/class/osparc/editor/WorkspaceEditor.js

@@ -197,12 +197,16 @@ qx.Class.define("osparc.editor.WorkspaceEditor", {
     },
 
     __createWorkspace: function() {
+      const workspaceStore = osparc.store.Workspaces.getInstance();
+      const workspaces = workspaceStore.getWorkspaces();
+      const existingNames = workspaces.map(workspace => workspace.getName());
+      const defaultName = osparc.utils.Utils.getUniqueName("New Workspace", existingNames)
       const newWorkspaceData = {
-        name: this.getLabel() || "New Workspace",
+        name: this.getLabel() || defaultName,
         description: this.getDescription(),
         thumbnail: this.getThumbnail(),
       };
-      return osparc.store.Workspaces.getInstance().postWorkspace(newWorkspaceData)
+      return workspaceStore.postWorkspace(newWorkspaceData)
     },
 
     __saveWorkspace: function(editButton) {

services/static-webserver/client/source/class/osparc/store/Workspaces.js

@@ -197,6 +197,10 @@ qx.Class.define("osparc.store.Workspaces", {
       return this.workspacesCached.find(w => w.getWorkspaceId() === workspaceId);
     },
 
+    getWorkspaces: function() {
+      return this.workspacesCached;
+    },
+
     __addToCache: function(workspace) {
       const found = this.workspacesCached.find(w => w.getWorkspaceId() === workspace.getWorkspaceId());
       if (!found) {

services/static-webserver/client/source/class/osparc/study/Utils.js

@@ -116,7 +116,8 @@ qx.Class.define("osparc.study.Utils", {
               newStudyLabel = metadata["name"];
             }
             if (existingStudies) {
-              const title = osparc.utils.Utils.getUniqueName(newStudyLabel, existingStudies);
+              const existingNames = existingStudies.map(study => study["name"]);
+              const title = osparc.utils.Utils.getUniqueName(newStudyLabel, existingNames);
               minStudyData["name"] = title;
             } else {
               minStudyData["name"] = newStudyLabel;

services/static-webserver/client/source/class/osparc/utils/Utils.js

@@ -277,12 +277,11 @@ qx.Class.define("osparc.utils.Utils", {
       return reloadButton;
     },
 
-    getUniqueName: function(preferredName, list, key = "name") {
+    getUniqueName: function(preferredName, existingNames) {
       let title = preferredName;
-      const existingTitles = list.map(study => study[key]);
-      if (existingTitles.includes(title)) {
+      if (existingNames.includes(title)) {
         let cont = 1;
-        while (existingTitles.includes(`${title} (${cont})`)) {
+        while (existingNames.includes(`${title} (${cont})`)) {
           cont++;
         }
         title += ` (${cont})`;