@quillsql/react 2.16.16 → 2.16.18

package/dist/index.cjs

@@ -378,7 +378,7 @@ var init_constants = __esm({
   "src/utils/constants.ts"() {
     "use strict";
     MAX_PIVOT_UNIQUE_VALUES = 250;
-    QUILL_SERVER = typeof process !== "undefined" && process.env ? process.env.QUILL_SERVER_HOST ?? "https://quill-344421.uc.r.appspot.com" : "https://quill-344421.uc.r.appspot.com";
+    QUILL_SERVER = typeof process !== "undefined" && process.env ? process.env.QUILL_SERVER_HOST ?? "https://api.quill.co" : "https://api.quill.co";
     QUILL_QUERY_ENDPOINT = typeof process !== "undefined" && process.env ? process.env.QUILL_QUERY_ENDPOINT ?? "/cloud/engine" : "/cloud/engine";
     ALL_TENANTS = "QUILL_ALL_TENANTS";
     SINGLE_TENANT = "QUILL_SINGLE_TENANT";
@@ -24292,15 +24292,33 @@ var useDashboard = (dashboardName, config) => {
   const { eventTracking } = (0, import_react2.useContext)(EventTrackingContext);
   const customFiltersRef = (0, import_react2.useRef)(customReportFilters);
   const reportRequestIds = (0, import_react2.useRef)({});
+  const lastDashboardName = (0, import_react2.useRef)(null);
+  const pendingNameChangeReload = (0, import_react2.useRef)(false);
   (0, import_react2.useEffect)(() => {
     customFiltersRef.current = customReportFilters;
   }, [customReportFilters]);
   (0, import_react2.useEffect)(() => {
-    if (!isLoading && !data && initialLoad.current) {
+    const nameChanged = dashboardName !== lastDashboardName.current;
+    if (nameChanged) {
+      lastDashboardName.current = dashboardName ?? null;
+      initialLoad.current = true;
+      fetchedInitialReports.current = false;
+      backfilledDashboards.current = false;
+      reportRequestIds.current = {};
+      pendingNameChangeReload.current = true;
+    }
+    if (!dashboardName) return;
+    if (pendingNameChangeReload.current && data) {
+      pendingNameChangeReload.current = false;
+      initialLoad.current = false;
+      return;
+    }
+    if (pendingNameChangeReload.current && !isLoading && !data && initialLoad.current) {
       initialLoad.current = false;
+      pendingNameChangeReload.current = false;
       reload();
     }
-  }, [isLoading, data]);
+  }, [isLoading, data, dashboardName]);
   (0, import_react2.useEffect)(() => {
     if (backfilledDashboards.current) return;
     if (isLoading || !data) return;
@@ -24310,7 +24328,7 @@ var useDashboard = (dashboardName, config) => {
     if (!needsBackfill) return;
     backfilledDashboards.current = true;
     reload(dashboardName, false);
-  }, [isLoading, data, dashboardFilters, dashboardName, reload]);
+  }, [isLoading, data, dashboardFilters, dashboardName]);
   const { allReportsById } = useAllReports();
   const sections = (0, import_react2.useMemo)(() => {
     if (!data?.sections) return null;
@@ -43842,6 +43860,20 @@ function ChartBuilder({
     const resolvedReport = reportId && !tempReport ? allReportsById[reportId] : tempReport;
     return resolvedReport;
   }, [reportId, tempReport, allReportsById]);
+  const reportFieldsByName = (0, import_react44.useMemo)(() => {
+    const fields = report?.fields;
+    if (!fields || fields.length === 0) {
+      return {};
+    }
+    const map = {};
+    for (const f of fields) {
+      const key = f?.name ?? f?.field;
+      if (key) {
+        map[key] = f;
+      }
+    }
+    return map;
+  }, [report]);
   const [windowWidth, setWindowWidth] = (0, import_react44.useState)(1200);
   const [rows, setRows] = (0, import_react44.useState)(() => report?.rows ?? []);
   const [itemQuery, setItemQuery] = (0, import_react44.useState)(report?.itemQuery);
@@ -43872,6 +43904,19 @@ function ChartBuilder({
           return col;
         }
         const newCol = { ...col };
+        const reportField = reportFieldsByName[col.field];
+        if (reportField && typeof reportField.dataTypeID === "number") {
+          const converted = convertPostgresColumn({
+            name: col.field,
+            dataTypeID: reportField.dataTypeID
+          });
+          return {
+            ...col,
+            fieldType: col.fieldType ?? converted.fieldType,
+            jsType: col.jsType ?? converted.jsType,
+            dataTypeID: col.dataTypeID ?? converted.dataTypeID
+          };
+        }
         let foundColumn;
         schemaData.schemaWithCustomFields.forEach((table) => {
           if (table.columns) {
@@ -43884,6 +43929,18 @@ function ChartBuilder({
           }
         });
         if (!foundColumn) {
+          if (typeof col.dataTypeID === "number") {
+            const converted = convertPostgresColumn({
+              field: col.field,
+              dataTypeID: col.dataTypeID
+            });
+            return {
+              ...col,
+              fieldType: col.fieldType ?? converted.fieldType,
+              jsType: col.jsType ?? converted.jsType,
+              dataTypeID: col.dataTypeID ?? converted.dataTypeID
+            };
+          }
           return col;
         }
         newCol.fieldType = foundColumn.fieldType;
@@ -45362,6 +45419,9 @@ function ChartBuilder({
         ),
         pivotRows: selectedPivotTable?.rows || void 0,
         pivotColumns: selectedPivotTable?.columns || void 0,
+        // Preserve underlying column metadata in the in-memory cache.
+        // ChartEditor/ChartBuilder use this for Pivot form field options on edit-chart.
+        columnInternal: report?.columnInternal ?? columns ?? [],
         triggerReload: true,
         error: void 0,
         section: formData.section
@@ -45980,9 +46040,9 @@ function ChartBuilder({
                             /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(
                               SelectComponent,
                               {
-                                value: formData.pivot && isDateField(formData.pivot.rowFieldType ?? "") ? "string" : formData.xAxisFormat,
+                                value: formData.pivot && formData.xAxisField === formData.pivot.rowField && isDateField(formData.pivot.rowFieldType ?? "") ? "string" : formData.xAxisFormat,
                                 onChange: (e) => handleChange(e.target.value, "xAxisFormat"),
-                                options: formData.pivot && isDateField(formData.pivot.rowFieldType ?? "") ? [{ value: "string", label: "date" }] : xAxisFormatOptions,
+                                options: formData.pivot && formData.xAxisField === formData.pivot.rowField && isDateField(formData.pivot.rowFieldType ?? "") ? [{ value: "string", label: "date" }] : xAxisFormatOptions,
                                 width: 200,
                                 hideEmptyOption: true
                               }

package/dist/index.js

@@ -392,7 +392,7 @@ var init_constants = __esm({
   "src/utils/constants.ts"() {
     "use strict";
     MAX_PIVOT_UNIQUE_VALUES = 250;
-    QUILL_SERVER = typeof process !== "undefined" && process.env ? process.env.QUILL_SERVER_HOST ?? "https://quill-344421.uc.r.appspot.com" : "https://quill-344421.uc.r.appspot.com";
+    QUILL_SERVER = typeof process !== "undefined" && process.env ? process.env.QUILL_SERVER_HOST ?? "https://api.quill.co" : "https://api.quill.co";
     QUILL_QUERY_ENDPOINT = typeof process !== "undefined" && process.env ? process.env.QUILL_QUERY_ENDPOINT ?? "/cloud/engine" : "/cloud/engine";
     ALL_TENANTS = "QUILL_ALL_TENANTS";
     SINGLE_TENANT = "QUILL_SINGLE_TENANT";
@@ -24312,15 +24312,33 @@ var useDashboard = (dashboardName, config) => {
   const { eventTracking } = useContext(EventTrackingContext);
   const customFiltersRef = useRef2(customReportFilters);
   const reportRequestIds = useRef2({});
+  const lastDashboardName = useRef2(null);
+  const pendingNameChangeReload = useRef2(false);
   useEffect2(() => {
     customFiltersRef.current = customReportFilters;
   }, [customReportFilters]);
   useEffect2(() => {
-    if (!isLoading && !data && initialLoad.current) {
+    const nameChanged = dashboardName !== lastDashboardName.current;
+    if (nameChanged) {
+      lastDashboardName.current = dashboardName ?? null;
+      initialLoad.current = true;
+      fetchedInitialReports.current = false;
+      backfilledDashboards.current = false;
+      reportRequestIds.current = {};
+      pendingNameChangeReload.current = true;
+    }
+    if (!dashboardName) return;
+    if (pendingNameChangeReload.current && data) {
+      pendingNameChangeReload.current = false;
+      initialLoad.current = false;
+      return;
+    }
+    if (pendingNameChangeReload.current && !isLoading && !data && initialLoad.current) {
       initialLoad.current = false;
+      pendingNameChangeReload.current = false;
       reload();
     }
-  }, [isLoading, data]);
+  }, [isLoading, data, dashboardName]);
   useEffect2(() => {
     if (backfilledDashboards.current) return;
     if (isLoading || !data) return;
@@ -24330,7 +24348,7 @@ var useDashboard = (dashboardName, config) => {
     if (!needsBackfill) return;
     backfilledDashboards.current = true;
     reload(dashboardName, false);
-  }, [isLoading, data, dashboardFilters, dashboardName, reload]);
+  }, [isLoading, data, dashboardFilters, dashboardName]);
   const { allReportsById } = useAllReports();
   const sections = useMemo2(() => {
     if (!data?.sections) return null;
@@ -43999,6 +44017,20 @@ function ChartBuilder({
     const resolvedReport = reportId && !tempReport ? allReportsById[reportId] : tempReport;
     return resolvedReport;
   }, [reportId, tempReport, allReportsById]);
+  const reportFieldsByName = useMemo21(() => {
+    const fields = report?.fields;
+    if (!fields || fields.length === 0) {
+      return {};
+    }
+    const map = {};
+    for (const f of fields) {
+      const key = f?.name ?? f?.field;
+      if (key) {
+        map[key] = f;
+      }
+    }
+    return map;
+  }, [report]);
   const [windowWidth, setWindowWidth] = useState29(1200);
   const [rows, setRows] = useState29(() => report?.rows ?? []);
   const [itemQuery, setItemQuery] = useState29(report?.itemQuery);
@@ -44029,6 +44061,19 @@ function ChartBuilder({
           return col;
         }
         const newCol = { ...col };
+        const reportField = reportFieldsByName[col.field];
+        if (reportField && typeof reportField.dataTypeID === "number") {
+          const converted = convertPostgresColumn({
+            name: col.field,
+            dataTypeID: reportField.dataTypeID
+          });
+          return {
+            ...col,
+            fieldType: col.fieldType ?? converted.fieldType,
+            jsType: col.jsType ?? converted.jsType,
+            dataTypeID: col.dataTypeID ?? converted.dataTypeID
+          };
+        }
         let foundColumn;
         schemaData.schemaWithCustomFields.forEach((table) => {
           if (table.columns) {
@@ -44041,6 +44086,18 @@ function ChartBuilder({
           }
         });
         if (!foundColumn) {
+          if (typeof col.dataTypeID === "number") {
+            const converted = convertPostgresColumn({
+              field: col.field,
+              dataTypeID: col.dataTypeID
+            });
+            return {
+              ...col,
+              fieldType: col.fieldType ?? converted.fieldType,
+              jsType: col.jsType ?? converted.jsType,
+              dataTypeID: col.dataTypeID ?? converted.dataTypeID
+            };
+          }
           return col;
         }
         newCol.fieldType = foundColumn.fieldType;
@@ -45519,6 +45576,9 @@ function ChartBuilder({
         ),
         pivotRows: selectedPivotTable?.rows || void 0,
         pivotColumns: selectedPivotTable?.columns || void 0,
+        // Preserve underlying column metadata in the in-memory cache.
+        // ChartEditor/ChartBuilder use this for Pivot form field options on edit-chart.
+        columnInternal: report?.columnInternal ?? columns ?? [],
         triggerReload: true,
         error: void 0,
         section: formData.section
@@ -46137,9 +46197,9 @@ function ChartBuilder({
                             /* @__PURE__ */ jsx66(
                               SelectComponent,
                               {
-                                value: formData.pivot && isDateField(formData.pivot.rowFieldType ?? "") ? "string" : formData.xAxisFormat,
+                                value: formData.pivot && formData.xAxisField === formData.pivot.rowField && isDateField(formData.pivot.rowFieldType ?? "") ? "string" : formData.xAxisFormat,
                                 onChange: (e) => handleChange(e.target.value, "xAxisFormat"),
-                                options: formData.pivot && isDateField(formData.pivot.rowFieldType ?? "") ? [{ value: "string", label: "date" }] : xAxisFormatOptions,
+                                options: formData.pivot && formData.xAxisField === formData.pivot.rowField && isDateField(formData.pivot.rowFieldType ?? "") ? [{ value: "string", label: "date" }] : xAxisFormatOptions,
                                 width: 200,
                                 hideEmptyOption: true
                               }

package/package.json

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