parse validation error for sld (#3717)

allyoucanmap · allyoucanmap · commit ec50876f88e3 · 2019-05-06T18:13:59.000+02:00
diff --git a/web/client/reducers/__tests__/styleeditor-test.js b/web/client/reducers/__tests__/styleeditor-test.js
@@ -130,4 +130,20 @@ describe('Test styleeditor reducer', () => {
             }
         });
     });
+
+    it('test errorStyle sld error', () => {
+        const state = styleeditor({ }, errorStyle('edit', { status: 400, statusText: 'Error on lineNumber: 10; columnNumber: 2;' }));
+        expect(state).toEqual({
+            loading: false,
+            canEdit: true,
+            error: {
+                edit: {
+                    status: 400,
+                    message: 'Error on lineNumber: 10; columnNumber: 2;',
+                    line: 10,
+                    column: 2
+                }
+            }
+        });
+    });
 });
diff --git a/web/client/reducers/styleeditor.js b/web/client/reducers/styleeditor.js
@@ -86,10 +86,10 @@ function styleeditor(state = {}, action) {
         }
         case ERROR_STYLE: {
             const message = action.error && action.error.statusText || '';
-            const position = message.match(/line\s([\d]+)|column\s([\d]+)/g);
+            const position = message.match(/line\s([\d]+)|column\s([\d]+)|lineNumber:\s([\d]+)|columnNumber:\s([\d]+)/g);
             const errorInfo = position && position.length === 2 && position.reduce((info, pos) => {
                 const splittedValues = pos.split(' ');
-                const param = splittedValues[0];
+                const param = splittedValues[0].replace(/Number:/g, '');
                 const value = parseFloat(splittedValues[1]);
                 return param && !isNaN(value) && {
                     ...info,
