@quillsql/react 2.12.3 → 2.12.5

package/dist/esm/components/UiComponents.js

@@ -1,9 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useContext, useEffect, useRef, } from 'react';
+import { useContext, useEffect, useRef, useState, } from 'react';
 import { XIcon } from '../assets';
 import { ThemeContext } from '../Context';
 import { useTheme } from '../hooks';
 import QuillTable from './QuillTable';
+import ChartSkeleton from './Chart/ChartSkeleton';
 /**
  * The fallback TextInput element for Quill.
  */
@@ -330,11 +331,53 @@ export const LoadingSpinner = () => (_jsx("div", { style: {
         justifyContent: 'center',
         alignItems: 'center',
     }, children: _jsxs("svg", { width: "24", height: "24", children: [_jsx("circle", { cx: "12", cy: "12", r: "9.375", strokeWidth: "3.75", strokeDasharray: "calc(2 * 3.14 * 9.375 / 3) calc(2 * 3.14 * 9.375 * 2 / 3)", strokeDashoffset: "calc(2 * 3.14 * 9.375 / 6)", stroke: "#364153", fill: "none", transform: "rotate(-90 12 12)", children: _jsx("animateTransform", { attributeName: "transform", attributeType: "XML", type: "rotate", from: "-180 12 12", to: "180 12 12", dur: "0.8s", repeatCount: "indefinite" }) }), _jsx("circle", { cx: "12", cy: "12", r: "9.375", strokeWidth: "3.75", strokeDasharray: "calc(2 * 3.14 * 9.375 / 3) calc(2 * 3.14 * 9.375 * 1 / 3)", strokeDashoffset: "calc(2 * 3.14 * 9.375 / 3) calc(2 * 3.14 * 9.375 * 2 / 3)", stroke: '#ADB1B9', fill: "none", transform: "rotate(90 12 12)", children: _jsx("animateTransform", { attributeName: "transform", attributeType: "XML", type: "rotate", from: "0 12 12", to: "360 12 12", dur: "0.8s", repeatCount: "indefinite" }) })] }) }));
-export const QuillTableComponent = ({ rows, columns, isLoading = false, }) => {
+export const QuillTableSQLEditorComponent = ({ rows, columns, isLoading = false, numberOfRows, onPageChange, onSortChange, }) => {
+    const [sort, setSort] = useState({ field: '', direction: '' });
+    const [page, setPage] = useState(0);
     if (isLoading) {
-        return (_jsx("div", { style: { display: 'flex', flexDirection: 'column', margin: 'auto' }, children: _jsx(LoadingSpinner, {}) }));
+        return (_jsx("div", { style: {
+                display: 'flex',
+                flexDirection: 'column',
+                margin: 'auto',
+                width: '100%',
+                height: '100%',
+            }, children: _jsx(LoadingSpinner, {}) }));
     }
-    return _jsx(QuillTable, { rows: rows, columns: columns, rowsPerPage: 20 });
+    return (_jsx(QuillTable, { rows: rows, columns: columns, rowsPerPage: 20, numberOfRows: numberOfRows, onPageChange: (page) => {
+            setPage(page.currentPage);
+            onPageChange && onPageChange(page);
+        }, onSortChange: (sort) => {
+            setSort(sort);
+            setPage(0);
+            onSortChange && onSortChange(sort);
+        }, sort: sort, currentPage: page, isLoading: isLoading }));
+};
+export const QuillTableComponent = ({ rows, columns, isLoading = false, numberOfRows, onPageChange, onSortChange, }) => {
+    const [sort, setSort] = useState({ field: '', direction: '' });
+    const [page, setPage] = useState(0);
+    const [initialLoad, setInitialLoad] = useState(true);
+    useEffect(() => {
+        if (initialLoad && !isLoading) {
+            setInitialLoad(false);
+        }
+    }, [isLoading]);
+    if (initialLoad) {
+        return (_jsx("div", { style: {
+                display: 'flex',
+                flexDirection: 'column',
+                margin: 'auto',
+                width: '100%',
+                height: '100%',
+            }, children: _jsx(ChartSkeleton, {}) }));
+    }
+    return (_jsx(QuillTable, { rows: rows, columns: columns, rowsPerPage: 20, numberOfRows: numberOfRows, onPageChange: (page) => {
+            setPage(page.currentPage);
+            onPageChange && onPageChange(page);
+        }, onSortChange: (sort) => {
+            setSort(sort);
+            setPage(0);
+            onSortChange && onSortChange(sort);
+        }, sort: sort, currentPage: page, isLoading: isLoading }));
 };
 export const QuillEmptyDashboardComponent = () => _jsx("div", {});
 export const QuillChartBuilderInputRowContainer = ({ children, }) => {

package/dist/esm/hooks/useExport.d.ts

@@ -1,5 +1,6 @@
-export declare const useExport: (reportId: string) => {
+export declare const useExport: (reportId?: string) => {
     downloadCSV: () => void;
     downloadPDF: () => void;
+    isLoading: boolean;
 };
 //# sourceMappingURL=useExport.d.ts.map

package/dist/esm/hooks/useExport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,SAAS,aAAc,MAAM;;;CAYzC,CAAC"}
+{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,SAAS,cAAe,MAAM;;;;CAmD1C,CAAC"}

package/dist/esm/hooks/useExport.js

@@ -1,15 +1,50 @@
 import { downloadCSV } from '../utils/csv';
-import { useQuill } from '../hooks/useQuill';
+import { useContext, useState } from 'react';
+import { getData } from '../utils/dataFetcher';
+import { ClientContext, DashboardFiltersContext } from '../Context';
 export const useExport = (reportId) => {
-    const chartData = useQuill(reportId).data;
-    if (!chartData)
-        return { downloadCSV: () => { }, downloadPDF: () => { } };
+    const { dashboardFilters } = useContext(DashboardFiltersContext);
+    const [client] = useContext(ClientContext);
+    const [isLoading, setIsLoading] = useState(false);
+    if (!reportId) {
+        return { downloadCSV: () => { }, downloadPDF: () => { }, isLoading: false };
+    }
     return {
-        downloadCSV: () => downloadCSV({
-            rows: chartData.rows,
-            fields: chartData.columns,
-            name: chartData.name,
-        }),
+        downloadCSV: async () => {
+            setIsLoading(true);
+            const minimalFilters = Object.values(dashboardFilters).length
+                ? Object.values(dashboardFilters).map((filter) => {
+                    const newFilter = { ...filter };
+                    if (newFilter.filterType === 'date_range') {
+                        delete newFilter['field'];
+                        delete newFilter['options'];
+                        delete newFilter['selectedValue'];
+                    }
+                    return newFilter;
+                })
+                : [];
+            const hostedBody = {
+                metadata: {
+                    dashboardItemId: reportId,
+                    orgId: client.customerId || '*',
+                    clientId: client.publicKey,
+                    task: 'item',
+                    databaseType: client?.databaseType,
+                    filters: minimalFilters,
+                },
+            };
+            const cloudBody = {
+                id: reportId,
+            };
+            const resp = await getData(client, 'itempost', 'same-origin', hostedBody, cloudBody);
+            downloadCSV({
+                rows: resp.rows,
+                fields: resp.columns,
+                name: resp.name,
+            });
+            setIsLoading(false);
+        },
         downloadPDF: () => { },
+        isLoading,
     };
 };

package/dist/esm/hooks/useQuill.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAUA,UAAU,MAAM;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,UAAU;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,eAAO,MAAM,QAAQ,aACT,MAAM;UAEV,WAAW,GAAG,IAAI;aACf,OAAO;WACT,MAAM,GAAG,IAAI;CAkFrB,CAAC"}
+{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAWA,UAAU,MAAM;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,UAAU;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,eAAO,MAAM,QAAQ,aACT,MAAM;UAEV,WAAW,GAAG,IAAI;aACf,OAAO;WACT,MAAM,GAAG,IAAI;CAoFrB,CAAC"}

package/dist/esm/hooks/useQuill.js

@@ -1,11 +1,12 @@
 import { useContext, useEffect, useState } from 'react';
-import { ClientContext, DashboardContext, DashboardFiltersContext, } from '../Context';
+import { ClientContext, CustomFieldContext, DashboardContext, DashboardFiltersContext, } from '../Context';
 import { getData } from '../utils/dataFetcher';
 import { mergeComparisonRange } from '../utils/merge';
 import { processFilterErrorList } from '../utils/errorProcessing';
 export const useQuill = (reportId) => {
     const { dashboard, dispatch } = useContext(DashboardContext);
     const { dashboardFilters } = useContext(DashboardFiltersContext);
+    const [customFields] = useContext(CustomFieldContext);
     const [client] = useContext(ClientContext);
     const [data, setData] = useState(null);
     const [loading, setLoading] = useState(true);
@@ -32,6 +33,7 @@ export const useQuill = (reportId) => {
                             task: 'item',
                             filters: [...Object.values(dashboardFilters)],
                             databaseType: client?.databaseType,
+                            customFields,
                         },
                     };
                     const cloudBody = {

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

@@ -1 +1 @@
-{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"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"}

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useContext, useMemo, useState, useEffect, useRef, } from 'react';
-import { ClientContext } from '../../Context';
+import { ClientContext, CustomFieldContext } from '../../Context';
 import { getDataFromCloud } from '../../utils/dataFetcher';
 import { PivotList, PivotCard } from './PivotList';
 import { differenceInDays, eachDayOfInterval, eachMonthOfInterval, eachWeekOfInterval, eachYearOfInterval, endOfDay, isWithinInterval, subMilliseconds, } from 'date-fns';
@@ -31,6 +31,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
     const [selectedPivotType, setSelectedPivotType] = useState('recommended');
     const [errors, setErrors] = useState([]);
     const [client] = useContext(ClientContext);
+    const [customFields] = useContext(CustomFieldContext);
     const rowFieldRef = useRef(null);
     const colFieldRef = useRef(null);
     const [pivotCardWidth, setPivotCardWidth] = useState(420);
@@ -52,7 +53,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                 setAllowedValueFields(possibleColumns.valueFields);
                 return possibleColumns;
             }
-            const newUniqueValues = await getUniqueValuesByColumns(stringColumns, query || '', data.rows || [], client);
+            const newUniqueValues = await getUniqueValuesByColumns(stringColumns, query || '', data.rows || [], client, customFields);
             if (!uniqueValues ||
                 hashCode(uniqueValues) !== hashCode(newUniqueValues)) {
                 const possibleColumns = getPossiblePivotFieldOptions(columns, newUniqueValues || {});

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

@@ -1 +1 @@
-{"version":3,"file":"csv.d.ts","sourceRoot":"","sources":["../../../src/utils/csv.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,WAAW,SAAU;IAChC,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,SA2FA,CAAC"}
+{"version":3,"file":"csv.d.ts","sourceRoot":"","sources":["../../../src/utils/csv.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,WAAW,SAAU;IAChC,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,SA2FA,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AA6B3C;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,GACpB,WAAW,CAmCb"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AA6B3C;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,GACpB,WAAW,CAqCb"}

package/dist/esm/utils/dashboard.js

@@ -58,6 +58,8 @@ export function cleanDashboardItem(item, dashboardFilters) {
         xAxisFormat: item.xAxisFormat,
         order: item.order,
         filtersApplied: item.filtersApplied,
+        sort: item.sort,
+        page: item.page,
     };
 }
 /**

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

@@ -1,10 +1,6 @@
 import { Pivot } from '../internals/ReportBuilder/PivotModal';
-import { Column } from '../models/Columns';
-export declare function pivotToSql(pivot: Pivot, query: string, client: any): {
-    query: string;
-    preQueries?: string[];
-    runQueryConfig?: any;
-} | undefined;
+import { Column, ColumnInternal } from '../models/Columns';
+export declare function pivotToSql(pivot: Pivot, query: string, columns: ColumnInternal[]): string;
 export declare function isValidPivot(pivot: Pivot): boolean;
 export declare function getPossiblePivotFieldOptions(columns: Column[], uniqueValues: {
     [field: string]: any;

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

@@ -1 +1 @@
-{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAkB,MAAM,mBAAmB,CAAC;AAG3D,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,GAAG,GACV;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,cAAc,CAAC,EAAE,GAAG,CAAA;CAAE,GAAG,SAAS,CAgD5E;AAmDD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,WAgBxC;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,MAAM,EAAE,EACjB,YAAY,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE;;;;EAsCvC;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,eAAe,EAAE;IACf,SAAS,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,GAAG,CAAC;IAClB,WAAW,EAAE,GAAG,CAAC;CAClB,GACA,KAAK,CAqCP"}
+{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAG3D,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,EAAE,GACxB,MAAM,CAsCR;AAmED,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,WAgBxC;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,MAAM,EAAE,EACjB,YAAY,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE;;;;EAsCvC;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,eAAe,EAAE;IACf,SAAS,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,GAAG,CAAC;IAClB,WAAW,EAAE,GAAG,CAAC;CAClB,GACA,KAAK,CAqCP"}

package/dist/esm/utils/pivotProcessing.js

@@ -1,53 +1,45 @@
 import { isIdColumn } from '../components/ReportBuilder/util';
 import { DATE_FORMAT_TYPES, NUMBER_FORMAT_TYPES } from './valueFormatter';
-export function pivotToSql(pivot, query, client) {
+export function pivotToSql(pivot, query, columns) {
     const processedAggType = pivot.aggregationType?.toLowerCase() === 'average'
         ? 'avg'
         : pivot.aggregationType?.toLowerCase();
     if ((!pivot.rowField && pivot.valueField && processedAggType) ||
         (!pivot.valueField && pivot.rowField && processedAggType === 'count')) {
         // table aggregation
-        return {
-            query: `with
-    prePivotQuery as (${query}) 
-    SELECT ${processedAggType}(${pivot.valueField ?? pivot.rowField}) FROM prePivotQuery`,
-        };
+        return `with
+    original_query as (${query})
+    SELECT ${processedAggType}(${pivot.valueField ?? pivot.rowField}) FROM original_query`;
     }
     else if (!pivot.columnField &&
         processedAggType &&
         pivot.rowField &&
         pivot.valueField) {
         // 1-d pivot
-        return {
-            query: `with
-    prePivotQuery as (${query}) 
-    SELECT ${pivot.rowField}, ${processedAggType}(${pivot.valueField}) FROM prePivotQuery GROUP BY ${pivot.rowField}`,
-        };
+        return `with
+    original_query as (${query})
+    SELECT ${pivot.rowField}, ${processedAggType}(${pivot.valueField}) FROM original_query GROUP BY ${pivot.rowField}`;
     }
     else if (pivot.columnField &&
         pivot.rowField &&
         pivot.valueField &&
         processedAggType) {
         // 2-d pivot
-        const sqlQuery = createPivotSqlQuery(pivot.rowField, pivot.columnField, pivot.valueField, processedAggType, query);
-        return {
-            preQueries: [sqlQuery],
-            query: '',
-            runQueryConfig: { getPivotQuery: true },
-        };
+        const sqlQuery = generateTwoDPivotQuery({ ...pivot, aggregationType: processedAggType }, query, columns);
+        return sqlQuery;
     }
-    return undefined;
+    return query;
 }
 function createPivotSqlQuery(rowField, columnField, valueField, aggregationType, query) {
     // const sqlAggregationType = convertToSqlAggregationType(aggregationType);
-    return `with querytable as (${query}),
-  DistinctProducts as (
+    return `with query_table as (${query}),
+  distinct_column_fields as (
     select distinct
       ${columnField}
     from
-      querytable
+      query_table
   ),
-  DynamicSQL as (
+  case_when_query as (
     select
       string_agg(
         concat(
@@ -60,25 +52,36 @@ function createPivotSqlQuery(rowField, columnField, valueField, aggregationType,
     '
       ) as sql_part
     from
-      DistinctProducts
+      distinct_column_fields
   ),
-  FinalQuery as (
+  joined_queries as (
     select
       concat(
-        'WITH querytable as (${query}) SELECT ${rowField}, ',
+        'WITH query_table as (${query}) SELECT ${rowField}, ',
         sql_part,
         ' 
-    FROM querytable 
+    FROM query_table 
     GROUP BY ${rowField} 
     ORDER BY ${rowField}'
       ) as query
     from
-      DynamicSQL
+    case_when_query
   )
 select
   query
 from
-  FinalQuery;`;
+  joined_queries;`;
+}
+function generateTwoDPivotQuery(pivot, query, columns) {
+    const caseWhens = columns.map((column) => {
+        return `${pivot.aggregationType}(
+      CASE WHEN ${pivot.columnField} = '${column.field}' THEN ${pivot.valueField} ELSE 0 END
+    ) AS "${column.field}"`;
+    });
+    return `WITH
+    original_query as (${query})
+  SELECT ${pivot.rowField}, ${caseWhens.join(', ')}
+  FROM original_query GROUP BY ${pivot.rowField}`;
 }
 export function isValidPivot(pivot) {
     if (pivot.rowField && pivot.aggregationType === 'count') {

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

@@ -0,0 +1,6 @@
+export declare const getCustomFieldInfo: (client: any, caller?: string) => Promise<any[]>;
+export declare const getSchemaInfoWithCustomFields: (client: any, caller?: string) => Promise<{
+    schemaData: any;
+    customFieldsByTable: any[];
+}>;
+//# sourceMappingURL=schema.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AAuBA,eAAO,MAAM,kBAAkB,WAAkB,GAAG,oCAqEnD,CAAC;AAEF,eAAO,MAAM,6BAA6B,WAChC,GAAG;;;EA2CZ,CAAC"}

package/dist/esm/utils/schema.js

@@ -0,0 +1,117 @@
+const parseResponse = (results) => {
+    if (results.data?.data) {
+        if (results.data.data.queries &&
+            results.data.data.queries.queryResults.length > 0) {
+            return results.data.data.queries.queryResults;
+        }
+        else {
+            return results.data.data.tables;
+        }
+    }
+    else {
+        if (results.queries &&
+            results.queries.queryResults &&
+            results.queries.queryResults.length > 0) {
+            return results.queries.queryResults;
+        }
+        else {
+            return results.data.tables;
+        }
+    }
+};
+export const getCustomFieldInfo = async (client, caller = 'se') => {
+    let customFieldsByTableUnique = [];
+    try {
+        const { queryEndpoint, queryHeaders, publicKey, databaseType, customerId } = client;
+        if (databaseType.toLowerCase() !== 'postgresql' ||
+            !['65d65b57cdd8ae70a5648d9c', '665610862cf7a3000be66453'].includes(publicKey)) {
+            throw new Error('CUSTOM FIELDS IS ONLY ALLOWED FOR POSTGRESQL DATABASES');
+        }
+        let response = await fetch(`${queryEndpoint}?cfr-${caller}`, {
+            method: 'POST',
+            headers: {
+                ...queryHeaders,
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                metadata: {
+                    clientId: publicKey,
+                    publicKey,
+                    task: 'custom-field-records',
+                    databaseType: databaseType,
+                    orgId: customerId,
+                },
+            }),
+        });
+        let result = await response.json();
+        const extractedData = parseResponse(result);
+        const customFieldsByTable = [];
+        extractedData.forEach((table) => {
+            if (!table.rows) {
+                return;
+            }
+            table.rows.forEach((row) => {
+                customFieldsByTable.push({
+                    ref_table: row.ref_table,
+                    field: row.field,
+                    ref_column: row.ref_column,
+                    type: row.type,
+                });
+            });
+        });
+        // make sure the are no duplicate records in extractedData
+        const customFieldsByTableSet = new Set();
+        customFieldsByTableUnique = customFieldsByTable.filter((item) => {
+            if (customFieldsByTableSet.has(item.ref_table + item.field + item.ref_column + item.type)) {
+                return false;
+            }
+            customFieldsByTableSet.add(item.ref_table + item.field + item.ref_column + item.type);
+            return true;
+        });
+    }
+    catch (e) {
+        console.error('CUSTOM FIELDS DISABLED');
+    }
+    return customFieldsByTableUnique;
+};
+export const getSchemaInfoWithCustomFields = async (client, caller = 'se') => {
+    const { queryEndpoint, queryHeaders, publicKey, databaseType, customerId } = client;
+    let customFieldsByTableUnique = [];
+    let getCustomFields = true;
+    if (!customerId || customerId !== '*') {
+        try {
+            customFieldsByTableUnique = await getCustomFieldInfo(client, caller);
+        }
+        catch (e) {
+            getCustomFields = false;
+        }
+    }
+    const response = await fetch(`${queryEndpoint}?schema-${caller}`, {
+        method: 'POST',
+        headers: {
+            ...queryHeaders,
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+            metadata: {
+                clientId: publicKey,
+                publicKey: publicKey,
+                task: 'schema',
+                removeCustomerField: true,
+                getCustomFields: !client.customerId ||
+                    client.customerId === '*' ||
+                    (customFieldsByTableUnique.length === 0 && !getCustomFields)
+                    ? false
+                    : true,
+                orgId: client.customerId || '*',
+                customFieldsByTable: customFieldsByTableUnique,
+                gatherSchemaData: true,
+            },
+        }),
+    });
+    const result = await response.json();
+    return {
+        schemaData: parseResponse(result),
+        customFieldsByTable: customFieldsByTableUnique,
+    };
+};

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

@@ -1,6 +1,6 @@
 import { Column } from '../models/Columns';
 export declare const hasColumnAlias: (columns: Column[], referencedColumns: string[]) => boolean;
-export declare const getUniqueValuesByColumns: (columns: Column[], query: string, rows: any, client: any) => Promise<{
+export declare const getUniqueValuesByColumns: (columns: Column[], query: string, rows: any, client: any, customFields: any[]) => Promise<{
     [column: string]: {
         [value: string]: boolean;
     };

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

@@ -1 +1 @@
-{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAI3C,eAAO,MAAM,cAAc,YAChB,MAAM,EAAE,qBACE,MAAM,EAAE,KAC1B,OAUF,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,MAAM,EAAE,SACV,MAAM,QACP,GAAG,UACD,GAAG;;;;SA2DZ,CAAC"}
+{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAI3C,eAAO,MAAM,cAAc,YAChB,MAAM,EAAE,qBACE,MAAM,EAAE,KAC1B,OAUF,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,MAAM,EAAE,SACV,MAAM,QACP,GAAG,UACD,GAAG,gBACG,GAAG,EAAE;;;;SA6DpB,CAAC"}

package/dist/esm/utils/tableProcessing.js

@@ -11,7 +11,7 @@ export const hasColumnAlias = (columns, referencedColumns) => {
     }
     return false;
 };
-export const getUniqueValuesByColumns = async (columns, query, rows, client) => {
+export const getUniqueValuesByColumns = async (columns, query, rows, client, customFields) => {
     const stringNames = columns.map((column) => column.field);
     const uniqueValues = {};
     if (!client.databaseType ||
@@ -24,6 +24,7 @@ export const getUniqueValuesByColumns = async (columns, query, rows, client) =>
                     orgId: client.customerId || '*',
                     clientId: client.publicKey,
                     databaseType: client?.databaseType,
+                    customFieldsByTable: customFields,
                 },
             };
             const cloudBody = { query };
@@ -46,7 +47,7 @@ export const getUniqueValuesByColumns = async (columns, query, rows, client) =>
     }
     else {
         const distinctValueQuery = generateDistinctQuery(stringNames, query);
-        const distinctStrings = await fetchDistinctStrings(distinctValueQuery, client);
+        const distinctStrings = await fetchDistinctStrings(distinctValueQuery, client, customFields);
         if (!distinctStrings) {
             return {};
         }
@@ -56,7 +57,7 @@ export const getUniqueValuesByColumns = async (columns, query, rows, client) =>
     }
     return uniqueValues;
 };
-const fetchDistinctStrings = async (query, client) => {
+const fetchDistinctStrings = async (query, client, customFields) => {
     try {
         const hostedBody = {
             metadata: {
@@ -65,6 +66,7 @@ const fetchDistinctStrings = async (query, client) => {
                 orgId: client.customerId || '*',
                 clientId: client.publicKey,
                 databaseType: client?.databaseType,
+                customFieldsByTable: customFields,
             },
         };
         const cloudBody = { query };

package/dist/esm/utils/valueFormatter.js

@@ -100,7 +100,7 @@ export const quillFormat = ({ value, format, }) => {
  */
 const formatString = (value) => {
     if (value === null || value === undefined) {
-        return 'null';
+        return '-';
     }
     if (typeof value === 'object') {
         return JSON.stringify(value);

package/package.json

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