[skip ci] renaming

Author: odeimaiz

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

@@ -168,15 +168,15 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
             if (plusButtonConfig["categories"]) {
               this.__addCategories(plusButtonConfig["categories"]);
             }
-            plusButtonConfig["resources"].forEach(newStudyData => {
-              if (newStudyData["showDisabled"]) {
-                this.__addDisabledButton(newStudyData);
-              } else if (newStudyData["resourceType"] === "study") {
-                this.__addEmptyStudyButton(newStudyData);
-              } else if (newStudyData["resourceType"] === "template") {
-                this.__addFromTemplateButton(newStudyData, templates);
-              } else if (newStudyData["resourceType"] === "service") {
-                this.__addFromServiceButton(newStudyData);
+            plusButtonConfig["resources"].forEach(buttonConfig => {
+              if (buttonConfig["showDisabled"]) {
+                this.__addDisabledButton(buttonConfig);
+              } else if (buttonConfig["resourceType"] === "study") {
+                this.__addEmptyStudyButton(buttonConfig);
+              } else if (buttonConfig["resourceType"] === "template") {
+                this.__addFromTemplateButton(buttonConfig, templates);
+              } else if (buttonConfig["resourceType"] === "service") {
+                this.__addFromServiceButton(buttonConfig);
               }
             });
           });
@@ -241,55 +241,55 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
       }
     },
 
-    __addDisabledButton: function(newStudyData) {
-      const menuButton = this.self().createMenuButton(null, newStudyData["title"], newStudyData["reason"]);
-      osparc.utils.Utils.setIdToWidget(menuButton, newStudyData["idToWidget"]);
+    __addDisabledButton: function(buttonConfig) {
+      const menuButton = this.self().createMenuButton(null, buttonConfig["title"], buttonConfig["reason"]);
+      osparc.utils.Utils.setIdToWidget(menuButton, buttonConfig["idToWidget"]);
       menuButton.setEnabled(false);
 
-      this.__addIcon(menuButton, newStudyData);
-      this.__addFromResourceButton(menuButton, newStudyData["category"]);
+      this.__addIcon(menuButton, buttonConfig);
+      this.__addFromResourceButton(menuButton, buttonConfig["category"]);
     },
 
-    __addEmptyStudyButton: function(newStudyData) {
-      const menuButton = this.self().createMenuButton(null, newStudyData["title"]);
-      osparc.utils.Utils.setIdToWidget(menuButton, newStudyData["idToWidget"]);
+    __addEmptyStudyButton: function(buttonConfig) {
+      const menuButton = this.self().createMenuButton(null, buttonConfig["title"]);
+      osparc.utils.Utils.setIdToWidget(menuButton, buttonConfig["idToWidget"]);
 
       menuButton.addListener("tap", () => {
         this.fireDataEvent("newEmptyStudyClicked", {
-          newStudyLabel: newStudyData["newStudyLabel"],
+          newStudyLabel: buttonConfig["newStudyLabel"],
         });
       });
 
-      this.__addIcon(menuButton, newStudyData);
-      this.__addFromResourceButton(menuButton, newStudyData["category"]);
+      this.__addIcon(menuButton, buttonConfig);
+      this.__addFromResourceButton(menuButton, buttonConfig["category"]);
     },
 
-    __addFromTemplateButton: function(newStudyData, templates) {
-      const menuButton = this.self().createMenuButton(null, newStudyData["title"]);
-      osparc.utils.Utils.setIdToWidget(menuButton, newStudyData["idToWidget"]);
+    __addFromTemplateButton: function(buttonConfig, templates) {
+      const menuButton = this.self().createMenuButton(null, buttonConfig["title"]);
+      osparc.utils.Utils.setIdToWidget(menuButton, buttonConfig["idToWidget"]);
       // disable it until found in templates store
       menuButton.setEnabled(false);
 
-      let templateMetadata = templates.find(t => t.name === newStudyData["expectedTemplateLabel"]);
+      let templateMetadata = templates.find(t => t.name === buttonConfig["expectedTemplateLabel"]);
       if (templateMetadata) {
         menuButton.setEnabled(true);
         menuButton.addListener("tap", () => {
           this.fireDataEvent("newStudyFromTemplateClicked", {
             templateData: templateMetadata,
-            newStudyLabel: newStudyData["newStudyLabel"],
+            newStudyLabel: buttonConfig["newStudyLabel"],
           });
         });
-        this.__addIcon(menuButton, newStudyData, templateMetadata);
-        this.__addFromResourceButton(menuButton, newStudyData["category"]);
+        this.__addIcon(menuButton, buttonConfig, templateMetadata);
+        this.__addFromResourceButton(menuButton, buttonConfig["category"]);
       }
     },
 
-    __addFromServiceButton: function(newStudyData) {
+    __addFromServiceButton: function(buttonConfig) {
       const addListenerToButton = (menuButton, latestMetadata) => {
         menuButton.addListener("tap", () => {
           this.fireDataEvent("newStudyFromServiceClicked", {
             serviceMetadata: latestMetadata,
-            newStudyLabel: newStudyData["newStudyLabel"],
+            newStudyLabel: buttonConfig["newStudyLabel"],
           });
         });
 
@@ -299,30 +299,35 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
           e.stopPropagation();
           latestMetadata["resourceType"] = "service";
           const resourceDetails = new osparc.dashboard.ResourceDetails(latestMetadata);
-          osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);
+          const win = osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);
+          resourceDetails.addListener("openService", ev => {
+            win.close();
+            const openServiceData = ev.getData();
+            this._createStudyFromService(openServiceData["key"], openServiceData["version"]);
+          });
         }
         const infoButton = new osparc.ui.basic.IconButton(osparc.ui.hint.InfoHint.INFO_ICON + "/16", cb);
         // where the shortcut is supposed to go
         // eslint-disable-next-line no-underscore-dangle
         menuButton._add(infoButton, {column: 2});
       };
 
-      if ("expectedKey" in newStudyData) {
-        const menuButton = this.self().createMenuButton(null, newStudyData["title"]);
-        osparc.utils.Utils.setIdToWidget(menuButton, newStudyData["idToWidget"]);
+      if ("expectedKey" in buttonConfig) {
+        const menuButton = this.self().createMenuButton(null, buttonConfig["title"]);
+        osparc.utils.Utils.setIdToWidget(menuButton, buttonConfig["idToWidget"]);
         // disable it until found in services store
         menuButton.setEnabled(false);
 
-        const key = newStudyData["expectedKey"];
+        const key = buttonConfig["expectedKey"];
         const latestMetadata = osparc.store.Services.getLatest(key);
         if (!latestMetadata) {
           return;
         }
         menuButton.setEnabled(true);
-        this.__addIcon(menuButton, newStudyData, latestMetadata);
-        this.__addFromResourceButton(menuButton, newStudyData["category"]);
+        this.__addIcon(menuButton, buttonConfig, latestMetadata);
+        this.__addFromResourceButton(menuButton, buttonConfig["category"]);
         addListenerToButton(menuButton, latestMetadata);
-      } else if ("myMostUsed" in newStudyData) {
+      } else if ("myMostUsed" in buttonConfig) {
         const excludeFrontend = true;
         const excludeDeprecated = true
         osparc.store.Services.getServicesLatestList(excludeFrontend, excludeDeprecated)
@@ -331,7 +336,7 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
               "sort": "hits",
               "order": "down"
             });
-            for (let i=0; i<newStudyData["myMostUsed"]; i++) {
+            for (let i=0; i<buttonConfig["myMostUsed"]; i++) {
               const latestMetadata = servicesList[i];
               if (latestMetadata && latestMetadata["hits"] > 0) {
                 const menuButton = new qx.ui.menu.Button().set({
@@ -340,7 +345,7 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
                   allowGrowX: true,
                 });
                 this.__addIcon(menuButton, null, latestMetadata);
-                this.__addFromResourceButton(menuButton, newStudyData["category"]);
+                this.__addFromResourceButton(menuButton, buttonConfig["category"]);
                 addListenerToButton(menuButton, latestMetadata);
               }
             }