diff --git a/projects/arlas-toolkit/src/lib/services/startup/arlasconfig.schema.json b/projects/arlas-toolkit/src/lib/services/startup/arlasconfig.schema.json index ff689b2c..42ee75fc 100644 --- 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 index 0e80bf81..b3b019b3 100644 --- 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 index 7b24bded..ccac01b3 100644 --- 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((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((resolve, reject) => { - const ajvObj = new Ajv(); + const ajvObj = new Ajv({allowUnionTypes:true}); ajvKeywords(ajvObj, 'uniqueItemProperties'); const validateConfig = ajvObj .addMetaSchema(draftSchema.default)