refactor

Author: odeimaiz

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

@@ -1024,13 +1024,16 @@ qx.Class.define("osparc.dashboard.CardBase", {
 
     __openResourceDetails: function(openWindowCB) {
       const resourceData = this.getResourceData();
-      const resourceDetails = new osparc.dashboard.ResourceDetails(resourceData);
+      const {
+        resourceDetails,
+        window,
+      } = osparc.dashboard.ResourceDetails.popUpInWindow(resourceData);
+
       resourceDetails.addListenerOnce("pagesAdded", () => {
         if (openWindowCB in resourceDetails) {
           resourceDetails[openWindowCB]();
         }
-      })
-      const win = osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);
+      });
       [
         "updateStudy",
         "updateTemplate",
@@ -1041,11 +1044,11 @@ qx.Class.define("osparc.dashboard.CardBase", {
         resourceDetails.addListener(ev, e => this.fireDataEvent(ev, e.getData()));
       });
       resourceDetails.addListener("publishTemplate", e => {
-        win.close();
+        window.close();
         this.fireDataEvent("publishTemplate", e.getData());
       });
       resourceDetails.addListener("openStudy", e => {
-        const openCB = () => win.close();
+        const openCB = () => window.close();
         const studyId = e.getData()["uuid"];
         const isStudyCreation = false;
         this._startStudyById(studyId, openCB, null, isStudyCreation);

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

@@ -360,10 +360,13 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
           // so that is not consumed by the menu button itself
           e.stopPropagation();
           latestMetadata["resourceType"] = "service";
-          const resourceDetails = new osparc.dashboard.ResourceDetails(latestMetadata);
-          const win = osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);
+          const {
+            resourceDetails,
+            window,
+          } = osparc.dashboard.ResourceDetails.popUpInWindow(latestMetadata);
+
           resourceDetails.addListener("openService", ev => {
-            win.close();
+            window.close();
             const openServiceData = ev.getData();
             this.fireDataEvent("newStudyFromServiceClicked", {
               serviceMetadata: openServiceData,

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

@@ -939,19 +939,22 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
     },
 
     _openResourceDetails: function(resourceData) {
-      const resourceDetails = new osparc.dashboard.ResourceDetails(resourceData);
-      const win = osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);
+      const {
+        resourceDetails,
+        window,
+      } = osparc.dashboard.ResourceDetails.popUpInWindow(resourceData);
+
       resourceDetails.addListener("updateStudy", e => this._updateStudyData(e.getData()));
       resourceDetails.addListener("updateTemplate", e => this._updateTemplateData(e.getData()));
       resourceDetails.addListener("updateTutorial", e => this._updateTutorialData(e.getData()));
       resourceDetails.addListener("updateService", e => this._updateServiceData(e.getData()));
       resourceDetails.addListener("updateHypertool", e => this._updateHypertoolData(e.getData()));
       resourceDetails.addListener("publishTemplate", e => {
-        win.close();
+        window.close();
         this.fireDataEvent("publishTemplate", e.getData());
       });
       resourceDetails.addListener("openStudy", e => {
-        const openCB = () => win.close();
+        const openCB = () => window.close();
         const studyId = e.getData()["uuid"];
         const isStudyCreation = false;
         this._startStudyById(studyId, openCB, null, isStudyCreation);
@@ -962,13 +965,13 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
         "openHypertool",
       ].forEach(eventName => {
         resourceDetails.addListener(eventName, e => {
-          win.close();
+          window.close();
           const templateData = e.getData();
           this._createStudyFromTemplate(templateData);
         });
       });
       resourceDetails.addListener("openService", e => {
-        win.close();
+        window.close();
         const openServiceData = e.getData();
         this._createStudyFromService(openServiceData["key"], openServiceData["version"]);
       });

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

@@ -107,21 +107,24 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
     WIDTH: 830,
     HEIGHT: 700,
 
-    popUpInWindow: function(resourceDetails) {
-      // eslint-disable-next-line no-underscore-dangle
-      const title = resourceDetails.__resourceData.name;
-      const win = osparc.ui.window.Window.popUpInWindow(resourceDetails, title, this.WIDTH, this.HEIGHT).set({
+    popUpInWindow: function(resourceData) {
+      const resourceDetails = new osparc.dashboard.ResourceDetails(resourceData);
+      const title = resourceData.name;
+      const window = osparc.ui.window.Window.popUpInWindow(resourceDetails, title, this.WIDTH, this.HEIGHT).set({
         layout: new qx.ui.layout.Grow(),
       });
-      win.set(osparc.ui.window.TabbedWindow.DEFAULT_PROPS);
-      win.set({
+      window.set(osparc.ui.window.TabbedWindow.DEFAULT_PROPS);
+      window.set({
         width: this.WIDTH,
         height: this.HEIGHT,
       });
       resourceDetails.addListener("closeWindow", () => {
-        win.close();
+        window.close();
       });
-      return win;
+      return {
+        resourceDetails,
+        window,
+      };
     },
 
     createToolbar: function() {

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

@@ -92,10 +92,12 @@ qx.Class.define("osparc.desktop.organizations.ServicesList", {
               .then(serviceData => {
                 if (serviceData) {
                   serviceData["resourceType"] = "service";
-                  const resourceDetails = new osparc.dashboard.ResourceDetails(serviceData).set({
+                  const {
+                    resourceDetails,
+                  } = osparc.dashboard.ResourceDetails.popUpInWindow(serviceData);
+                  resourceDetails.set({
                     showOpenButton: false
                   });
-                  osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);
                 }
               });
           });

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

@@ -90,10 +90,12 @@ qx.Class.define("osparc.desktop.organizations.TutorialsList", {
               .then(templateData => {
                 if (templateData) {
                   templateData["resourceType"] = "tutorial";
-                  const resourceDetails = new osparc.dashboard.ResourceDetails(templateData).set({
+                  const {
+                    resourceDetails,
+                  } = osparc.dashboard.ResourceDetails.popUpInWindow(templateData);
+                  resourceDetails.set({
                     showOpenButton: false
                   });
-                  osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);
                 }
               });
           });

services/static-webserver/client/source/class/osparc/notification/NotificationUI.js

@@ -332,11 +332,14 @@ qx.Class.define("osparc.notification.NotificationUI", {
           if (studyData) {
             const studyDataCopy = osparc.data.model.Study.deepCloneStudyObject(studyData);
             studyDataCopy["resourceType"] = notification.getCategory() === "TEMPLATE_SHARED" ? "template" : "study";
-            const resourceDetails = new osparc.dashboard.ResourceDetails(studyDataCopy);
-            const win = osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);
+            const {
+              resourceDetails,
+              window,
+            } = osparc.dashboard.ResourceDetails.popUpInWindow(studyDataCopy);
+
             resourceDetails.addListener("openStudy", () => {
               if (notification.getCategory() === "STUDY_SHARED") {
-                const openCB = () => win.close();
+                const openCB = () => window.close();
                 osparc.dashboard.ResourceBrowserBase.startStudyById(studyId, openCB);
               }
             });

services/static-webserver/client/source/class/osparc/share/ShareePermissions.js

@@ -90,12 +90,11 @@ qx.Class.define("osparc.share.ShareePermissions", {
             hBox.add(infoButton);
             hBox.add(label);
             osparc.store.Services.getService(inaccessibleService.key, inaccessibleService.version)
-              .then(metadata => {
-                label.setValue(metadata["name"] + " : " + metadata["version"])
+              .then(serviceMetadata => {
+                label.setValue(serviceMetadata["name"] + " : " + serviceMetadata["version"])
                 infoButton.addListener("execute", () => {
-                  metadata["resourceType"] = "service";
-                  const resourceDetails = new osparc.dashboard.ResourceDetails(metadata);
-                  osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);
+                  serviceMetadata["resourceType"] = "service";
+                  osparc.dashboard.ResourceDetails.popUpInWindow(serviceMetadata);
                 }, this);
               })
 

services/static-webserver/client/source/class/osparc/widget/PersistentIframe.js

@@ -338,11 +338,14 @@ qx.Class.define("osparc.widget.PersistentIframe", {
                 "uuid": templateId,
                 "resourceType": "function",
               };
-              const resourceDetails = new osparc.dashboard.ResourceDetails(functionData).set({
+              const {
+                resourceDetails,
+                window,
+              } = osparc.dashboard.ResourceDetails.popUpInWindow(functionData);
+              resourceDetails.set({
                 showOpenButton: false,
               });
-              const win = osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);
-              win.setCaption("Function Details");
+              window.setCaption("Function Details");
             }
             break;
           }