Code review feedback

Author: alaric-rd

lib/importer/nunjucks/views/error-handling/server-error.njk

@@ -45,6 +45,11 @@
 {% endblock %}
 
 
+{% block footer %}
+  {{ govukFooter({}) }}
+{% endblock %}
+
+
 {% block pageScripts %}
 <script>
   ;(() => {

lib/importer/src/dudk/backend.js

@@ -130,8 +130,7 @@ exports.SessionGetColumnsNeedingFormats = (sid) => {
 
   let columnsNeedingFormats = new Array();
 
-  Object.entries(mappings).forEach((entry) => {
-    const [colIdx, columnAttribute] = entry;
+  Object.entries(mappings).forEach((colIdx, columnAttribute) => {
     if(columnAttribute != "") {
       const columnDef = attributes.find((attr) => attr.name == columnAttribute);
       const columnTypeName = columnDef.type;

lib/importer/src/dudk/types/guesser.js

@@ -77,11 +77,17 @@ exports.ListPossibleTypes = (field) => {
     // Either way, we can't narrow the set of possible types, but it's a blank cell
     return [false, true];
   case "d": // Date or time or both
-    if(isDateFormat(field.z)) {
-      possibleTypes.set("date", ["native"]);
+    if(field.z) {
+      if(isDateFormat(field.z)) {
+        possibleTypes.set("date", ["native"]);
+      }
+      // FIXME: Add cases for time formats, eg "h:mm", when we support them
+      return [possibleTypes, isBlank];
+    } else {
+      // Field format code in field.z should always be present, but let's fail
+      // quietly if not rather than ruining the whole import
+      return [possibleTypes, isBlank];
     }
-    // FIXME: Add cases for time formats, eg "h:mm", when we support them
-    return [possibleTypes, isBlank];
     break;
   case "s":
     // String

lib/importer/src/functions.js

@@ -98,8 +98,7 @@ const importerPossibleColumnFormats = (data) => {
     const dataRange = backend_lib.SessionSuggestDataRange(session.backendSid, hRange, fRange);
     const typeGuesses = backend_lib.SessionGuessTypes(session.backendSid, dataRange);
 
-    return Object.entries(mappings).map((entry) => {
-        const [colIndex, columnField] = entry;
+    return Object.entries(mappings).map((colIndex, columnField) => {
         if (!columnField) return false; // Skip unmapped columns
         const columnGuesses = typeGuesses[colIndex];
         const columnDef = session.fields.find((field) => field.name == columnField);
@@ -109,9 +108,7 @@ const importerPossibleColumnFormats = (data) => {
         if (columnGuesses.types && columnGuesses.types.has(columnTypeName)) {
             const guessedFormats = columnGuesses.types.get(columnTypeName);
             if(guessedFormats && columnType.formats) {
-                likelyFormats = new Set(Array.from(columnType.formats.keys()).filter((fmtName) => {
-                    return guessedFormats.includes(fmtName);
-                }));
+                likelyFormats = new Set(Array.from(columnType.formats.keys()).filter((fmtName) => guessedFormats.includes(fmtName)));
             }
         }