Fix a bad merge with missing fields in message (#308)

* Fix a bad merge with missing fields in message

* Fix tests now field has moved

Author: rossjones

lib/importer/src/dudk/sheets.js

@@ -377,15 +377,11 @@ const remapErrorStructure = (errors, row_data, mappingIndices, headerRangeOffset
 
         const errorObj = messageMap.get(key);
         errorObj.type = error.type;
-        errorObj.type.field = error.field;
 
-        if( !errorObj.fields) {
-            errorObj.fields = new Set();
-        }
         if( !errorObj.rows) {
             errorObj.rows = new Map();
         }
-        errorObj.fields.add(error.field);
+        errorObj.field = error.field;
         errorObj.context = new Set();
 
         // Convert to 0-based index
@@ -438,7 +434,7 @@ const remapErrorStructure = (errors, row_data, mappingIndices, headerRangeOffset
                 first: errorRows[0]?.index || 0,
                 count: errorRows?.length || 0
             },
-            fields: Array.from(errorObj.fields),
+            field: errorObj.field,
             rows: Array.from(errorObj.rows.values())
         }
     }));

lib/importer/src/dudk/sheets.test.js

@@ -38,8 +38,8 @@ describe('remapErrorStructure', () => {
         const result = sheets_lib.RemapErrorStructure(errors, row_data, RewrittenMapping);
         expect(result).toEqual([
             {
-                type: {variant: "IncorrectType", field: "A"},
-                fields: [ "A"],
+                type: {variant: "IncorrectType"},
+                field: "A",
                 // Only 1 error (in the two rows) because A appears twice but in
                 // rows 1 and 3 and here we have rows 1 and 2
                 meta: { first: 1, count: 1 },
@@ -49,8 +49,8 @@ describe('remapErrorStructure', () => {
                 ]
             },
             {
-                type: {variant: "IncorrectType", field: "B"},
-                fields: ["B"],
+                type: {variant: "IncorrectType"},
+                field: "B",
                 meta: { first: 1, count: 2 },
                 rows: [
                     {index:1, error: true, row: [{value:"0", error: true},{value:"1", error: true}]},
@@ -73,7 +73,7 @@ describe('remapErrorStructure', () => {
         expect(result).toEqual([
             {
                 type: "Error 1",
-                fields: ["A"],
+                field: "A",
                 meta: {first: 1, count: 2},
                 rows: [
                     {index: 1, error: true, row: [{value:"0", error: true},{value:"1"}]},
@@ -99,7 +99,7 @@ describe('remapErrorStructure', () => {
         expect(result).toEqual([
             {
                 type: "Error 1",
-                fields: ["A"],
+                field: "A",
                 meta: { first: 1, count: 1 },
                 rows: [
                     {index: 1, error: true, row: [{value:"0", error: true},{value:"1"}]},
@@ -125,7 +125,7 @@ describe('remapErrorStructure', () => {
         ];
         const result = sheets_lib.RemapErrorStructure(errors, row_data, RewrittenMapping);
         expect(result).toEqual([
-            { type: "Error 1", meta: { count: 0, first: 0}, fields: ["A"], rows: [] }
+            { type: "Error 1", meta: { count: 0, first: 0}, field: "A", rows: [] }
         ]);
     });
 
@@ -159,8 +159,8 @@ describe('remapErrorStructure', () => {
         const result = sheets_lib.RemapErrorStructure(errors, row_data, mappingIndices, headerRangeOffset);
         expect(result).toEqual([
             {
-                type: {variant: "FieldRequired", field: "Salary"},
-                fields: ['Salary'],
+                type: {variant: "FieldRequired"},
+                field: 'Salary',
                 meta: { first: 3, count: 3 },
                 rows: [
                     // errors in index 3, 5 and 6
@@ -213,7 +213,7 @@ describe('remapErrorStructure', () => {
             {
                 type: { variant: "FieldRequired" },
                 meta: { first: 4, count: 4 },
-                fields: [ 'Salary' ],
+                field: 'Salary',
                 rows:[
                     { index: 4, row: [ {value: "Kris"}, {value: "1-1-24"}, {value: "1:00"}, {value: "5.5"}, {value: "Pink"}, {value: "Splotches"}, {value: "   ", error: true} ]},
                     { index: 5, row: [ {value: "Alex"}, {value: "2-4-24"}, {value: "4:34"}, {value: "6"}, {value: "Beige"}, {value: "N/A"}, {value: "My fave <3"} ]},
@@ -226,7 +226,7 @@ describe('remapErrorStructure', () => {
             {
                 type: { variant: "IncorrectType" },
                 meta: { first: 5, count: 2 },
-                fields: [ 'Salary' ],
+                field: 'Salary',
                 rows: [
                     { index: 4, row: [ {value: "Kris"}, {value: "1-1-24"}, {value: "1:00"}, {value: "5.5"}, {value: "Pink"}, {value: "Splotches"}, undefined ]},
                     { index: 5, row: [ {value: "Alex"}, {value: "2-4-24"}, {value: "4:34"}, {value: "6"}, {value: "Beige"}, {value: "N/A"}, {value: "My fave <3", error: true} ]},

lib/importer/templates/review.html

@@ -29,9 +29,9 @@ <h2 class="govuk-heading-m">Errors</h2>
                     <h2 class="govuk-heading-m validation-error-message">
                         {% switch error.variant %}
                             {% case 'FieldRequired' %}
-                                '{{error.field}}' must be supplied
+                                '{{errorObject.field}}' must be supplied
                             {% case 'IncorrectType' %}
-                                '{{error.field}}' must be a '{{error.type}}'
+                                '{{errorObject.field}}' must be a '{{error.type}}'
                             {% case 'MonthUnrecognised' %}
                                 Months must either be numbers or recognised names
                             {% case 'MonthOutOfRange' %}

prototypes/basic/app/views/review.html

@@ -64,9 +64,9 @@ <h2 class="govuk-heading-m">Errors</h2>
                      <h2 class="govuk-heading-m validation-error-message">
                          {% switch error.variant %}
                             {% case 'FieldRequired' %}
-                                '{{error.field}}' must be supplied
+                                '{{errorObject.field}}' must be supplied
                             {% case 'IncorrectType' %}
-                                '{{error.field}}' must be a '{{error.type}}'
+                                '{{errorObject.field}}' must be a '{{error.type}}'
                             {% case 'MonthUnrecognised' %}
                                 Months must either be numbers or recognised names
                             {% case 'MonthOutOfRange' %}