@quillsql/react 2.12.28 → 2.12.30

package/dist/esm/utils/valueFormatter.js

@@ -60,7 +60,8 @@ export const valueFormatter = ({ value, field, fields }) => {
 };
 export const quillFormat = ({ value, format, }) => {
     // Handle special case, if value is null and format is numeric display '-'
-    if (value === null && NUMBER_FORMAT_TYPES.includes(format)) {
+    if (value === null &&
+        (NUMBER_FORMAT_TYPES.includes(format) || DATE_FORMAT_TYPES.includes(format))) {
         return '-';
     }
     const HANDLERS = {
@@ -195,9 +196,13 @@ const formatPercent = (value) => {
 // Converts the value to a UTC date with the given format string. If the
 // resulting date is invalid, it returns "Invalid date".
 const _getUTCDateHelper = (value, fmt) => {
-    const utcDate = utcToZonedTime(new Date(value), 'UTC');
+    const parsedDate = parse(value, fmt, new Date());
+    const utcDate = isValid(parsedDate)
+        ? utcToZonedTime(parsedDate, 'UTC')
+        : utcToZonedTime(new Date(value), 'UTC');
+    // const utcDate: Date = utcToZonedTime(new Date(value), 'UTC');
     if (!isValid(utcDate))
-        return 'Invalid date';
+        return value; //'Invalid date';
     return format(utcDate, fmt);
 };
 const format_YYYY = (value) => _getUTCDateHelper(value, 'yyyy');
@@ -239,7 +244,6 @@ const format_MMM_ww_yyyy = (value) => {
     const utcDate = utcToZonedTime(new Date(value), 'UTC');
     if (!isValid(utcDate))
         return 'Invalid date';
-    const currentDate = new Date();
     const startOfWeekDate = startOfWeek(utcDate, { weekStartsOn: 1 });
     const endOfWeekDate = endOfWeek(utcDate, { weekStartsOn: 1 });
     const month = format(utcDate, 'MMM');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.12.28",
+  "version": "2.12.30",
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",

package/dist/cjs/internals/ReportBuilder/PivotModal.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=PivotModal.spec.d.ts.map

package/dist/cjs/internals/ReportBuilder/PivotModal.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"PivotModal.spec.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.spec.ts"],"names":[],"mappings":""}

package/dist/cjs/internals/ReportBuilder/PivotModal.spec.js

@@ -1,213 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const chai_1 = require("chai");
-const PivotModal_1 = require("./PivotModal");
-const date_fns_1 = require("date-fns");
-describe('PivotModal', function () {
-    describe('generatePivotTable', function () {
-        context('non date pivots', function () {
-            const rowPivot = {
-                rowField: 'merchant',
-                rowFieldType: 'varchar',
-                valueField: 'amount',
-                aggregationType: 'sum',
-            };
-            const rowColumnPivot = {
-                ...rowPivot,
-                columnField: 'user_name',
-                columnFieldType: 'varchar',
-            };
-            const rows = [
-                { merchant: 'm1', amount: 3, user_name: 'u1' },
-                { merchant: 'm1', amount: 4, user_name: 'u2' },
-                { merchant: 'm1', amount: 5, user_name: 'u1' },
-                { merchant: 'm2', amount: 6, user_name: 'u1' },
-                { merchant: 'm2', amount: 7, user_name: 'u2' },
-                { merchant: 'm2', amount: 8, user_name: 'u2' },
-            ];
-            it('should return empty table with no data', function () {
-                const table = (0, PivotModal_1.generatePivotTable)(rowPivot, [], [new Date(), (0, date_fns_1.subMonths)(new Date(), 3)]);
-                (0, chai_1.expect)(table.columns.length).to.equal(2);
-                (0, chai_1.expect)(table.rows.length).to.equal(0);
-            });
-            it('should combine values based on row pivot', function () {
-                const table = (0, PivotModal_1.generatePivotTable)(rowPivot, rows, [
-                    new Date(),
-                    (0, date_fns_1.subMonths)(new Date(), 3),
-                ]);
-                (0, chai_1.expect)(table.columns.length).to.equal(2);
-                (0, chai_1.expect)(table.columns[0].field).to.equal('merchant');
-                (0, chai_1.expect)(table.columns[1].field).to.equal('amount');
-                (0, chai_1.expect)(table.rows.length).to.equal(2);
-                (0, chai_1.expect)(table.rows[0].amount).to.equal(12);
-                (0, chai_1.expect)(table.rows[1].amount).to.equal(21);
-            });
-            it('should combine values based on row and column pivots', function () {
-                const table = (0, PivotModal_1.generatePivotTable)(rowColumnPivot, rows, [
-                    new Date(),
-                    (0, date_fns_1.subMonths)(new Date(), 3),
-                ]);
-                (0, chai_1.expect)(table.columns.length).to.equal(3);
-                (0, chai_1.expect)(table.columns[0].field).to.equal('merchant');
-                (0, chai_1.expect)(table.columns[1].field).to.equal('u1');
-                (0, chai_1.expect)(table.columns[2].field).to.equal('u2');
-                (0, chai_1.expect)(table.rows.length).to.equal(2);
-                (0, chai_1.expect)(table.rows[0].u1).to.equal(8);
-                (0, chai_1.expect)(table.rows[0].u2).to.equal(4);
-                (0, chai_1.expect)(table.rows[1].u1).to.equal(6);
-                (0, chai_1.expect)(table.rows[1].u2).to.equal(15);
-            });
-        });
-        context('date pivots', function () {
-            const rows = [
-                {
-                    merchant: 'm1',
-                    amount: 3,
-                    user_name: 'u1',
-                    date: new Date('October 13, 2023 11:13:00'),
-                    created_at: new Date('October 13, 2023 11:13:00'),
-                },
-                {
-                    merchant: 'm1',
-                    amount: 5,
-                    user_name: 'u1',
-                    date: new Date('October 14, 2023 11:13:00'),
-                    created_at: new Date('October 14, 2023 11:13:00'),
-                },
-                {
-                    merchant: 'm2',
-                    amount: 6,
-                    user_name: 'u1',
-                    date: new Date('October 13, 2023 00:00:00'),
-                    created_at: new Date('October 14, 2023 11:13:00'),
-                },
-                {
-                    merchant: 'm2',
-                    amount: 6,
-                    user_name: 'u1',
-                    date: new Date('October 14, 2023 23:13:00'),
-                    created_at: new Date('October 13, 2023 11:13:00'),
-                },
-                {
-                    merchant: 'm1',
-                    amount: 6,
-                    user_name: 'u2',
-                    date: new Date('October 14, 2023 23:13:00'),
-                    created_at: new Date('October 13, 2023 11:13:00'),
-                },
-            ];
-            it('should handle a row date pivot', function () {
-                const pivot = {
-                    rowField: 'date',
-                    rowFieldType: 'date',
-                    valueField: 'amount',
-                    aggregationType: 'sum',
-                };
-                const table = (0, PivotModal_1.generatePivotTable)(pivot, rows, [
-                    new Date('October 10, 2023 00:00:00'),
-                    new Date('October 15, 2023 00:00:00'),
-                ]);
-                (0, chai_1.expect)(table.columns.length).to.equal(2);
-                (0, chai_1.expect)(table.columns[0].field).to.equal('date');
-                (0, chai_1.expect)(table.columns[1].field).to.equal('amount');
-                (0, chai_1.expect)(table.rows.length).to.equal(6);
-                (0, chai_1.expect)(table.rows[3].amount).to.equal(9);
-                (0, chai_1.expect)(table.rows[4].amount).to.equal(17);
-                (0, chai_1.expect)(table.rows[5].amount).to.equal(0);
-            });
-            it('should handle a row timestamp pivot', function () {
-                const pivot = {
-                    rowField: 'date',
-                    rowFieldType: 'timestamp',
-                    valueField: 'amount',
-                    aggregationType: 'sum',
-                };
-                const table = (0, PivotModal_1.generatePivotTable)(pivot, rows, [
-                    new Date('October 10, 2023 00:00:00').getTime(),
-                    new Date('October 15, 2023 00:00:00').getTime(),
-                ]);
-                (0, chai_1.expect)(table.columns.length).to.equal(2);
-                (0, chai_1.expect)(table.columns[0].field).to.equal('date');
-                (0, chai_1.expect)(table.columns[1].field).to.equal('amount');
-                (0, chai_1.expect)(table.rows.length).to.equal(6);
-                (0, chai_1.expect)(table.rows[3].amount).to.equal(9);
-                (0, chai_1.expect)(table.rows[4].amount).to.equal(17);
-                (0, chai_1.expect)(table.rows[5].amount).to.equal(0);
-            });
-            it('should handle a string row pivot with a date column pivot', function () {
-                const pivot = {
-                    columnField: 'date',
-                    columnFieldType: 'date',
-                    valueField: 'amount',
-                    aggregationType: 'sum',
-                    rowField: 'user_name',
-                    rowFieldType: 'varchar',
-                };
-                const table = (0, PivotModal_1.generatePivotTable)(pivot, rows, [
-                    new Date('October 10, 2023 00:00:00'),
-                    new Date('October 15, 2023 00:00:00'),
-                ]);
-                (0, chai_1.expect)(table.columns.length).to.equal(7);
-                (0, chai_1.expect)(table.columns[0].field).to.equal('user_name');
-                (0, chai_1.expect)(table.rows.length).to.equal(2);
-                // u1
-                (0, chai_1.expect)(table.rows[0].user_name).to.equal('u1');
-                (0, chai_1.expect)(Object.values(table.rows[0])[4]).to.equal(9);
-                (0, chai_1.expect)(Object.values(table.rows[0])[5]).to.equal(11);
-                // u2
-                (0, chai_1.expect)(table.rows[1].user_name).to.equal('u2');
-                (0, chai_1.expect)(Object.values(table.rows[1])[5]).to.equal(6);
-            });
-            it('should handle a date row pivot with a string column pivot', function () {
-                const pivot = {
-                    rowField: 'date',
-                    rowFieldType: 'date',
-                    valueField: 'amount',
-                    aggregationType: 'sum',
-                    columnField: 'user_name',
-                    columnFieldType: 'varchar',
-                };
-                const table = (0, PivotModal_1.generatePivotTable)(pivot, rows, [
-                    new Date('October 10, 2023 00:00:00'),
-                    new Date('October 15, 2023 00:00:00'),
-                ]);
-                (0, chai_1.expect)(table.columns.length).to.equal(3);
-                (0, chai_1.expect)(table.columns[0].field).to.equal('date');
-                (0, chai_1.expect)(table.columns[1].field).to.equal('u1');
-                (0, chai_1.expect)(table.columns[2].field).to.equal('u2');
-                (0, chai_1.expect)(table.rows.length).to.equal(6);
-                // day without transactions
-                (0, chai_1.expect)(table.rows[2].u1).to.equal(0);
-                (0, chai_1.expect)(table.rows[2].u2).to.equal(0);
-                // days with transactions
-                (0, chai_1.expect)(table.rows[3].u1).to.equal(9);
-                (0, chai_1.expect)(table.rows[3].u2).to.equal(0);
-                (0, chai_1.expect)(table.rows[4].u1).to.equal(11);
-                (0, chai_1.expect)(table.rows[4].u2).to.equal(6);
-            });
-            it('should handle a date row pivot with a date column pivot', function () {
-                const pivot = {
-                    columnField: 'date',
-                    columnFieldType: 'date',
-                    valueField: 'amount',
-                    aggregationType: 'count',
-                    rowField: 'created_at',
-                    rowFieldType: 'date',
-                };
-                const table = (0, PivotModal_1.generatePivotTable)(pivot, rows, [
-                    new Date('October 10, 2023 00:00:00'),
-                    new Date('October 15, 2023 00:00:00'),
-                ]);
-                console.log(table);
-                (0, chai_1.expect)(table.columns.length).to.equal(7);
-                (0, chai_1.expect)(table.columns[0].field).to.equal('created_at');
-                (0, chai_1.expect)(table.rows.length).to.equal(6);
-                (0, chai_1.expect)(Object.values(table.rows[3])[4]).to.equal(1);
-                (0, chai_1.expect)(Object.values(table.rows[3])[5]).to.equal(2);
-                (0, chai_1.expect)(Object.values(table.rows[4])[4]).to.equal(1);
-                (0, chai_1.expect)(Object.values(table.rows[4])[5]).to.equal(1);
-            });
-        });
-    });
-});

package/dist/esm/internals/ReportBuilder/PivotModal.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=PivotModal.spec.d.ts.map

package/dist/esm/internals/ReportBuilder/PivotModal.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"PivotModal.spec.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.spec.ts"],"names":[],"mappings":""}

package/dist/esm/internals/ReportBuilder/PivotModal.spec.js

@@ -1,211 +0,0 @@
-// @ts-nocheck
-import { expect } from 'chai';
-import { generatePivotTable } from './PivotModal';
-import { subMonths } from 'date-fns';
-describe('PivotModal', function () {
-    describe('generatePivotTable', function () {
-        context('non date pivots', function () {
-            const rowPivot = {
-                rowField: 'merchant',
-                rowFieldType: 'varchar',
-                valueField: 'amount',
-                aggregationType: 'sum',
-            };
-            const rowColumnPivot = {
-                ...rowPivot,
-                columnField: 'user_name',
-                columnFieldType: 'varchar',
-            };
-            const rows = [
-                { merchant: 'm1', amount: 3, user_name: 'u1' },
-                { merchant: 'm1', amount: 4, user_name: 'u2' },
-                { merchant: 'm1', amount: 5, user_name: 'u1' },
-                { merchant: 'm2', amount: 6, user_name: 'u1' },
-                { merchant: 'm2', amount: 7, user_name: 'u2' },
-                { merchant: 'm2', amount: 8, user_name: 'u2' },
-            ];
-            it('should return empty table with no data', function () {
-                const table = generatePivotTable(rowPivot, [], [new Date(), subMonths(new Date(), 3)]);
-                expect(table.columns.length).to.equal(2);
-                expect(table.rows.length).to.equal(0);
-            });
-            it('should combine values based on row pivot', function () {
-                const table = generatePivotTable(rowPivot, rows, [
-                    new Date(),
-                    subMonths(new Date(), 3),
-                ]);
-                expect(table.columns.length).to.equal(2);
-                expect(table.columns[0].field).to.equal('merchant');
-                expect(table.columns[1].field).to.equal('amount');
-                expect(table.rows.length).to.equal(2);
-                expect(table.rows[0].amount).to.equal(12);
-                expect(table.rows[1].amount).to.equal(21);
-            });
-            it('should combine values based on row and column pivots', function () {
-                const table = generatePivotTable(rowColumnPivot, rows, [
-                    new Date(),
-                    subMonths(new Date(), 3),
-                ]);
-                expect(table.columns.length).to.equal(3);
-                expect(table.columns[0].field).to.equal('merchant');
-                expect(table.columns[1].field).to.equal('u1');
-                expect(table.columns[2].field).to.equal('u2');
-                expect(table.rows.length).to.equal(2);
-                expect(table.rows[0].u1).to.equal(8);
-                expect(table.rows[0].u2).to.equal(4);
-                expect(table.rows[1].u1).to.equal(6);
-                expect(table.rows[1].u2).to.equal(15);
-            });
-        });
-        context('date pivots', function () {
-            const rows = [
-                {
-                    merchant: 'm1',
-                    amount: 3,
-                    user_name: 'u1',
-                    date: new Date('October 13, 2023 11:13:00'),
-                    created_at: new Date('October 13, 2023 11:13:00'),
-                },
-                {
-                    merchant: 'm1',
-                    amount: 5,
-                    user_name: 'u1',
-                    date: new Date('October 14, 2023 11:13:00'),
-                    created_at: new Date('October 14, 2023 11:13:00'),
-                },
-                {
-                    merchant: 'm2',
-                    amount: 6,
-                    user_name: 'u1',
-                    date: new Date('October 13, 2023 00:00:00'),
-                    created_at: new Date('October 14, 2023 11:13:00'),
-                },
-                {
-                    merchant: 'm2',
-                    amount: 6,
-                    user_name: 'u1',
-                    date: new Date('October 14, 2023 23:13:00'),
-                    created_at: new Date('October 13, 2023 11:13:00'),
-                },
-                {
-                    merchant: 'm1',
-                    amount: 6,
-                    user_name: 'u2',
-                    date: new Date('October 14, 2023 23:13:00'),
-                    created_at: new Date('October 13, 2023 11:13:00'),
-                },
-            ];
-            it('should handle a row date pivot', function () {
-                const pivot = {
-                    rowField: 'date',
-                    rowFieldType: 'date',
-                    valueField: 'amount',
-                    aggregationType: 'sum',
-                };
-                const table = generatePivotTable(pivot, rows, [
-                    new Date('October 10, 2023 00:00:00'),
-                    new Date('October 15, 2023 00:00:00'),
-                ]);
-                expect(table.columns.length).to.equal(2);
-                expect(table.columns[0].field).to.equal('date');
-                expect(table.columns[1].field).to.equal('amount');
-                expect(table.rows.length).to.equal(6);
-                expect(table.rows[3].amount).to.equal(9);
-                expect(table.rows[4].amount).to.equal(17);
-                expect(table.rows[5].amount).to.equal(0);
-            });
-            it('should handle a row timestamp pivot', function () {
-                const pivot = {
-                    rowField: 'date',
-                    rowFieldType: 'timestamp',
-                    valueField: 'amount',
-                    aggregationType: 'sum',
-                };
-                const table = generatePivotTable(pivot, rows, [
-                    new Date('October 10, 2023 00:00:00').getTime(),
-                    new Date('October 15, 2023 00:00:00').getTime(),
-                ]);
-                expect(table.columns.length).to.equal(2);
-                expect(table.columns[0].field).to.equal('date');
-                expect(table.columns[1].field).to.equal('amount');
-                expect(table.rows.length).to.equal(6);
-                expect(table.rows[3].amount).to.equal(9);
-                expect(table.rows[4].amount).to.equal(17);
-                expect(table.rows[5].amount).to.equal(0);
-            });
-            it('should handle a string row pivot with a date column pivot', function () {
-                const pivot = {
-                    columnField: 'date',
-                    columnFieldType: 'date',
-                    valueField: 'amount',
-                    aggregationType: 'sum',
-                    rowField: 'user_name',
-                    rowFieldType: 'varchar',
-                };
-                const table = generatePivotTable(pivot, rows, [
-                    new Date('October 10, 2023 00:00:00'),
-                    new Date('October 15, 2023 00:00:00'),
-                ]);
-                expect(table.columns.length).to.equal(7);
-                expect(table.columns[0].field).to.equal('user_name');
-                expect(table.rows.length).to.equal(2);
-                // u1
-                expect(table.rows[0].user_name).to.equal('u1');
-                expect(Object.values(table.rows[0])[4]).to.equal(9);
-                expect(Object.values(table.rows[0])[5]).to.equal(11);
-                // u2
-                expect(table.rows[1].user_name).to.equal('u2');
-                expect(Object.values(table.rows[1])[5]).to.equal(6);
-            });
-            it('should handle a date row pivot with a string column pivot', function () {
-                const pivot = {
-                    rowField: 'date',
-                    rowFieldType: 'date',
-                    valueField: 'amount',
-                    aggregationType: 'sum',
-                    columnField: 'user_name',
-                    columnFieldType: 'varchar',
-                };
-                const table = generatePivotTable(pivot, rows, [
-                    new Date('October 10, 2023 00:00:00'),
-                    new Date('October 15, 2023 00:00:00'),
-                ]);
-                expect(table.columns.length).to.equal(3);
-                expect(table.columns[0].field).to.equal('date');
-                expect(table.columns[1].field).to.equal('u1');
-                expect(table.columns[2].field).to.equal('u2');
-                expect(table.rows.length).to.equal(6);
-                // day without transactions
-                expect(table.rows[2].u1).to.equal(0);
-                expect(table.rows[2].u2).to.equal(0);
-                // days with transactions
-                expect(table.rows[3].u1).to.equal(9);
-                expect(table.rows[3].u2).to.equal(0);
-                expect(table.rows[4].u1).to.equal(11);
-                expect(table.rows[4].u2).to.equal(6);
-            });
-            it('should handle a date row pivot with a date column pivot', function () {
-                const pivot = {
-                    columnField: 'date',
-                    columnFieldType: 'date',
-                    valueField: 'amount',
-                    aggregationType: 'count',
-                    rowField: 'created_at',
-                    rowFieldType: 'date',
-                };
-                const table = generatePivotTable(pivot, rows, [
-                    new Date('October 10, 2023 00:00:00'),
-                    new Date('October 15, 2023 00:00:00'),
-                ]);
-                console.log(table);
-                expect(table.columns.length).to.equal(7);
-                expect(table.columns[0].field).to.equal('created_at');
-                expect(table.rows.length).to.equal(6);
-                expect(Object.values(table.rows[3])[4]).to.equal(1);
-                expect(Object.values(table.rows[3])[5]).to.equal(2);
-                expect(Object.values(table.rows[4])[4]).to.equal(1);
-                expect(Object.values(table.rows[4])[5]).to.equal(1);
-            });
-        });
-    });
-});