@quillsql/react 2.12.28 → 2.12.29

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

@@ -12,7 +12,7 @@ import { isNumericColumnType, } from '../../components/ReportBuilder/ast';
 import { QuillCard } from '../../components/QuillCard';
 import { cleanPivot, getPossiblePivotFieldOptions, isValidPivot, } from '../../utils/pivotProcessing';
 import { hashCode } from '../../utils/crypto';
-import { getDateRangeByColumns, getUniqueValuesByColumns, } from '../../utils/tableProcessing';
+import { getCountsByColumns, getDateRangeByColumns, getUniqueValuesByColumns, } from '../../utils/tableProcessing';
 import { generatePivotWithSQL } from '../../utils/pivotConstructor';
 import { getDateBucketFromRange, } from '../../utils/dates';
 const QuillHover = () => {
@@ -54,9 +54,10 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                 setAllowedRowFields(possibleColumns.rowFields);
                 setAllowedColumnFields(possibleColumns.columnFields);
                 setAllowedValueFields(possibleColumns.valueFields);
-                return possibleColumns;
+                return { possibleColumns, uniqueValues: {} };
             }
-            const newUniqueValues = await getUniqueValuesByColumns(stringColumns, query || '', data.rows || [], client, customFields);
+            const smallStringColumns = await getCountsByColumns(stringColumns, query || '', client, customFields);
+            const newUniqueValues = await getUniqueValuesByColumns(smallStringColumns, query || '', data.rows || [], client, customFields);
             if (!uniqueValues ||
                 hashCode(uniqueValues) !== hashCode(newUniqueValues)) {
                 const possibleColumns = getPossiblePivotFieldOptions(columns, newUniqueValues || {});
@@ -64,17 +65,16 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                 setAllowedColumnFields(possibleColumns.columnFields);
                 setAllowedValueFields(possibleColumns.valueFields);
                 setUniqueValues(newUniqueValues);
-                return possibleColumns;
+                return { possibleColumns, uniqueValues: newUniqueValues };
             }
         }
-        return { rowFields: [], columnFields: [], valueFields: [] };
+        return {
+            possibleColumns: { rowFields: [], columnFields: [], valueFields: [] },
+            uniqueValues: {},
+        };
     };
     const getAllDateRangesByColumn = async () => {
         // Don't reprocess dateRanges if they are already gathered
-        if (Object.keys(dateRanges).length > 0 ||
-            (client && client.databaseType !== 'postgresql')) {
-            return;
-        }
         if (columns) {
             const dateColumns = columns.filter((column) => {
                 return column.jsType === 'date';
@@ -151,7 +151,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                     });
                 }
                 else {
-                    const { rows, columns } = await generatePivotTable(pivot, data, dateRange, false);
+                    const { rows, columns } = await generatePivotTable(pivot, data, dateRange, false, -1, undefined, undefined, report, client, uniqueValues);
                     setSamplePivotTable({ pivot: pivot, rows, columns });
                 }
             }
@@ -167,30 +167,6 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
             getDistinctValues();
         }
     }, [initialSelectedPivotTable, columns, data, pivotRowField]);
-    useEffect(() => {
-        const fetchPivotTables = async () => {
-            const pivot = {
-                rowField: pivotRowField || '',
-                rowFieldType: columnsToShow[pivotRowField || ''],
-                columnField: pivotColumnField,
-                columnFieldType: columnsToShow[pivotColumnField || ''],
-                valueField: pivotValueField || '',
-                aggregationType: pivotAggregation || '',
-            };
-            if (isValidPivot(pivot) && data && columns) {
-                const { rows, columns } = await generatePivotTable(pivot, data, dateRange, false);
-                setSamplePivotTable({ pivot: pivot, rows, columns });
-            }
-        };
-        fetchPivotTables();
-    }, [
-        data,
-        columns,
-        pivotRowField,
-        pivotColumnField,
-        pivotValueField,
-        pivotAggregation,
-    ]);
     useEffect(() => {
         if (!initialUniqueValues) {
             return;
@@ -218,7 +194,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                 return null;
             }
             const pivot = createdPivots[selectedPivotIndex];
-            const { rows, columns } = await generatePivotTable(pivot, data, dateRange, false);
+            const { rows, columns } = await generatePivotTable(pivot, data, dateRange, false, -1, undefined, undefined, report, client, uniqueValues);
             setSelectedPivotTable({
                 pivot: pivot,
                 rows: rows,
@@ -229,7 +205,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
     }, [selectedPivotIndex, data, dateRange, createdPivots]);
     const onSelectRecommendedPivot = (pivot, index) => {
         if (showEditOnPivotClick) {
-            onEditPivot(pivot, index);
+            onEditPivot(pivot, index, 'recommended');
             return;
         }
         if (index === selectedPivotIndex && selectedPivotType === 'recommended') {
@@ -242,18 +218,24 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
         setIsOpen(false);
     };
     const onSelectCreatedPivot = (pivot, index) => {
-        selectPivot(pivot, pivot.columnField ? uniqueValues : undefined, dateRanges[pivot.rowField]?.dateRange);
+        selectPivot(pivot, pivot.columnField ? uniqueValues : undefined, dateRanges[pivot.rowField]?.dateRange, samplePivotTable);
         setSelectedPivotType('created');
         setIsOpen(false);
         setPopUpTitle('Add pivot');
     };
-    const onEditPivot = async (pivot, index) => {
+    const onEditPivot = async (pivot, index, pivotType) => {
         setIsLoading(false);
         setPivotRowField(pivot.rowField);
         setPivotColumnField(pivot.columnField);
         setPivotValueField(pivot.valueField);
         setPivotAggregation(pivot.aggregationType);
         setShowUpdatePivot(true);
+        if (pivotType === 'recommended' &&
+            index !== null &&
+            recommendedPivotTables[index]) {
+            setSamplePivotTable(recommendedPivotTables[index]);
+            return;
+        }
         if (isValidPivot(pivot)) {
             let dateBucket = undefined;
             if (pivotRowField && dateRanges[pivotRowField]) {
@@ -275,6 +257,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
             return;
         }
         setIsLoading(true);
+        let tempUniqueValues = uniqueValues;
         let possibleColumns = {
             rowFields: allowedRowFields,
             columnFields: allowedColumnFields,
@@ -284,7 +267,9 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
             allowedColumnFields.length === 0 &&
             allowedValueFields.length === 0) ||
             !uniqueValues) {
-            possibleColumns = await getDistinctValues();
+            const distinctValues = await getDistinctValues();
+            possibleColumns = distinctValues.possibleColumns;
+            tempUniqueValues = distinctValues.uniqueValues;
         }
         const cloudBody = {
             pivotCountRequest,
@@ -304,9 +289,8 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
         try {
             const resp = await getDataFromCloud(client, 'pivotai', cloudBody);
             const recommendedPivots = resp?.data?.pivotTables.map((pivot) => cleanPivot(pivot, possibleColumns)) || [];
-            setRecommendedPivots(recommendedPivots.map((pivot) => {
-                if (pivot.columnField &&
-                    columnsToShow[pivot.columnField] === 'date') {
+            const cleanedPivots = recommendedPivots.map((pivot) => {
+                if (pivot.columnField && columnsToShow[pivot.columnField] === 'date') {
                     const columnField = pivot.columnField;
                     pivot.columnField = pivot.rowField;
                     pivot.rowField = columnField;
@@ -319,7 +303,13 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                         : undefined,
                     title: generatePivotTitle(pivot),
                 };
+            });
+            setRecommendedPivots(cleanedPivots);
+            const pts = await Promise.all(cleanedPivots.map(async (p) => {
+                const { rows, columns } = await generatePivotTable(p, data, dateRange, false, 6, undefined, undefined, report, client, tempUniqueValues);
+                return { pivot: p, rows, columns };
             }));
+            setRecommendedPivotTables(pts);
             setSelectedPivotIndex(-1);
         }
         catch (e) {
@@ -372,21 +362,34 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
         }, 500);
     };
     const [recommendedPivotTables, setRecommendedPivotTables] = useState([]);
-    useEffect(() => {
-        const fetchPivotTables = async () => {
-            const pts = await Promise.all(recommendedPivots.map(async (p) => {
-                const { rows, columns } = await generatePivotTable(p, data, dateRange, false, 6);
-                return { pivot: p, rows, columns };
-            }));
-            setRecommendedPivotTables(pts);
-        };
-        fetchPivotTables();
-    }, [recommendedPivots, dateRange]);
+    // useEffect(() => {
+    //   const fetchPivotTables = async () => {
+    //     const pts = await Promise.all(
+    //       recommendedPivots.map(async (p: Pivot) => {
+    //         const { rows, columns } = await generatePivotTable(
+    //           p,
+    //           data,
+    //           dateRange,
+    //           false,
+    //           6,
+    //           undefined,
+    //           undefined,
+    //           report,
+    //           client,
+    //           uniqueValues,
+    //         );
+    //         return { pivot: p, rows, columns };
+    //       }),
+    //     );
+    //     setRecommendedPivotTables(pts);
+    //   };
+    //   fetchPivotTables();
+    // }, [recommendedPivots, dateRange]);
     const [createdPivotTables, setCreatedPivotTables] = useState([]);
     useEffect(() => {
         const fetchPivotTables = async () => {
             const pts = await Promise.all(createdPivots.map(async (p) => {
-                const { rows, columns } = await generatePivotTable(p, data, dateRange, false, 6);
+                const { rows, columns } = await generatePivotTable(p, data, dateRange, false, 6, undefined, undefined, report, client, uniqueValues);
                 return { pivot: p, rows, columns };
             }));
             setCreatedPivotTables(pts);
@@ -788,11 +791,7 @@ const fixBigQueryData = (data = []) => {
 };
 export async function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1, compRange = undefined, dateBucket, report, client, uniqueValues) {
     try {
-        if (report &&
-            report.rowCount &&
-            report.rowCount !== data.length &&
-            client &&
-            client.databaseType.toLowerCase() === 'postgresql') {
+        if (report && report.rowCount && report.rowCount !== data.length) {
             let dateFilter = report
                 ? report.filtersApplied.find((f) => f.filterType === 'date_range')
                 : undefined;

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

@@ -7,4 +7,5 @@ export declare function convertPostgresColumn(field: {
 export declare function convertColumnInfoToColumnInternal(columnInfo: ColumnInfo): ColumnInternal;
 export declare function convertFieldTypeToJSType(fieldType: string): string;
 export declare function convertFormatToJsType(column: Column): string;
+export declare function processColumnName(columnName: string): string;
 //# sourceMappingURL=columnProcessing.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"columnProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/columnProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAE3D,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,cAAc,CAyGjB;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AA0DD,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAsBlE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAY5D"}
+{"version":3,"file":"columnProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/columnProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAM3D,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,cAAc,CAyGjB;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AA0DD,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAsBlE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAY5D;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D"}

package/dist/esm/utils/columnProcessing.js

@@ -1,3 +1,6 @@
+function removeBigQuerySpecialChars(columnName) {
+    return columnName.replaceAll('quill_forward_slash', '/');
+}
 export function convertPostgresColumn(field) {
     let format;
     let fieldType;
@@ -200,3 +203,6 @@ export function convertFormatToJsType(column) {
             return 'string';
     }
 }
+export function processColumnName(columnName) {
+    return removeBigQuerySpecialChars(columnName);
+}

package/dist/esm/utils/dashboard.js

@@ -120,7 +120,7 @@ async function getPivotTable(report, dashboardFilters, client, dateBucketInitial
     }
     const pivot = report?.pivot;
     const data = report || {};
-    if (pivot && client && client.databaseType.toLowerCase() === 'postgresql') {
+    if (pivot && client) {
         if (report.rowCount === 0) {
             return { rows: [], columns: [] };
         }

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

@@ -1,3 +1,3 @@
-export declare function getData(client: any, cloudQueryEndpoint: string, noCred: RequestCredentials, hostedRequestBody: any, cloudRequestBody: any, method?: string): Promise<any>;
+export declare function getData(client: any, cloudQueryEndpoint: string, noCred: RequestCredentials, hostedRequestBody: any, cloudRequestBody: any, method?: string, queryParam?: string): Promise<any>;
 export declare function getDataFromCloud(client: any, cloudQueryEndpoint: string, cloudRequestBody: any, method?: string): Promise<any>;
 //# sourceMappingURL=dataFetcher.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AAqBA,wBAAsB,OAAO,CAC3B,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBAmGhB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBAgChB"}
+{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AAqBA,wBAAsB,OAAO,CAC3B,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,EACf,UAAU,CAAC,EAAE,MAAM,gBAwGpB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBAgChB"}

package/dist/esm/utils/dataFetcher.js

@@ -8,7 +8,7 @@ function parseData(rows, queryType) {
                 end: new Date(rows[0]?.max_date),
             };
         case 'rowCount':
-            return parseInt(rows[0]?.count);
+            return parseInt(rows[0]?.row_count);
         case 'distinctStrings':
             return rows.map((row) => {
                 return row['column_field'];
@@ -19,11 +19,15 @@ function parseData(rows, queryType) {
 }
 // this function gets the data either from the self hosted endpoint or
 // our cloud server
-export async function getData(client, cloudQueryEndpoint, noCred, hostedRequestBody, cloudRequestBody, method = 'POST') {
+export async function getData(client, cloudQueryEndpoint, noCred, hostedRequestBody, cloudRequestBody, method = 'POST', queryParam) {
+    if (!client) {
+        return null;
+    }
     try {
         if (client.queryEndpoint) {
             // self hosted
-            const resp = await fetch(client.queryEndpoint, {
+            const processedParam = queryParam ? `?${queryParam}` : '';
+            const resp = await fetch(`${client.queryEndpoint}${processedParam}`, {
                 method: 'POST',
                 headers: {
                     ...client.queryHeaders,
@@ -39,7 +43,8 @@ export async function getData(client, cloudQueryEndpoint, noCred, hostedRequestB
             let result;
             if (hostedRequestBody &&
                 hostedRequestBody.metadata &&
-                hostedRequestBody.metadata.task === 'report') {
+                (hostedRequestBody.metadata.task === 'report' ||
+                    hostedRequestBody.metadata.useUpdatedDataGathering)) {
                 if (responseJson.data?.data) {
                     result = {
                         fields: responseJson?.data.queries?.queryResults[0]?.fields,

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

@@ -15,4 +15,5 @@ export declare function getDateBucketFromRange(dateRange: {
     start: Date;
     end: Date;
 }): "month" | "week" | "day" | "year";
+export declare function parseDateByDatabaseType(date: any, databaseType: string): Date;
 //# sourceMappingURL=dates.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../src/utils/dates.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,UAYxB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,WAa/C;AAED,wBAAgB,qBAAqB,CACnC,eAAe,EAAE;IACf,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,IAAI,CAAC;CACf,EACD,UAAU,CAAC,EAAE,MAAM,sBAepB;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,qCAW3E"}
+{"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../src/utils/dates.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,UAYxB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,WAa/C;AAED,wBAAgB,qBAAqB,CACnC,eAAe,EAAE;IACf,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,IAAI,CAAC;CACf,EACD,UAAU,CAAC,EAAE,MAAM,sBAepB;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,qCAW3E;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,QAMtE"}

package/dist/esm/utils/dates.js

@@ -39,10 +39,10 @@ export function getComparisonInterval(comparisonRange, dateBucket) {
     const dayCount = differenceInDays(comparisonRange.endDate, comparisonRange.startDate);
     if (!isNaN(dayCount)) {
         if (dateBucket === 'month') {
-            return dayCount / 30 + ' month';
+            return Math.floor(dayCount / 30) + ' month';
         }
         else if (dateBucket === 'year') {
-            return dayCount / 365 + ' year';
+            return Math.floor(dayCount / 365) + ' year';
         }
         else {
             return dayCount + ' day';
@@ -64,3 +64,11 @@ export function getDateBucketFromRange(dateRange) {
         return 'year';
     }
 }
+export function parseDateByDatabaseType(date, databaseType) {
+    if (databaseType.toLowerCase() === 'bigquery') {
+        return new Date(date.value);
+    }
+    else {
+        return new Date(date);
+    }
+}

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

@@ -0,0 +1,20 @@
+import { Monaco } from '@monaco-editor/react';
+import { Range } from 'monaco-editor';
+interface CompletionItem {
+    label: string;
+    kind: number;
+    insertText: string;
+    insertTextRules: number;
+    range: any;
+    detail?: string;
+}
+export declare function generateSuggestionsBySchema(schema: any[], monaco: Monaco, range: Range, databaseType: string): CompletionItem[];
+export declare function generateSuggestionsByDatasource(monaco: Monaco, range: Range, databaseType: string): {
+    label: string;
+    kind: import("monaco-editor").languages.CompletionItemKind;
+    insertText: string;
+    insertTextRules: import("monaco-editor").languages.CompletionItemInsertTextRule;
+    range: Range;
+}[];
+export {};
+//# sourceMappingURL=monacoAutocomplete.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"monacoAutocomplete.d.ts","sourceRoot":"","sources":["../../../src/utils/monacoAutocomplete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAY,KAAK,EAAE,MAAM,eAAe,CAAC;AAGhD,UAAU,cAAc;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AA4HD,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,GAAG,EAAE,EACb,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,MAAM,GACnB,cAAc,EAAE,CA4BlB;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,MAAM;;;;;;IAMrB"}

package/dist/esm/utils/monacoAutocomplete.js

@@ -0,0 +1,140 @@
+import { processColumnReference } from './queryConstructor';
+const GENERIC_DATASOURCE_SUGGESTIONS = (monaco, range) => {
+    return [
+        {
+            label: 'SELECT',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'SELECT',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'FROM',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'FROM',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'JOIN',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'JOIN',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'LEFT JOIN',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'LEFT JOIN',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'INNER JOIN',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'INNER JOIN',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'MAX',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'MAX',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'MIN',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'MIN',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'ON',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'ON',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'WHERE',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'WHERE',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'LIMIT',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'LIMIT',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'GROUP BY',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'GROUP BY',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'ORDER BY',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'ORDER BY',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+    ];
+};
+const POSTGRES_DATASOURCE_SUGGESTIONS = (monaco, range) => {
+    return [
+        {
+            label: 'SELECT',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'SELECT',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'FROM',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'FROM',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+    ];
+};
+export function generateSuggestionsBySchema(schema, monaco, range, databaseType) {
+    console.log(databaseType);
+    const suggestions = [];
+    schema.forEach((table) => {
+        const curSuggestion = {
+            label: table.name,
+            kind: monaco.languages.CompletionItemKind.Field,
+            insertText: `${processColumnReference(table.name, databaseType).replaceAll('`', '')}`,
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        };
+        suggestions.push(curSuggestion);
+        table.columns.forEach((column) => {
+            const insertText = `${processColumnReference(column.name, databaseType).replaceAll('`', '')}`;
+            const curSuggestion = {
+                label: column.name,
+                kind: monaco.languages.CompletionItemKind.Field,
+                insertText,
+                detail: table.name,
+                insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+                range,
+            };
+            suggestions.push(curSuggestion);
+        });
+    }, []);
+    return suggestions;
+}
+export function generateSuggestionsByDatasource(monaco, range, databaseType) {
+    return [
+        ...POSTGRES_DATASOURCE_SUGGESTIONS(monaco, range),
+        ...GENERIC_DATASOURCE_SUGGESTIONS(monaco, range),
+    ];
+}

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

@@ -1 +1 @@
-{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiB,MAAM,uCAAuC,CAAC;AAK7E,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,GAAG,EACX,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,GAAG,EAChB,eAAe,CAAC,EAAE,GAAG;;;eAkHtB"}
+{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAiB,MAAM,uCAAuC,CAAC;AAO7E,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,GAAG,EACX,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,GAAG,EAChB,eAAe,CAAC,EAAE,GAAG;;;eAsKtB"}

package/dist/esm/utils/pivotConstructor.js

@@ -1,7 +1,11 @@
+import { dateFormatOptions } from '../ChartBuilder';
+import { isNumericColumnType } from '../components/ReportBuilder/ast';
 import { getDateString } from '../internals/ReportBuilder/PivotModal';
+import { processColumnName } from './columnProcessing';
 import { getData } from './dataFetcher';
 import { getComparisonInterval } from './dates';
 import { generatePivotQuery } from './queryConstructor';
+import { snakeCaseToTitleCase } from './textProcessing';
 export async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilter, distinctStrings) {
     if (dateFilter && dateFilter.startDate) {
         dateFilter.start = dateFilter.startDate;
@@ -22,7 +26,12 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
         const rowColumn = report.columns.find((column) => column.field === pivot.rowField);
         pivot.rowFieldType = rowColumn.format;
     }
-    const sqlQuery = generatePivotQuery(pivot, report.itemQuery, report.rows, dateBucket, comparisonInterval, distinctStrings);
+    let distinctStringValues = undefined;
+    if (!distinctStrings && report.rows && pivot.columnField) {
+        const distinctValues = Array.from(new Set(report.rows.map((row) => row[pivot.columnField])));
+        distinctStringValues = distinctValues.map((value) => value.toString());
+    }
+    const sqlQuery = generatePivotQuery(pivot, report.itemQuery, client.databaseType, comparisonInterval, distinctStrings ? distinctStrings : distinctStringValues, dateBucket);
     if (sqlQuery && report.rows.length > 0) {
         const hostedBody = {
             metadata: {
@@ -39,15 +48,35 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
             },
         };
         const cloudBody = { ...hostedBody };
-        const resp = await getData(client, 'query', 'same-origin', hostedBody, cloudBody);
+        const resp = await getData(client, 'query', 'same-origin', hostedBody, cloudBody, 'POST', 'fetch-pivot');
         // With our current design we have to remove the second row field but leave the first for comparison purposes.
         const rows = resp.queryResults[0].rows;
+        if (pivot.columnField && client.databaseType.toLowerCase() === 'bigquery') {
+            rows.forEach((row) => {
+                Object.keys(row).forEach((key) => {
+                    const processedKey = processColumnName(key);
+                    if (processedKey !== key) {
+                        row[processedKey] = row[key];
+                        delete row[key];
+                    }
+                });
+            });
+        }
         const columns = resp.queryResults[0].fields
             .map((field) => ({
-            field: field.name,
-            label: field.name.replace('comparison_', 'comparison '),
+            field: processColumnName(field.name),
+            label: snakeCaseToTitleCase(processColumnName(field.name.replace('comparison_', 'comparison '))),
         }))
-            .filter((field, index) => field.field !== 'comparison_' + pivot.rowField || index === 0);
+            .filter((field, index) => field.field !== 'comparison_' + pivot.rowField || index === 0)
+            .sort((a, b) => {
+            if (a.field === pivot.rowField) {
+                return -1;
+            }
+            if (b.field === pivot.rowField) {
+                return 1;
+            }
+            return 0;
+        });
         if (pivot.rowField && !['string', 'varchar'].includes(pivot.rowFieldType)) {
             rows.forEach((row) => {
                 row[pivot.rowField] = getDateString(row[pivot.rowField], undefined, dateBucket);
@@ -75,6 +104,30 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
                 }
             }
         }
+        if (pivot.sort) {
+            rows.sort((a, b) => {
+                if (pivot.sortDirection === 'ASC') {
+                    if (dateFormatOptions.includes(pivot.sortFieldType ?? '')) {
+                        // @ts-ignore
+                        return new Date(a[pivot.sortField]) - new Date(b[pivot.sortField]);
+                    }
+                    else if (isNumericColumnType(pivot.sortFieldType)) {
+                        return a[pivot.sortField] - b[pivot.sortField];
+                    }
+                    return a[pivot.sortField].localeCompare(b[pivot.sortField]);
+                }
+                else {
+                    if (dateFormatOptions.includes(pivot.sortFieldType ?? '')) {
+                        // @ts-ignore
+                        return new Date(b[pivot.sortField]) - new Date(a[pivot.sortField]);
+                    }
+                    else if (isNumericColumnType(pivot.sortFieldType)) {
+                        return b[pivot.sortField] - a[pivot.sortField];
+                    }
+                    return b[pivot.sortField].localeCompare(a[pivot.sortField]);
+                }
+            });
+        }
         return {
             rows: rows,
             columns: columns,

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

@@ -1,5 +1,7 @@
 import { Pivot } from '../internals/ReportBuilder/PivotModal';
-export declare function generateDistinctQuery(stringFields: string[], query: string): string;
+export declare function processColumnReference(column: string, databaseType: string): string;
+export declare function generateCountQuery(fields: string[], query: string, databaseType: string): string;
+export declare function generateDistinctQuery(stringFields: string[], query: string, databaseType: string): string;
 export declare function generateMinMaxRangeQueries(columnFields: string[], query: string, databaseType: string): string;
-export declare function generatePivotQuery(pivot: Pivot, itemQueries: string[], rows: any[], dateBucket?: string, comparisonInterval?: string, distinctStrings?: string[]): string | undefined;
+export declare function generatePivotQuery(pivot: Pivot, itemQueries: string[], databaseType: string, comparisonInterval?: string, distinctStrings?: string[], dateBucket?: string): string | undefined;
 //# sourceMappingURL=queryConstructor.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAe9D,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,UAQ1E;AAED,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAcrB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,IAAI,EAAE,GAAG,EAAE,EACX,UAAU,CAAC,EAAE,MAAM,EACnB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,GACzB,MAAM,GAAG,SAAS,CAuBpB"}
+{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAmB9D,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAa1E;AA4CD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAUrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UASrB;AAED,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAcrB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAwBpB"}