@becollective/utils 2.0.15 → 2.0.16

package/lib/date-time.js

@@ -68,8 +68,11 @@ const getShiftText = (from, to, timezone) => {
     try {
         if (!from || !to || !timezone)
             return '';
-        const startToTimezone = luxon_1.DateTime.fromJSDate(from).setZone(timezone);
-        const endToTimezone = luxon_1.DateTime.fromJSDate(to).setZone(timezone);
+        // GraphQL / JSON often yield ISO strings; fromJSDate alone rejects those as Invalid.
+        const startToTimezone = luxon_1.DateTime.fromJSDate(new Date(from)).setZone(timezone);
+        const endToTimezone = luxon_1.DateTime.fromJSDate(new Date(to)).setZone(timezone);
+        if (!startToTimezone.isValid || !endToTimezone.isValid)
+            return '';
         return `${startToTimezone.toFormat('cccc, d MMMM yyyy, h:mma')}-${endToTimezone.toFormat('h:mma')}`;
     }
     catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@becollective/utils",
-  "version": "2.0.15",
+  "version": "2.0.16",
   "description": "Common utilities",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/date-time.ts

@@ -65,8 +65,10 @@ export const datesByThemselves = (a, b) => {
 export const getShiftText = (from, to, timezone) => {
   try {
     if (!from || !to || !timezone) return '';
-    const startToTimezone = DateTime.fromJSDate(from).setZone(timezone);
-    const endToTimezone = DateTime.fromJSDate(to).setZone(timezone);
+    // GraphQL / JSON often yield ISO strings; fromJSDate alone rejects those as Invalid.
+    const startToTimezone = DateTime.fromJSDate(new Date(from)).setZone(timezone);
+    const endToTimezone = DateTime.fromJSDate(new Date(to)).setZone(timezone);
+    if (!startToTimezone.isValid || !endToTimezone.isValid) return '';
     return `${startToTimezone.toFormat('cccc, d MMMM yyyy, h:mma')}-${endToTimezone.toFormat('h:mma')}`;
   }
   catch (e) {

package/tests/date-time.test.ts

@@ -150,6 +150,11 @@ describe('getShiftText', () => {
   test('get shift text with auckland timezone', () => {
     expect(getShiftText(from, to, auckland)).toBe('Thursday, 30 July 2020, 12:00PM-5:30PM');
   });
+  test('accepts ISO strings from GraphQL', () => {
+    expect(getShiftText(from.toISOString(), to.toISOString(), melbourne)).toBe(
+      'Thursday, 30 July 2020, 10:00AM-3:30PM',
+    );
+  });
   // Will not execute due to TypeScript
   // test('with empty data', () => {
   //   expect(getShiftText()).toBe('');