Updated geostore error parser location

geosolutions-it · Jan 12, 2018 · 63dcfbf · 63dcfbf
1 parent b408315
commit 63dcfbf
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 16 deletions.
diff --git a/web/client/api/GeoStoreDAO.js b/web/client/api/GeoStoreDAO.js
@@ -351,6 +351,25 @@ var Api = {
             postUser.attribute = postUser.attribute && postUser.attribute.length > 0 ? [...postUser.attribute, uuidAttr] : [uuidAttr];
             return postUser;
         }
+    },
+    errorParser: {
+        /**
+         * Returns localized message for geostore map errors
+         * @param  {object} e error object
+         * @return {object} {title, message}
+         */
+        mapsError: e => {
+            if (e.status === 403 || e.status === 404 || e.status === 409 || e.status === 500) {
+                return {
+                    title: 'map.mapError.errorTitle',
+                    message: 'map.mapError.error' + e.status
+                };
+            }
+            return {
+                title: 'map.mapError.errorTitle',
+                message: 'map.mapError.errorDefault'
+            };
+        }
     }
 };
 

diff --git a/web/client/api/__tests__/GeoStoreDAO-test.jsx b/web/client/api/__tests__/GeoStoreDAO-test.jsx
@@ -40,4 +40,15 @@ describe('Test correctness of the GeoStore APIs', () => {
         const user2 = API.utils.initUser(originalUser2);
         expect(user2.attribute.length).toBe(2);
     });
+
+    it('test error parser', () => {
+        expect(API.errorParser.mapsError({status: 409})).toEqual({
+            title: 'map.mapError.errorTitle',
+            message: 'map.mapError.error409'
+        });
+        expect(API.errorParser.mapsError({status: 400})).toEqual({
+            title: 'map.mapError.errorTitle',
+            message: 'map.mapError.errorDefault'
+        });
+    });
 });
diff --git a/web/client/utils/LocaleUtils.js b/web/client/utils/LocaleUtils.js
@@ -52,21 +52,12 @@ const DATE_FORMATS = {
     "nl-NL": "dd/MM/yyyy"
 };
 
-const errorParser = {
-    geostore: {
-        mapsError: e => {
-            if (e.status === 403 || e.status === 404 || e.status === 409 || e.status === 500) {
-                return {
-                    title: 'map.mapError.errorTitle',
-                    message: 'map.mapError.error' + e.status
-                };
-            }
-            return {
-                title: 'map.mapError.errorTitle',
-                message: 'map.mapError.errorDefault'
-            };
-        }
-    }
+const servicesErrorParser = {
+    geostore: require('../api/GeoStoreDAO').errorParser
+};
+
+const getErrorParser = service => {
+    return servicesErrorParser[service];
 };
 /**
  * Utilities for locales.
@@ -137,7 +128,8 @@ const LocaleUtils = {
      * @return {object} {title, message}
      */
     getErrorMessage: (e, service, section) => {
-        return service && section && errorParser[service] && errorParser[service][section] && errorParser[service][section](e) || {
+        const errorParser = getErrorParser(service);
+        return service && section && errorParser && errorParser[section] && errorParser[section](e) || {
             title: 'errorTitleDefault',
             message: 'errorDefault'
         };