Some updates to how we handle table header and use it in the final mapData step so that we can import data without visible headers

Author: OwainJones

fixtures/tables_test.xlsx

@@ -252,11 +252,23 @@ exports.GetTableHeader = (sid, sheet, table) => {
     }
   }
 
-
   return headerRange;
 
 }
 
+exports.GetTableColumns = (sid, sheet, table) => {
+  const tableRangeContainer = backend.SessionGetInputTableRanges(sid, sheet).get(table);  
+  assert(tableRangeContainer, `Table Range ${table} not found in ${sheet}` )
+
+  const columnRow = tableRangeContainer.columns;
+  const columnList = [];
+  for (var i = 0; i < columnRow.length; i++) {
+    columnList.push(columnRow[i].name)
+  }
+
+  return columnList;
+}
+
 exports.GetTableFooter = (sid, sheet, table) => {
   const tableRangeContainer = backend.SessionGetInputTableRanges(sid, sheet).get(table);  
   const sheetDimensions = backend.SessionGetInputDimensions(sid)
@@ -421,9 +433,24 @@ const RewriteMapping = (mapping, fields) => {
 // Uses the session ID provided, which must contain a sheet name and a
 // mapping to perform the mapping of the data across the remaining
 // rows in the sheet to return an array of objects.
-exports.MapData = (sid, sheet, mapping, fields, previewLimit = DEFAULT_PREVIEW_LIMIT) => {
-  const hRange = backend.SessionGetHeaderRange(sid, sheet)
+exports.MapData = (sid, sheet, mapping, fields, table = null, previewLimit = DEFAULT_PREVIEW_LIMIT) => {
+  let hRange = backend.SessionGetHeaderRange(sid, sheet)
   const fRange = backend.SessionGetFooterRange(sid, sheet)
+  console.debug(hRange)
+
+  if (table != null && hRange.start.row == -1) {
+    tableRangeContainer = backend.SessionGetInputTableRanges(sid, sheet).get(table);  
+    assert(tableRangeContainer, `Table Range ${table} not found in ${sheet}` )  
+    tableRange = tableRangeContainer.range 
+    
+    hRange = {
+      sheet: sheet,
+      start: { row: tableRange.start.row -1, column: tableRange.start.column },
+      end: { row: tableRange.start.row -1, column: tableRange.end.column },
+    }
+  } 
+
+  
 
   // Construct the range to be mapped - everything but the first row
   const rowRange = backend.SessionSuggestDataRange(sid, hRange, fRange);

lib/importer/src/dudk/sheets.js

@@ -141,6 +141,7 @@ const importerGetHeaders = (data) => {
     const session = new session_lib.Session(session_data)
 
     let header_names = sheets_lib.GetHeader(session.backendSid, session.sheet);
+  
     const response = {
         data: [],
         error: false,
@@ -191,7 +192,7 @@ const importerMappedData = (data) => {
     const session_data = data[IMPORTER_SESSION_KEY];
     const session = new session_lib.Session(session_data)
 
-    const mapResults = sheets_lib.MapData(session.backendSid, session.sheet, session.mapping, session.fields);
+    const mapResults = sheets_lib.MapData(session.backendSid, session.sheet, session.mapping, session.fields, session.table);
     const headers = session.fields;
 
     return {
@@ -221,7 +222,7 @@ const data_sum = (data, column) => {
     const session_data = data[IMPORTER_SESSION_KEY];
     const session = new session_lib.Session(session_data)
 
-    const mapResults = sheets_lib.MapData(session.backendSid, session.sheet, session.mapping, session.fields);
+    const mapResults = sheets_lib.MapData(session.backendSid, session.sheet, session.mapping, session.fields, session.table);
     const headers = session.fields;
 
     const idx = headers.findIndex((x) => x.name == column)
@@ -241,7 +242,7 @@ const data_avg = (data, column) => {
     const session_data = data[IMPORTER_SESSION_KEY];
     const session = new session_lib.Session(session_data)
 
-    const mapResults = sheets_lib.MapData(session.backendSid, session.sheet, session.mapping, session.fields);
+    const mapResults = sheets_lib.MapData(session.backendSid, session.sheet, session.mapping, session.fields, session.table);
     const headers = session.fields;
 
     const idx = headers.findIndex((x) => x.name == column)

lib/importer/src/functions.js

@@ -283,8 +283,21 @@ exports.Initialise = (config, router, prototypeKit) => {
       if (request.body.table == "no_table") {
         session.table = null
         //redirectOnwards(request, response); //if no table is selected we don't need to persist one
-        //return;
-        // Ensure the session is persisted. Currently in session, eventually another way
+        maxCol = sheets_lib.GetTotalColumns(session.backendSid, session.sheet);
+        maxRow = sheets_lib.GetTotalRows(session.backendSid, session.sheet)
+
+        session.headerRange = {
+          sheet: session.sheet,
+          start: { row: -1, column: 0 },
+          end: { row: -1, column: maxCol - 1 },
+        };
+
+        session.footerRange = {
+          sheet: session.sheet,
+          start: { row: maxRow, column: 0 },
+          end: {row: maxRow, column: maxCol - 1 }
+        }
+        // Ensure the session is persisted. Currently in session, eventually another way.
         request.session.data[IMPORTER_SESSION_KEY] = session;
         redirectOnwards(request, response); 
         return;
@@ -300,15 +313,15 @@ exports.Initialise = (config, router, prototypeKit) => {
         // Get header range, for tables this will check the column names against the first row of the table.
         // If they match that first row will be designated as the headerRange, otherwise it will be null.
         headerRange = sheets_lib.GetTableHeader(session.backendSid, session.sheet, session.table)
-        if (headerRange != null) {
-          session.headerRange = headerRange //overwrite assumed header range with table header range
-        }
+        
+        session.headerRange = headerRange //overwrite assumed header range with table header range
+      
 
         //Set a footer range, this may be overridden later
         footerRange = sheets_lib.GetTableFooter(session.backendSid, session.sheet, session.table)
-        if (footerRange != null) {
-          session.footerRange = footerRange 
-        }
+       
+        session.footerRange = footerRange 
+        
 
         // The user