@quillsql/react 2.16.2 → 2.16.4

package/dist/index.js

@@ -393,7 +393,7 @@ var init_constants = __esm({
     "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_QUERY_ENDPOINT = typeof process !== "undefined" && process.env ? process.env.QUILL_QUERY_ENDPOINT ?? "/cloud" : "/cloud";
+    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";
     SAVED_QUERIES_DASHBOARD = "quill-saved-queries";
@@ -15983,6 +15983,7 @@ async function generatePivotWithSQL({
   dateFilter,
   distinctStrings,
   dashboardName,
+  dashboardFilters,
   tenants,
   additionalProcessing,
   pivotQuery,
@@ -16026,6 +16027,7 @@ async function generatePivotWithSQL({
     metadata: {
       clientId: client.clientId,
       pivot: pivotConfig,
+      reportId: report?.id !== "__quillTempReport" ? report?.id : void 0,
       itemQuery: reportBuilderState ? void 0 : report?.queryString,
       // Don't send itemQuery if reportBuilderState is present
       reportBuilderState,
@@ -16033,6 +16035,11 @@ async function generatePivotWithSQL({
       databaseType,
       // Required when sending reportBuilderState
       dashboardName,
+      filters: !report?.id ? void 0 : dashboardFilters?.map((filter) => ({
+        ...filter,
+        options: void 0
+      })),
+      // Only pass dashboard filters in Dashboard context, not ReportBuilder
       tenants,
       additionalProcessing
     },
@@ -16202,6 +16209,7 @@ async function generatePivotTable({
   eventTracking,
   uniqueValues,
   dashboardName,
+  dashboardFilters,
   tenants,
   additionalProcessing,
   caller,
@@ -16219,6 +16227,7 @@ async function generatePivotTable({
         dateBucket,
         dateFilter,
         dashboardName,
+        dashboardFilters,
         tenants,
         additionalProcessing,
         caller,
@@ -17179,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."
           );
@@ -17209,27 +17217,6 @@ var init_astProcessing = __esm({
         if (!tableInfo) {
           throw new Error("Table info not found");
         }
-        console.log("[astProcessing] Calling report-builder-unique-values", {
-          table: processedName,
-          columnCount: tableInfo.columns.length,
-          reportBuilderState: {
-            tables: [{ name: processedName }],
-            columns: tableInfo.columns.map(
-              (col) => ({
-                field: col.field,
-                table: processedName,
-                label: col.label,
-                format: col.format,
-                aggregate: void 0,
-                customExpression: void 0
-              })
-            ),
-            filters: [],
-            sorts: [],
-            groupByColumns: [],
-            limit: void 0
-          }
-        });
         const uniqueValues = await getUniqueStringValuesByColumn({
           columns: tableInfo.columns,
           tableName: processedName,
@@ -17310,12 +17297,15 @@ var init_astProcessing = __esm({
         if (!report) {
           throw new Error("Report not found");
         }
-        const resp = astify(
-          report.queryString,
-          client.databaseType || "postgresql",
-          true
-          // useNewNodeSql = true
-        );
+        const { data: resp } = await quillFetch({
+          client,
+          task: "astify",
+          metadata: {
+            query: report.queryString,
+            useNewNodeSql: true
+          },
+          getToken
+        });
         if (resp.success === false) {
           throw new Error(resp.message || "Couldn't process report query.");
         }
@@ -17656,7 +17646,15 @@ var init_tableProcessing = __esm({
             baseQuery = withMatch[1];
           }
           const dbType = client.databaseType || "postgresql";
-          const astResponse = astify(baseQuery, dbType, true);
+          const { data: astResponse } = await quillFetch({
+            client,
+            task: "astify",
+            metadata: {
+              query: baseQuery,
+              useNewNodeSql: true
+            },
+            getToken
+          });
           if (astResponse.success && astResponse.ast) {
             const selectAst = getSelectFromAST(astResponse.ast);
             const tableNames = selectAst.from ? selectAst.from.map((t) => t.as || t.table || t.name).filter(Boolean) : [];
@@ -17812,7 +17810,7 @@ var init_tableProcessing = __esm({
           task: "report-builder-unique-values",
           metadata: {
             reportBuilderState,
-            columns: stringColumns.map((col) => col.field),
+            stringColumns: stringColumns.map((col) => col.field),
             clientId: client.clientId,
             databaseType: client.databaseType?.toLowerCase() || "postgresql",
             customFields,
@@ -17933,7 +17931,6 @@ var init_tableProcessing = __esm({
             dashboardName,
             reportBuilderState
           );
-          console.log("dateRanges 1", dateRanges);
           if (dateRanges === null) {
             throw new Error("Couldn't fetch date ranges");
           }
@@ -18050,7 +18047,7 @@ var init_tableProcessing = __esm({
             task: "report-builder-unique-values",
             metadata: {
               reportBuilderState,
-              columns,
+              stringColumns: columns,
               clientId: client.clientId,
               databaseType: client.databaseType?.toLowerCase() || "postgresql",
               customFields,
@@ -18188,7 +18185,6 @@ var init_tableProcessing = __esm({
           },
           {}
         );
-        console.log("what", results);
         return results;
       }
       const distinctValueQuery = generateMinMaxDateRangeQueries(
@@ -18299,15 +18295,23 @@ var init_tableProcessing = __esm({
           let parsedSuccessfully = true;
           let parsingError = "";
           if (!rowCountOnly) {
-            const results = astify(
-              query,
-              client.databaseType || "postgresql",
-              true
-              // useNewNodeSql = true
-            );
-            if (!results || results.success == false) {
+            try {
+              const { data: results } = await quillFetch({
+                client,
+                task: "astify",
+                metadata: {
+                  query,
+                  useNewNodeSql: true
+                },
+                getToken
+              });
+              if (!results || results.success == false) {
+                parsedSuccessfully = false;
+                parsingError = results.message || "";
+              }
+            } catch (e) {
               parsedSuccessfully = false;
-              parsingError = results.message || "";
+              parsingError = e.message || "Failed to parse query";
             }
           }
           const fetchResp = await quillFetch({
@@ -19932,6 +19936,7 @@ async function getPivotTable(report, dashboardFilters, dashboardName, getToken,
         dateBucket,
         dateFilter,
         dashboardName,
+        dashboardFilters,
         tenants,
         additionalProcessing,
         getToken
@@ -19960,6 +19965,7 @@ async function getPivotTable(report, dashboardFilters, dashboardName, getToken,
     client,
     uniqueValues: report.distinctStrings,
     dashboardName,
+    dashboardFilters,
     tenants,
     dateFilter,
     additionalProcessing,
@@ -20367,27 +20373,37 @@ async function saveReport({
   tenants
 }) {
   const { publicKey, databaseType } = client;
-  const { reportBuilderState, queryString, ...reportWithoutStateAndQuery } = report;
+  const {
+    reportBuilderState,
+    queryString,
+    adminMode,
+    ...reportWithoutStateAndQuery
+  } = report;
   const reportToSave = reportWithoutStateAndQuery;
-  const task = reportBuilderState ? "create-report" : "create";
+  const task = reportBuilderState && !adminMode ? "create-report" : "create";
+  const isCreateTask = task === "create";
   const { data } = await quillFetch({
     client,
     task,
     metadata: {
       ...reportToSave,
-      // Pass reportBuilderState for create-report, queryString for create
+      // Pass reportBuilderState if present, queryString otherwise
       ...reportBuilderState ? {
         reportBuilderState,
-        databaseType: databaseType || "postgresql"
+        databaseType
       } : {
         queryString
       },
       rows: void 0,
       compareRows: void 0,
       dashboardItemId,
+      ...dashboardItemId ? { reportId: dashboardItemId } : {},
       // Remove useNewNodeSql since backend will handle conversion
       clientId: publicKey,
-      tenants
+      tenants,
+      // Only include adminMode for 'create' task, not 'create-report'
+      ...isCreateTask && { adminMode },
+      section: report.section
     },
     getToken
   });
@@ -20664,7 +20680,6 @@ var fetchReportBuilderDataFromAST = async ({
           customFields ?? [],
           dashboardName
         );
-        console.log("dateRanges 3", dateRanges);
         if (dateRanges === null) {
           throw new Error("Couldn't fetch date ranges");
         }
@@ -31633,23 +31648,53 @@ function QuillMetricComponent({
                       width: "100%"
                     }
                   }
-                ) : !report?.rows?.[0] || report.rows[0][report.xAxisField] === null ? /* @__PURE__ */ jsx43(
+                ) : !report?.rows || report?.rows?.length === 0 || report.rows[0]?.[report.xAxisField] === null || report.rows[0]?.[report.xAxisField] === void 0 ? /* @__PURE__ */ jsx43(
                   "div",
                   {
                     style: {
-                      display: "flex",
-                      flex: "1 0 auto",
-                      // height: '100%',
-                      margin: "auto",
-                      justifyContent: "center",
-                      alignItems: "center",
-                      fontSize: 13,
-                      fontFamily: theme?.fontFamily,
-                      color: theme?.secondaryTextColor,
-                      maxWidth: "100%",
-                      width: "100%"
+                      padding: 0,
+                      height: "100%",
+                      width: "100%",
+                      boxSizing: "content-box",
+                      flex: 1
                     },
-                    children: "No results"
+                    children: /* @__PURE__ */ jsx43(
+                      "div",
+                      {
+                        style: {
+                          fontFamily: theme?.fontFamily,
+                          fontSize: 32,
+                          color: theme?.primaryTextColor,
+                          fontWeight: "600",
+                          textOverflow: "ellipsis",
+                          margin: 0,
+                          whiteSpace: "nowrap",
+                          boxSizing: "content-box",
+                          maxWidth: "100%",
+                          textAlign: "left",
+                          overflow: "hidden",
+                          height: "100%",
+                          minHeight: "80px",
+                          display: "flex",
+                          width: "100%",
+                          flexDirection: "row",
+                          justifyContent: "center",
+                          alignItems: "center"
+                        },
+                        children: /* @__PURE__ */ jsx43(
+                          "span",
+                          {
+                            style: {
+                              fontFamily: theme?.fontFamily,
+                              fontSize: 13,
+                              color: theme?.secondaryTextColor,
+                              fontWeight: "normal"
+                            },
+                            children: "No results"
+                          }
+                        )
+                      }
+                    )
                   }
                 ) : /* @__PURE__ */ jsx43(
                   MetricDisplay,
@@ -32882,6 +32927,29 @@ function USMap({
   const hoveredValue = useMemo12(() => {
     return !hoveredState ? void 0 : mappedData[fipsToNames[hoveredState]?.abbreviation ?? ""]?.[measureField] ?? mappedData[fipsToNames[hoveredState]?.name ?? ""]?.[measureField] ?? mappedData[fipsToNames[hoveredState]?.abbreviation?.toLowerCase() ?? ""]?.[measureField] ?? mappedData[fipsToNames[hoveredState]?.name?.toLowerCase() ?? ""]?.[measureField];
   }, [hoveredState, mappedData, measureField]);
+  if (!measureField) {
+    return /* @__PURE__ */ jsx45(
+      "div",
+      {
+        style: {
+          display: "flex",
+          flex: "1 0 auto",
+          marginLeft: "auto",
+          marginRight: "auto",
+          marginTop: "auto",
+          marginBottom: "auto",
+          justifyContent: "center",
+          alignItems: "center",
+          fontSize: 13,
+          color: theme?.secondaryTextColor,
+          fontFamily: theme?.fontFamily,
+          ...containerStyle
+        },
+        className,
+        children: "No results"
+      }
+    );
+  }
   return /* @__PURE__ */ jsxs34(
     "div",
     {
@@ -33050,6 +33118,29 @@ function WorldMap({
   const hoveredValue = useMemo12(() => {
     return !hoveredCountry ? void 0 : mappedData[isoToNames[hoveredCountry]?.abbreviation ?? ""]?.[measureField] ?? mappedData[isoToNames[hoveredCountry]?.name ?? ""]?.[measureField] ?? mappedData[isoToNames[hoveredCountry]?.abbreviation?.toLowerCase() ?? ""]?.[measureField] ?? mappedData[isoToNames[hoveredCountry]?.name?.toLowerCase() ?? ""]?.[measureField];
   }, [hoveredCountry, mappedData, measureField]);
+  if (!measureField) {
+    return /* @__PURE__ */ jsx45(
+      "div",
+      {
+        style: {
+          display: "flex",
+          flex: "1 0 auto",
+          marginLeft: "auto",
+          marginRight: "auto",
+          marginTop: "auto",
+          marginBottom: "auto",
+          justifyContent: "center",
+          alignItems: "center",
+          fontSize: 13,
+          color: theme?.secondaryTextColor,
+          fontFamily: theme?.fontFamily,
+          ...containerStyle
+        },
+        className,
+        children: "No results"
+      }
+    );
+  }
   return /* @__PURE__ */ jsxs34(
     "div",
     {
@@ -35264,7 +35355,7 @@ function Chart({
           index
         )) }),
         loading || !report ? /* @__PURE__ */ jsx48(LoadingComponent, {}) : /* @__PURE__ */ jsxs36(Fragment6, { children: [
-          ("table" === report.chartType || "metric" === report.chartType) && /* @__PURE__ */ jsx48(
+          ("table" === report.chartType || "metric" === report.chartType) && /* @__PURE__ */ jsx48(Fragment6, { children: /* @__PURE__ */ jsx48(
             DataLoader,
             {
               item: report,
@@ -35299,13 +35390,17 @@ function Chart({
                   error: error2,
                   rowCount: rowCount ?? data?.rowCount ?? data?.rows?.length ?? 0,
                   rowCountIsLoading,
-                  onPageChange: (page) => onPageChange(page),
-                  onSortChange: (sort) => onSortChange(sort),
+                  onPageChange: (page) => {
+                    onPageChange(page);
+                  },
+                  onSortChange: (sort) => {
+                    onSortChange(sort);
+                  },
                   hideName: true
                 }
               )
             }
-          ),
+          ) }),
           report.chartType !== "table" && report.chartType !== "metric" && /* @__PURE__ */ jsx48(
             ChartDataLoader,
             {
@@ -35435,7 +35530,7 @@ var ChartDisplay = ({
       {
         className,
         containerStyle,
-        data: config?.rows?.map((row) => {
+        data: !config?.pivot ? config?.rows?.map((row) => {
           return {
             ...row,
             count: (
@@ -35443,7 +35538,7 @@ var ChartDisplay = ({
               parseInt(row[config?.yAxisFields[0]?.field]) / sumByKey(config?.rows, config?.yAxisFields[0]?.field)
             )
           };
-        }) || [],
+        }) || [] : config?.rows || [],
         category: config?.yAxisFields?.[0]?.field,
         index: config?.xAxisField,
         colors: chartColors,
@@ -35558,27 +35653,41 @@ var ChartDisplay = ({
     );
   }
   if (config?.chartType?.toLowerCase() === "metric") {
-    if (!config?.rows || config?.rows?.length === 0 || // @ts-ignore
-    config?.rows[0][config?.xAxisField] === null) {
+    if (!config?.rows || config?.rows?.length === 0 || config?.rows[0]?.[config?.xAxisField] === null || config?.rows[0]?.[config?.xAxisField] === void 0) {
       return /* @__PURE__ */ jsx48(
         "div",
         {
           style: {
-            display: "flex",
-            flex: "1 0 auto",
-            // height: containerStyle?.height || '100%',
-            margin: "auto",
-            justifyContent: "center",
-            alignItems: "center",
-            fontSize: 13,
             fontFamily: theme?.fontFamily,
-            color: theme?.secondaryTextColor,
+            fontSize: 32,
+            color: theme?.primaryTextColor,
+            fontWeight: "600",
+            textOverflow: "ellipsis",
+            margin: 0,
+            whiteSpace: "nowrap",
+            boxSizing: "content-box",
             maxWidth: "100%",
+            textAlign: "left",
+            overflow: "hidden",
+            height: containerStyle?.height || "100%",
+            display: "flex",
             width: "100%",
+            flexDirection: "row",
+            alignItems: "center",
             ...containerStyle
           },
           className,
-          children: "No results"
+          children: /* @__PURE__ */ jsx48(
+            "span",
+            {
+              style: {
+                fontFamily: theme?.fontFamily,
+                fontSize: 13,
+                color: theme?.secondaryTextColor
+              },
+              children: "No results"
+            }
+          )
         }
       );
     }
@@ -38453,7 +38562,7 @@ function Dashboard({
                   data: data2,
                   rowCount,
                   rowCountIsLoading
-                }) => /* @__PURE__ */ jsx57(
+                }) => /* @__PURE__ */ jsx57(Fragment10, { children: /* @__PURE__ */ jsx57(
                   TableComponent,
                   {
                     report: data2,
@@ -38478,10 +38587,14 @@ function Dashboard({
                     hoverActions,
                     rowCount: rowCount ?? data2?.rowCount ?? data2?.rows?.length ?? 0,
                     rowCountIsLoading,
-                    onPageChange: (page) => onPageChange(page),
-                    onSortChange: (sort) => onSortChange(sort)
+                    onPageChange: (page) => {
+                      onPageChange(page);
+                    },
+                    onSortChange: (sort) => {
+                      onSortChange(sort);
+                    }
                   }
-                )
+                ) })
               },
               `${name2}${item.id}`
             )) })
@@ -38501,7 +38614,11 @@ function Dashboard({
                   children: ({
                     isLoading: isLoading2,
                     error,
-                    data: data2
+                    onPageChange,
+                    onSortChange,
+                    data: data2,
+                    rowCount,
+                    rowCountIsLoading
                   }) => item.chartType === "metric" ? /* @__PURE__ */ jsx57(
                     MetricComponent,
                     {
@@ -38548,7 +38665,14 @@ function Dashboard({
                         });
                       } : void 0,
                       hoverActions,
-                      rowCount: data2.rowCount ?? data2.rows?.length ?? 0
+                      rowCount: rowCount ?? data2.rowCount ?? data2.rows?.length ?? 0,
+                      rowCountIsLoading,
+                      onPageChange: (page) => {
+                        onPageChange(page);
+                      },
+                      onSortChange: (sort) => {
+                        onSortChange(sort);
+                      }
                     }
                   )
                 },
@@ -39544,11 +39668,6 @@ var PivotModal = ({
           dashboardName,
           reportBuilderState
         );
-        console.log("[PivotModal] Calling report-builder-unique-values", {
-          columnCount: smallStringColumns.length,
-          hasReportBuilderState: !!reportBuilderState,
-          reportBuilderState
-        });
         newUniqueValues = await getUniqueValuesByQuery({
           columns: smallStringColumns,
           query: query || "",
@@ -41786,6 +41905,7 @@ function InternalChart({
 // src/ChartBuilder.tsx
 init_paginationProcessing();
 init_tableProcessing();
+init_dataFetcher();
 init_dates();
 
 // src/components/QuillMultiSelectSectionList.tsx
@@ -42631,15 +42751,19 @@ function ChartBuilderWithModal(props) {
       title: title || "Add to dashboard",
       width: isHorizontalView ? modalWidth : void 0,
       height: isHorizontalView ? modalHeight : void 0,
-      children: (props.reportId ? dashboard[props.reportId] ?? props.tempReport : props.tempReport) ? /* @__PURE__ */ jsx65(
-        ChartBuilder,
-        {
-          ...props,
-          filtersEnabled: filtersEnabledState,
-          onFiltersEnabledChanged: setFiltersEnabledState,
-          runQueryOnMount: filtersEnabledState
-        }
-      ) : /* @__PURE__ */ jsx65("div", { style: { padding: 20 }, children: /* @__PURE__ */ jsx65(QuillLoadingComponent, {}) })
+      children: (() => {
+        const resolvedReport = props.tempReport ?? (props.reportId ? dashboard[props.reportId] : void 0);
+        return resolvedReport ? /* @__PURE__ */ jsx65(
+          ChartBuilder,
+          {
+            ...props,
+            tempReport: resolvedReport,
+            filtersEnabled: filtersEnabledState,
+            onFiltersEnabledChanged: setFiltersEnabledState,
+            runQueryOnMount: filtersEnabledState
+          }
+        ) : /* @__PURE__ */ jsx65("div", { style: { padding: 20 }, children: /* @__PURE__ */ jsx65(QuillLoadingComponent, {}) });
+      })()
     }
   ) });
 }
@@ -42719,8 +42843,9 @@ function ChartBuilder({
   const { dashboardConfig } = useContext26(DashboardConfigContext);
   const { tenants, flags } = useContext26(TenantContext);
   const report = useMemo21(() => {
-    return reportId && !tempReport ? allReportsById[reportId] : tempReport;
-  }, [reportId]);
+    const resolvedReport = reportId && !tempReport ? allReportsById[reportId] : tempReport;
+    return resolvedReport;
+  }, [reportId, tempReport, allReportsById]);
   const [windowWidth, setWindowWidth] = useState28(1200);
   const [rows, setRows] = useState28(report?.rows ?? []);
   const [itemQuery, setItemQuery] = useState28(report?.itemQuery);
@@ -42729,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) => {
@@ -42800,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();
@@ -42918,7 +43044,7 @@ function ChartBuilder({
   };
   const [currentProcessing, setCurrentProcessing] = useState28(baseProcessing);
   const [customTenantAccess, setCustomTenantAccess] = useState28(
-    !!Object.values(report?.flags ?? {}).length
+    report?.flags === null ? false : !!Object.values(report?.flags ?? {}).length
   );
   const [dateFieldOptions, setDateFieldOptions] = useState28([]);
   const [allTables, setAllTables] = useState28([]);
@@ -43068,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 ?? "";
@@ -43631,16 +43774,6 @@ function ChartBuilder({
       fetchRowCount(processing, overrideFilters);
       if (formData.pivot) {
         try {
-          console.log(
-            "[ChartBuilder] Calling report-builder-unique-values for pivot",
-            {
-              columns: tableInfo.columns.filter(
-                (column) => column.field === formData.pivot?.columnField
-              ).map((c) => c.field),
-              hasReportBuilderState: !!reportBuilderState,
-              reportBuilderState
-            }
-          );
           const uniqueValues = await getUniqueValuesByQuery({
             reportBuilderState,
             columns: tableInfo.columns.filter(
@@ -44028,9 +44161,46 @@ function ChartBuilder({
     event.preventDefault();
   };
   const deleteChart = async () => {
-    if (onDelete && onDelete()) {
-      setIsOpen(false);
-      setIsSubmitting(false);
+    if (!client || !reportId) {
+      console.error("Cannot delete: missing client or reportId");
+      return;
+    }
+    try {
+      const { status, error } = await quillFetch({
+        client,
+        task: "delete",
+        metadata: {
+          dashboardItemId: reportId,
+          tenants
+        },
+        getToken
+      });
+      if (status !== "success") {
+        throw new Error(`Error deleting report: ${error}`);
+      } else {
+        if (onDelete) {
+          onDelete();
+        }
+        reloadDashboard(destinationDashboard, true, {
+          report: { id: reportId },
+          action: "delete"
+        });
+        setIsOpen(false);
+        setIsSubmitting(false);
+      }
+    } catch (err) {
+      console.error("Error deleting chart:", err);
+      eventTracking?.logError?.({
+        type: "bug",
+        severity: "high",
+        message: "Error deleting chart",
+        errorMessage: err.message,
+        errorStack: err.stack,
+        errorData: {
+          caller: "ChartBuilder",
+          function: "deleteChart"
+        }
+      });
     }
   };
   const editChart = async () => {
@@ -44047,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 = {
@@ -44069,14 +44239,17 @@ function ChartBuilder({
       includeCustomFields: includeCustomFields || containsCustomFields,
       template: tenants ? void 0 : report && !isAdmin && formData.template ? false : formData.template,
       adminMode: isAdmin,
-      flags: containsCustomFields && customTenantAccess ? currentTenantAsFormFlags : formFlags ? Object.fromEntries(
-        Object.entries(formFlags).filter(([, value]) => value.length > 0).map(([key, value]) => {
-          return [
-            key,
-            Object.keys(allTenantMap).length > 1 && allTenantMap[key]?.length === value.length ? ALL_TENANTS : value
-          ];
-        })
-      ) : void 0,
+      reportBuilderState,
+      ...isAdmin && {
+        reportFlags: !customTenantAccess && !containsCustomFields ? null : containsCustomFields && customTenantAccess ? currentTenantAsFormFlags : formFlags ? Object.fromEntries(
+          Object.entries(formFlags).filter(([, value]) => value.length > 0).map(([key, value]) => {
+            return [
+              key,
+              Object.keys(allTenantMap).length > 1 && allTenantMap[key]?.length === value.length ? ALL_TENANTS : value
+            ];
+          })
+        ) : void 0
+      },
       referenceLines: formData.referenceLines.map((line) => {
         return {
           label: line.label,
@@ -45445,7 +45618,7 @@ function ChartBuilder({
                           right: 16
                         },
                         children: [
-                          !hideDeleteButton && !isHorizontalView && report && /* @__PURE__ */ jsx65(
+                          !hideDeleteButton && report && /* @__PURE__ */ jsx65(
                             SecondaryButtonComponent,
                             {
                               onClick: deleteChart,
@@ -46201,6 +46374,7 @@ function SQLEditor({
   CheckboxComponent = QuillChartBuilderCheckboxComponent,
   defaultQuery,
   destinationDashboard,
+  destinationSection,
   onChangeQuery,
   onChangeData,
   onChangeColumns,
@@ -46210,12 +46384,16 @@ function SQLEditor({
   onCloseChartBuilder,
   isChartBuilderEnabled = false,
   isAdminEnabled = false,
+  chartBuilderOptions,
   chartBuilderTitle,
   runQueryOnMount = false,
   onAddToDashboardComplete,
+  onSubmitCreateReport,
+  onSubmitEditReport,
   onSaveQueryComplete,
   addToDashboardButtonLabel = "Add to dashboard",
   report = void 0,
+  reportId = void 0,
   organizationName = void 0,
   isChartBuilderHorizontalView = true,
   containerStyle = { height: "100vh" },
@@ -46223,10 +46401,11 @@ 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);
-  const { tenants } = useContext28(TenantContext);
+  const { tenants, flags } = useContext28(TenantContext);
   const { dashboards } = useDashboards();
   const {
     data,
@@ -46235,6 +46414,7 @@ function SQLEditor({
   } = useDashboardInternal(destinationDashboard);
   const { getToken, quillFetchWithToken } = useContext28(FetchContext);
   const { eventTracking } = useContext28(EventTrackingContext);
+  const { allReportsById } = useAllReports();
   const destinationDashboardConfig = useMemo22(() => {
     return dashboards?.find((d) => d.name === destinationDashboard);
   }, [dashboards, destinationDashboard]);
@@ -46302,6 +46482,46 @@ function SQLEditor({
       reload();
     }
   }, [data, dashboardIsLoading]);
+  useEffect24(() => {
+    const loadReport = async () => {
+      let reportToLoad;
+      if (!client) {
+        return;
+      }
+      try {
+        if (!reportId) {
+          throw new Error("Report ID is required");
+        }
+        reportToLoad = allReportsById[reportId];
+        if (!reportToLoad) {
+          throw new Error("Report not found");
+        }
+        setQuery(reportToLoad.queryString || "");
+        setTempReport(reportToLoad);
+        if (reportToLoad.rows && reportToLoad.rows.length > 0) {
+          setRows(reportToLoad.rows);
+          setDisplayTable(true);
+        }
+      } catch (err) {
+        console.error(err);
+        eventTracking?.logError?.({
+          type: "bug",
+          severity: "high",
+          message: "Error loading report",
+          errorMessage: err.message,
+          errorStack: err.stack,
+          errorData: {
+            caller: "SQLEditor",
+            function: "loadReport"
+          }
+        });
+        setErrorMessage("Error when loading report");
+      }
+    };
+    if (reportId && client) {
+      loadReport();
+    }
+  }, [allReportsById[reportId || ""], client]);
   const dynamicHeight = tableRef.current ? tableRef.current.clientHeight : cachedHeight;
   const rowsPerPage = Math.max(
     DEFAULT_ROWS_PER_PAGE,
@@ -46505,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?.({
@@ -46830,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: () => {
@@ -46920,7 +47150,7 @@ function SQLEditor({
                                                 label: "Clear query"
                                               }
                                             ),
-                                            addToDashboardButtonLabel === "Add to dashboard" && /* @__PURE__ */ jsx66(
+                                            computedButtonLabel === "Add to dashboard" && /* @__PURE__ */ jsx66(
                                               ButtonComponent,
                                               {
                                                 onClick: async () => {
@@ -46944,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
@@ -46963,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" : ""
                                               }
@@ -47079,25 +47310,14 @@ function SQLEditor({
                                       label: "Discard changes"
                                     }
                                   ),
-                                  addToDashboardButtonLabel !== "Add to dashboard" && /* @__PURE__ */ jsx66(
+                                  computedButtonLabel !== "Add to dashboard" && /* @__PURE__ */ jsx66(
                                     ButtonComponent,
                                     {
                                       onClick: async () => {
                                         onSaveChanges && onSaveChanges();
-                                        setTempReport({
-                                          ...tempReport,
-                                          id: TEMP_REPORT_ID,
-                                          rows,
-                                          columns,
-                                          columnInternal: columns,
-                                          rowCount: rowCount ?? 0,
-                                          queryString: query ?? "",
-                                          dashboardName: report?.dashboardName ?? destinationDashboard
-                                          // flags: flagsToAdd,
-                                        });
                                         setIsChartBuilderOpen(true);
                                       },
-                                      label: addToDashboardButtonLabel,
+                                      label: computedButtonLabel,
                                       disabled: !!errorMessage || !(lastSuccessfulQuery === query)
                                     }
                                   )
@@ -47120,13 +47340,38 @@ function SQLEditor({
             isHorizontalView: isChartBuilderHorizontalView,
             isOpen: isChartBuilderOpen,
             setIsOpen: setIsChartBuilderOpen,
-            onAddToDashboardComplete,
+            onAddToDashboardComplete: reportId || report?.id ? (data2) => {
+              if (onSubmitEditReport) {
+                onSubmitEditReport(data2);
+              } else if (onAddToDashboardComplete) {
+                onAddToDashboardComplete(data2);
+              }
+              if (!isAdminEnabled && destinationDashboard) {
+                reload(destinationDashboard, false, {
+                  report: data2,
+                  action: "upsert"
+                });
+              }
+            } : (data2) => {
+              if (onSubmitCreateReport) {
+                onSubmitCreateReport(data2);
+              } else if (onAddToDashboardComplete) {
+                onAddToDashboardComplete(data2);
+              }
+              if (!isAdminEnabled && destinationDashboard) {
+                reload(destinationDashboard, false, {
+                  report: data2,
+                  action: "upsert"
+                });
+              }
+            },
             destinationDashboard,
+            destinationSection,
             isAdmin: isAdminEnabled,
             title: chartBuilderTitle,
-            buttonLabel: addToDashboardButtonLabel,
+            buttonLabel: computedButtonLabel,
             tempReport,
-            reportId: report?.id,
+            reportId: reportId || report?.id,
             organizationName,
             CardComponent,
             TableComponent,
@@ -47151,6 +47396,8 @@ function SQLEditor({
             CheckboxComponent,
             hideDateRangeFilter: true,
             hideDeleteButton: true,
+            showTableFormatOptions: chartBuilderOptions?.showTableFormatOptions,
+            showDashboardFilterFields: chartBuilderOptions?.showDashboardFilterFields,
             onClickChartElement,
             isEditingMode: true
           }
@@ -47170,7 +47417,7 @@ function SQLEditor({
             isAdmin: false,
             title: "Save query",
             buttonLabel: "Save query",
-            tempReport,
+            tempReport: { ...tempReport, dashboardName: SAVED_QUERIES_DASHBOARD },
             reportId: report?.id,
             organizationName,
             CardComponent,
@@ -51503,7 +51750,10 @@ var SaveReport = ({
   chartBuilderTitle,
   onSubmitEditReport = () => void 0,
   onSubmitCreateReport = () => void 0,
+  onDiscardChanges = () => void 0,
   destinationSection,
+  showTableFormatOptions,
+  showDashboardFilterFields,
   SelectComponent = QuillSelectComponent,
   TextInputComponent = QuillTextInput,
   ButtonComponent = MemoizedButton,
@@ -51536,6 +51786,9 @@ var SaveReport = ({
   ),
   submitButtonLabel
 }) => {
+  const { reload } = useDashboardInternal(
+    reportBuilder.destinationDashboard ?? null
+  );
   return /* @__PURE__ */ jsxs59("div", { children: [
     SaveTrigger,
     /* @__PURE__ */ jsx79(
@@ -51549,7 +51802,24 @@ var SaveReport = ({
         isHorizontalView: true,
         isOpen,
         setIsOpen,
-        onAddToDashboardComplete: reportBuilder.reportId ? onSubmitEditReport : onSubmitCreateReport,
+        onAddToDashboardComplete: reportBuilder.reportId ? (data) => {
+          onSubmitEditReport(data);
+          if (!isAdminEnabled && reportBuilder.destinationDashboard) {
+            reload(reportBuilder.destinationDashboard, false, {
+              report: data,
+              action: "upsert"
+            });
+          }
+        } : (data) => {
+          onSubmitCreateReport(data);
+          if (!isAdminEnabled && reportBuilder.destinationDashboard) {
+            reload(reportBuilder.destinationDashboard, false, {
+              report: data,
+              action: "upsert"
+            });
+          }
+        },
+        onDiscardChanges,
         destinationDashboard: reportBuilder.destinationDashboard,
         destinationSection,
         initialUniqueValues: reportBuilder.columnUniqueValues,
@@ -51578,6 +51848,8 @@ var SaveReport = ({
         FormContainer: ChartBuilderFormContainer,
         hideDateRangeFilter: true,
         hideDeleteButton: true,
+        showTableFormatOptions,
+        showDashboardFilterFields,
         buttonLabel: submitButtonLabel ?? (!!reportBuilder.reportId ? "Save changes" : "Add to dashboard"),
         onClickChartElement,
         isEditingMode: true
@@ -51674,6 +51946,7 @@ function ReportBuilder({
   containerStyle,
   className,
   pivotRecommendationsEnabled = true,
+  chartBuilderOptions,
   reportId,
   hideCopySQL = true,
   isChartBuilderHorizontalView = true,
@@ -52130,6 +52403,9 @@ function ReportBuilder({
             ErrorMessageComponent,
             PivotRowContainer,
             PivotColumnContainer,
+            showTableFormatOptions: chartBuilderOptions?.showTableFormatOptions,
+            showDashboardFilterFields: chartBuilderOptions?.showDashboardFilterFields,
+            onDiscardChanges,
             onClickChartElement,
             submitButtonLabel
           }
@@ -52150,7 +52426,7 @@ function ReportBuilder({
             isAdmin: false,
             title: "Save query",
             buttonLabel: "Save query",
-            tempReport,
+            tempReport: { ...tempReport, dashboardName: SAVED_QUERIES_DASHBOARD },
             reportId,
             organizationName,
             CardComponent,
@@ -52204,7 +52480,10 @@ function ChartEditor({
   chartBuilderTitle = "Edit chart",
   chartBuilderButtonLabel,
   onAddToDashboardComplete,
+  onSubmitEditReport,
+  onDiscardChanges,
   destinationDashboard,
+  destinationSection,
   organizationName,
   isHorizontalView = true,
   onDelete,
@@ -52232,6 +52511,9 @@ function ChartEditor({
   ErrorComponent = QuillChartErrorWithAction,
   hideDeleteButton = false,
   hideSubmitButton = false,
+  showTableFormatOptions,
+  showDashboardFilterFields,
+  chartBuilderOptions,
   onClickChartElement,
   onClickChartError
 }) {
@@ -52320,7 +52602,12 @@ function ChartEditor({
     ModalComponent,
     {
       isOpen,
-      setIsOpen,
+      setIsOpen: (value) => {
+        if (!value) {
+          setChartBuilderKey(chartBuilderKey + 1);
+        }
+        setIsOpen(value);
+      },
       title: chartBuilderTitle || "Add to dashboard",
       width: isHorizontalView ? modalWidth : void 0,
       height: isHorizontalView ? modalHeight : void 0,
@@ -52333,8 +52620,15 @@ function ChartEditor({
           isComparison: dateFilter?.comparisonRange,
           setIsOpen,
           showDashboardDropdown: isAdmin,
-          onAddToDashboardComplete,
+          onAddToDashboardComplete: (data) => {
+            if (onSubmitEditReport) {
+              onSubmitEditReport(data);
+            } else if (onAddToDashboardComplete) {
+              onAddToDashboardComplete(data);
+            }
+          },
           destinationDashboard,
+          destinationSection,
           dateRange,
           SelectComponent,
           TextInputComponent,
@@ -52360,13 +52654,18 @@ function ChartEditor({
           onClickChartError,
           onDelete,
           onDiscardChanges: () => {
+            if (onDiscardChanges) {
+              onDiscardChanges();
+            }
             setChartBuilderKey(chartBuilderKey + 1);
           },
           title: chartBuilderTitle,
           buttonLabel: chartBuilderButtonLabel,
           organizationName,
           hideSubmitButton,
-          hideDeleteButton,
+          hideDeleteButton: chartBuilderOptions?.showDeleteButton !== void 0 ? !chartBuilderOptions.showDeleteButton : hideDeleteButton,
+          showTableFormatOptions: chartBuilderOptions?.showTableFormatOptions ?? showTableFormatOptions,
+          showDashboardFilterFields: chartBuilderOptions?.showDashboardFilterFields ?? showDashboardFilterFields,
           filtersEnabled,
           onFiltersEnabledChanged: (value) => {
             setFiltersEnabled(value);