@quillsql/react 2.13.44 → 2.13.46

package/dist/esm/utils/reportBuilder.js

@@ -1,5 +1,6 @@
 import { convertASTToPivotData } from '../components/ReportBuilder/convert';
 import { deepCopy } from '../components/ReportBuilder/util';
+import { JoinType, } from '../models/ReportBuilder';
 import { astToFilterTree, filterTreeToAst, getFieldFromExpression, } from './astFilterProcessing';
 import { getDateFormatFromBucket } from './dates';
 import { filterStackToFilterTree, generateFilterStack, } from './filterProcessing';
@@ -384,3 +385,126 @@ export const setTypesOnPivot = (newPivot, searchColumns) => ({
     valueFieldType: searchColumns.find((c) => c.field === newPivot.aggregations?.[0]?.valueField)?.jsType,
     valueField2Type: searchColumns.find((c) => c.field === newPivot.aggregations?.[0]?.valueField2)?.jsType,
 });
+export const orderTablesByBestPrimaryTable = (tables, foreignKeyMap) => {
+    const getPrimaryTableMappings = (table) => {
+        const tablesMappedByPrimaryTable = [{ ...table }];
+        foreignKeyMap[table.name]?.forEach((mapping) => {
+            if (tables.some((t) => t.name === mapping.foreignTable)) {
+                tablesMappedByPrimaryTable.push({
+                    name: mapping.foreignTable,
+                    join: {
+                        type: JoinType.INNER,
+                        condition: {
+                            operator: '=',
+                            left: { field: mapping.foreignKey, table: table.name },
+                            right: {
+                                field: mapping.foreignTablePrimaryKey,
+                                table: mapping.foreignTable,
+                            },
+                        },
+                    },
+                });
+            }
+        });
+        return tablesMappedByPrimaryTable;
+    };
+    if (tables.length === 0) {
+        return [];
+    }
+    let primaryTableMappings = [];
+    tables.forEach((table) => {
+        const mappedByTable = getPrimaryTableMappings(table);
+        if (mappedByTable.length > primaryTableMappings.length) {
+            primaryTableMappings = mappedByTable;
+        }
+    });
+    return primaryTableMappings;
+};
+export const validatedReportBuilderState = (state, foreignKeyMap) => {
+    let { tables, columns, filterStack, sort } = state;
+    const { pivot, limit } = state;
+    if (columns.length === 0) {
+        return {
+            tables: [],
+            columns: [],
+            filterStack: [],
+            pivot: null,
+            sort: [],
+            limit: null,
+        };
+    }
+    const tablesReferencedInColumns = tables.filter((table) => {
+        return columns.some((col) => col.table === table.name);
+    });
+    tables = columns.some((col) => col.table === tables[0]?.name)
+        ? tablesReferencedInColumns
+        : orderTablesByBestPrimaryTable(tablesReferencedInColumns, foreignKeyMap);
+    columns = columns.filter((col) => {
+        return tables.some((table) => table.name === col.table);
+    });
+    filterStack = filterStack.filter((filter, index) => {
+        if (!filter.value) {
+            let prevFilterValid = true;
+            let nextFilterValid = true;
+            if (index === 1) {
+                const prevFilter = filterStack[0];
+                prevFilterValid =
+                    !!prevFilter.value &&
+                        columns.some((col) => col.field === prevFilter.value?.field) &&
+                        tables.some((table) => table.name === prevFilter.value?.table);
+            }
+            const nextFilter = filterStack[index + 1];
+            if (nextFilter) {
+                nextFilterValid =
+                    !!nextFilter.value &&
+                        columns.some((col) => col.field === nextFilter.value?.field) &&
+                        tables.some((table) => table.name === nextFilter.value?.table);
+            }
+            return prevFilterValid && nextFilterValid;
+        }
+        else {
+            return (columns.some((col) => col.field === filter.value?.field) &&
+                tables.some((table) => table.name === filter.value?.table));
+        }
+    });
+    sort = sort.filter((sort) => {
+        return columns.some((col) => (col.alias ?? col.field) === sort.field);
+    });
+    // If pivot is using removed columns, remove pivot
+    let removePivot = false;
+    if (pivot) {
+        const referencedColumns = [];
+        if (pivot.rowField) {
+            referencedColumns.push(pivot.rowField);
+        }
+        if (pivot.columnField) {
+            referencedColumns.push(pivot.columnField);
+        }
+        if (pivot.aggregations) {
+            pivot.aggregations.forEach((agg) => {
+                if (agg.valueField) {
+                    referencedColumns.push(agg.valueField);
+                }
+                if (agg.valueField2) {
+                    referencedColumns.push(agg.valueField2);
+                }
+            });
+        }
+        const columnMapping = referencedColumns
+            .map((col) => {
+            const column = columns.find((c) => (c.alias || c.field) === col);
+            return column;
+        })
+            .filter((c) => c !== undefined);
+        removePivot = !columnMapping.every((col) => columns.some((c) => (c.alias || c.field) === (col.alias || col.field) &&
+            c.table === col.table));
+    }
+    return {
+        tables,
+        columns,
+        filterStack,
+        pivot: removePivot ? null : pivot,
+        sort,
+        limit,
+    };
+};

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

@@ -1,3 +1,4 @@
+import { ForeignKeyMap } from '../components/ReportBuilder/schema';
 import { QuillProviderClient } from '../models/Client';
 import { ColumnInternal } from '../models/Columns';
 import { CustomField } from '../models/Schema';
@@ -30,11 +31,5 @@ export declare const getSchemaInfo: ({ client, caller, tenants, tableIds, abortS
     schemaWithCustomFields: Table[];
 }>;
 export declare const customFieldToColumnInternal: (customField: CustomField) => ColumnInternal;
-export declare const getSchemaForeignKeyMapping: (schema: Table[]) => {
-    [table: string]: {
-        foreignTable: string;
-        foreignTablePrimaryKey: string;
-        foreignKey: string;
-    }[];
-};
+export declare const getSchemaForeignKeyMapping: (schema: Table[]) => ForeignKeyMap;
 //# 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,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,CAwFxD,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,CAgEA,CAAC;AA2BF,eAAO,MAAM,2BAA2B,gBACzB,WAAW,KACvB,cAaF,CAAC;AAIF,eAAO,MAAM,0BAA0B,WAC7B,KAAK,EAAE,KACd;IACD,CAAC,KAAK,EAAE,MAAM,GAAG;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,sBAAsB,EAAE,MAAM,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,EAAE,CAAC;CAiCL,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EAEd,MAAM,oCAAoC,CAAC;AAC5C,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,CAwFxD,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,CAgEA,CAAC;AA2BF,eAAO,MAAM,2BAA2B,gBACzB,WAAW,KACvB,cAaF,CAAC;AAIF,eAAO,MAAM,0BAA0B,WAAY,KAAK,EAAE,KAAG,aA8B5D,CAAC"}

package/dist/esm/utils/schema.js

@@ -203,6 +203,10 @@ export const getSchemaForeignKeyMapping = (schema) => {
         table.columns.forEach((column) => {
             if (column.field.toLowerCase().endsWith('_id')) {
                 const foreignTableName = `${column.field.slice(0, -3)}s`;
+                if (foreignTableName === table.name) {
+                    // avoid self-referential foreign keys
+                    return;
+                }
                 const foreignTable = schema.find((t) => t.name === foreignTableName);
                 if (foreignTable &&
                     foreignTable.columns.some((c) => c.field === 'id')) {

package/package.json

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