@quillsql/react 2.16.82 → 2.16.83

package/dist/index.cjs

@@ -56310,6 +56310,25 @@ var encodeRuleField = (field, table) => {
   }
   return tableName ? `${tableName}.${fieldName}` : fieldName;
 };
+var parseRuleField = (ruleField, config) => {
+  if (config?.field) {
+    return {
+      field: config.field,
+      table: config.table
+    };
+  }
+  if (ruleField.includes(".")) {
+    const [table, ...fieldParts] = ruleField.split(".");
+    return {
+      table: config?.table ?? table,
+      field: fieldParts.join(".")
+    };
+  }
+  return {
+    table: config?.table,
+    field: ruleField
+  };
+};
 var isRelativeDateQueryBuilderOperator = (operator) => {
   const compactOperatorKey = normalizeCompactToken(
     extractOperatorToken(operator)
@@ -56468,8 +56487,12 @@ var qualifyQueryBuilderRuleGroupFields = (group, fieldConfigByName, allowedTable
   const reportQualifiedKeys = reportBuilderColumnsToQualifiedKeys(
     reportColumns ?? void 0
   );
-  const qualifyFieldName = (field) => {
+  const qualifyFieldName = (field, table) => {
     const f = String(field ?? "").trim();
+    const t = String(table ?? "").trim();
+    if (t && !f.includes(".")) {
+      return `${t}.${f}`;
+    }
     if (!f || f.includes(".")) {
       return f;
     }
@@ -56521,7 +56544,7 @@ var qualifyQueryBuilderRuleGroupFields = (group, fieldConfigByName, allowedTable
     if (isRule(entry)) {
       return {
         ...entry,
-        field: qualifyFieldName(entry.field)
+        field: qualifyFieldName(entry.field, entry.table)
       };
     }
     return entry;
@@ -61401,6 +61424,11 @@ var toNormalizedRelativeDateUnit = (rawUnit, fallbackUnit = "day") => {
   const unit = String(rawUnit ?? "").trim().toLowerCase();
   return RELATIVE_DATE_UNIT_KEYS.has(unit) ? unit : fallbackUnit;
 };
+var normalizeRelativeDateAmount = (value) => {
+  if (typeof value !== "string" || !value.trim()) return value;
+  const amount = Number(value);
+  return Number.isFinite(amount) ? amount : value;
+};
 var toRelativeDateTuple = (value, fallbackUnit = "day") => {
   if (Array.isArray(value)) {
     if (value.length >= 2) {
@@ -61470,7 +61498,7 @@ var normalizeRelativeDateRules = (nextQuery, previousQuery) => {
       previousTuple[1]
     );
     const operatorToken = normalizeOperatorToken(nextRule.operator);
-    const nextAmount = operatorToken === "inthecurrent" ? 1 : nextAmountRaw;
+    const nextAmount = operatorToken === "inthecurrent" ? 1 : normalizeRelativeDateAmount(nextAmountRaw);
     return {
       ...nextRule,
       value: [nextAmount, nextUnitRaw]
@@ -65412,6 +65440,7 @@ async function recoverFromFailedReportTaskExecution({
   if (!rebuiltState) {
     return null;
   }
+  rebuiltState.rules = fetchedReportBuilderState?.rules ?? baseReport?.reportBuilderState?.rules ?? rebuiltState.rules;
   const persistedColumns = reportColumnsFromReportBuilderState(rebuiltState);
   const recoveryBaseReport = {
     ...EMPTY_INTERNAL_REPORT,
@@ -67125,14 +67154,21 @@ function useReport(reportIdArg, options = {}) {
   );
   const filtersForQueryBuilder = (0, import_react62.useMemo)(
     () => canonicalizeMultiselectStringRulesToOptionValues(
-      queryFilters,
+      qualifyQueryBuilderRuleGroupFields(
+        queryFilters,
+        queryBuilderFieldConfigByName,
+        fieldOptionsAllowedTableNames,
+        sourceReport?.reportBuilderState?.columns
+      ),
       filterValueOptionsByFieldName,
       queryBuilderFieldConfigByName
     ),
     [
       queryFilters,
       filterValueOptionsByFieldName,
-      queryBuilderFieldConfigByName
+      queryBuilderFieldConfigByName,
+      fieldOptionsAllowedTableNames,
+      sourceReport?.reportBuilderState?.columns
     ]
   );
   const baseReportBuilderTables = sourceReport?.reportBuilderState?.tables ?? [];
@@ -67720,14 +67756,17 @@ function useReport(reportIdArg, options = {}) {
         if (entry && typeof entry === "object" && "field" in entry) {
           const previousFieldName = String(entry.field ?? "").trim();
           const ruleTableName = String(entry.table ?? "").trim();
-          const tableQualifiedKey = ruleTableName && previousFieldName && !previousFieldName.includes(".") ? `${ruleTableName}.${previousFieldName}` : "";
-          const nextFieldName = tableQualifiedKey && queryBuilderFieldConfigByName[tableQualifiedKey] ? tableQualifiedKey : normalizeQueryBuilderFieldNameForConfig(previousFieldName);
-          if (!nextFieldName || nextFieldName === previousFieldName) {
+          const editorField = ruleTableName && !previousFieldName.includes(".") ? `${ruleTableName}.${previousFieldName}` : previousFieldName;
+          const fieldKey = normalizeQueryBuilderFieldNameForConfig(editorField);
+          if (!fieldKey) {
             return entry;
           }
           return {
             ...entry,
-            field: nextFieldName
+            ...parseRuleField(
+              fieldKey,
+              queryBuilderFieldConfigByName[fieldKey]
+            )
           };
         }
         return entry;
@@ -67899,6 +67938,10 @@ function useReport(reportIdArg, options = {}) {
     resolvedGroupColumnsBy,
     resolvedGroupRowsBy
   ]);
+  const filtersForRequest = (0, import_react62.useMemo)(
+    () => normalizeQueryBuilderFiltersForConfig(queryFilters),
+    [normalizeQueryBuilderFiltersForConfig, queryFilters]
+  );
   const effectiveReportBuilderState = (0, import_react62.useMemo)(() => {
     if (!sourceReport && effectiveReportBuilderTables.length === 0) {
       return void 0;
@@ -67906,7 +67949,7 @@ function useReport(reportIdArg, options = {}) {
     return {
       tables: effectiveReportBuilderTables,
       columns: effectiveReportBuilderColumns,
-      rules: queryFilters,
+      rules: filtersForRequest,
       pivot: pivotState ? {
         ...pivotState,
         sort: Boolean(pivotSort?.sortField),
@@ -67934,7 +67977,7 @@ function useReport(reportIdArg, options = {}) {
   }, [
     effectiveReportBuilderColumns,
     effectiveReportBuilderTables,
-    queryFilters,
+    filtersForRequest,
     limit,
     pivotState,
     pivotSort,

package/dist/index.js

@@ -56468,6 +56468,25 @@ var encodeRuleField = (field, table) => {
   }
   return tableName ? `${tableName}.${fieldName}` : fieldName;
 };
+var parseRuleField = (ruleField, config) => {
+  if (config?.field) {
+    return {
+      field: config.field,
+      table: config.table
+    };
+  }
+  if (ruleField.includes(".")) {
+    const [table, ...fieldParts] = ruleField.split(".");
+    return {
+      table: config?.table ?? table,
+      field: fieldParts.join(".")
+    };
+  }
+  return {
+    table: config?.table,
+    field: ruleField
+  };
+};
 var isRelativeDateQueryBuilderOperator = (operator) => {
   const compactOperatorKey = normalizeCompactToken(
     extractOperatorToken(operator)
@@ -56626,8 +56645,12 @@ var qualifyQueryBuilderRuleGroupFields = (group, fieldConfigByName, allowedTable
   const reportQualifiedKeys = reportBuilderColumnsToQualifiedKeys(
     reportColumns ?? void 0
   );
-  const qualifyFieldName = (field) => {
+  const qualifyFieldName = (field, table) => {
     const f = String(field ?? "").trim();
+    const t = String(table ?? "").trim();
+    if (t && !f.includes(".")) {
+      return `${t}.${f}`;
+    }
     if (!f || f.includes(".")) {
       return f;
     }
@@ -56679,7 +56702,7 @@ var qualifyQueryBuilderRuleGroupFields = (group, fieldConfigByName, allowedTable
     if (isRule(entry)) {
       return {
         ...entry,
-        field: qualifyFieldName(entry.field)
+        field: qualifyFieldName(entry.field, entry.table)
       };
     }
     return entry;
@@ -61604,6 +61627,11 @@ var toNormalizedRelativeDateUnit = (rawUnit, fallbackUnit = "day") => {
   const unit = String(rawUnit ?? "").trim().toLowerCase();
   return RELATIVE_DATE_UNIT_KEYS.has(unit) ? unit : fallbackUnit;
 };
+var normalizeRelativeDateAmount = (value) => {
+  if (typeof value !== "string" || !value.trim()) return value;
+  const amount = Number(value);
+  return Number.isFinite(amount) ? amount : value;
+};
 var toRelativeDateTuple = (value, fallbackUnit = "day") => {
   if (Array.isArray(value)) {
     if (value.length >= 2) {
@@ -61673,7 +61701,7 @@ var normalizeRelativeDateRules = (nextQuery, previousQuery) => {
       previousTuple[1]
     );
     const operatorToken = normalizeOperatorToken(nextRule.operator);
-    const nextAmount = operatorToken === "inthecurrent" ? 1 : nextAmountRaw;
+    const nextAmount = operatorToken === "inthecurrent" ? 1 : normalizeRelativeDateAmount(nextAmountRaw);
     return {
       ...nextRule,
       value: [nextAmount, nextUnitRaw]
@@ -65620,6 +65648,7 @@ async function recoverFromFailedReportTaskExecution({
   if (!rebuiltState) {
     return null;
   }
+  rebuiltState.rules = fetchedReportBuilderState?.rules ?? baseReport?.reportBuilderState?.rules ?? rebuiltState.rules;
   const persistedColumns = reportColumnsFromReportBuilderState(rebuiltState);
   const recoveryBaseReport = {
     ...EMPTY_INTERNAL_REPORT,
@@ -67333,14 +67362,21 @@ function useReport(reportIdArg, options = {}) {
   );
   const filtersForQueryBuilder = useMemo33(
     () => canonicalizeMultiselectStringRulesToOptionValues(
-      queryFilters,
+      qualifyQueryBuilderRuleGroupFields(
+        queryFilters,
+        queryBuilderFieldConfigByName,
+        fieldOptionsAllowedTableNames,
+        sourceReport?.reportBuilderState?.columns
+      ),
       filterValueOptionsByFieldName,
       queryBuilderFieldConfigByName
     ),
     [
       queryFilters,
       filterValueOptionsByFieldName,
-      queryBuilderFieldConfigByName
+      queryBuilderFieldConfigByName,
+      fieldOptionsAllowedTableNames,
+      sourceReport?.reportBuilderState?.columns
     ]
   );
   const baseReportBuilderTables = sourceReport?.reportBuilderState?.tables ?? [];
@@ -67928,14 +67964,17 @@ function useReport(reportIdArg, options = {}) {
         if (entry && typeof entry === "object" && "field" in entry) {
           const previousFieldName = String(entry.field ?? "").trim();
           const ruleTableName = String(entry.table ?? "").trim();
-          const tableQualifiedKey = ruleTableName && previousFieldName && !previousFieldName.includes(".") ? `${ruleTableName}.${previousFieldName}` : "";
-          const nextFieldName = tableQualifiedKey && queryBuilderFieldConfigByName[tableQualifiedKey] ? tableQualifiedKey : normalizeQueryBuilderFieldNameForConfig(previousFieldName);
-          if (!nextFieldName || nextFieldName === previousFieldName) {
+          const editorField = ruleTableName && !previousFieldName.includes(".") ? `${ruleTableName}.${previousFieldName}` : previousFieldName;
+          const fieldKey = normalizeQueryBuilderFieldNameForConfig(editorField);
+          if (!fieldKey) {
             return entry;
           }
           return {
             ...entry,
-            field: nextFieldName
+            ...parseRuleField(
+              fieldKey,
+              queryBuilderFieldConfigByName[fieldKey]
+            )
           };
         }
         return entry;
@@ -68107,6 +68146,10 @@ function useReport(reportIdArg, options = {}) {
     resolvedGroupColumnsBy,
     resolvedGroupRowsBy
   ]);
+  const filtersForRequest = useMemo33(
+    () => normalizeQueryBuilderFiltersForConfig(queryFilters),
+    [normalizeQueryBuilderFiltersForConfig, queryFilters]
+  );
   const effectiveReportBuilderState = useMemo33(() => {
     if (!sourceReport && effectiveReportBuilderTables.length === 0) {
       return void 0;
@@ -68114,7 +68157,7 @@ function useReport(reportIdArg, options = {}) {
     return {
       tables: effectiveReportBuilderTables,
       columns: effectiveReportBuilderColumns,
-      rules: queryFilters,
+      rules: filtersForRequest,
       pivot: pivotState ? {
         ...pivotState,
         sort: Boolean(pivotSort?.sortField),
@@ -68142,7 +68185,7 @@ function useReport(reportIdArg, options = {}) {
   }, [
     effectiveReportBuilderColumns,
     effectiveReportBuilderTables,
-    queryFilters,
+    filtersForRequest,
     limit,
     pivotState,
     pivotSort,

package/package.json

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