Merge pull request #736 from gisaia/feature/fixSchemaJson

Feat: fix schema json
gisaia · Mar 7, 2024 · 5bf215e · 5bf215e
2 parents 1223195 + 293e794
commit 5bf215e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/projects/arlas-toolkit/src/lib/services/startup/arlasconfig.schema.json b/projects/arlas-toolkit/src/lib/services/startup/arlasconfig.schema.json
@@ -157,8 +157,7 @@
                                         }
                                     }
                                 ]
-                            },
-                            "additionalProperties": false
+                            }
                         },
                         "filters_shortcuts": {
                             "description": "List of shortcut widgets to filter data",
@@ -368,6 +367,7 @@
                             "type": "object",
                             "patternProperties": {
                                 "^(share)$": {
+                                    "type": "object",
                                     "patternProperties": {
                                         "^(geojson)$": {
                                             "description": "Configuration of arlas share component",
@@ -644,7 +644,6 @@
                         }
                     }
                 }
-
             },
             "required": [
                 "web",

diff --git a/projects/arlas-toolkit/src/lib/services/startup/settings.schema.json b/projects/arlas-toolkit/src/lib/services/startup/settings.schema.json
@@ -119,6 +119,7 @@
     },
     "persistence": {
       "description": "Configuration of ARLAS-persistence server",
+      "type": "object",
       "properties": {
         "url": {
           "type": "string",
@@ -131,6 +132,7 @@
     },
     "permission": {
       "description": "Configuration of ARLAS-permission server",
+      "type": "object",
       "properties": {
         "url": {
           "type": "string",

diff --git a/projects/arlas-toolkit/src/lib/services/startup/startup.service.ts b/projects/arlas-toolkit/src/lib/services/startup/startup.service.ts
@@ -213,7 +213,7 @@ export class ArlasStartupService {
 
   public validateSettings(settings) {
     return new Promise<any>((resolve, reject) => {
-      const ajvObj = new Ajv();
+      const ajvObj = new Ajv({allowUnionTypes:true});
       ajvKeywords(ajvObj, 'uniqueItemProperties');
       const validateConfig = ajvObj
         .addMetaSchema(draftSchema.default)
@@ -233,7 +233,7 @@ export class ArlasStartupService {
 
   public validateConfiguration(data) {
     return new Promise<any>((resolve, reject) => {
-      const ajvObj = new Ajv();
+      const ajvObj = new Ajv({allowUnionTypes:true});
       ajvKeywords(ajvObj, 'uniqueItemProperties');
       const validateConfig = ajvObj
         .addMetaSchema(draftSchema.default)