fetchVipModels from Store

Author: odeimaiz

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

@@ -29,7 +29,7 @@ qx.Class.define("osparc.store.LicensedItems", {
     VIP_MODELS: {
       HUMAN_BODY: "https://itis.swiss/PD_DirectDownload/getDownloadableItems/HumanWholeBody",
       HUMAN_BODY_REGION: "https://itis.swiss/PD_DirectDownload/getDownloadableItems/HumanBodyRegion",
-      ANIMAL_BODY: "https://itis.swiss/PD_DirectDownload/getDownloadableItems/AnimalWholeBody",
+      ANIMAL: "https://itis.swiss/PD_DirectDownload/getDownloadableItems/AnimalWholeBody",
       PHANTOM: "https://speag.swiss/PD_DirectDownload/getDownloadableItems/ComputationalPhantom",
     },
 
@@ -63,15 +63,15 @@ qx.Class.define("osparc.store.LicensedItems", {
     __modelsCache: null,
 
     __fetchVipModels: async function(vipSubset) {
-      if (!(vipSubset in this.VIP_MODELS)) {
+      if (!(vipSubset in this.self().VIP_MODELS)) {
         return [];
       }
 
       if (vipSubset in this.__modelsCache) {
         return this.__modelsCache[vipSubset];
       }
 
-      return await fetch(this.VIP_MODELS[vipSubset], {
+      return await fetch(this.self().VIP_MODELS[vipSubset], {
         method:"POST"
       })
         .then(resp => resp.json())
@@ -85,7 +85,7 @@ qx.Class.define("osparc.store.LicensedItems", {
             anatomicalModel["name"] = model["Features"]["name"] + " " + model["Features"]["version"];
             anatomicalModel["description"] = model["Description"];
             anatomicalModel["features"] = model["Features"];
-            anatomicalModel["date"] = new Date(model["Features"]["date"]);
+            anatomicalModel["date"] = model["Features"]["date"];
             anatomicalModel["DOI"] = model["DOI"];
             anatomicalModels.push(anatomicalModel);
           });

services/static-webserver/client/source/class/osparc/vipMarket/Market.js

@@ -33,22 +33,22 @@ qx.Class.define("osparc.vipMarket.Market", {
           category: "human",
           label: "Humans",
           icon: "@FontAwesome5Solid/users/20",
-          url: "https://itis.swiss/PD_DirectDownload/getDownloadableItems/HumanWholeBody",
+          vipSubset: "HUMAN_BODY",
         }, {
           category: "human_region",
           label: "Humans (Region)",
           icon: "@FontAwesome5Solid/users/20",
-          url: "https://itis.swiss/PD_DirectDownload/getDownloadableItems/HumanBodyRegion",
+          vipSubset: "HUMAN_BODY_REGION",
         }, {
           category: "animal",
           label: "Animals",
           icon: "@FontAwesome5Solid/users/20",
-          url: "https://itis.swiss/PD_DirectDownload/getDownloadableItems/AnimalWholeBody",
+          vipSubset: "ANIMAL",
         }, {
           category: "phantom",
           label: "Phantoms",
           icon: "@FontAwesome5Solid/users/20",
-          url: "https://speag.swiss/PD_DirectDownload/getDownloadableItems/ComputationalPhantom",
+          vipSubset: "PHANTOM",
         }].forEach(marketInfo => {
           this.__buildViPMarketPage(marketInfo);
         });
@@ -76,7 +76,7 @@ qx.Class.define("osparc.vipMarket.Market", {
     __buildViPMarketPage: function(marketInfo) {
       const vipMarketView = new osparc.vipMarket.VipMarket();
       vipMarketView.set({
-        metadataUrl: marketInfo["url"],
+        vipSubset: marketInfo["vipSubset"],
       });
       this.bind("openBy", vipMarketView, "openBy");
       vipMarketView.addListener("importMessageSent", () => this.fireEvent("importMessageSent"));

services/static-webserver/client/source/class/osparc/vipMarket/VipMarket.js

@@ -38,12 +38,12 @@ qx.Class.define("osparc.vipMarket.VipMarket", {
       event: "changeOpenBy",
     },
 
-    metadataUrl: {
-      check: "String",
+    vipSubset: {
+      check: ["HUMAN_BODY", "HUMAN_BODY_REGION", "ANIMAL", "PHANTOM"],
       init: null,
-      nullable: false,
+      nullable: true,
       apply: "__fetchModels",
-    }
+    },
   },
 
   statics: {
@@ -192,14 +192,9 @@ qx.Class.define("osparc.vipMarket.VipMarket", {
       }, this);
     },
 
-    __fetchModels: function(url) {
-      fetch(url, {
-        method:"POST"
-      })
-        .then(resp => resp.json())
-        .then(anatomicalModelsRaw => {
-          const allAnatomicalModels = this.self().curateAnatomicalModels(anatomicalModelsRaw);
-
+    __fetchModels: function(vipSubset) {
+      osparc.store.LicensedItems.getInstance().fetchVipModels(vipSubset)
+        .then(allAnatomicalModels => {
           const store = osparc.store.Store.getInstance();
           const contextWallet = store.getContextWallet();
           if (!contextWallet) {
@@ -221,17 +216,11 @@ qx.Class.define("osparc.vipMarket.VipMarket", {
 
               this.__anatomicalModels = [];
               allAnatomicalModels.forEach(model => {
-                const modelId = model["ID"];
+                const modelId = model["modelId"];
                 const licensedItem = licensedItems.find(licItem => licItem["name"] == modelId);
                 if (licensedItem) {
-                  const anatomicalModel = {};
-                  anatomicalModel["modelId"] = model["ID"];
-                  anatomicalModel["thumbnail"] = model["Thumbnail"];
-                  anatomicalModel["name"] = model["Features"]["name"] + " " + model["Features"]["version"];
-                  anatomicalModel["description"] = model["Description"];
-                  anatomicalModel["features"] = model["Features"];
-                  anatomicalModel["date"] = new Date(model["Features"]["date"]);
-                  anatomicalModel["DOI"] = model["DOI"];
+                  const anatomicalModel = osparc.utils.Utils.deepCloneObject(model);
+                  anatomicalModel["date"] = new Date(anatomicalModel["date"]);
                   // attach license data
                   anatomicalModel["licensedItemId"] = licensedItem["licensedItemId"];
                   anatomicalModel["pricingPlanId"] = licensedItem["pricingPlanId"];