🎨 [Frontend] Enh service calls: avoid request deduplication (#7487)

Author: odeimaiz

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

@@ -526,12 +526,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
       });
 
       if (resourceData["resourceType"] === "study" || resourceData["resourceType"] === "template") {
-        const params = {
-          url: {
-            studyId: this.getResourceData()["uuid"]
-          }
-        };
-        osparc.data.Resources.fetch("studies", "getServices", params)
+        osparc.store.Services.getStudyServices(this.getResourceData()["uuid"])
           .then(resp => {
             const services = resp["services"];
             resourceData["services"] = services;

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

@@ -194,7 +194,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
       };
       Promise.all([
         osparc.data.Resources.fetch("studies", "getOne", params),
-        osparc.data.Resources.fetch("studies", "getServices", params)
+        osparc.store.Services.getStudyServices(this.__resourceData["uuid"]),
       ])
         .then(values => {
           const updatedStudyData = values[0];

services/static-webserver/client/source/class/osparc/data/Resources.js

@@ -569,21 +569,6 @@ qx.Class.define("osparc.data.Resources", {
        * SERVICES
        */
       "services": {
-        useCache: true,
-        idField: ["key", "version"],
-        endpoints: {
-          pricingPlans: {
-            useCache: false,
-            method: "GET",
-            url: statics.API + "/catalog/services/{key}/{version}/pricing-plan"
-          }
-        }
-      },
-
-      /*
-       * SERVICES V2
-       */
-      "servicesV2": {
         useCache: false, // handled in osparc.store.Services
         idField: ["key", "version"],
         endpoints: {
@@ -598,7 +583,12 @@ qx.Class.define("osparc.data.Resources", {
           patch: {
             method: "PATCH",
             url: statics.API + "/catalog/services/{key}/{version}"
-          }
+          },
+          pricingPlans: {
+            useCache: false,
+            method: "GET",
+            url: statics.API + "/catalog/services/{key}/{version}/pricing-plan"
+          },
         }
       },
 

services/static-webserver/client/source/class/osparc/metadata/ServicesInStudyUpdate.js

@@ -57,12 +57,7 @@ qx.Class.define("osparc.metadata.ServicesInStudyUpdate", {
       });
       this._introText.add(introText);
       let msg = "";
-      const params = {
-        url: {
-          studyId: this._studyData["uuid"]
-        }
-      };
-      osparc.data.Resources.fetch("studies", "getServices", params)
+      osparc.store.Services.getStudyServices(this._studyData["uuid"])
         .then(resp => {
           const services = resp["services"];
           if (osparc.study.Utils.getCantExecuteServices(services).length) {

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

@@ -20,6 +20,8 @@ qx.Class.define("osparc.store.Services", {
 
   statics: {
     __servicesCached: {},
+    __servicesPromisesCached: {},
+    __studyServicesPromisesCached: {},
 
     getServicesLatest: function(useCache = true) {
       return new Promise(resolve => {
@@ -30,7 +32,7 @@ qx.Class.define("osparc.store.Services", {
           return;
         }
 
-        osparc.data.Resources.getInstance().getAllPages("servicesV2")
+        osparc.data.Resources.getInstance().getAllPages("services")
           .then(servicesArray => {
             const servicesObj = osparc.service.Utils.convertArrayToObject(servicesArray);
             this.__addHits(servicesObj);
@@ -99,6 +101,11 @@ qx.Class.define("osparc.store.Services", {
     },
 
     getService: function(key, version, useCache = true) {
+      // avoid request deduplication
+      if (key in this.__servicesPromisesCached && version in this.__servicesPromisesCached[key]) {
+        return this.__servicesPromisesCached[key][version];
+      }
+
       return new Promise((resolve, reject) => {
         if (
           useCache &&
@@ -109,10 +116,13 @@ qx.Class.define("osparc.store.Services", {
           return;
         }
 
+        if (!(key in this.__servicesPromisesCached)) {
+          this.__servicesPromisesCached[key] = {};
+        }
         const params = {
           url: osparc.data.Resources.getServiceUrl(key, version)
         };
-        osparc.data.Resources.fetch("servicesV2", "getOne", params)
+        this.__servicesPromisesCached[key][version] = osparc.data.Resources.fetch("services", "getOne", params)
           .then(service => {
             this.__addHit(service);
             this.__addTSRInfo(service);
@@ -121,12 +131,36 @@ qx.Class.define("osparc.store.Services", {
             resolve(service);
           })
           .catch(err => {
+            // store it in cache to avoid asking again
+            this.__servicesCached[key][version] = null;
             console.error(err);
             reject();
+          })
+          .finally(() => {
+            delete this.__servicesPromisesCached[key][version];
           });
       });
     },
 
+    getStudyServices: function(studyId) {
+      // avoid request deduplication
+      if (studyId in this.__studyServicesPromisesCached) {
+        return this.__studyServicesPromisesCached[studyId];
+      }
+
+      const params = {
+        url: {
+          studyId
+        }
+      };
+      this.__studyServicesPromisesCached[studyId] = osparc.data.Resources.fetch("studies", "getServices", params)
+        .finally(() => {
+          delete this.__studyServicesPromisesCached[studyId];
+        });
+
+      return this.__studyServicesPromisesCached[studyId]
+    },
+
     __getAllVersions: function(key) {
       const services = this.__servicesCached;
       let versions = [];
@@ -235,7 +269,7 @@ qx.Class.define("osparc.store.Services", {
         url: osparc.data.Resources.getServiceUrl(key, version),
         data: patchData
       };
-      return osparc.data.Resources.fetch("servicesV2", "patch", params)
+      return osparc.data.Resources.fetch("services", "patch", params)
         .then(() => {
           this.__servicesCached[key][version][fieldKey] = value;
           serviceData[fieldKey] = value;

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

@@ -342,12 +342,11 @@ qx.Class.define("osparc.study.Utils", {
       return Object.values(studyData["workbench"]).filter(nodeData => !osparc.data.model.Node.isFrontend(nodeData));
     },
 
-    guessIcon: async function(studyData) {
+    guessIcon: function(studyData) {
       if (osparc.product.Utils.isProduct("tis") || osparc.product.Utils.isProduct("tiplite")) {
-        return this.__guessTIPIcon(studyData);
+        return new Promise(resolve => resolve(this.__guessTIPIcon(studyData)));
       }
-      const icon = await this.__guessIcon(studyData);
-      return icon;
+      return this.__guessIcon(studyData);
     },
 
     __guessIcon: function(studyData) {