@quillsql/react 2.12.46 → 2.12.48

package/dist/esm/utils/report.js

@@ -14,6 +14,7 @@ import { mergeComparisonRange } from './merge';
 import { DEFAULT_PAGINATION } from './paginationProcessing';
 import { isPivotPossible, isValidPivot } from './pivotProcessing';
 import { fetchTableByAST, getRelevantInfoFromQuery, } from './tableProcessing';
+import { snakeAndCamelCaseToTitleCase } from './textProcessing';
 import { quillFormat } from './valueFormatter';
 export const EMPTY_REPORT = {
     id: '',
@@ -57,6 +58,7 @@ function extractAllReportValuesFromQuillInternalReport(reportInternal) {
         filtersApplied: reportInternal.filtersApplied,
         queryString: reportInternal.queryString,
         rowCount: reportInternal.rowCount,
+        template: reportInternal.template,
     };
 }
 export async function fetchReport(reportId, client, useReportTask = true, filters = [], additionalProcessing, dateBucket, customFields) {
@@ -108,6 +110,22 @@ export async function fetchReport(reportId, client, useReportTask = true, filter
             reportInfo.pagination = additionalProcessing.page;
             reportInfo.sort = additionalProcessing.sort;
         }
+        // Ensure the report columns don't reference any columns that aren't present in the rows
+        const observedColumns = reportInfo?.rows[0]
+            ? Object.keys(reportInfo.rows[0])
+            : [];
+        if (reportInfo &&
+            useReportTask &&
+            reportInfo.columns?.filter((col) => !observedColumns.includes(col.field))
+                ?.length > 0) {
+            reportInfo.columns = reportInfo.columns.filter((col) => observedColumns.includes(col.field));
+            reportInfo.columnInternal = reportInfo.columnInternal.filter((col) => observedColumns.includes(col.field));
+            await saveReport({
+                report: { ...dashboardItem, query: reportInfo.queryString },
+                dashboardItemId: reportId,
+                client,
+            });
+        }
     }
     catch (error) {
         if (error instanceof DataLoadError) {
@@ -120,7 +138,7 @@ export async function fetchReport(reportId, client, useReportTask = true, filter
             else {
                 if (!error.data.data) {
                     errorMessage = 'Failed to fetch chart';
-                    reportInfo = EMPTY_REPORT;
+                    reportInfo = EMPTY_INTERNAL_REPORT;
                 }
                 else {
                     reportInfo = {
@@ -134,15 +152,46 @@ export async function fetchReport(reportId, client, useReportTask = true, filter
             }
         }
         else {
-            reportInfo = {
-                id: reportId,
-                rows: [],
-                columns: [],
-            };
+            reportInfo = { ...EMPTY_INTERNAL_REPORT, id: reportId };
             errorMessage = error.message;
         }
     }
-    return { report: reportInfo || EMPTY_REPORT, error: errorMessage };
+    return { report: reportInfo || EMPTY_INTERNAL_REPORT, error: errorMessage };
+}
+export async function saveReport({ report, dashboardItemId, client, }) {
+    const { publicKey, customerId, databaseType } = client;
+    const cloudBody = {
+        ...report,
+        dashboardItemId,
+        customerId: customerId || '*',
+        useNewNodeSql: true,
+    };
+    // @ts-ignore
+    if (cloudBody['rows']) {
+        // @ts-ignore
+        delete cloudBody['rows'];
+        // @ts-ignore
+        delete cloudBody['compareRows'];
+    }
+    // add orgId: customerId if present for hostedBody
+    // set defaultDateField if date field not present
+    const hostedBody = {
+        metadata: {
+            task: 'create',
+            clientId: publicKey,
+            databaseType: databaseType,
+            ...cloudBody,
+            orgId: customerId || '*',
+            useNewNodeSql: true,
+        },
+    };
+    const searchParams = new URLSearchParams(customerId
+        ? {
+            clientId: publicKey,
+            customerId: customerId,
+        }
+        : { clientId: publicKey }).toString();
+    return await getData(client, `dashedit2?${searchParams}`, 'same-origin', hostedBody, cloudBody);
 }
 export const formatRowsFromReport = (report) => {
     if (!report.rows || !report.columns) {
@@ -251,7 +300,11 @@ export const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, c
             filtersApplied: [],
             rows: tableData.rows,
             columns: tableData.columns.map((col) => {
-                return { field: col.field, format: col.format, label: col.label };
+                return {
+                    field: col.field,
+                    format: col.format,
+                    label: snakeAndCamelCaseToTitleCase(col.label),
+                };
             }),
             columnInternal: tableData.columns,
         };

package/dist/esm/utils/schema.js

@@ -2,27 +2,27 @@ import { convertColumnInfoToColumnInternal } from './columnProcessing';
 const triggerSoftUpdate = async (client, tables) => {
     const { queryEndpoint, queryHeaders, publicKey, withCredentials } = client;
     tables.forEach(async (table) => {
-        if (table.isSelectStar) {
-            fetch(`${queryEndpoint}?update-view`, {
-                method: 'POST',
-                headers: {
-                    ...queryHeaders,
-                    'Content-Type': 'application/json',
+        // if (table.isSelectStar) {
+        fetch(`${queryEndpoint}?update-view`, {
+            method: 'POST',
+            headers: {
+                ...queryHeaders,
+                'Content-Type': 'application/json',
+            },
+            credentials: withCredentials ? 'include' : 'omit',
+            body: JSON.stringify({
+                metadata: {
+                    preQueries: [table.viewQuery.replace(/;/, '')],
+                    clientId: publicKey,
+                    publicKey: publicKey,
+                    task: 'update-view',
+                    name: table.name,
+                    id: table._id,
+                    runQueryConfig: { getColumns: true },
                 },
-                credentials: withCredentials ? 'include' : 'omit',
-                body: JSON.stringify({
-                    metadata: {
-                        preQueries: [table.viewQuery.replace(/;/, '')],
-                        clientId: publicKey,
-                        publicKey: publicKey,
-                        task: 'update-view',
-                        name: table.name,
-                        id: table._id,
-                        runQueryConfig: { getColumns: true },
-                    },
-                }),
-            });
-        }
+            }),
+        });
+        // }
     });
 };
 const parseResponse = (results) => {
@@ -172,6 +172,8 @@ function convertSchemaInfoToTable(schemaData) {
             _id: table._id,
             customFieldInfo: table.customFieldInfo,
             displayName: table.displayName,
+            broken: table.broken,
+            error: table.error,
         };
         tables.push(newTable);
     });

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

@@ -17,6 +17,7 @@ export declare const getUniqueValuesByColumns: (columns: Column[], query: string
         [value: string]: boolean;
     };
 } | null>;
+export declare const getUniqueStringValues: (columns: ColumnInternal[], tableName: string, client: any, customFields?: any, previousUniqueValues?: any) => Promise<any>;
 export declare const getRelevantInfoFromQuery: (columns: ColumnInternal[], client: Client, query: string, customFields?: any) => Promise<{
     uniqueStrings?: UniqueValuesByColumn | undefined;
     dateRanges?: DateRangesByColumn | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAe5E,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,eAAO,MAAM,cAAc,YAChB,MAAM,EAAE,qBACE,MAAM,EAAE,KAC1B,OAUF,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,MAAM,EAAE,SACV,MAAM,QACP,GAAG,UACD,MAAM,gBACA,GAAG,EAAE;;;;SAmEpB,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,cAAc,EAAE,UACjB,MAAM,SACP,MAAM,iBACE,GAAG;;;;EA6DnB,CAAC;AAEF,eAAO,MAAM,kBAAkB,YACpB,MAAM,EAAE,SACV,MAAM,UACL,MAAM,gBACA,GAAG,EAAE,KAClB,QAAQ,MAAM,EAAE,CA2ClB,CAAC;AAkDF,eAAO,MAAM,qBAAqB,YACvB,MAAM,EAAE,SACV,MAAM,UACL,MAAM,gBACA,GAAG,EAAE;;mBAEY;YAAE,KAAK,EAAE,IAAI,CAAC;YAAC,GAAG,EAAE,IAAI,CAAA;SAAE;;SAiB1D,CAAC;AA2DF,eAAO,MAAM,gBAAgB,WACnB,MAAM,UACN,MAAM,aACH,MAAM,eACJ,oBAAoB,YACvB,GAAG,iBACE,GAAG,KACjB,QAAQ;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAaA,CAAC;AAEF,eAAO,MAAM,iBAAiB,UACrB,MAAM,UACL,MAAM,eACD,oBAAoB,iBAClB,GAAG;aAET,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EAqDZ,CAAC;AAEF,eAAO,MAAM,kBAAkB,aACnB,MAAM,UACR,MAAM,eACD,oBAAoB,YACvB,GAAG,iBACE,GAAG;aAET,MAAM,EAAE;UACX,GAAG,EAAE;;;EAgFZ,CAAC;AAEF,eAAO,MAAM,eAAe,QACrB,cAAc,MAAM,UACjB,MAAM,eACD,oBAAoB,iBAClB,GAAG;aAET,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EAuDZ,CAAC;AAEF,eAAO,MAAM,+CAA+C,0BACnC,oBAAoB;;CAU5C,CAAC"}
+{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EACd,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAgB5E,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,eAAO,MAAM,cAAc,YAChB,MAAM,EAAE,qBACE,MAAM,EAAE,KAC1B,OAUF,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,MAAM,EAAE,SACV,MAAM,QACP,GAAG,UACD,MAAM,gBACA,GAAG,EAAE;;;;SAmEpB,CAAC;AAEF,eAAO,MAAM,qBAAqB,YACvB,cAAc,EAAE,aACd,MAAM,UACT,GAAG,iBACI,GAAG,yBACK,GAAG,iBAkC3B,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,cAAc,EAAE,UACjB,MAAM,SACP,MAAM,iBACE,GAAG;;;;EA6DnB,CAAC;AAEF,eAAO,MAAM,kBAAkB,YACpB,MAAM,EAAE,SACV,MAAM,UACL,MAAM,gBACA,GAAG,EAAE,KAClB,QAAQ,MAAM,EAAE,CA2ClB,CAAC;AAkDF,eAAO,MAAM,qBAAqB,YACvB,MAAM,EAAE,SACV,MAAM,UACL,MAAM,gBACA,GAAG,EAAE;;mBAEY;YAAE,KAAK,EAAE,IAAI,CAAC;YAAC,GAAG,EAAE,IAAI,CAAA;SAAE;;SAiB1D,CAAC;AA2DF,eAAO,MAAM,gBAAgB,WACnB,MAAM,UACN,MAAM,aACH,MAAM,eACJ,oBAAoB,YACvB,GAAG,iBACE,GAAG,KACjB,QAAQ;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAaA,CAAC;AAEF,eAAO,MAAM,iBAAiB,UACrB,MAAM,UACL,MAAM,eACD,oBAAoB,iBAClB,GAAG;aAET,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EAqDZ,CAAC;AAEF,eAAO,MAAM,kBAAkB,aACnB,MAAM,UACR,MAAM,eACD,oBAAoB,YACvB,GAAG,iBACE,GAAG;aAET,MAAM,EAAE;UACX,GAAG,EAAE;;;EAgFZ,CAAC;AAEF,eAAO,MAAM,eAAe,QACrB,cAAc,MAAM,UACjB,MAAM,eACD,oBAAoB,iBAClB,GAAG;aAET,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EAuDZ,CAAC;AAEF,eAAO,MAAM,+CAA+C,0BACnC,oBAAoB;;CAU5C,CAAC"}

package/dist/esm/utils/tableProcessing.js

@@ -1,4 +1,5 @@
 import { isTextColumnType, } from '../components/ReportBuilder/ast';
+import { deepCopy } from '../components/ReportBuilder/util';
 import { convertPostgresColumn } from './columnProcessing';
 import { MAX_PIVOT_UNIQUE_VALUES } from './constants';
 import { getData } from './dataFetcher';
@@ -7,7 +8,7 @@ import { parseDateByDatabaseType } from './dates';
 import { processFilterErrorList } from './errorProcessing';
 import { mergeComparisonRange } from './merge';
 import { DEFAULT_PAGINATION } from './paginationProcessing';
-import { generateCountQuery, generateDistinctQuery, generateMinMaxRangeQueries, } from './queryConstructor';
+import { generateCountQuery, generateDistinctQuery, generateMinMaxRangeQueries, processColumnReference, } from './queryConstructor';
 export const hasColumnAlias = (columns, referencedColumns) => {
     if (!referencedColumns) {
         return true;
@@ -66,6 +67,25 @@ export const getUniqueValuesByColumns = async (columns, query, rows, client, cus
     }
     return uniqueValues;
 };
+export const getUniqueStringValues = async (columns, tableName, client, customFields, previousUniqueValues) => {
+    const convertedStringColumns = columns.filter((column) => {
+        return isTextColumnType(column.fieldType);
+    });
+    const stringNames = convertedStringColumns.map((column) => processColumnReference(column.field, client.databaseType));
+    const smallStringColumns = await getCountsByColumns(convertedStringColumns, `Select ${stringNames.join(', ')} from ${tableName}`, client, customFields ?? []);
+    const smallStringNames = smallStringColumns.map((column) => processColumnReference(column.field, client.databaseType));
+    const newUniqueValues = await getUniqueValuesByColumns(smallStringColumns, `Select ${smallStringNames.join(', ')} from ${tableName}`, [], client, customFields ?? []);
+    if (previousUniqueValues) {
+        // This logic was used in ReportBuilder before this function was extracted
+        // Not sure if it still accurate, but didn't want to remove in case
+        const joinedUniqueValues = deepCopy(previousUniqueValues);
+        joinedUniqueValues[tableName] = newUniqueValues;
+        return joinedUniqueValues;
+    }
+    else {
+        return newUniqueValues;
+    }
+};
 export const getRelevantInfoFromQuery = async (columns, client, query, customFields) => {
     let dateRanges = {};
     let uniqueStrings = {};

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

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../src/utils/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,eAAO,MAAM,cAAc,aACf,gBAAgB,iBACX;IAAE,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,CAAA;CAAE,qBACjC;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,aAC1C,GAAG,EAAE,UA4BjB,CAAC"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../src/utils/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGnD,eAAO,MAAM,cAAc,aACf,gBAAgB,iBACX;IAAE,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,CAAA;CAAE,qBACjC;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,aAC1C,GAAG,EAAE,UA+BjB,CAAC"}

package/dist/esm/utils/validation.js

@@ -1,3 +1,4 @@
+import { isValidPivot } from './pivotProcessing';
 export const validateReport = (formData, dashboardData, defaultDateFilter, allTables) => {
     const issues = [];
     const filters = dashboardData.filters || [];
@@ -16,5 +17,8 @@ export const validateReport = (formData, dashboardData, defaultDateFilter, allTa
             issues.push(`Delete the "${filter.label}" filter on "${formData.dashboardName}" or add to another dashboard.`);
         }
     });
+    if (formData.pivot && !isValidPivot(formData.pivot)) {
+        issues.push(`Pivot is invalid.`);
+    }
     return issues;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.12.46",
+  "version": "2.12.48",
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
@@ -22,6 +22,7 @@
     "@dnd-kit/sortable": "^8.0.0",
     "@dnd-kit/utilities": "^3.2.2",
     "@monaco-editor/react": "^4.5.1",
+    "big.js": "^6.2.1",
     "date-fns": "^2.29.3",
     "date-fns-tz": "^2.0.0",
     "react-to-print": "^2.15.1",
@@ -30,6 +31,7 @@
   "devDependencies": {
     "@repo/eslint-config": "*",
     "@repo/typescript-config": "*",
+    "@types/big.js": "^6.2.2",
     "@types/eslint": "^8.56.1",
     "@types/node": "^20.10.6",
     "@types/react": "^18.2.46",