@quillsql/react 2.16.3 → 2.16.4

package/dist/index.cjs

@@ -17152,7 +17152,6 @@ var init_astProcessing = __esm({
         }
         if (numRetries === MAX_RETRIES) {
           console.error("[Error]: Max retries exceeded.");
-          console.info(`%c[Prompt]: ${aiPrompt}`, "color: dimgray");
           throw new Error(
             "Error: Couldn't process your request, please re-word your prompt."
           );
@@ -20390,11 +20389,13 @@ async function saveReport({
       rows: void 0,
       compareRows: void 0,
       dashboardItemId,
+      ...dashboardItemId ? { reportId: dashboardItemId } : {},
       // Remove useNewNodeSql since backend will handle conversion
       clientId: publicKey,
       tenants,
       // Only include adminMode for 'create' task, not 'create-report'
-      ...isCreateTask && { adminMode }
+      ...isCreateTask && { adminMode },
+      section: report.section
     },
     getToken
   });
@@ -39001,7 +39002,6 @@ var Table_default = Table;
 
 // src/SQLEditor.tsx
 var import_react45 = require("react");
-var import_react_dom5 = require("react-dom");
 var import_react46 = __toESM(require("@monaco-editor/react"), 1);
 
 // src/ChartBuilder.tsx
@@ -42698,7 +42698,8 @@ function ChartBuilder({
   const { dashboardConfig } = (0, import_react43.useContext)(DashboardConfigContext);
   const { tenants, flags } = (0, import_react43.useContext)(TenantContext);
   const report = (0, import_react43.useMemo)(() => {
-    return reportId && !tempReport ? allReportsById[reportId] : tempReport;
+    const resolvedReport = reportId && !tempReport ? allReportsById[reportId] : tempReport;
+    return resolvedReport;
   }, [reportId, tempReport, allReportsById]);
   const [windowWidth, setWindowWidth] = (0, import_react43.useState)(1200);
   const [rows, setRows] = (0, import_react43.useState)(report?.rows ?? []);
@@ -42708,8 +42709,9 @@ function ChartBuilder({
   const [isLoading, setIsLoading] = (0, import_react43.useState)(false);
   const [rowCountIsLoading, setRowCountIsLoading] = (0, import_react43.useState)(false);
   const [isSubmitting, setIsSubmitting] = (0, import_react43.useState)(false);
-  const [pivotCardWidth, setPivotCardWidth] = (0, import_react43.useState)(665);
-  const [formWidth, setFormWidth] = (0, import_react43.useState)(665);
+  const MIN_FORM_WIDTH = 710;
+  const [pivotCardWidth, setPivotCardWidth] = (0, import_react43.useState)(MIN_FORM_WIDTH);
+  const [formWidth, setFormWidth] = (0, import_react43.useState)(MIN_FORM_WIDTH);
   const inputRef = (0, import_react43.useRef)(null);
   const selectRef = (0, import_react43.useRef)(null);
   const processColumns = (columns2) => {
@@ -42779,10 +42781,10 @@ function ChartBuilder({
         const spaceBetween = selectSize.left - inputSize.right;
         const gap = showDash ? (spaceBetween - selectWidth) / 2 : spaceBetween;
         const width = inputSize.width + 2 * gap + 2 * selectWidth;
-        setPivotCardWidth(width);
+        setPivotCardWidth(Math.max(width, MIN_FORM_WIDTH));
         const deleteSize = deleteRef.current?.getBoundingClientRect();
         const deleteWidth = deleteSize?.width ?? 0;
-        setFormWidth(width + deleteWidth);
+        setFormWidth(Math.max(width + deleteWidth, MIN_FORM_WIDTH));
       }
     };
     handleResize();
@@ -43047,23 +43049,40 @@ function ChartBuilder({
     return result;
   };
   const getReferencedTables = async (client2, dbTables, sqlQuery, reportBuilderState2, skipStar) => {
-    const { data: resp } = await quillFetchWithToken({
-      client: client2,
-      task: "astify",
-      metadata: reportBuilderState2 ? {
-        reportBuilderState: reportBuilderState2,
-        clientId: client2.clientId,
-        useNewNodeSql: true
-      } : {
-        query: sqlQuery,
-        clientId: client2.clientId,
-        useNewNodeSql: true
+    const metadata = reportBuilderState2 ? {
+      reportBuilderState: reportBuilderState2,
+      clientId: client2.clientId,
+      useNewNodeSql: true
+    } : {
+      query: sqlQuery,
+      clientId: client2.clientId,
+      useNewNodeSql: true
+    };
+    try {
+      const { data: resp } = await quillFetchWithToken({
+        client: client2,
+        task: "astify",
+        metadata
+      });
+      if (resp.success === false) {
+        return getTablesHelper(getSelectFromAST({}), dbTables, skipStar);
       }
-    });
-    if (resp.success === false) {
-      return getTablesHelper(getSelectFromAST({}), dbTables, skipStar);
+      return getTablesHelper(getSelectFromAST(resp.ast), dbTables, skipStar);
+    } catch (error) {
+      console.error(
+        "[ChartBuilder#getReferencedTables] Failed to fetch referenced tables",
+        {
+          error,
+          hasReportBuilderState: !!reportBuilderState2,
+          hasSqlQuery: !!sqlQuery,
+          skipStar: !!skipStar
+        }
+      );
+      return {
+        referencedTablesAndColumns: [],
+        dateFields: []
+      };
     }
-    return getTablesHelper(getSelectFromAST(resp.ast), dbTables, skipStar);
   };
   const getCurrentSection = () => {
     let id2 = report?.id ?? "";
@@ -44053,7 +44072,7 @@ function ChartBuilder({
       return;
     }
     let dashboardItemId = reportId ? reportId : void 0;
-    if (report && !isAdmin && formData.template) {
+    if (report && !isAdmin && formData.template && !isEditingMode) {
       dashboardItemId = void 0;
     }
     const newReport = {
@@ -46237,6 +46256,7 @@ function SQLEditor({
   onClickChartElement,
   onRequestAddVirtualTable
 }) {
+  const computedButtonLabel = addToDashboardButtonLabel === "Add to dashboard" ? reportId || report?.id ? "Save changes" : "Add to dashboard" : addToDashboardButtonLabel;
   const [sqlPrompt, setSqlPrompt] = (0, import_react45.useState)("");
   const [client] = (0, import_react45.useContext)(ClientContext);
   const [theme] = (0, import_react45.useContext)(ThemeContext);
@@ -46560,25 +46580,35 @@ function SQLEditor({
         onChangeFields(tableInfo.columns);
       }
       const formData = report ? report : createInitialFormData(tableInfo.columns);
-      const newReport = {
+      const baseReport = reportId ? tempReport : {
         ...tempReport,
-        ...formData,
+        ...formData
+      };
+      const newReport = {
+        ...baseReport,
+        // In edit mode, preserve critical fields that shouldn't be overwritten
+        ...reportId && tempReport.name ? { name: tempReport.name } : {},
         itemQuery: tableInfo.itemQuery,
         rowCount: tableInfo.rowCount ?? tableInfo.rows.length,
         rows: tempRows,
         columns: tableInfo.columns,
-        referencedTables: tableInfo.referencedTables
+        referencedTables: tableInfo.referencedTables,
+        queryString: query ?? tempReport.queryString ?? ""
       };
-      const cleaned = await cleanDashboardItem({
-        item: newReport,
-        dashboardFilters: newReport.filtersApplied,
-        client,
-        customFields: schemaData.customFields,
-        getToken,
-        tenants,
-        eventTracking
-      });
-      setTempReport(cleaned);
+      if (reportId) {
+        setTempReport(newReport);
+      } else {
+        const cleaned = await cleanDashboardItem({
+          item: newReport,
+          dashboardFilters: newReport.filtersApplied,
+          client,
+          customFields: schemaData.customFields,
+          getToken,
+          tenants,
+          eventTracking
+        });
+        setTempReport(cleaned);
+      }
       setLastSuccessfulQuery(query);
     } catch (e) {
       eventTracking?.logError?.({
@@ -46885,7 +46915,7 @@ function SQLEditor({
                                             height: 70
                                           },
                                           children: /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)("div", { style: { display: "flex", gap: 12 }, children: [
-                                            addToDashboardButtonLabel === "Add to dashboard" ? /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(
+                                            computedButtonLabel === "Add to dashboard" ? /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(
                                               SecondaryButtonComponent,
                                               {
                                                 onClick: () => {
@@ -46975,7 +47005,7 @@ function SQLEditor({
                                                 label: "Clear query"
                                               }
                                             ),
-                                            addToDashboardButtonLabel === "Add to dashboard" && /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(
+                                            computedButtonLabel === "Add to dashboard" && /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(
                                               ButtonComponent,
                                               {
                                                 onClick: async () => {
@@ -46999,9 +47029,9 @@ function SQLEditor({
                                                       return (schemaData.customFields?.[table] ?? []).map((field) => field.field);
                                                     }).flat();
                                                   }
-                                                  setTempReport({
+                                                  const newTempReport = {
                                                     ...tempReport,
-                                                    id: TEMP_REPORT_ID,
+                                                    id: reportId || report?.id || TEMP_REPORT_ID,
                                                     rows,
                                                     columns: isSelectStar ? (
                                                       // so Automatic Custom Fields can be applied
@@ -47018,10 +47048,11 @@ function SQLEditor({
                                                     rowCount: rowCount ?? 0,
                                                     queryString: query ?? "",
                                                     dashboardName: report?.dashboardName ?? destinationDashboard
-                                                  });
+                                                  };
+                                                  setTempReport(newTempReport);
                                                   setIsChartBuilderOpen(true);
                                                 },
-                                                label: addToDashboardButtonLabel,
+                                                label: computedButtonLabel,
                                                 disabled: !!errorMessage || !(lastSuccessfulQuery === query) || !query,
                                                 tooltipText: !!errorMessage || !(lastSuccessfulQuery === query) ? "Please run a query" : ""
                                               }
@@ -47134,28 +47165,14 @@ function SQLEditor({
                                       label: "Discard changes"
                                     }
                                   ),
-                                  addToDashboardButtonLabel !== "Add to dashboard" && /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(
+                                  computedButtonLabel !== "Add to dashboard" && /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(
                                     ButtonComponent,
                                     {
                                       onClick: async () => {
                                         onSaveChanges && onSaveChanges();
-                                        const updatedReport = {
-                                          ...tempReport,
-                                          id: TEMP_REPORT_ID,
-                                          rows,
-                                          columns,
-                                          columnInternal: columns,
-                                          rowCount: rowCount ?? 0,
-                                          queryString: query ?? "",
-                                          dashboardName: report?.dashboardName ?? destinationDashboard
-                                          // flags: flagsToAdd,
-                                        };
-                                        (0, import_react_dom5.flushSync)(() => {
-                                          setTempReport(updatedReport);
-                                        });
                                         setIsChartBuilderOpen(true);
                                       },
-                                      label: addToDashboardButtonLabel,
+                                      label: computedButtonLabel,
                                       disabled: !!errorMessage || !(lastSuccessfulQuery === query)
                                     }
                                   )
@@ -47207,7 +47224,7 @@ function SQLEditor({
             destinationSection,
             isAdmin: isAdminEnabled,
             title: chartBuilderTitle,
-            buttonLabel: addToDashboardButtonLabel,
+            buttonLabel: computedButtonLabel,
             tempReport,
             reportId: reportId || report?.id,
             organizationName,

package/dist/index.js

@@ -17188,7 +17188,6 @@ var init_astProcessing = __esm({
         }
         if (numRetries === MAX_RETRIES) {
           console.error("[Error]: Max retries exceeded.");
-          console.info(`%c[Prompt]: ${aiPrompt}`, "color: dimgray");
           throw new Error(
             "Error: Couldn't process your request, please re-word your prompt."
           );
@@ -20398,11 +20397,13 @@ async function saveReport({
       rows: void 0,
       compareRows: void 0,
       dashboardItemId,
+      ...dashboardItemId ? { reportId: dashboardItemId } : {},
       // Remove useNewNodeSql since backend will handle conversion
       clientId: publicKey,
       tenants,
       // Only include adminMode for 'create' task, not 'create-report'
-      ...isCreateTask && { adminMode }
+      ...isCreateTask && { adminMode },
+      section: report.section
     },
     getToken
   });
@@ -39100,7 +39101,6 @@ import {
   useMemo as useMemo22,
   useCallback as useCallback3
 } from "react";
-import { flushSync as flushSync2 } from "react-dom";
 import MonacoEditor from "@monaco-editor/react";
 
 // src/ChartBuilder.tsx
@@ -42843,7 +42843,8 @@ function ChartBuilder({
   const { dashboardConfig } = useContext26(DashboardConfigContext);
   const { tenants, flags } = useContext26(TenantContext);
   const report = useMemo21(() => {
-    return reportId && !tempReport ? allReportsById[reportId] : tempReport;
+    const resolvedReport = reportId && !tempReport ? allReportsById[reportId] : tempReport;
+    return resolvedReport;
   }, [reportId, tempReport, allReportsById]);
   const [windowWidth, setWindowWidth] = useState28(1200);
   const [rows, setRows] = useState28(report?.rows ?? []);
@@ -42853,8 +42854,9 @@ function ChartBuilder({
   const [isLoading, setIsLoading] = useState28(false);
   const [rowCountIsLoading, setRowCountIsLoading] = useState28(false);
   const [isSubmitting, setIsSubmitting] = useState28(false);
-  const [pivotCardWidth, setPivotCardWidth] = useState28(665);
-  const [formWidth, setFormWidth] = useState28(665);
+  const MIN_FORM_WIDTH = 710;
+  const [pivotCardWidth, setPivotCardWidth] = useState28(MIN_FORM_WIDTH);
+  const [formWidth, setFormWidth] = useState28(MIN_FORM_WIDTH);
   const inputRef = useRef17(null);
   const selectRef = useRef17(null);
   const processColumns = (columns2) => {
@@ -42924,10 +42926,10 @@ function ChartBuilder({
         const spaceBetween = selectSize.left - inputSize.right;
         const gap = showDash ? (spaceBetween - selectWidth) / 2 : spaceBetween;
         const width = inputSize.width + 2 * gap + 2 * selectWidth;
-        setPivotCardWidth(width);
+        setPivotCardWidth(Math.max(width, MIN_FORM_WIDTH));
         const deleteSize = deleteRef.current?.getBoundingClientRect();
         const deleteWidth = deleteSize?.width ?? 0;
-        setFormWidth(width + deleteWidth);
+        setFormWidth(Math.max(width + deleteWidth, MIN_FORM_WIDTH));
       }
     };
     handleResize();
@@ -43192,23 +43194,40 @@ function ChartBuilder({
     return result;
   };
   const getReferencedTables = async (client2, dbTables, sqlQuery, reportBuilderState2, skipStar) => {
-    const { data: resp } = await quillFetchWithToken({
-      client: client2,
-      task: "astify",
-      metadata: reportBuilderState2 ? {
-        reportBuilderState: reportBuilderState2,
-        clientId: client2.clientId,
-        useNewNodeSql: true
-      } : {
-        query: sqlQuery,
-        clientId: client2.clientId,
-        useNewNodeSql: true
+    const metadata = reportBuilderState2 ? {
+      reportBuilderState: reportBuilderState2,
+      clientId: client2.clientId,
+      useNewNodeSql: true
+    } : {
+      query: sqlQuery,
+      clientId: client2.clientId,
+      useNewNodeSql: true
+    };
+    try {
+      const { data: resp } = await quillFetchWithToken({
+        client: client2,
+        task: "astify",
+        metadata
+      });
+      if (resp.success === false) {
+        return getTablesHelper(getSelectFromAST({}), dbTables, skipStar);
       }
-    });
-    if (resp.success === false) {
-      return getTablesHelper(getSelectFromAST({}), dbTables, skipStar);
+      return getTablesHelper(getSelectFromAST(resp.ast), dbTables, skipStar);
+    } catch (error) {
+      console.error(
+        "[ChartBuilder#getReferencedTables] Failed to fetch referenced tables",
+        {
+          error,
+          hasReportBuilderState: !!reportBuilderState2,
+          hasSqlQuery: !!sqlQuery,
+          skipStar: !!skipStar
+        }
+      );
+      return {
+        referencedTablesAndColumns: [],
+        dateFields: []
+      };
     }
-    return getTablesHelper(getSelectFromAST(resp.ast), dbTables, skipStar);
   };
   const getCurrentSection = () => {
     let id2 = report?.id ?? "";
@@ -44198,7 +44217,7 @@ function ChartBuilder({
       return;
     }
     let dashboardItemId = reportId ? reportId : void 0;
-    if (report && !isAdmin && formData.template) {
+    if (report && !isAdmin && formData.template && !isEditingMode) {
       dashboardItemId = void 0;
     }
     const newReport = {
@@ -46382,6 +46401,7 @@ function SQLEditor({
   onClickChartElement,
   onRequestAddVirtualTable
 }) {
+  const computedButtonLabel = addToDashboardButtonLabel === "Add to dashboard" ? reportId || report?.id ? "Save changes" : "Add to dashboard" : addToDashboardButtonLabel;
   const [sqlPrompt, setSqlPrompt] = useState30("");
   const [client] = useContext28(ClientContext);
   const [theme] = useContext28(ThemeContext);
@@ -46705,25 +46725,35 @@ function SQLEditor({
         onChangeFields(tableInfo.columns);
       }
       const formData = report ? report : createInitialFormData(tableInfo.columns);
-      const newReport = {
+      const baseReport = reportId ? tempReport : {
         ...tempReport,
-        ...formData,
+        ...formData
+      };
+      const newReport = {
+        ...baseReport,
+        // In edit mode, preserve critical fields that shouldn't be overwritten
+        ...reportId && tempReport.name ? { name: tempReport.name } : {},
         itemQuery: tableInfo.itemQuery,
         rowCount: tableInfo.rowCount ?? tableInfo.rows.length,
         rows: tempRows,
         columns: tableInfo.columns,
-        referencedTables: tableInfo.referencedTables
+        referencedTables: tableInfo.referencedTables,
+        queryString: query ?? tempReport.queryString ?? ""
       };
-      const cleaned = await cleanDashboardItem({
-        item: newReport,
-        dashboardFilters: newReport.filtersApplied,
-        client,
-        customFields: schemaData.customFields,
-        getToken,
-        tenants,
-        eventTracking
-      });
-      setTempReport(cleaned);
+      if (reportId) {
+        setTempReport(newReport);
+      } else {
+        const cleaned = await cleanDashboardItem({
+          item: newReport,
+          dashboardFilters: newReport.filtersApplied,
+          client,
+          customFields: schemaData.customFields,
+          getToken,
+          tenants,
+          eventTracking
+        });
+        setTempReport(cleaned);
+      }
       setLastSuccessfulQuery(query);
     } catch (e) {
       eventTracking?.logError?.({
@@ -47030,7 +47060,7 @@ function SQLEditor({
                                             height: 70
                                           },
                                           children: /* @__PURE__ */ jsxs48("div", { style: { display: "flex", gap: 12 }, children: [
-                                            addToDashboardButtonLabel === "Add to dashboard" ? /* @__PURE__ */ jsx66(
+                                            computedButtonLabel === "Add to dashboard" ? /* @__PURE__ */ jsx66(
                                               SecondaryButtonComponent,
                                               {
                                                 onClick: () => {
@@ -47120,7 +47150,7 @@ function SQLEditor({
                                                 label: "Clear query"
                                               }
                                             ),
-                                            addToDashboardButtonLabel === "Add to dashboard" && /* @__PURE__ */ jsx66(
+                                            computedButtonLabel === "Add to dashboard" && /* @__PURE__ */ jsx66(
                                               ButtonComponent,
                                               {
                                                 onClick: async () => {
@@ -47144,9 +47174,9 @@ function SQLEditor({
                                                       return (schemaData.customFields?.[table] ?? []).map((field) => field.field);
                                                     }).flat();
                                                   }
-                                                  setTempReport({
+                                                  const newTempReport = {
                                                     ...tempReport,
-                                                    id: TEMP_REPORT_ID,
+                                                    id: reportId || report?.id || TEMP_REPORT_ID,
                                                     rows,
                                                     columns: isSelectStar ? (
                                                       // so Automatic Custom Fields can be applied
@@ -47163,10 +47193,11 @@ function SQLEditor({
                                                     rowCount: rowCount ?? 0,
                                                     queryString: query ?? "",
                                                     dashboardName: report?.dashboardName ?? destinationDashboard
-                                                  });
+                                                  };
+                                                  setTempReport(newTempReport);
                                                   setIsChartBuilderOpen(true);
                                                 },
-                                                label: addToDashboardButtonLabel,
+                                                label: computedButtonLabel,
                                                 disabled: !!errorMessage || !(lastSuccessfulQuery === query) || !query,
                                                 tooltipText: !!errorMessage || !(lastSuccessfulQuery === query) ? "Please run a query" : ""
                                               }
@@ -47279,28 +47310,14 @@ function SQLEditor({
                                       label: "Discard changes"
                                     }
                                   ),
-                                  addToDashboardButtonLabel !== "Add to dashboard" && /* @__PURE__ */ jsx66(
+                                  computedButtonLabel !== "Add to dashboard" && /* @__PURE__ */ jsx66(
                                     ButtonComponent,
                                     {
                                       onClick: async () => {
                                         onSaveChanges && onSaveChanges();
-                                        const updatedReport = {
-                                          ...tempReport,
-                                          id: TEMP_REPORT_ID,
-                                          rows,
-                                          columns,
-                                          columnInternal: columns,
-                                          rowCount: rowCount ?? 0,
-                                          queryString: query ?? "",
-                                          dashboardName: report?.dashboardName ?? destinationDashboard
-                                          // flags: flagsToAdd,
-                                        };
-                                        flushSync2(() => {
-                                          setTempReport(updatedReport);
-                                        });
                                         setIsChartBuilderOpen(true);
                                       },
-                                      label: addToDashboardButtonLabel,
+                                      label: computedButtonLabel,
                                       disabled: !!errorMessage || !(lastSuccessfulQuery === query)
                                     }
                                   )
@@ -47352,7 +47369,7 @@ function SQLEditor({
             destinationSection,
             isAdmin: isAdminEnabled,
             title: chartBuilderTitle,
-            buttonLabel: addToDashboardButtonLabel,
+            buttonLabel: computedButtonLabel,
             tempReport,
             reportId: reportId || report?.id,
             organizationName,

package/package.json

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