@quillsql/react 2.16.51 → 2.16.52

package/dist/index.cjs

@@ -61926,7 +61926,8 @@ function mergeDisplayAndSourceForTableFormats(args) {
     effectiveReportBuilderTableNames,
     scopedSchemaColumns,
     displayColumns,
-    sourceReport
+    sourceReport,
+    includeSelectedSchemaFallback
   } = args;
   const selectedTableNames = new Set(effectiveReportBuilderTableNames);
   const persistedReportColumns = Array.isArray(sourceReport?.columns) && sourceReport.columns.length > 0 ? sourceReport.columns : null;
@@ -61947,6 +61948,21 @@ function mergeDisplayAndSourceForTableFormats(args) {
       ...tableName ? { table: tableName } : {}
     };
   }).filter((column) => Boolean(column));
+  const normalizedSchemaColumns = includeSelectedSchemaFallback ? scopedSchemaColumns.filter(
+    (column) => selectedTableNames.has(String(column.table ?? "").trim())
+  ).map((column) => {
+    const field = String(column.field ?? "").trim();
+    if (!field) return null;
+    const label = String(column.label ?? "").trim() || field;
+    const format9 = String(column.format ?? "").trim() || "string";
+    const tableName = String(column.table ?? "").trim();
+    return {
+      label,
+      field,
+      format: format9,
+      ...tableName ? { table: tableName } : {}
+    };
+  }).filter((column) => Boolean(column)) : [];
   const normalizedDisplayColumns = (displayColumns ?? []).map((column) => {
     const field = String(column?.field ?? "").trim();
     if (!field) return null;
@@ -61971,7 +61987,10 @@ function mergeDisplayAndSourceForTableFormats(args) {
         sourceColumnsByKey.set(key, [column]);
       }
     };
-    for (const sourceColumn of normalizedSourceColumns) {
+    for (const sourceColumn of [
+      ...normalizedSourceColumns,
+      ...normalizedSchemaColumns
+    ]) {
       const tableName = String(sourceColumn.table ?? "").trim();
       addSourceColumnKey(sourceColumn.field, sourceColumn);
       addSourceColumnKey(sourceColumn.label, sourceColumn);
@@ -63322,6 +63341,9 @@ function useReport(reportIdArg, options = {}) {
   const [preserveSchemaWideOptions, setPreserveSchemaWideOptions] = (0, import_react61.useState)(false);
   const [initialSchemaScopedTableNames, setInitialSchemaScopedTableNames] = (0, import_react61.useState)(null);
   const [tableColumnsEditedSignature, setTableColumnsEditedSignature] = (0, import_react61.useState)(null);
+  (0, import_react61.useEffect)(() => {
+    setTableColumnsEditedSignature(null);
+  }, [effectiveReportId]);
   const [chartAxisEdits, setChartAxisEdits] = (0, import_react61.useState)({});
   const [chartVisibilityOverrides, setChartVisibilityOverrides] = (0, import_react61.useState)({});
   const [client] = (0, import_react61.useContext)(ClientContext);
@@ -66638,13 +66660,15 @@ function useReport(reportIdArg, options = {}) {
       effectiveReportBuilderTableNames,
       scopedSchemaColumns,
       displayColumns,
-      sourceReport
+      sourceReport,
+      includeSelectedSchemaFallback: tableColumnsEditedSignature !== null
     }),
     [
       effectiveReportBuilderTableNames,
       scopedSchemaColumns,
       displayColumns,
-      sourceReport
+      sourceReport,
+      tableColumnsEditedSignature
     ]
   );
   const table = (0, import_react61.useMemo)(() => {
@@ -66654,7 +66678,8 @@ function useReport(reportIdArg, options = {}) {
       effectiveReportBuilderTableNames,
       scopedSchemaColumns,
       displayColumns,
-      sourceReport
+      sourceReport,
+      includeSelectedSchemaFallback: tableColumnsEditedSignature !== null
     });
     const pivotRowFieldForTable = String(
       sourceReport?.pivot?.rowField ?? ""
@@ -66755,6 +66780,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedYAxisFieldsForDisplay,
     scopedSchemaColumns,
     sourceReport,
+    tableColumnsEditedSignature,
     pagination,
     paginationActive,
     paginationPageCount,
@@ -67249,6 +67275,17 @@ function useReport(reportIdArg, options = {}) {
   };
   applyReportChange = (nextState) => {
     const effectiveNextState = nextState;
+    const normalizedRequestedDisplayColumns = effectiveNextState.columns === void 0 ? void 0 : normalizeColumnsInput(
+      effectiveNextState.columns,
+      columnIdentifierLookup
+    );
+    const visibleDisplayColumnKeys = new Set(
+      activeTableColumnIds.map((id) => columnIdentifierLookup.get(id)).filter((column) => Boolean(column)).map((column) => toReportBuilderColumnKey(column)).filter(Boolean)
+    );
+    const addedRequestedDisplayColumns = (normalizedRequestedDisplayColumns ?? []).filter((column) => {
+      const key = toReportBuilderColumnKey(column);
+      return Boolean(key) && !visibleDisplayColumnKeys.has(key);
+    });
     if (effectiveNextState.showLegend !== void 0) {
       setChartVisibilityOverrides((previous) => ({
         ...previous,
@@ -67344,7 +67381,7 @@ function useReport(reportIdArg, options = {}) {
     dispatchFormRuntime({
       type: "APPLY_SET_REPORT",
       touchesPivotState: dispatchTouchesPivot,
-      shouldRefreshExpandedTableData: shouldRefreshExpandedTableData || isDatasourceUpdate,
+      shouldRefreshExpandedTableData: shouldRefreshExpandedTableData || isDatasourceUpdate || addedRequestedDisplayColumns.length > 0,
       queuePromoteColumnToRow,
       updater: (prev) => {
         const next = {
@@ -67410,19 +67447,8 @@ function useReport(reportIdArg, options = {}) {
           }
         }
         if (effectiveNextState.columns !== void 0) {
-          const normalizedDisplayColumns = normalizeColumnsInput(
-            effectiveNextState.columns,
-            columnIdentifierLookup
-          );
-          const previousDisplayColumnKeys = new Set(
-            next.columns.map((column) => toReportBuilderColumnKey(column)).filter(Boolean)
-          );
-          const addedDisplayColumns = normalizedDisplayColumns.filter(
-            (column) => {
-              const key = toReportBuilderColumnKey(column);
-              return Boolean(key) && !previousDisplayColumnKeys.has(key);
-            }
-          );
+          const normalizedDisplayColumns = normalizedRequestedDisplayColumns ?? [];
+          const addedDisplayColumns = addedRequestedDisplayColumns;
           next.columns = normalizedDisplayColumns;
           if (addedDisplayColumns.length > 0) {
             const queryTableNames = new Set(

package/dist/index.js

@@ -62138,7 +62138,8 @@ function mergeDisplayAndSourceForTableFormats(args) {
     effectiveReportBuilderTableNames,
     scopedSchemaColumns,
     displayColumns,
-    sourceReport
+    sourceReport,
+    includeSelectedSchemaFallback
   } = args;
   const selectedTableNames = new Set(effectiveReportBuilderTableNames);
   const persistedReportColumns = Array.isArray(sourceReport?.columns) && sourceReport.columns.length > 0 ? sourceReport.columns : null;
@@ -62159,6 +62160,21 @@ function mergeDisplayAndSourceForTableFormats(args) {
       ...tableName ? { table: tableName } : {}
     };
   }).filter((column) => Boolean(column));
+  const normalizedSchemaColumns = includeSelectedSchemaFallback ? scopedSchemaColumns.filter(
+    (column) => selectedTableNames.has(String(column.table ?? "").trim())
+  ).map((column) => {
+    const field = String(column.field ?? "").trim();
+    if (!field) return null;
+    const label = String(column.label ?? "").trim() || field;
+    const format9 = String(column.format ?? "").trim() || "string";
+    const tableName = String(column.table ?? "").trim();
+    return {
+      label,
+      field,
+      format: format9,
+      ...tableName ? { table: tableName } : {}
+    };
+  }).filter((column) => Boolean(column)) : [];
   const normalizedDisplayColumns = (displayColumns ?? []).map((column) => {
     const field = String(column?.field ?? "").trim();
     if (!field) return null;
@@ -62183,7 +62199,10 @@ function mergeDisplayAndSourceForTableFormats(args) {
         sourceColumnsByKey.set(key, [column]);
       }
     };
-    for (const sourceColumn of normalizedSourceColumns) {
+    for (const sourceColumn of [
+      ...normalizedSourceColumns,
+      ...normalizedSchemaColumns
+    ]) {
       const tableName = String(sourceColumn.table ?? "").trim();
       addSourceColumnKey(sourceColumn.field, sourceColumn);
       addSourceColumnKey(sourceColumn.label, sourceColumn);
@@ -63534,6 +63553,9 @@ function useReport(reportIdArg, options = {}) {
   const [preserveSchemaWideOptions, setPreserveSchemaWideOptions] = useState41(false);
   const [initialSchemaScopedTableNames, setInitialSchemaScopedTableNames] = useState41(null);
   const [tableColumnsEditedSignature, setTableColumnsEditedSignature] = useState41(null);
+  useEffect31(() => {
+    setTableColumnsEditedSignature(null);
+  }, [effectiveReportId]);
   const [chartAxisEdits, setChartAxisEdits] = useState41({});
   const [chartVisibilityOverrides, setChartVisibilityOverrides] = useState41({});
   const [client] = useContext36(ClientContext);
@@ -66850,13 +66872,15 @@ function useReport(reportIdArg, options = {}) {
       effectiveReportBuilderTableNames,
       scopedSchemaColumns,
       displayColumns,
-      sourceReport
+      sourceReport,
+      includeSelectedSchemaFallback: tableColumnsEditedSignature !== null
     }),
     [
       effectiveReportBuilderTableNames,
       scopedSchemaColumns,
       displayColumns,
-      sourceReport
+      sourceReport,
+      tableColumnsEditedSignature
     ]
   );
   const table = useMemo32(() => {
@@ -66866,7 +66890,8 @@ function useReport(reportIdArg, options = {}) {
       effectiveReportBuilderTableNames,
       scopedSchemaColumns,
       displayColumns,
-      sourceReport
+      sourceReport,
+      includeSelectedSchemaFallback: tableColumnsEditedSignature !== null
     });
     const pivotRowFieldForTable = String(
       sourceReport?.pivot?.rowField ?? ""
@@ -66967,6 +66992,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedYAxisFieldsForDisplay,
     scopedSchemaColumns,
     sourceReport,
+    tableColumnsEditedSignature,
     pagination,
     paginationActive,
     paginationPageCount,
@@ -67461,6 +67487,17 @@ function useReport(reportIdArg, options = {}) {
   };
   applyReportChange = (nextState) => {
     const effectiveNextState = nextState;
+    const normalizedRequestedDisplayColumns = effectiveNextState.columns === void 0 ? void 0 : normalizeColumnsInput(
+      effectiveNextState.columns,
+      columnIdentifierLookup
+    );
+    const visibleDisplayColumnKeys = new Set(
+      activeTableColumnIds.map((id) => columnIdentifierLookup.get(id)).filter((column) => Boolean(column)).map((column) => toReportBuilderColumnKey(column)).filter(Boolean)
+    );
+    const addedRequestedDisplayColumns = (normalizedRequestedDisplayColumns ?? []).filter((column) => {
+      const key = toReportBuilderColumnKey(column);
+      return Boolean(key) && !visibleDisplayColumnKeys.has(key);
+    });
     if (effectiveNextState.showLegend !== void 0) {
       setChartVisibilityOverrides((previous) => ({
         ...previous,
@@ -67556,7 +67593,7 @@ function useReport(reportIdArg, options = {}) {
     dispatchFormRuntime({
       type: "APPLY_SET_REPORT",
       touchesPivotState: dispatchTouchesPivot,
-      shouldRefreshExpandedTableData: shouldRefreshExpandedTableData || isDatasourceUpdate,
+      shouldRefreshExpandedTableData: shouldRefreshExpandedTableData || isDatasourceUpdate || addedRequestedDisplayColumns.length > 0,
       queuePromoteColumnToRow,
       updater: (prev) => {
         const next = {
@@ -67622,19 +67659,8 @@ function useReport(reportIdArg, options = {}) {
           }
         }
         if (effectiveNextState.columns !== void 0) {
-          const normalizedDisplayColumns = normalizeColumnsInput(
-            effectiveNextState.columns,
-            columnIdentifierLookup
-          );
-          const previousDisplayColumnKeys = new Set(
-            next.columns.map((column) => toReportBuilderColumnKey(column)).filter(Boolean)
-          );
-          const addedDisplayColumns = normalizedDisplayColumns.filter(
-            (column) => {
-              const key = toReportBuilderColumnKey(column);
-              return Boolean(key) && !previousDisplayColumnKeys.has(key);
-            }
-          );
+          const normalizedDisplayColumns = normalizedRequestedDisplayColumns ?? [];
+          const addedDisplayColumns = addedRequestedDisplayColumns;
           next.columns = normalizedDisplayColumns;
           if (addedDisplayColumns.length > 0) {
             const queryTableNames = new Set(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.16.51",
+  "version": "2.16.52",
   "type": "module",
   "exports": {
     ".": {