@quillsql/react 2.13.40 → 2.13.42

package/dist/esm/utils/report.js

@@ -2,7 +2,7 @@ import equal from 'fast-deep-equal';
 import { createInitialFormData } from '../ChartBuilder';
 import { getTableNames } from '../components/ReportBuilder/ast';
 import { generatePivotTable } from '../internals/ReportBuilder/PivotModal';
-import { FilterType } from '../models/Filter';
+import { InternalFilterType } from '../models/Filter';
 import { createBasicSelectASTFromColumns } from './astProcessing';
 import { getYAxisFields } from './columnProcessing';
 import { cleanDashboardItem } from './dashboard';
@@ -14,7 +14,7 @@ import { DEFAULT_PAGINATION } from './paginationProcessing';
 import { isPivotPossible, isValidPivot } from './pivotProcessing';
 import { fetchTableByAST, getQueryDateRangeByColumns, getRelevantInfoFromQuery, getUniqueStringValues, } from './tableProcessing';
 import { snakeAndCamelCaseToTitleCase } from './textProcessing';
-import { quillFormat } from './valueFormatter';
+import { quillAutoFormat, quillFormat } from './valueFormatter';
 export const EMPTY_REPORT = {
     id: '',
     name: '',
@@ -57,10 +57,14 @@ function extractAllReportValuesFromQuillInternalReport(reportInternal) {
         queryString: reportInternal.queryString,
         rowCount: reportInternal.rowCount,
         template: reportInternal.template,
+        referenceLineYValues: reportInternal.referenceLineYValues,
+        referenceLines: reportInternal.referenceLines,
+        includeCustomFields: reportInternal.includeCustomFields,
+        columnsWithCustomFields: reportInternal.columnsWithCustomFields,
     };
 }
 // TODO: Convert this to take an object rather than a bunch of arguments
-export async function fetchReport(reportId, client, tenants, flags, useReportTask = true, filters = [], additionalProcessing, dateBucket, customFields, rowsOnly, rowCountOnly, abortSignal, getDefaultDashboardFilters) {
+export async function fetchReport({ reportId, client, tenants, flags, useReportTask = true, filters = [], additionalProcessing, dateBucket, customFields, rowsOnly, rowCountOnly, abortSignal, getDefaultDashboardFilters, }) {
     let reportInfo = undefined;
     let errorMessage = undefined;
     try {
@@ -95,6 +99,7 @@ export async function fetchReport(reportId, client, tenants, flags, useReportTas
             filters,
             dateBucket,
             additionalProcessing,
+            customFields,
         });
     }
     catch (error) {
@@ -123,10 +128,10 @@ export async function fetchReport(reportId, client, tenants, flags, useReportTas
     }
     return { report: reportInfo || EMPTY_INTERNAL_REPORT, error: errorMessage };
 }
-export async function processReportResponse({ resp, client, filters, dateBucket, additionalProcessing, }) {
+export async function processReportResponse({ resp, client, filters, dateBucket, additionalProcessing, customFields, }) {
     const dashboardItem = {
         ...resp,
-        filtersApplied: filters?.filter((filter) => filter.filterType in FilterType),
+        filtersApplied: filters?.filter((filter) => filter.filterType in InternalFilterType),
     };
     if (resp.errorMessage) {
         throw new DataLoadError(resp?.errorMessage, {
@@ -143,7 +148,14 @@ export async function processReportResponse({ resp, client, filters, dateBucket,
             parseValueFromBigQueryDates(dashboardItem.compareRows, resp.fields);
         }
     }
-    const reportInfo = await cleanDashboardItem(dashboardItem, filters, client, dateBucket, additionalProcessing);
+    const reportInfo = await cleanDashboardItem({
+        item: dashboardItem,
+        dashboardFilters: filters,
+        client,
+        dateBucket,
+        additionalProcessing,
+        customFields,
+    });
     if (additionalProcessing) {
         reportInfo.pagination = additionalProcessing.page;
         reportInfo.sort = additionalProcessing.sort;
@@ -245,15 +257,22 @@ export const formatRowsFromReport = (report, xAxisField, xAxisFormat) => {
     if (!report.rows || !report.columns) {
         return [];
     }
+    const columns = report.includeCustomFields &&
+        report.columnsWithCustomFields &&
+        !report.pivot
+        ? report.columnsWithCustomFields
+        : report.columns;
     return report.rows.map((row) => {
-        return report.columns.reduce((formattedRow, column) => {
+        return columns.reduce((formattedRow, column) => {
             // Apply the format function to each field in the row
-            const formattedValue = quillFormat({
-                value: row[column.field],
-                format: column.field === xAxisField && xAxisFormat
-                    ? xAxisFormat
-                    : column.format,
-            });
+            const formattedValue = column.inferFormat
+                ? quillAutoFormat(row[column.field])
+                : quillFormat({
+                    value: row[column.field],
+                    format: column.field === xAxisField && xAxisFormat
+                        ? xAxisFormat
+                        : column.format,
+                });
             formattedRow[column.field] = formattedValue;
             return formattedRow;
         }, {});
@@ -269,7 +288,8 @@ export function convertInternalReportToReport(report, dashboardFilters, initiato
         };
         if (formattedReport.pivot &&
             isValidPivot(formattedReport.pivot).valid &&
-            initiator !== 'useQuill') {
+            initiator !== 'useQuill' &&
+            initiator !== 'Table') {
             let columns = report.pivotColumns ?? report.columns;
             let rows = report.pivotRows ?? report.rows;
             if (report.chartType === 'table') {
@@ -343,7 +363,7 @@ export const fetchReportBuilderDataFromAST = async ({ baseAst, formData, schema,
         if (!table || !tableInfo) {
             throw new Error('No table found');
         }
-        const tableData = await fetchTableByAST({ ...baseAst, where: formData }, client, tenants, processing ?? { page: DEFAULT_PAGINATION }, undefined, skipRowCount, undefined, dashboardName);
+        const tableData = await fetchTableByAST({ ...baseAst, where: formData }, client, tenants, processing ?? { page: DEFAULT_PAGINATION }, customFields, skipRowCount, undefined, dashboardName);
         if (tableData.error) {
             throw new Error(tableData.error);
         }
@@ -371,6 +391,8 @@ export const fetchReportBuilderDataFromAST = async ({ baseAst, formData, schema,
                 };
             }),
             columnInternal: tableData.columns,
+            referenceLines: report?.referenceLines,
+            referenceLineYValues: report?.referenceLineYValues,
         };
         if (table !== currentTable || previousFormData !== formData) {
             const queryResult = await fetchSqlQuery({
@@ -411,7 +433,7 @@ export const fetchReportBuilderDataFromAST = async ({ baseAst, formData, schema,
                 }
                 if (!Object.values(relevantInfo.uniqueStrings[table] ?? {}).length ||
                     !equal(formData, previousFormData)) {
-                    relevantInfo.uniqueStrings[table] = await getUniqueStringValues(tableInfo.columns.filter((column) => column.field === pivot?.columnField), table, client, tenants, customFields, undefined, undefined, query ? query : (report?.queryString ?? ''));
+                    relevantInfo.uniqueStrings[table] = await getUniqueStringValues(tableInfo.columns.filter((column) => column.field === pivot?.columnField), table, client, tenants, customFields, undefined, undefined, query ? query : (report?.queryString ?? ''), report?.dashboardName);
                 }
                 newPivotData = await generatePivotTable({
                     pivot,

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

@@ -1,8 +1,33 @@
 import { QuillProviderClient } from '../models/Client';
+import { ColumnInternal } from '../models/Columns';
+import { CustomField } from '../models/Schema';
 import { Table } from '../models/Tables';
-export declare const getCustomFieldInfo: (client: QuillProviderClient, caller?: string) => Promise<any[]>;
-export declare const getSchemaInfo: (client: QuillProviderClient, caller?: string, tableIds?: string[]) => Promise<{
+export declare const getCustomFieldInfo: ({ client, tenants, caller, abortSignal, }: {
+    client: QuillProviderClient;
+    tenants: {
+        tenantField: string;
+        tenantIds: (string | number)[];
+    }[] | (string | number)[];
+    caller?: string;
+    abortSignal?: AbortSignal;
+}) => Promise<{
+    [tableName: string]: CustomField[];
+} | null>;
+export declare const getSchemaInfo: ({ client, caller, tenants, tableIds, abortSignal, }: {
+    client: QuillProviderClient;
+    tenants?: {
+        tenantField: string;
+        tenantIds: (string | number)[];
+    }[] | (string | number)[];
+    caller?: string;
+    tableIds?: string[];
+    abortSignal?: AbortSignal;
+}) => Promise<{
     schemaData: Table[];
-    customFieldsByTable: any;
+    customFieldsByTable: {
+        [tableName: string]: CustomField[];
+    } | null;
+    schemaWithCustomFields: Table[];
 }>;
+export declare const customFieldToColumnInternal: (customField: CustomField) => ColumnInternal;
 //# sourceMappingURL=schema.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AA0BzC,eAAO,MAAM,kBAAkB,WACrB,mBAAmB,oCAmF5B,CAAC;AAEF,eAAO,MAAM,aAAa,WAChB,mBAAmB,8BAEhB,MAAM,EAAE,KAClB,OAAO,CAAC;IAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IAAC,mBAAmB,EAAE,GAAG,CAAA;CAAE,CAqD3D,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AA8BzC,eAAO,MAAM,kBAAkB,8CAK5B;IACD,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,EACH;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,KAAG,OAAO,CAAC;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;CAAE,GAAG,IAAI,CAmFxD,CAAC;AAEF,eAAO,MAAM,aAAa,wDAMvB;IACD,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,CAAC,EACJ;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,KAAG,OAAO,CAAC;IACV,UAAU,EAAE,KAAK,EAAE,CAAC;IACpB,mBAAmB,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IACnE,sBAAsB,EAAE,KAAK,EAAE,CAAC;CACjC,CAiEA,CAAC;AA0BF,eAAO,MAAM,2BAA2B,gBACzB,WAAW,KACvB,cAaF,CAAC"}

package/dist/esm/utils/schema.js

@@ -1,4 +1,4 @@
-import { convertColumnInfoToColumnInternal } from './columnProcessing';
+import { convertColumnInfoToColumnInternal, fieldTypeToDataTypeID, isNumberType, } from './columnProcessing';
 const parseResponse = (results) => {
     if (results.data?.data) {
         if (results.data.data.queries &&
@@ -20,14 +20,16 @@ const parseResponse = (results) => {
         }
     }
 };
-export const getCustomFieldInfo = async (client, caller = 'se') => {
-    let customFieldsByTableUnique = [];
+export const getCustomFieldInfo = async ({ client, tenants, caller = 'se', abortSignal, }) => {
+    let customFieldsByTableUniqueRows = [];
     try {
-        const { queryEndpoint, queryHeaders, publicKey, databaseType, } = client;
-        if ((databaseType && databaseType.toLowerCase() !== 'postgresql') ||
-            !['665610862cf7a3000be66453'].includes(publicKey)) {
-            throw new Error('CUSTOM FIELDS IS ONLY ALLOWED FOR POSTGRESQL DATABASES');
-        }
+        const { queryEndpoint, queryHeaders, publicKey, databaseType } = client;
+        // if (
+        //   (databaseType && databaseType.toLowerCase() !== 'postgresql') ||
+        //   !['665610862cf7a3000be66453'].includes(publicKey)
+        // ) {
+        //   throw new Error('CUSTOM FIELDS IS ONLY ALLOWED FOR POSTGRESQL DATABASES');
+        // }
         const response = await fetch(`${queryEndpoint}?cfr-${caller}`, {
             method: 'POST',
             headers: {
@@ -39,10 +41,12 @@ export const getCustomFieldInfo = async (client, caller = 'se') => {
                 metadata: {
                     clientId: publicKey,
                     publicKey,
-                    task: 'custom-field-records',
+                    tenants,
+                    task: 'custom-fields',
                     databaseType: databaseType,
                 },
             }),
+            signal: abortSignal,
         });
         const result = await response.json();
         const extractedData = parseResponse(result);
@@ -53,49 +57,66 @@ export const getCustomFieldInfo = async (client, caller = 'se') => {
             }
             table.rows.forEach((row) => {
                 customFieldsByTable.push({
-                    view_name: table.name,
-                    ref_table: row.ref_table,
+                    viewName: table.name,
+                    refTable: row.ref_table,
                     field: row.field,
-                    ref_column: row.ref_column,
+                    refColumn: row.ref_column,
                     type: row.type,
+                    refField: row.ref_table_id_field,
                 });
             });
         });
         // make sure the are no duplicate records in extractedData
         const customFieldsByTableSet = new Set();
-        customFieldsByTableUnique = customFieldsByTable.filter((item) => {
-            if (customFieldsByTableSet.has(item.view_name +
-                item.ref_table +
+        customFieldsByTableUniqueRows = customFieldsByTable.filter((item) => {
+            if (customFieldsByTableSet.has(item.viewName +
+                item.refTable +
+                item.refField +
                 item.field +
-                item.ref_column +
+                item.refColumn +
                 item.type)) {
                 return false;
             }
-            customFieldsByTableSet.add(item.view_name +
-                item.ref_table +
-                item.field +
-                item.ref_column +
-                item.type);
+            customFieldsByTableSet.add(item.viewName + item.refTable + item.refField + item.field + item.refColumn + item.type);
             return true;
         });
     }
     catch (e) {
-        return customFieldsByTableUnique;
+        return null;
     }
+    const customFieldsByTableUnique = customFieldsByTableUniqueRows
+        ? customFieldsByTableUniqueRows.reduce((acc, row) => {
+            if (!acc[row.viewName]) {
+                acc[row.viewName] = [];
+            }
+            acc[row.viewName]?.push(row);
+            return acc;
+        }, {})
+        : {};
     return customFieldsByTableUnique;
 };
-export const getSchemaInfo = async (client, caller = 'se', tableIds) => {
-    const { queryEndpoint, queryHeaders, publicKey, withCredentials, } = client;
-    // TODO: Make custom fields work
-    // let customFieldsByTableUnique: any[] = [];
-    // let getCustomFields = true;
-    // if (!organizationId || organizationId !== '*') {
-    //   try {
-    //     customFieldsByTableUnique = await getCustomFieldInfo(client, caller);
-    //   } catch (e) {
-    //     getCustomFields = false;
-    //   }
-    // }
+export const getSchemaInfo = async ({ client, caller = 'se', tenants, tableIds, abortSignal, }) => {
+    const { queryEndpoint, queryHeaders, publicKey, withCredentials } = client;
+    let customFieldsByTableUnique = null;
+    if (client.featureFlags?.customFieldsEnabled &&
+        tenants &&
+        tenants[0] !== 'QUILL_ALL_TENANTS' &&
+        tenants.length === 1 &&
+        (typeof tenants[0] !== 'object' ||
+            (tenants[0].tenantIds?.[0] !== 'QUILL_ALL_TENANTS' &&
+                tenants[0].tenantIds?.length === 1))) {
+        try {
+            customFieldsByTableUnique = await getCustomFieldInfo({
+                client,
+                tenants,
+                caller,
+                abortSignal,
+            });
+        }
+        catch (e) {
+            console.error('Error fetching custom fields', e);
+        }
+    }
     const response = await fetch(`${queryEndpoint}?schema-${caller}`, {
         method: 'POST',
         headers: {
@@ -109,26 +130,28 @@ export const getSchemaInfo = async (client, caller = 'se', tableIds) => {
                 publicKey: publicKey,
                 task: 'schema',
                 removeCustomerField: true,
-                getCustomFields: false,
-                // !client.organizationId ||
-                // client.organizationId === '*' ||
-                // (customFieldsByTableUnique.length === 0 && !getCustomFields)
-                //   ? false
-                //   : true,
+                removeCustomFieldRef: true,
                 tableIds,
-                // customFieldsByTable: customFieldsByTableUnique,
+                customFieldsByTable: customFieldsByTableUnique,
+                useNewCustomFields: true,
                 gatherSchemaData: '665610862cf7a3000be66453' === publicKey ? true : false,
+                tenants,
             },
+            signal: abortSignal,
         }),
     });
     const result = await response.json();
     const parsedData = parseResponse(result);
     const converted = convertSchemaInfoToTable(parsedData);
     // triggerSoftUpdate(client, converted);
+    const schemaWithCustomFields = converted.map((table) => {
+        const customFieldRows = (customFieldsByTableUnique?.[table.name] ?? []).map((customField) => customFieldToColumnInternal(customField));
+        return { ...table, columns: [...table.columns, ...customFieldRows] };
+    });
     return {
         schemaData: converted,
-        // customFieldsByTable: customFieldsByTableUnique,
-        customFieldsByTable: [],
+        customFieldsByTable: customFieldsByTableUnique,
+        schemaWithCustomFields,
     };
 };
 // Used to convert backend data to front end data
@@ -154,3 +177,15 @@ function convertSchemaInfoToTable(schemaData) {
     });
     return tables;
 }
+export const customFieldToColumnInternal = (customField) => {
+    return {
+        field: customField.field,
+        label: customField.field,
+        format: isNumberType(customField.type || 'varchar')
+            ? 'whole_number'
+            : 'string', // ex. 'whole_number'
+        fieldType: customField.type || 'varchar',
+        dataTypeID: fieldTypeToDataTypeID(customField.type?.toLocaleLowerCase() || 'varchar'),
+        jsType: isNumberType(customField.type || 'varchar') ? 'number' : 'string',
+    };
+};

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

@@ -4,6 +4,7 @@ import { Column, ColumnInternal } from '../models/Columns';
 import { DashboardFilter } from '../models/Filter';
 import { Pagination } from '../models/Pagination';
 import { Pivot } from '../models/Pivot';
+import { CustomField } from '../models/Schema';
 import { DateRangesByColumn } from '../models/Tables';
 export interface AdditionalProcessing {
     sort?: {
@@ -17,7 +18,9 @@ export declare const hasColumnAlias: (columns: Column[], referencedColumns: stri
 export declare const getUniqueValuesByColumns: (columns: Column[], query: string, rows: any, client: QuillProviderClient, tenants: {
     tenantField: string;
     tenantIds: (string | number)[];
-}[] | (string | number)[] | undefined, customFields: any[], filters?: DashboardFilter[], dashboardName?: string) => Promise<{
+}[] | (string | number)[] | undefined, customFields: {
+    [table: string]: CustomField[];
+}, filters?: DashboardFilter[], dashboardName?: string) => Promise<{
     [column: string]: {
         [value: string]: boolean;
     };
@@ -41,14 +44,18 @@ export declare const getRelevantInfoFromQuery: (columns: ColumnInternal[], clien
 export declare const getCountsByColumns: (columns: Column[], query: string, client: QuillProviderClient, tenants: {
     tenantField: string;
     tenantIds: (string | number)[];
-}[] | (string | number)[] | undefined, customFields: any[], dashboardName?: string) => Promise<{
+}[] | (string | number)[] | undefined, customFields: {
+    [table: string]: CustomField[];
+}, dashboardName?: string) => Promise<{
     filteredColumns: Column[];
     exceededColumns: Column[] | undefined;
 }>;
 export declare const getQueryDateRangeByColumns: (columns: Column[], query: string, client: QuillProviderClient, tenants: {
     tenantField: string;
     tenantIds: (string | number)[];
-}[] | (string | number)[] | undefined, customFields: any[], dashboardName?: string) => Promise<{
+}[] | (string | number)[] | undefined, customFields: {
+    [table: string]: CustomField[];
+}, dashboardName?: string) => Promise<{
     [column: string]: {
         dateRange: {
             start: Date;
@@ -97,6 +104,7 @@ export declare const fetchResultsByQuery: ({ query, client, tenants, processing,
     rowCount?: number;
     error?: string;
     itemQuery?: string[];
+    referencedTables?: string[];
 }>;
 export declare const fetchResultsByReport: ({ reportId, client, tenants, processing, filters, customFields, rowsOnly, rowCountOnly, abortSignal, pivot, pivotQuery, comparisonPivotQuery, getPivotRowCount, }: {
     reportId: string;
@@ -130,6 +138,7 @@ export declare const fetchTableByAST: (ast: NodeSQLParser.Select, client: QuillP
     rowCount?: number;
     error?: string;
     itemQuery?: string[];
+    referencedTables?: string[];
 }>;
 export declare const convertUniqueValuesByColumnToUniqueValueStrings: (uniqueValuesByColumns: {
     [column: string]: {

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,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEhE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAoBtD,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,MAAM,CAAC;CACf;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,mBAAmB,WAEvB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACnB,SAAS,gBACC,GAAG,EAAE,YACT,eAAe,EAAE,kBACX,MAAM,KACrB,OAAO,CAAC;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAA;CAAE,GAAG,IAAI,CAiFnE,CAAC;AAEF,eAAO,MAAM,qBAAqB,YACvB,cAAc,EAAE,aACd,MAAM,UACT,GAAG,WAEP;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACnB,SAAS,iBACE,GAAG,yBACK,GAAG,wBACJ,OAAO,UACrB,MAAM,kBACE,MAAM,iBAyDvB,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,cAAc,EAAE,UACjB,mBAAmB,WAEvB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACnB,SAAS,SACN,MAAM,iBACE,GAAG,kBACF,MAAM,KACrB,OAAO,CAAC;IACT,aAAa,CAAC,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG;YAAE,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;SAAE,CAAA;KAAE,CAAC;IACnE,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CA+DA,CAAC;AAEF,eAAO,MAAM,kBAAkB,YACpB,MAAM,EAAE,SACV,MAAM,UACL,mBAAmB,WAEvB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACnB,SAAS,gBACC,GAAG,EAAE,kBACH,MAAM,KACrB,OAAO,CAAC;IACT,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CACvC,CAsDA,CAAC;AA8EF,eAAO,MAAM,0BAA0B,YAC5B,MAAM,EAAE,SACV,MAAM,UACL,mBAAmB,WAEvB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACnB,SAAS,gBACC,GAAG,EAAE,kBACH,MAAM,KACrB,OAAO,CAAC;IACT,CAAC,MAAM,EAAE,MAAM,GAAG;QAAE,SAAS,EAAE;YAAE,KAAK,EAAE,IAAI,CAAC;YAAC,GAAG,EAAE,IAAI,CAAA;SAAE,CAAA;KAAE,CAAC;CAC7D,GAAG,IAAI,CAkBP,CAAC;AA4DF,eAAO,MAAM,gBAAgB,WACnB,mBAAmB,WAEvB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACnB,SAAS,UACL,MAAM,aACH,MAAM,eACJ,oBAAoB,YACvB,GAAG,iBACE,GAAG,kBACF,MAAM,KACrB,OAAO,CAAC;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,CAsBA,CAAC;AAIF,eAAO,MAAM,mBAAmB,0KAe7B;IACD,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,EACH;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACnB,SAAS,CAAC;IACd,UAAU,CAAC,EAAE,oBAAoB,CAAC;IAClC,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACpD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;IAChE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,KAAG,OAAO,CAAC;IACV,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB,CAoHA,CAAC;AAEF,eAAO,MAAM,oBAAoB,sKAc9B;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,EACH;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACnB,SAAS,CAAC;IACd,UAAU,CAAC,EAAE,oBAAoB,CAAC;IAClC,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,KAAG,OAAO,CAAC;IACV,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CA+FA,CAAC;AAEF,eAAO,MAAM,eAAe,QACrB,aAAa,CAAC,MAAM,UACjB,mBAAmB,WAEvB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACnB,SAAS,eACA,oBAAoB,iBAClB,GAAG,aACP,OAAO,iBACH,OAAO,kBACN,MAAM,KACrB,OAAO,CAAC;IACT,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB,CAsDA,CAAC;AAEF,eAAO,MAAM,+CAA+C,0BAClC;IACtB,CAAC,MAAM,EAAE,MAAM,GAAG;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;CAChD;;CASA,CAAC"}
+{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"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"}

package/dist/esm/utils/tableProcessing.js

@@ -77,11 +77,11 @@ export const getUniqueStringValues = async (columns, tableName, client, tenants,
     const convertedStringColumns = columns.filter((column) => {
         return isStringType(column.fieldType);
     });
-    const stringNames = convertedStringColumns.map((column) => processColumnReference(column.field, client.databaseType));
+    const stringNames = convertedStringColumns.map((column) => processColumnReference(column.field, client.databaseType, undefined, true));
     const { filteredColumns: smallStringColumns, exceededColumns } = stringNames.length > 0
         ? await getCountsByColumns(convertedStringColumns, query || `Select ${stringNames.join(', ')} from ${tableName}`, client, tenants, customFields ?? [], dashboardName)
         : { filteredColumns: [], exceededColumns: undefined };
-    const smallStringNames = smallStringColumns.map((column) => processColumnReference(column.field, client.databaseType));
+    const smallStringNames = smallStringColumns.map((column) => processColumnReference(column.field, client.databaseType, undefined, true));
     const newUniqueValues = query || smallStringColumns.length > 0
         ? await getUniqueValuesByColumns(
         // returns null if data error
@@ -195,8 +195,8 @@ const fetchDistinctStrings = async (query, client, tenants, customFields, filter
                 filters,
                 // @ts-ignore
                 dateField: filters?.find((filter) => filter.filterType === 'date_range')?.dateField,
-                dashboardName: dashboardName && tenants ? dashboardName : undefined,
-                tenants: dashboardName && tenants ? tenants : undefined,
+                dashboardName,
+                tenants,
             },
         };
         const cloudBody = { query };
@@ -308,6 +308,7 @@ export const fetchResultsByQuery = async ({ query, client, tenants, processing,
     let error = undefined;
     let rowCount = undefined;
     let itemQuery = undefined;
+    let referencedTables = undefined;
     try {
         if (pivot) {
             const pivotData = await generatePivotWithSQL({
@@ -333,7 +334,6 @@ export const fetchResultsByQuery = async ({ query, client, tenants, processing,
                     filterMap,
                     clientId: client.publicKey,
                     databaseType: client?.databaseType,
-                    getCustomFields: !!tenants?.length,
                     customFieldsByTable: customFields,
                     additionalProcessing: processing,
                     useUpdatedDataGathering: processing ? true : false,
@@ -399,6 +399,20 @@ export const fetchResultsByQuery = async ({ query, client, tenants, processing,
             columns = resp.fields.map((elem) => convertPostgresColumn(elem));
             rows = resp.rows;
             itemQuery = resp.itemQuery;
+            referencedTables = resp.referencedTables;
+            if (customFields) {
+                const tables = referencedTables ?? [];
+                tables.forEach((table) => {
+                    const _customFields = customFields?.[table] ?? [];
+                    columns.forEach((col) => {
+                        if (_customFields.some((field) => {
+                            return field.field === col.field;
+                        })) {
+                            col.inferFormat = true;
+                        }
+                    });
+                });
+            }
         }
     }
     catch (e) {
@@ -409,7 +423,7 @@ export const fetchResultsByQuery = async ({ query, client, tenants, processing,
     if (client.databaseType && client.databaseType.toLowerCase() === 'bigquery') {
         parseValueFromBigQueryDates(rows, columns);
     }
-    return { rows, columns, rowCount, error, itemQuery };
+    return { rows, columns, rowCount, error, itemQuery, referencedTables };
 };
 export const fetchResultsByReport = async ({ reportId, client, tenants, processing, filters, customFields, rowsOnly, rowCountOnly, abortSignal, pivot, pivotQuery, comparisonPivotQuery, getPivotRowCount = true, }) => {
     if (pivot && pivotQuery) {
@@ -503,6 +517,7 @@ export const fetchTableByAST = async (ast, client, tenants, processing, customFi
     let rowCount;
     let error;
     let itemQuery;
+    let referencedTables;
     try {
         const hostedBody = {
             metadata: {
@@ -510,7 +525,6 @@ export const fetchTableByAST = async (ast, client, tenants, processing, customFi
                 ast,
                 publicKey: client.publicKey,
                 task: 'patterns',
-                getCustomFields: false,
                 customFields,
                 additionalProcessing: processing,
                 useUpdatedDataGathering: true,
@@ -534,6 +548,20 @@ export const fetchTableByAST = async (ast, client, tenants, processing, customFi
         columns = resp.fields.map((elem) => convertPostgresColumn(elem));
         rows = gatheredRows;
         itemQuery = resp.itemQuery;
+        referencedTables = resp.referencedTables;
+        if (customFields) {
+            const tables = referencedTables ?? [];
+            tables.forEach((table) => {
+                const _customFields = customFields?.[table] ?? [];
+                columns.forEach((col) => {
+                    if (_customFields.some((field) => {
+                        return field.field === col.field;
+                    })) {
+                        col.inferFormat = true;
+                    }
+                });
+            });
+        }
     }
     catch (e) {
         rows = [];
@@ -544,7 +572,7 @@ export const fetchTableByAST = async (ast, client, tenants, processing, customFi
     if (client.databaseType && client.databaseType.toLowerCase() === 'bigquery') {
         parseValueFromBigQueryDates(rows, columns);
     }
-    return { rows, columns, rowCount, error, itemQuery };
+    return { rows, columns, rowCount, error, itemQuery, referencedTables };
 };
 export const convertUniqueValuesByColumnToUniqueValueStrings = (uniqueValuesByColumns) => {
     return Object.keys(uniqueValuesByColumns).reduce((acc, column) => {

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

@@ -1 +1 @@
-{"version":3,"file":"textProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/textProcessing.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQhD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAsE1F;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,UAa/C;AAED,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,MAAM,UAkBvD;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,UAK7C"}
+{"version":3,"file":"textProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/textProcessing.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQhD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAsE1F;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,UAa/C;AAED,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,MAAM,UAiBvD;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,UAK7C"}

package/dist/esm/utils/textProcessing.js

@@ -83,7 +83,6 @@ export function snakeCaseToTitleCase(str) {
 }
 export function snakeAndCamelCaseToTitleCase(str) {
     if (!str || typeof str !== 'string') {
-        console.log('str', str, typeof str);
         return str;
     }
     if (str.includes('_')) {

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

@@ -23,6 +23,7 @@ export declare const quillFormat: ({ value, format, }: {
     value: any;
     format: string;
 }) => string;
+export declare const quillAutoFormat: (value: any) => string;
 export declare function getValidDate(dateString: string): Date | undefined;
 export declare const compareValues: (a: {
     [key: string]: any;

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

@@ -1 +1 @@
-{"version":3,"file":"valueFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/valueFormatter.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,MAAM,KAAK,GAAG;IAClB,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;IAChB,SAAS,CAAC,EAAE;QAAE,KAAK,EAAE,IAAI,CAAC;QAAC,GAAG,EAAE,IAAI,CAAA;KAAE,CAAC;IACvC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAQ7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,UAO/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,uDAMxB,KAAK,KAAG,MA8CV,CAAC;AAEF,eAAO,MAAM,WAAW,uBAGrB;IACD,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;CAChB,KAAG,MAkDH,CAAC;AAgPF,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,oBAG9C;AAED,eAAO,MAAM,aAAa,MACrB;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,KACtB;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,UACjB,MAAM,KACb,MAkDF,CAAC"}
+{"version":3,"file":"valueFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/valueFormatter.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,MAAM,KAAK,GAAG;IAClB,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;IAChB,SAAS,CAAC,EAAE;QAAE,KAAK,EAAE,IAAI,CAAC;QAAC,GAAG,EAAE,IAAI,CAAA;KAAE,CAAC;IACvC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAQ7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,UAO/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,uDAMxB,KAAK,KAAG,MA8CV,CAAC;AAEF,eAAO,MAAM,WAAW,uBAGrB;IACD,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;CAChB,KAAG,MAkDH,CAAC;AAEF,eAAO,MAAM,eAAe,UAAW,GAAG,KAAG,MA+D5C,CAAC;AAgPF,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,oBAG9C;AAED,eAAO,MAAM,aAAa,MACrB;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,KACtB;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,UACjB,MAAM,KACb,MAkDF,CAAC"}