working

Author: odeimaiz

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

@@ -64,6 +64,7 @@ qx.Class.define("osparc.store.Products", {
                 allErrors: true,
                 strictDefaults: true,
                 useDefaults: true,
+                strictTypes: true,
               });
               const validate = ajv.compile(schema);
               const valid = validate(uiConfig);

services/static-webserver/client/source/resource/schemas/product-ui.json

@@ -2,79 +2,88 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
-    "categories": {
-      "type": "array",
-      "items": {
-        "type": "object",
-        "properties": {
-          "id": { "type": "string" },
-          "title": { "type": "string" },
-          "description": { "type": "string" }
-        },
-        "required": ["id", "title"]
-      }
+    "plusButton": {
+      "$ref": "#/definitions/buttonConfig"
     },
-    "resources": {
-      "type": "array",
-      "items": {
-        "oneOf": [
-          {
-            "type": "object",
-            "properties": {
-              "resourceType": { "enum": ["study"] },
-              "title": { "type": "string" },
-              "icon": { "type": "string" },
-              "newStudyLabel": { "type": "string" },
-              "idToWidget": { "type": "string" }
-            },
-            "required": ["resourceType", "title"]
-          },
-          {
-            "type": "object",
-            "properties": {
-              "resourceType": { "enum": ["template"] },
-              "expectedTemplateLabel": { "type": "string" },
-              "title": { "type": "string" },
-              "icon": { "type": "string" },
-              "newStudyLabel": { "type": "string" },
-              "category": { "type": "string" },
-              "idToWidget": { "type": "string" }
-            },
-            "required": ["resourceType", "expectedTemplateLabel", "title"]
-          },
-          {
-            "type": "object",
-            "properties": {
-              "resourceType": { "enum": ["service"] },
-              "expectedKey": { "type": "string" },
-              "title": { "type": "string" },
-              "icon": { "type": "string" },
-              "newStudyLabel": { "type": "string" },
-              "category": { "type": "string" },
-              "idToWidget": { "type": "string" }
-            },
-            "required": ["resourceType", "expectedKey", "title"]
-          },
-          {
+    "newStudies": {
+      "$ref": "#/definitions/buttonConfig"
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "buttonConfig": {
+      "type": "object",
+      "properties": {
+        "categories": {
+          "type": "array",
+          "items": {
             "type": "object",
             "properties": {
-              "showDisabled": {
-                "type": "boolean",
-                "enum": [true]
-              },
+              "id": { "type": "string" },
               "title": { "type": "string" },
-              "icon": { "type": "string" },
-              "reason": { "type": "string" },
-              "newStudyLabel": { "type": "string" },
-              "category": { "type": "string" },
-              "idToWidget": { "type": "string" }
+              "description": { "type": "string" }
             },
-            "required": ["showDisabled", "title"]
+            "required": ["id", "title"]
           }
-        ]
+        },
+        "resources": {
+          "type": "array",
+          "items": {
+            "oneOf": [{
+              "type": "object",
+              "properties": {
+                "resourceType": { "enum": ["study"] },
+                "title": { "type": "string" },
+                "icon": { "type": "string" },
+                "newStudyLabel": { "type": "string" },
+                "idToWidget": { "type": "string" }
+              },
+              "required": ["resourceType", "title"]
+            }, {
+              "type": "object",
+              "properties": {
+                "resourceType": { "enum": ["template"] },
+                "expectedTemplateLabel": { "type": "string" },
+                "title": { "type": "string" },
+                "icon": { "type": "string" },
+                "newStudyLabel": { "type": "string" },
+                "category": { "type": "string" },
+                "idToWidget": { "type": "string" }
+              },
+              "required": ["resourceType", "expectedTemplateLabel", "title"]
+            }, {
+              "type": "object",
+              "properties": {
+                "resourceType": { "enum": ["service"] },
+                "expectedKey": { "type": "string" },
+                "title": { "type": "string" },
+                "icon": { "type": "string" },
+                "newStudyLabel": { "type": "string" },
+                "category": { "type": "string" },
+                "idToWidget": { "type": "string" }
+              },
+              "required": ["resourceType", "expectedKey", "title"]
+            }, {
+              "type": "object",
+              "properties": {
+                "showDisabled": {
+                  "type": "boolean",
+                  "enum": [true]
+                },
+                "title": { "type": "string" },
+                "icon": { "type": "string" },
+                "reason": { "type": "string" },
+                "newStudyLabel": { "type": "string" },
+                "category": { "type": "string" },
+                "idToWidget": { "type": "string" }
+              },
+              "required": ["showDisabled", "title"]
+            }]
+          },
+          "additionalProperties": false
+        }
       },
       "additionalProperties": false
     }
-  },
-  "additionalProperties": false
+  }
 }