From d299f455d6f235e6d34ef7d7f1aaf5a2fca2612c Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Thu, 21 May 2020 09:06:02 +0200 Subject: [PATCH 1/3] boot/salix.js deprecated --- front/core/lib/module-loader.js | 2 +- loopback/common/models/schema.json | 5 ++--- loopback/server/boot/salix.js | 9 --------- 3 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 loopback/server/boot/salix.js diff --git a/front/core/lib/module-loader.js b/front/core/lib/module-loader.js index 18f0a3ea3b..c48e7d93d8 100644 --- a/front/core/lib/module-loader.js +++ b/front/core/lib/module-loader.js @@ -11,7 +11,7 @@ export function factory($http, $window, $ocLazyLoad, $translatePartialLoader, $t this.loaded = {}; this.imports = {}; this.moduleImport = moduleImport; - this.modelInfo = $http.get(`modelInfo`) + this.modelInfo = $http.get(`Schemas/modelInfo`) .then(json => { this.onModelInfoReady(json); this.modelInfo = true; diff --git a/loopback/common/models/schema.json b/loopback/common/models/schema.json index face506ff6..1bdf0fcf7e 100644 --- a/loopback/common/models/schema.json +++ b/loopback/common/models/schema.json @@ -3,11 +3,10 @@ "base": "PersistedModel", "acls": [ { - "property": "validations", - "accessType": "EXECUTE", + "property": "modelInfo", "principalType": "ROLE", "principalId": "$everyone", "permission": "ALLOW" } ] -} +} \ No newline at end of file diff --git a/loopback/server/boot/salix.js b/loopback/server/boot/salix.js deleted file mode 100644 index 018389e40d..0000000000 --- a/loopback/server/boot/salix.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = function(app) { - // FIXME: Fix until the original can be used - app.get('/api/modelInfo', function(req, res) { - app.models.Schema.modelInfo({req}).then(json => { - res.set('Content-Type', 'application/json'); - res.send(JSON.stringify(json)); - }); - }); -}; From 44cd2f743f65964493ce02da06242d4a96122309 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Thu, 21 May 2020 09:23:44 +0200 Subject: [PATCH 2/3] updated the modelInfo route for the tests --- front/core/lib/specs/module-loader.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/core/lib/specs/module-loader.spec.js b/front/core/lib/specs/module-loader.spec.js index 2f756f7be8..dbed5e9a06 100644 --- a/front/core/lib/specs/module-loader.spec.js +++ b/front/core/lib/specs/module-loader.spec.js @@ -23,7 +23,7 @@ describe('factory vnModuleLoader', () => { } ]; - $httpBackend.whenGET('modelInfo') + $httpBackend.whenGET('Schemas/modelInfo') .respond({ FooModel: { properties: { From 245827e8d5059379db4824aa948e87d9c3413d7f Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Thu, 21 May 2020 09:28:50 +0200 Subject: [PATCH 3/3] corrected a typo --- modules/claim/back/models/claim-state.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/claim/back/models/claim-state.json b/modules/claim/back/models/claim-state.json index c905aacbad..287a525ad1 100644 --- a/modules/claim/back/models/claim-state.json +++ b/modules/claim/back/models/claim-state.json @@ -21,7 +21,7 @@ "required": true }, "priority": { - "type": "nomber", + "type": "Number", "required": true } },