@quillsql/react 2.12.16 → 2.12.18

package/dist/esm/utils/dashboard.js

@@ -28,7 +28,6 @@ const defaultDashboardItem = {
  * @param item
  */
 export function cleanDashboardItem(item, dashboardFilters) {
-    // console.log(item);
     if (!item)
         return defaultDashboardItem;
     if (!item.rows)
@@ -52,7 +51,9 @@ export function cleanDashboardItem(item, dashboardFilters) {
         primaryAggregation,
         comparisonAggregation,
         aggregationPercentChange,
-        yAxisFields: extractPivotedYAxis(pivotTable, item),
+        yAxisFields: pivotTable
+            ? extractPivotedYAxis(pivotTable, item)
+            : item.yAxisFields,
         xAxisLabel: item.xAxisLabel,
         xAxisField: item.xAxisField,
         xAxisFormat: item.xAxisFormat,
@@ -137,8 +138,10 @@ function extractPivotedData(pivotTable, item, config = undefined) {
  */
 function extractPivotedYAxis(pivotTable, itemInfo, config = undefined) {
     if (!pivotTable)
-        return [];
+        return itemInfo?.yAxisFields ?? [];
     const pivot = itemInfo?.pivot || config?.pivot;
+    if (!pivot.columnField)
+        return itemInfo?.yAxisFields ?? [];
     const yAxisFields = config ? config.yAxisFields : itemInfo?.yAxisFields;
     const pivotTableYAxis = yAxisFields
         ? generatePivotTableYAxis(pivot, pivotTable.columns, yAxisFields?.[0]?.format)
@@ -153,7 +156,7 @@ function extractPivotedYAxis(pivotTable, itemInfo, config = undefined) {
         fields[fields.length] = {
             ...sampleField,
             field: `comparison_${sampleField.field}`,
-            label: `comparison ${sampleField.label}`,
+            label: `Comparison ${sampleField.label}`,
         };
     }
     return fields;

package/dist/esm/utils/filterProcessing.d.ts

@@ -0,0 +1,2 @@
+export declare function findAndProcessDateFilter(filters: any[]): any;
+//# sourceMappingURL=filterProcessing.d.ts.map

package/dist/esm/utils/filterProcessing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAAA,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAoB5D"}

package/dist/esm/utils/filterProcessing.js

@@ -0,0 +1,21 @@
+export function findAndProcessDateFilter(filters) {
+    let dateFilter = filters.find((filter) => filter.filterType === 'date_range');
+    if (dateFilter) {
+        // For the TRADITIONAL date filter
+        return dateFilter;
+    }
+    // For the new date filter
+    dateFilter = filters.find((filter) => filter.operator === 'BETWEEN' &&
+        filter.values &&
+        isValidDate(filter.values[0]));
+    if (!dateFilter) {
+        return null;
+    }
+    return {
+        startDate: new Date(dateFilter.values[0]),
+        endDate: new Date(dateFilter.values[1]),
+    };
+}
+function isValidDate(date) {
+    return !isNaN(Date.parse(date));
+}

package/dist/esm/utils/valueFormatter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"valueFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/valueFormatter.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,MAAM,KAAK,GAAG;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAQ7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,UAM/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,6BAA8B,KAAK,KAAG,MAwChE,CAAC;AAEF,eAAO,MAAM,WAAW;WAIf,GAAG;YACF,MAAM;MACZ,MAwCH,CAAC;AAoMF,eAAO,MAAM,aAAa;;;;WAGhB,MAAM,KACb,MAkDF,CAAC"}
+{"version":3,"file":"valueFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/valueFormatter.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,MAAM,KAAK,GAAG;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAQ7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,UAM/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,6BAA8B,KAAK,KAAG,MA0ChE,CAAC;AAEF,eAAO,MAAM,WAAW;WAIf,GAAG;YACF,MAAM;MACZ,MAwCH,CAAC;AAiNF,eAAO,MAAM,aAAa;;;;WAGhB,MAAM,KACb,MAkDF,CAAC"}

package/dist/esm/utils/valueFormatter.js

@@ -36,8 +36,10 @@ export const valueFormatter = ({ value, field, fields }) => {
         two_decimal_places: formatTwoDecimalPlaces,
         string: formatString,
         yyyy: format_YYYY,
+        MMM_dd: format_MMM_dd,
         MMM_yyyy: format_MMM_yyyy,
         MMM_dd_yyyy: format_MMM_dd_yyyy,
+        MMM_ww_yyyy: format_MMM_ww_yyyy,
         hh_ap_pm: format_hh_ap_pm,
         'MMM_dd-MMM_dd': format_MMM_dd_MMM_dd,
         'MMM_dd_hh:mm_ap_pm': format_MMM_dd_hh_mm_ap_pm,
@@ -233,6 +235,19 @@ const format_wo_yyyy = (value) => {
         return 'Invalid date';
     return `${getWeek(utcDate)},${utcDate.getFullYear()}`;
 };
+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');
+    const startDay = format(startOfWeekDate, 'd');
+    const endDay = format(endOfWeekDate, 'd');
+    const year = format(utcDate, 'yyyy');
+    return `${month}, ${startDay}-${endDay}, ${year}`;
+};
 /**
  * Parses a numeric string back into a number, taking into account that
  * users in different locales will format numbers differently (eg. 1,234 means

package/package.json

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