Merge branch 'master' into is6201/catalog-history-alternative

Author: pcrespov

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

@@ -52,6 +52,7 @@ qx.Class.define("osparc.data.model.LicensedItemResource", {
     }
 
     this.set({
+      modelId: licensedItemResourceData.id,
       description: description,
       title: title,
       subtitle: subtitle,
@@ -66,6 +67,13 @@ qx.Class.define("osparc.data.model.LicensedItemResource", {
   },
 
   properties: {
+    modelId: {
+      check: "Number",
+      nullable: false,
+      init: null,
+      event: "changeModelId",
+    },
+
     description: {
       check: "String",
       nullable: false,

services/static-webserver/client/source/class/osparc/navigation/UserMenu.js

@@ -86,7 +86,7 @@ qx.Class.define("osparc.navigation.UserMenu", {
           this.add(control);
           break;
         case "market":
-          control = new qx.ui.menu.Button(this.tr("Model Store"));
+          control = new qx.ui.menu.Button(this.tr("The Shop"));
           control.addListener("execute", () => osparc.vipMarket.MarketWindow.openWindow());
           this.add(control);
           break;

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

@@ -356,7 +356,7 @@ qx.Class.define("osparc.vipMarket.LicensedItemDetails", {
       });
       importButton.addListener("execute", () => {
         this.fireDataEvent("modelImportRequested", {
-          modelId: anatomicalModelsData.getLicensedResources()[selectedIdx]["id"],
+          modelId: anatomicalModelsData.getLicensedResources()[selectedIdx].getModelId(),
           categoryId: anatomicalModelsData.getCategoryId(),
         });
       }, this);

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

@@ -19,7 +19,7 @@ qx.Class.define("osparc.vipMarket.MarketWindow", {
   extend: osparc.ui.window.TabbedWindow,
 
   construct: function(nodeId, category) {
-    this.base(arguments, "store", this.tr("Model Store"));
+    this.base(arguments, "store", this.tr("The Shop"));
 
     osparc.utils.Utils.setIdToWidget(this, "storeWindow");