ITISFoundation · odeimaiz · Jul 23, 2024 · Jul 1, 2024 · Jul 1, 2024 · Jul 1, 2024
@@ -102,7 +102,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
         const myGroupId = osparc.auth.Data.getInstance().getGroupId();
         if (checks && myGroupId in checks) {
           const myAccessRights = checks[myGroupId];
-          const totalAccess = "delete" in myAccessRights ? myAccessRights["delete"] : myAccessRights["write_access"];
+          const totalAccess = "delete" in myAccessRights ? myAccessRights["delete"] : myAccessRights["write"];
           if (sharedWith === "my-resources") {
             return !totalAccess;
           } else if (sharedWith === "shared-with-me") {
@@ -127,10 +127,10 @@ qx.Class.define("osparc.dashboard.CardBase", {
       return false;
     },
 
-    filterServiceType: function(resourceType, metaData, serviceType) {
+    filterServiceType: function(resourceType, metadata, serviceType) {
       if (serviceType && resourceType === "service") {
-        if (metaData && metaData.type) {
-          const matches = metaData.type === serviceType;
+        if (metadata && metadata.type) {
+          const matches = metadata.type === serviceType;
           return !matches;
         }
         return false;
@@ -452,27 +452,23 @@ qx.Class.define("osparc.dashboard.CardBase", {
       } else if (osparc.study.Utils.isWorkbenchDeprecated(workbench)) {
         this.setUpdatable("deprecated");
       } else {
-        osparc.study.Utils.isWorkbenchUpdatable(workbench)
-          .then(updatable => {
-            if (updatable) {
-              this.setUpdatable("updatable");
-            }
-          });
+        const updatable = osparc.study.Utils.isWorkbenchUpdatable(workbench)
+        if (updatable) {
+          this.setUpdatable("updatable");
+        }
       }
 
       // Block card
-      osparc.study.Utils.getInaccessibleServices(workbench)
-        .then(unaccessibleServices => {
-          if (unaccessibleServices.length) {
-            this.__enableCard(false);
-            const image = "@FontAwesome5Solid/ban/";
-            let toolTipText = this.tr("Service info missing");
-            unaccessibleServices.forEach(unSrv => {
-              toolTipText += "<br>" + unSrv.key + ":" + unSrv.version;
-            });
-            this.__showBlockedCard(image, toolTipText);
-          }
+      const unaccessibleServices = osparc.study.Utils.getInaccessibleServices(workbench)
+      if (unaccessibleServices.length) {
+        this.__enableCard(false);
+        const image = "@FontAwesome5Solid/ban/";
+        let toolTipText = this.tr("Service info missing");
+        unaccessibleServices.forEach(unSrv => {
+          toolTipText += "<br>" + unSrv.key + ":" + unSrv.version;
         });
+        this.__showBlockedCard(image, toolTipText);
+      }
     },
 
     __applyEmptyWorkbench: function(isEmpty) {

@@ -167,7 +167,7 @@ qx.Class.define("osparc.dashboard.Dashboard", {
       const preResourcePromises = [];
       const store = osparc.store.Store.getInstance();
       preResourcePromises.push(store.getAllGroupsAndMembers());
-      preResourcePromises.push(store.getAllServices(true));
+      preResourcePromises.push(osparc.service.Store.getServicesLatest(false));
       if (permissions.canDo("study.tag")) {
         preResourcePromises.push(osparc.data.Resources.get("tags"));
       }

@@ -459,7 +459,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
       throw new Error("Abstract method called!");
     },
 
-    _createStudyFromService: async function() {
+    _createStudyFromService: function() {
       throw new Error("Abstract method called!");
     },
 

@@ -90,7 +90,6 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
     __qualityPage: null,
     __servicesUpdatePage: null,
     __openButton: null,
-    _services: null,
 
     __createToolbar: function() {
       const toolbar = new qx.ui.container.Composite(new qx.ui.layout.HBox(20).set({
@@ -151,10 +150,6 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
           let anyUpdatable = false;
           for (const nodeId in workbench) {
             const node = workbench[nodeId];
-            const latestCompatibleMetadata = osparc.service.Utils.getLatestCompatible(this._services, node["key"], node["version"]);
-            if (latestCompatibleMetadata === null) {
-              osparc.FlashMessenger.logAs(this.tr("Some service information could not be retrieved"), "WARNING");
-            }
             const isUpdatable = osparc.service.Utils.isUpdatable(node);
             if (isUpdatable) {
               anyUpdatable = true;
@@ -241,36 +236,34 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
       const versionsBox = new osparc.ui.toolbar.SelectBox();
       hBox.add(versionsBox);
 
-      // populate it with owned versions
-      const store = osparc.store.Store.getInstance();
-      store.getAllServices()
-        .then(services => {
-          const versions = osparc.service.Utils.getVersions(services, this.__resourceData["key"]);
-          let selectedItem = null;
-
-          // first setSelection
-          versions.reverse().forEach(version => {
-            selectedItem = new qx.ui.form.ListItem(version);
-            versionsBox.add(selectedItem);
-            if (this.__resourceData["version"] === version) {
-              versionsBox.setSelection([selectedItem]);
-            }
-          });
 
-          // then listen to changes
-          versionsBox.addListener("changeSelection", e => {
-            const selection = e.getData();
-            if (selection.length) {
-              const serviceVersion = selection[0].getLabel();
-              if (serviceVersion !== this.__resourceData["version"]) {
-                const serviceData = osparc.service.Utils.getFromObject(services, this.__resourceData["key"], serviceVersion);
+      const versions = osparc.service.Utils.getVersions(this.__resourceData["key"]);
+      let selectedItem = null;
+
+      // first setSelection
+      versions.forEach(version => {
+        selectedItem = osparc.service.Utils.versionToListItem(this.__resourceData["key"], version);
+        versionsBox.add(selectedItem);
+        if (this.__resourceData["version"] === version) {
+          versionsBox.setSelection([selectedItem]);
+        }
+      });
+
+      // then listen to changes
+      versionsBox.addListener("changeSelection", e => {
+        const selection = e.getData();
+        if (selection.length) {
+          const serviceVersion = selection[0].getLabel();
+          if (serviceVersion !== this.__resourceData["version"]) {
+            osparc.service.Store.getService(this.__resourceData["key"], serviceVersion)
+              .then(serviceData => {
                 serviceData["resourceType"] = "service";
                 this.__resourceData = serviceData;
                 this.__addPages();
-              }
-            }
-          }, this);
-        });
+              });
+          }
+        }
+      }, this);
 
       return hBox;
     },

@@ -43,49 +43,36 @@ qx.Class.define("osparc.dashboard.ServiceBrowser", {
   },
 
   members: {
-    __servicesAll: null,
     __sortBy: null,
 
     // overridden
     initResources: function() {
-      this.__servicesAll = {};
       this._resourcesList = [];
-      const preResourcePromises = [];
-      const store = osparc.store.Store.getInstance();
-      preResourcePromises.push(store.getAllServices());
-      if (osparc.data.Permissions.getInstance().canDo("study.tag")) {
-        preResourcePromises.push(osparc.data.Resources.get("tags"));
-      }
-
-      Promise.all(preResourcePromises)
-        .then(() => {
-          this.getChildControl("resources-layout");
-          this.reloadResources();
-          this._hideLoadingPage();
-        })
-        .catch(err => console.error(err));
+      this.getChildControl("resources-layout");
+      this.reloadResources();
+      this._hideLoadingPage();
     },
 
     reloadResources: function() {
-      this.__reloadServices();
+      this.__loadServices();
     },
 
-    __reloadServices: function() {
-      const store = osparc.store.Store.getInstance();
-      store.getAllServices(false, false)
-        .then(services => {
-          this.__servicesAll = services;
-          const favServices = osparc.utils.Utils.localCache.getFavServices();
+    __loadServices: function() {
+      osparc.service.Store.getServicesLatest()
+        .then(servicesLatest => {
           const servicesList = [];
-          for (const key in services) {
-            const latestService = osparc.service.Utils.getLatest(services, key);
-            const found = Object.keys(favServices).find(favSrv => favSrv === key);
-            latestService.hits = found ? favServices[found]["hits"] : 0;
-            // do not list frontend services
-            if (!latestService["key"].includes("simcore/services/frontend/")) {
-              servicesList.push(latestService);
+          Object.keys(servicesLatest).forEach(key => {
+            const serviceLatest = servicesLatest[key];
+            // do not show frontend services
+            if (key.includes("simcore/services/frontend/")) {
+              return;
             }
-          }
+            // do not show retired services
+            if (servicesLatest[key]["retired"]) {
+              return;
+            }
+            servicesList.push(serviceLatest);
+          });
           this.__setResourcesToList(servicesList);
         })
         .catch(err => {
@@ -128,7 +115,7 @@ qx.Class.define("osparc.dashboard.ServiceBrowser", {
       this.resetSelection();
     },
 
-    _createStudyFromService: async function(key, version) {
+    _createStudyFromService: function(key, version) {
       if (!this._checkLoggedIn()) {
         return;
       }

@@ -137,10 +137,9 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           // Show "Contact Us" message if studies.length === 0 && templates.length === 0 && services.length === 0
           // Most probably is a product-stranger user (it can also be that the catalog is down)
           if (nStudies === 0) {
-            const store = osparc.store.Store.getInstance();
             Promise.all([
-              store.getTemplates(),
-              store.getAllServices()
+              osparc.store.Store.getInstance().getTemplates(),
+              osparc.service.Store.getServicesLatest()
             ]).then(values => {
               const templates = values[0];
               const services = values[1];
@@ -526,17 +525,17 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         });
     },
 
-    __addNewStudyFromServiceButtons: function(services, serviceKey, newButtonInfo) {
+    __addNewStudyFromServiceButtons: function(serviceKey, newButtonInfo) {
       const mode = this._resourcesContainer.getMode();
       // Make sure we have access to that service
-      const versions = osparc.service.Utils.getVersions(services, serviceKey);
+      const versions = osparc.service.Utils.getVersions(serviceKey);
       if (versions.length && newButtonInfo) {
         const title = newButtonInfo.title;
         const desc = newButtonInfo.description;
         const newStudyFromServiceButton = (mode === "grid") ? new osparc.dashboard.GridButtonNew(title, desc) : new osparc.dashboard.ListButtonNew(title, desc);
         newStudyFromServiceButton.setCardKey("new-"+serviceKey);
         osparc.utils.Utils.setIdToWidget(newStudyFromServiceButton, newButtonInfo.idToWidget);
-        newStudyFromServiceButton.addListener("execute", () => this.__newStudyFromServiceBtnClicked(newStudyFromServiceButton, serviceKey, versions[versions.length-1], newButtonInfo.newStudyLabel));
+        newStudyFromServiceButton.addListener("execute", () => this.__newStudyFromServiceBtnClicked(newStudyFromServiceButton, serviceKey, versions[0], newButtonInfo.newStudyLabel));
         if (this._resourcesContainer.getMode() === "list") {
           const width = this._resourcesContainer.getBounds().width - 15;
           newStudyFromServiceButton.setWidth(width);
@@ -546,20 +545,16 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     },
 
     __addPlusButtonsFromServices: function() {
-      const store = osparc.store.Store.getInstance();
-      store.getAllServices()
-        .then(services => {
-          // add new plus buttons if key services exists
-          osparc.utils.Utils.fetchJSON("/resource/osparc/new_studies.json")
-            .then(newStudiesData => {
-              const product = osparc.product.Utils.getProductName()
-              if (product in newStudiesData) {
-                const newButtonsInfo = newStudiesData[product].resources;
-                newButtonsInfo.forEach(newButtonInfo => {
-                  this.__addNewStudyFromServiceButtons(services, newButtonInfo.expectedKey, newButtonInfo);
-                });
-              }
+      // add new plus buttons if key services exists
+      osparc.utils.Utils.fetchJSON("/resource/osparc/new_studies.json")
+        .then(newStudiesData => {
+          const product = osparc.product.Utils.getProductName()
+          if (product in newStudiesData) {
+            const newButtonsInfo = newStudiesData[product].resources;
+            newButtonsInfo.forEach(newButtonInfo => {
+              this.__addNewStudyFromServiceButtons(newButtonInfo.expectedKey, newButtonInfo);
             });
+          }
         });
     },
 
@@ -956,17 +951,20 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     __getThumbnailStudyMenuButton: function(studyData) {
       const thumbButton = new qx.ui.menu.Button(this.tr("Thumbnail..."));
       thumbButton.addListener("execute", () => {
-        const title = this.tr("Edit Thumbnail");
-        const oldThumbnail = studyData.thumbnail;
-        const suggestions = osparc.editor.ThumbnailSuggestions.extractThumbnailSuggestions(studyData);
-        const thumbnailEditor = new osparc.editor.ThumbnailEditor(oldThumbnail, suggestions);
-        const win = osparc.ui.window.Window.popUpInWindow(thumbnailEditor, title, suggestions.length > 2 ? 500 : 350, 280);
-        thumbnailEditor.addListener("updateThumbnail", e => {
-          win.close();
-          const newUrl = e.getData();
-          this.__updateThumbnail(studyData, newUrl);
-        }, this);
-        thumbnailEditor.addListener("cancel", () => win.close());
+        osparc.editor.ThumbnailSuggestions.extractThumbnailSuggestions(studyData)
+          .then(suggestions => {
+            const title = this.tr("Edit Thumbnail");
+            const oldThumbnail = studyData.thumbnail;
+            const thumbnailEditor = new osparc.editor.ThumbnailEditor(oldThumbnail, suggestions);
+            const win = osparc.ui.window.Window.popUpInWindow(thumbnailEditor, title, suggestions.length > 2 ? 500 : 350, 280);
+            thumbnailEditor.addListener("updateThumbnail", e => {
+              win.close();
+              const newUrl = e.getData();
+              this.__updateThumbnail(studyData, newUrl);
+            }, this);
+            thumbnailEditor.addListener("cancel", () => win.close());
+          })
+          .catch(err => console.error(err));
       }, this);
       return thumbButton;
     },

@@ -39,21 +39,10 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
     // overridden
     initResources: function() {
       this._resourcesList = [];
-      const preResourcePromises = [];
-      const store = osparc.store.Store.getInstance();
-      preResourcePromises.push(store.getAllServices());
-      if (osparc.data.Permissions.getInstance().canDo("study.tag")) {
-        preResourcePromises.push(osparc.data.Resources.get("tags"));
-      }
-
-      Promise.all(preResourcePromises)
-        .then(() => {
-          this.getChildControl("resources-layout");
-          this.reloadResources();
-          this.__attachEventHandlers();
-          this._hideLoadingPage();
-        })
-        .catch(err => console.error(err));
+      this.getChildControl("resources-layout");
+      this.reloadResources();
+      this.__attachEventHandlers();
+      this._hideLoadingPage();
     },
 
     reloadResources: function() {
@@ -253,9 +242,17 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
         const studyData = osparc.data.model.Study.deepCloneStudyObject(uniqueTemplateData);
         const templatePromises = [];
         for (const nodeId in studyData["workbench"]) {
-          const newVersion = osparc.metadata.ServicesInStudyUpdate.getLatestVersion(studyData, nodeId)
-          if (newVersion) {
-            templatePromises.push(osparc.info.StudyUtils.patchNodeData(uniqueTemplateData, nodeId, "version", newVersion));
+          const node = studyData["workbench"][nodeId];
+          const latestCompatible = osparc.service.Utils.getLatestCompatible(node["key"], node["version"]);
+          if (latestCompatible && (node["key"] !== latestCompatible["key"] || node["version"] !== latestCompatible["version"])) {
+            const patchData = {};
+            if (node["key"] !== latestCompatible["key"]) {
+              patchData["key"] = latestCompatible["key"];
+            }
+            if (node["version"] !== latestCompatible["version"]) {
+              patchData["version"] = latestCompatible["version"];
+            }
+            templatePromises.push(osparc.info.StudyUtils.patchNodeData(uniqueTemplateData, nodeId, patchData));
           }
         }
         Promise.all(templatePromises)