@quillsql/react 2.16.74 → 2.16.76

package/dist/index.cjs

@@ -63264,7 +63264,7 @@ async function loadReportForUseForm({
       draftSessionId
     });
     const pivotRows = pivotResult.report?.pivotRows;
-    const rowField = effectivePivot?.rowField;
+    const rowField = pivotResult.report?.pivotResultRowField ?? effectivePivot?.rowField;
     const rowFieldTrimmed = String(rowField ?? "").trim();
     const hasRowBucketKey = !rowFieldTrimmed || Array.isArray(pivotRows) && pivotRows.some(
       (row) => row && typeof row === "object" && Object.prototype.hasOwnProperty.call(row, rowFieldTrimmed)
@@ -63671,6 +63671,31 @@ function useReport(reportIdArg, options = {}) {
     () => getSchemaForeignKeyMapping(schemaForReportBuilderState),
     [schemaForReportBuilderState]
   );
+  const datasourceJoinOptionsByTable = (0, import_react61.useMemo)(() => {
+    const tableNames = new Set(
+      schemaForReportBuilderState.map((table2) => String(table2.name ?? "").trim()).filter(Boolean)
+    );
+    const compatibleByTable = new Map(
+      Array.from(tableNames, (tableName) => [tableName, /* @__PURE__ */ new Set()])
+    );
+    for (const [tableName, mappings] of Object.entries(schemaForeignKeyMap)) {
+      if (!tableNames.has(tableName)) continue;
+      for (const mapping of mappings) {
+        const foreignTableName = String(mapping.foreignTable ?? "").trim();
+        if (!foreignTableName || foreignTableName === tableName || !tableNames.has(foreignTableName)) {
+          continue;
+        }
+        compatibleByTable.get(tableName)?.add(foreignTableName);
+        compatibleByTable.get(foreignTableName)?.add(tableName);
+      }
+    }
+    return new Map(
+      Array.from(compatibleByTable, ([tableName, compatibleTables]) => [
+        tableName,
+        Array.from(compatibleTables)
+      ])
+    );
+  }, [schemaForReportBuilderState, schemaForeignKeyMap]);
   const reportBuilderBaseTableNamesKey = (sourceReport?.reportBuilderState?.tables ?? []).map((t) => String(t?.name ?? "").trim()).filter(Boolean).join("\0") ?? "";
   const selectedBaseTableNamesForFieldOptions = (0, import_react61.useMemo)(() => {
     const fromPicker = schemaDatasourceIds?.map((id) => String(id ?? "").trim()).filter(Boolean) ?? [];
@@ -63757,9 +63782,6 @@ function useReport(reportIdArg, options = {}) {
     queryColumnsBootstrapKey
   ]);
   const datasourceOptions = (0, import_react61.useMemo)(() => {
-    const tableNames = new Set(
-      schemaForReportBuilderState.map((table2) => String(table2.name ?? "").trim()).filter(Boolean)
-    );
     const seen = /* @__PURE__ */ new Set();
     const result = [];
     for (const table2 of schemaForReportBuilderState) {
@@ -63769,16 +63791,11 @@ function useReport(reportIdArg, options = {}) {
       result.push({
         value: name2,
         label: toTitleCaseLabel(name2),
-        joinOptions: getJoinCompatibleTableNames(
-          [name2],
-          schemaForeignKeyMap
-        ).filter(
-          (candidate) => candidate !== name2 && tableNames.has(candidate)
-        )
+        joinOptions: datasourceJoinOptionsByTable.get(name2) ?? []
       });
     }
     return result;
-  }, [schemaForReportBuilderState, schemaForeignKeyMap]);
+  }, [schemaForReportBuilderState, datasourceJoinOptionsByTable]);
   const queryBuilderFieldConfigByName = (0, import_react61.useMemo)(() => {
     const configByName = buildQueryBuilderFieldConfigByName(
       schemaForReportBuilderState

package/dist/index.js

@@ -63476,7 +63476,7 @@ async function loadReportForUseForm({
       draftSessionId
     });
     const pivotRows = pivotResult.report?.pivotRows;
-    const rowField = effectivePivot?.rowField;
+    const rowField = pivotResult.report?.pivotResultRowField ?? effectivePivot?.rowField;
     const rowFieldTrimmed = String(rowField ?? "").trim();
     const hasRowBucketKey = !rowFieldTrimmed || Array.isArray(pivotRows) && pivotRows.some(
       (row) => row && typeof row === "object" && Object.prototype.hasOwnProperty.call(row, rowFieldTrimmed)
@@ -63883,6 +63883,31 @@ function useReport(reportIdArg, options = {}) {
     () => getSchemaForeignKeyMapping(schemaForReportBuilderState),
     [schemaForReportBuilderState]
   );
+  const datasourceJoinOptionsByTable = useMemo33(() => {
+    const tableNames = new Set(
+      schemaForReportBuilderState.map((table2) => String(table2.name ?? "").trim()).filter(Boolean)
+    );
+    const compatibleByTable = new Map(
+      Array.from(tableNames, (tableName) => [tableName, /* @__PURE__ */ new Set()])
+    );
+    for (const [tableName, mappings] of Object.entries(schemaForeignKeyMap)) {
+      if (!tableNames.has(tableName)) continue;
+      for (const mapping of mappings) {
+        const foreignTableName = String(mapping.foreignTable ?? "").trim();
+        if (!foreignTableName || foreignTableName === tableName || !tableNames.has(foreignTableName)) {
+          continue;
+        }
+        compatibleByTable.get(tableName)?.add(foreignTableName);
+        compatibleByTable.get(foreignTableName)?.add(tableName);
+      }
+    }
+    return new Map(
+      Array.from(compatibleByTable, ([tableName, compatibleTables]) => [
+        tableName,
+        Array.from(compatibleTables)
+      ])
+    );
+  }, [schemaForReportBuilderState, schemaForeignKeyMap]);
   const reportBuilderBaseTableNamesKey = (sourceReport?.reportBuilderState?.tables ?? []).map((t) => String(t?.name ?? "").trim()).filter(Boolean).join("\0") ?? "";
   const selectedBaseTableNamesForFieldOptions = useMemo33(() => {
     const fromPicker = schemaDatasourceIds?.map((id) => String(id ?? "").trim()).filter(Boolean) ?? [];
@@ -63969,9 +63994,6 @@ function useReport(reportIdArg, options = {}) {
     queryColumnsBootstrapKey
   ]);
   const datasourceOptions = useMemo33(() => {
-    const tableNames = new Set(
-      schemaForReportBuilderState.map((table2) => String(table2.name ?? "").trim()).filter(Boolean)
-    );
     const seen = /* @__PURE__ */ new Set();
     const result = [];
     for (const table2 of schemaForReportBuilderState) {
@@ -63981,16 +64003,11 @@ function useReport(reportIdArg, options = {}) {
       result.push({
         value: name2,
         label: toTitleCaseLabel(name2),
-        joinOptions: getJoinCompatibleTableNames(
-          [name2],
-          schemaForeignKeyMap
-        ).filter(
-          (candidate) => candidate !== name2 && tableNames.has(candidate)
-        )
+        joinOptions: datasourceJoinOptionsByTable.get(name2) ?? []
       });
     }
     return result;
-  }, [schemaForReportBuilderState, schemaForeignKeyMap]);
+  }, [schemaForReportBuilderState, datasourceJoinOptionsByTable]);
   const queryBuilderFieldConfigByName = useMemo33(() => {
     const configByName = buildQueryBuilderFieldConfigByName(
       schemaForReportBuilderState

package/package.json

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