Feat/table part1 (#197)

* feat(csv): export data as csv file
* feat(table): toggle fullscreen
* ux: coordinate tooltip open delay
* feat(excelDates): update tests
* refactor: folder structure

server/src/utils/__tests__/time.test.js

@@ -0,0 +1,28 @@
+import { parseExcelDate } from '../time';
+
+describe('parseExcelDate', () => {
+  it('parses a valid date string as expected from excel', () => {
+    const millis = parseExcelDate('1899-12-30T07:00:00.000Z');
+    expect(millis).not.toBe(0);
+  });
+
+  describe('parses a time string that passes validation', () => {
+    const validFields = ['10:00:00', '10:00'];
+    validFields.forEach((field) => {
+      it(`handles ${field}`, () => {
+        const millis = parseExcelDate(field);
+        expect(millis).not.toBe(0);
+      });
+    });
+  });
+
+  describe('returns 0 on other strings', () => {
+    const invalidFields = ['10', 'test', ''];
+    invalidFields.forEach((field) => {
+      it(`handles ${field}`, () => {
+        const millis = parseExcelDate(field);
+        expect(millis).toBe(0);
+      });
+    });
+  });
+});

server/src/utils/parser.js

@@ -12,7 +12,7 @@ import {
   parseSettings_v1,
   parseUserFields_v1,
 } from './parserUtils_v1.js';
-import { excelDateStringToMillis } from './time.js';
+import { parseExcelDate } from './time.js';
 import { generateId } from './generate_id.js';
 
 export const EXCEL_MIME = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
@@ -79,9 +79,9 @@ export const parseExcel_v1 = async (excelData) => {
           eventData.url = column;
           eventUrlNext = false;
         } else if (j === timeStartIndex) {
-          event.timeStart = excelDateStringToMillis(column);
+          event.timeStart = parseExcelDate(column);
         } else if (j === timeEndIndex) {
-          event.timeEnd = excelDateStringToMillis(column);
+          event.timeEnd = parseExcelDate(column);
         } else if (j === titleIndex) {
           event.title = column;
         } else if (j === presenterIndex) {

server/src/utils/time.js

@@ -2,22 +2,6 @@ const mts = 1000; // millis to seconds
 const mtm = 1000 * 60; // millis to minutes
 const mth = 1000 * 60 * 60; // millis to hours
 
-/**
- * Returns current time in milliseconds
- * @returns {number}
- */
-export const nowInMillis = () => {
-  const now = new Date();
-
-  // extract milliseconds since midnight
-  let elapsed = now.getHours() * 3600000;
-  elapsed += now.getMinutes() * 60000;
-  elapsed += now.getSeconds() * 1000;
-  elapsed += now.getMilliseconds();
-
-  return elapsed;
-};
-
 /**
  * @description Converts milliseconds to string representing time
  * @param {number} ms - time in milliseconds
@@ -51,17 +35,114 @@ export const stringFromMillis = (ms, showSeconds = true, delim = ':', ifNull = '
 
 /**
  * @description Converts an excel date to milliseconds
- * @argument {string} excelDate - excel string date
+ * @argument {string} date - excel string date
  * @returns {number} - time in milliseconds
  */
-export const excelDateStringToMillis = (excelDate) => {
+export const dateToMillis = (date) => {
+  const h = date.getHours();
+  const m = date.getMinutes();
+  const s = date.getSeconds();
+
+  return h * mth + m * mtm + s * mts;
+};
+
+/**
+ * @description Parses an excel date using the correct parser
+ * @param {string} excelDate
+ * @returns {number} - time in milliseconds
+
+ */
+export const parseExcelDate = (excelDate) => {
+  // attempt converting to date object
   const date = new Date(excelDate);
   if (date instanceof Date && !isNaN(date)) {
-    const h = date.getHours();
-    const m = date.getMinutes();
-    const s = date.getSeconds();
-
-    return h * mth + m * mtm + s * mts;
+    return dateToMillis(date);
+  } else if (isTimeString(excelDate)) {
+    return forgivingStringToMillis(excelDate);
   }
   return 0;
 };
+
+export const timeFormat = 'HH:mm';
+export const timeFormatSeconds = 'HH:mm:ss';
+
+/**
+ * @description Validates a time string
+ * @param {string} string - time string "23:00:12"
+ * @returns {boolean} string represents time
+ */
+export const isTimeString = (string) => {
+  // ^                   # Start of string
+  // (?:                 # Try to match...
+  //  (?:                #  Try to match...
+  //   ([01]?\d|2[0-3]): #   HH:
+  //  )?                 #  (optionally).
+  //  ([0-5]?\d):        #  MM: (required)
+  // )?                  # (entire group optional, so either HH:MM:, MM: or nothing)
+  // ([0-5]?\d)          # SS (required)
+  // $                   # End of string
+
+  const regex = /^(?:(?:([01]?\d|2[0-3])[:,.])?([0-5]?\d)[:,.])?([0-5]?\d)$/;
+  return regex.test(string);
+};
+
+/**
+ * @description safe parse string to int, copied from client code
+ * @param valueAsString
+ * @return {number}
+ */
+const parse = (valueAsString) => {
+  const parsed = parseInt(valueAsString, 10);
+  if (isNaN(parsed)) {
+    return 0;
+  }
+  return Math.abs(parsed);
+};
+
+/**
+ * @description Parses a time string to millis, copied from client code
+ * @param {string} value - time string
+ * @param {boolean} fillLeft - autofill left = hours / right = seconds
+ * @returns {number} - time string in millis
+ */
+export const forgivingStringToMillis = (value, fillLeft = true) => {
+  let millis = 0;
+
+  // split string at known separators    : , .
+  const separatorRegex = /[\s,:.]+/;
+  const [first, second, third] = value.split(separatorRegex);
+
+  if (first != null && second != null && third != null) {
+    // if string has three sections, treat as [hours] [minutes] [seconds]
+    millis = parse(first) * mth;
+    millis += parse(second) * mtm;
+    millis += parse(third) * mts;
+  } else if (first != null && second == null && third == null) {
+    // if string has one section,
+    // could be a complete string like 121010 - 12:10:10
+    if (first.length === 6) {
+      const hours = first.substring(0, 2);
+      const minutes = first.substring(2, 4);
+      const seconds = first.substring(4);
+      millis = parse(hours) * mth;
+      millis += parse(minutes) * mtm;
+      millis += parse(seconds) * mts;
+    } else {
+      // otherwise lets treat as [minutes]
+      millis = parse(first) * mtm;
+    }
+  }
+  if (first != null && second != null && third == null) {
+    // if string has two sections
+    if (fillLeft) {
+      // treat as [hours] [minutes]
+      millis = parse(first) * mth;
+      millis += parse(second) * mtm;
+    } else {
+      // treat as [minutes] [seconds]
+      millis = parse(first) * mtm;
+      millis += parse(second) * mts;
+    }
+  }
+  return millis;
+};