Update error messages

Author: davidjamesstone

src/server/plugins/engine/components/GeospatialField.ts

@@ -112,10 +112,15 @@ export class GeospatialField extends FormComponent {
    */
   static getAllPossibleErrors(): ErrorMessageTemplateList {
     return {
-      baseErrors: [{ type: 'required', template: messageTemplate.required }],
-      advancedSettingsErrors: [
+      baseErrors: [
+        { type: 'required', template: messageTemplate.selectRequired },
+        {
+          type: 'array.min',
+          template: '{{#title}} must contain at least 1 items'
+        },
         { type: 'object.invalidjson', template: messageTemplate.format }
-      ]
+      ],
+      advancedSettingsErrors: []
     }
   }
 }

src/server/plugins/engine/components/helpers/geospatial.test.js

@@ -48,7 +48,7 @@ describe('Geospatial validation helpers', () => {
   test('it should validate an empty string', () => {
     const result = geospatialSchema.validate('')
 
-    expect(result.error).toBeUndefined()
-    expect(result.value).toEqual([])
+    expect(result.error).toBeDefined()
+    expect(result.value).toBeUndefined()
   })
 })

src/server/plugins/engine/components/helpers/geospatial.ts

@@ -20,7 +20,7 @@ const Joi = JoiBase.extend({
       if (typeof value === 'string') {
         if (value.trim() === '') {
           return {
-            value: []
+            value: undefined
           }
         }
 

src/server/plugins/engine/pageControllers/validationOptions.ts

@@ -89,7 +89,9 @@ export const messages: LanguageMessagesExt = {
   'date.base': messageTemplate.dateFormat,
   'date.format': messageTemplate.dateFormat,
   'date.min': messageTemplate.dateMin,
-  'date.max': messageTemplate.dateMax
+  'date.max': messageTemplate.dateMax,
+
+  'object.invalidjson': messageTemplate.format
 }
 
 export const messagesPre: LanguageMessages =