@quillsql/react 2.16.42 → 2.16.44

package/dist/index.js

@@ -16998,7 +16998,7 @@ async function generatePivotWithSQL({
     client,
     task: "pivot-template",
     metadata: {
-      clientId: client.clientId,
+      clientId: client.id,
       pivot: pivotConfig,
       reportId: report?.id !== "__quillTempReport" ? report?.id : void 0,
       itemQuery: reportBuilderState ? void 0 : report?.queryString,
@@ -18823,7 +18823,7 @@ var init_tableProcessing = __esm({
           metadata: {
             reportBuilderState,
             stringColumns: stringColumns.map((col) => col.field),
-            clientId: client.clientId,
+            clientId: client.id,
             databaseType: client.databaseType?.toLowerCase() || "postgresql",
             customFields,
             filters: void 0,
@@ -19014,7 +19014,7 @@ var init_tableProcessing = __esm({
             metadata: {
               reportBuilderState,
               columns: stringNames,
-              clientId: client.publicKey,
+              clientId: client.id,
               databaseType: client.databaseType,
               customFieldsByTable: customFields,
               useNewNodeSql: true,
@@ -19029,7 +19029,7 @@ var init_tableProcessing = __esm({
             task: "query",
             metadata: {
               query: countQuery,
-              clientId: client.publicKey,
+              clientId: client.id,
               databaseType: client.databaseType,
               customFieldsByTable: customFields,
               useNewNodeSql: true,
@@ -19089,7 +19089,7 @@ var init_tableProcessing = __esm({
             metadata: {
               reportBuilderState,
               stringColumns: columns,
-              clientId: client.clientId,
+              clientId: client.id,
               databaseType: client.databaseType?.toLowerCase() || "postgresql",
               customFields,
               filters,
@@ -19139,7 +19139,7 @@ var init_tableProcessing = __esm({
           task: "query",
           metadata: {
             query,
-            clientId: client.publicKey,
+            clientId: client.id,
             databaseType: client.databaseType,
             customFieldsByTable: customFields,
             useNewNodeSql: true,
@@ -19251,7 +19251,7 @@ var init_tableProcessing = __esm({
           task: "query",
           metadata: {
             query,
-            clientId: client.publicKey,
+            clientId: client.id,
             databaseType: client.databaseType,
             customFieldsByTable: customFields,
             useNewNodeSql: true,
@@ -19361,7 +19361,7 @@ var init_tableProcessing = __esm({
             metadata: {
               query,
               filterMap,
-              clientId: client.publicKey,
+              clientId: client.id,
               databaseType: client?.databaseType,
               customFieldsByTable: customFields,
               additionalProcessing: processing,
@@ -19396,7 +19396,7 @@ var init_tableProcessing = __esm({
               task: "log-broken-query",
               metadata: {
                 query,
-                clientId: client.clientId,
+                clientId: client.id,
                 error: parsingError
               },
               getToken
@@ -19504,7 +19504,7 @@ var init_tableProcessing = __esm({
           metadata: {
             dashboardItemId: reportId,
             filters: minimalFilters,
-            clientId: client?.publicKey,
+            clientId: client?.id,
             databaseType: client?.databaseType,
             additionalProcessing: updatedProcessing,
             forcePagination: true,
@@ -19578,7 +19578,7 @@ var init_tableProcessing = __esm({
             rowCountOnly,
             customFields,
             tenants,
-            clientId: client.clientId,
+            clientId: client.id,
             databaseType: client.databaseType?.toLowerCase() || "postgresql",
             dashboardName
           },
@@ -19719,7 +19719,7 @@ async function testSqlViewState(client, referencedTables, getToken) {
         task: "test-view",
         metadata: {
           tables: [table],
-          clientId: client.clientId
+          clientId: client.id
         },
         getToken
       });
@@ -19728,7 +19728,7 @@ async function testSqlViewState(client, referencedTables, getToken) {
           metadata: {
             table,
             task: "set-broken-view",
-            clientId: client.clientId
+            clientId: client.id
           }
         };
         quillFetch({
@@ -19838,7 +19838,7 @@ async function* quillStream({
       body: JSON.stringify({
         metadata: {
           task,
-          clientId: client.clientId,
+          clientId: client.id,
           ...metadata
         }
       }),
@@ -20065,7 +20065,7 @@ async function getData(client, cloudQueryEndpoint, noCred, hostedRequestBody, cl
           body: method === "POST" ? JSON.stringify({
             ...cloudRequestBody,
             ...{
-              publicKey: client?.publicKey
+              publicKey: client?.id
             }
           }) : null,
           signal: abortSignal
@@ -20094,7 +20094,7 @@ async function fetchSqlQuery(ast, client, getToken, formData) {
       client,
       task: "sqlify",
       metadata: {
-        clientId: client.clientId,
+        clientId: client.id,
         useNewNodeSql: true,
         ast: { ...ast, where }
       },
@@ -20115,7 +20115,7 @@ async function fetchSqlQueryFromState(reportBuilderState, client, getToken, data
       client,
       task: "sqlify",
       metadata: {
-        clientId: client.clientId,
+        clientId: client.id,
         useNewNodeSql: true,
         ast
       },
@@ -20132,7 +20132,7 @@ async function fetchQueryDateRangesFromState(reportBuilderState, columns, client
       client,
       task: "report-builder-date-ranges",
       metadata: {
-        clientId: client.clientId,
+        clientId: client.id,
         reportBuilderState,
         dateColumns: columns,
         databaseType: databaseType || "postgresql",
@@ -20223,7 +20223,7 @@ var init_dataFetcher = __esm({
           body: JSON.stringify({
             metadata: {
               task,
-              clientId: client.clientId,
+              clientId: client.id ?? client.clientId,
               ...metadata
             }
           }),
@@ -21169,7 +21169,7 @@ async function getDashboard(dashboardName, client, getToken, tenants, flags) {
     task: "dashboard",
     metadata: {
       name: dashboardName,
-      clientId: client.publicKey,
+      clientId: client.id,
       databaseType: client.databaseType,
       useNewNodeSql: true,
       tenants,
@@ -21388,7 +21388,7 @@ async function fetchReportRows({
     task: "report",
     metadata: {
       reportId,
-      clientId: client.publicKey,
+      clientId: client.id,
       databaseType: client.databaseType,
       filters: filters.map((filter) => ({ ...filter, options: void 0 })),
       useNewNodeSql: true,
@@ -21437,7 +21437,7 @@ async function fetchReport({
       metadata: {
         reportId,
         dashboardItemId: reportId,
-        clientId: client.publicKey,
+        clientId: client.id,
         databaseType: client.databaseType,
         filters: filters.map((filter) => ({ ...filter, options: void 0 })),
         customFields,
@@ -21570,7 +21570,7 @@ async function fetchReportRowCount(reportId, client, getToken, tenants, flags, u
     metadata: {
       reportId,
       dashboardItemId: reportId,
-      clientId: client.publicKey,
+      clientId: client.id,
       databaseType: client.databaseType,
       filters: filters.map((filter) => ({ ...filter, options: void 0 })),
       customFields,
@@ -21599,7 +21599,7 @@ async function saveReport({
   eventTracking,
   tenants
 }) {
-  const { publicKey, databaseType } = client;
+  const { id, databaseType } = client;
   const {
     reportBuilderState,
     queryString,
@@ -21626,7 +21626,7 @@ async function saveReport({
       dashboardItemId,
       ...dashboardItemId ? { reportId: dashboardItemId } : {},
       // Remove useNewNodeSql since backend will handle conversion
-      clientId: publicKey,
+      clientId: id,
       tenants,
       // Only include adminMode for 'create' task, not 'create-report'
       ...isCreateTask && { adminMode },
@@ -22431,7 +22431,6 @@ var getSchemaInfo = async ({
   getToken,
   eventTracking
 }) => {
-  const { publicKey } = client;
   let customFieldsByTableUnique = null;
   if (client.featureFlags?.customFieldsEnabled && tenants && tenants[0] !== "QUILL_ALL_TENANTS" && tenants.length === 1 && (typeof tenants[0] !== "object" || tenants[0].tenantIds?.[0] !== "QUILL_ALL_TENANTS" && tenants[0].tenantIds?.length === 1)) {
     try {
@@ -22450,13 +22449,13 @@ var getSchemaInfo = async ({
     client,
     task: "schema",
     metadata: {
-      clientId: publicKey,
+      clientId: client.id,
       removeCustomerField: true,
       removeCustomFieldRef: true,
       tableIds,
       customFieldsByTable: customFieldsByTableUnique,
       useNewCustomFields: true,
-      gatherSchemaData: "665610862cf7a3000be66453" === publicKey ? true : false,
+      gatherSchemaData: "665610862cf7a3000be66453" === client.id ? true : false,
       // TODO: this should be a feature flag on the client
       tenants
     },
@@ -23568,7 +23567,7 @@ var CacheCab = class {
         task: "report",
         metadata: {
           reportId,
-          clientId: client.publicKey,
+          clientId: client.id,
           databaseType: client.databaseType,
           filters: adjusted,
           additionalProcessing: { page: { rowsPerPage: 1e3, rowsPerRequest: 1e5 } },
@@ -23707,7 +23706,7 @@ var CacheCab = class {
     );
     const keyParts = [
       reportId,
-      client.publicKey,
+      client.id,
       client.databaseType,
       hashString(stableStringify(canonicalizeForKey(tenants ?? null))),
       hashString(stableStringify(canonicalizeForKey(flags ?? null))),
@@ -24345,12 +24344,11 @@ var ContextProvider = ({
     typeof window !== "undefined" && sessionStorage ? JSON.parse(sessionStorage.getItem("quill-client") ?? "null") : null
   );
   const populatedClient = useMemo(() => {
-    if (!client || client.clientId !== publicKey) return null;
+    if (!client || client.id !== publicKey) return null;
     return {
       ...client,
-      publicKey,
-      _id: publicKey,
       id: publicKey,
+      clientId: publicKey,
       queryHeaders,
       queryEndpoint,
       streamEndpoint,
@@ -24511,7 +24509,7 @@ var ContextProvider = ({
           try {
             const result = await quillFetch({
               client: {
-                clientId: publicKey,
+                id: publicKey,
                 queryEndpoint,
                 queryHeaders,
                 withCredentials: !!withCredentials
@@ -24633,7 +24631,7 @@ var ContextProvider = ({
     try {
       const resp = await quillFetch({
         client: {
-          clientId: publicKey,
+          id: publicKey,
           queryEndpoint,
           queryHeaders,
           withCredentials: !!withCredentials
@@ -24641,7 +24639,7 @@ var ContextProvider = ({
         task: fetchRows ? "report" : "report-info",
         metadata: {
           reportId,
-          clientId: populatedClient.publicKey,
+          clientId: populatedClient.id,
           useNewNodeSql: true,
           filters: filters?.map((f) => ({ ...f, options: void 0 })),
           additionalProcessing,
@@ -24824,7 +24822,7 @@ var ContextProvider = ({
           try {
             const result = await quillFetch({
               client: {
-                clientId: publicKey,
+                id: publicKey,
                 queryEndpoint,
                 queryHeaders,
                 withCredentials: !!withCredentials
@@ -25033,7 +25031,7 @@ var ContextProvider = ({
       });
       return curDashboardConfig;
     }
-    if (!populatedClient || !populatedClient.publicKey) {
+    if (!populatedClient || !populatedClient.id) {
       return curDashboardConfig;
     }
     if (dashboardName === null || dashboardName === void 0)
@@ -25187,7 +25185,7 @@ var ContextProvider = ({
     try {
       const result = await quillFetch({
         client: {
-          clientId: publicKey2,
+          id: publicKey2,
           queryEndpoint,
           queryHeaders,
           withCredentials: !!withCredentials
@@ -25730,8 +25728,7 @@ var ContextProvider = ({
             withCredentials: withCredentials ?? false,
             databaseType: envClient.databaseType,
             name: envClient.name,
-            clientId: publicKey2,
-            publicKey: publicKey2,
+            id: publicKey2,
             featureFlags: envClient.featureFlags,
             clerkOrgId: envClient.clerkOrgId,
             allTenantTypes: hydratedTenantTypes
@@ -25803,16 +25800,16 @@ var ContextProvider = ({
   }, [publicKey]);
   useEffect(() => {
     if (!hasHandledInitialPopulatedClient.current) {
-      if (!populatedClient?.publicKey && !populatedClient?.currentTenants) {
+      if (!populatedClient?.id && !populatedClient?.currentTenants) {
         return;
       }
       hasHandledInitialPopulatedClient.current = true;
-      currentPublicKey.current = populatedClient?.publicKey ?? null;
+      currentPublicKey.current = populatedClient?.id ?? null;
       currentTenant.current = populatedClient?.currentTenants ?? null;
       return;
     }
     let publicKeyChanged = false;
-    if (populatedClient?.publicKey && currentPublicKey.current !== populatedClient?.publicKey) {
+    if (populatedClient?.id && currentPublicKey.current !== populatedClient?.id) {
       publicKeyChanged = true;
       dispatch({ type: "CLEAR_DASHBOARDS" });
       dashboardFiltersDispatch({ type: "CLEAR_DASHBOARD_FILTERS" });
@@ -25821,7 +25818,7 @@ var ContextProvider = ({
       backfilledDashboards.current.clear();
       if (isAdmin) {
         setIsDashboardsLoading(true);
-        fetchDashboards(populatedClient?.publicKey);
+        fetchDashboards(populatedClient?.id);
       } else {
         setIsDashboardsLoading(false);
       }
@@ -25853,17 +25850,17 @@ var ContextProvider = ({
         })
       );
     }
-    if (populatedClient?.currentTenants && populatedClient?.publicKey) {
+    if (populatedClient?.currentTenants && populatedClient?.id) {
       const tenant = typeof populatedClient?.currentTenants[0] === "object" ? populatedClient?.currentTenants[0]?.tenantField : void 0;
       const tenantIds = tenant && typeof populatedClient?.currentTenants[0] === "object" ? populatedClient?.currentTenants[0]?.tenantIds : populatedClient?.currentTenants;
       eventTracking?.setUser?.({
-        clientId: populatedClient.publicKey,
+        clientId: populatedClient.id,
         clerkOrgId: populatedClient.clerkOrgId,
         tenant,
         tenantIds
       });
     }
-  }, [populatedClient?.currentTenants, populatedClient?.publicKey]);
+  }, [populatedClient?.currentTenants, populatedClient?.id]);
   if (!theme) {
     return null;
   }
@@ -26177,7 +26174,7 @@ var useDashboardInternal = (dashboardName, customFilters) => {
       });
       const body = {
         task: "set-section-order",
-        clientId: client.clientId,
+        clientId: client.id,
         dashboardName,
         sectionOrder
       };
@@ -26405,7 +26402,7 @@ var useDashboards = () => {
       dateFilter,
       name: name2.trim(),
       task: "edit-dashboard",
-      clientId: clientId ?? client.clientId,
+      clientId: clientId ?? client.id,
       tenantKeys: dashboardOwners
     };
     try {
@@ -26480,7 +26477,7 @@ var useDashboards = () => {
       initialCacheDateRange,
       name: name2.trim(),
       task: "edit-dashboard",
-      clientId: clientId ?? client.clientId,
+      clientId: clientId ?? client.id,
       tenantKeys
     };
     try {
@@ -26658,7 +26655,7 @@ var useDashboards = () => {
       client,
       task: "delete-dashboard",
       metadata: {
-        clientId: client.clientId,
+        clientId: client.id,
         databaseType: client.databaseType,
         name: name2
       }
@@ -27502,7 +27499,7 @@ async function getExportData(client, dashboardFilters, reportId, getToken, event
     metadata: {
       reportId,
       dashboardItemId: reportId,
-      clientId: client.publicKey,
+      clientId: client.id,
       databaseType: client?.databaseType,
       filters: minimalFilters,
       useNewNodeSql: true,
@@ -30580,7 +30577,8 @@ var getLegendLabel = (entry) => {
 var LegendItem = ({
   entry,
   index,
-  theme
+  theme,
+  onClick
 }) => /* @__PURE__ */ jsx27(
   "div",
   {
@@ -30589,6 +30587,7 @@ var LegendItem = ({
       alignItems: "baseline",
       marginRight: "1rem"
     },
+    onClick: () => onClick ? onClick(entry) : void 0,
     children: /* @__PURE__ */ jsxs19(
       "div",
       {
@@ -30632,7 +30631,8 @@ var getOuterWidth = (element) => {
 };
 var RenderLegend = ({
   payload,
-  limit
+  limit,
+  onClickLegendElement
 }) => {
   const [theme] = useContext5(ThemeContext);
   const [isOpen, setIsOpen] = useState9(false);
@@ -30709,7 +30709,6 @@ var RenderLegend = ({
               visibility: "hidden",
               height: 0,
               overflow: "hidden",
-              pointerEvents: "none",
               display: "flex",
               alignItems: "center",
               flexWrap: "nowrap",
@@ -30733,7 +30732,15 @@ var RenderLegend = ({
                       ref: (element) => {
                         itemRefs.current[index] = element;
                       },
-                      children: /* @__PURE__ */ jsx27(LegendItem, { entry, index, theme })
+                      children: /* @__PURE__ */ jsx27(
+                        LegendItem,
+                        {
+                          entry,
+                          index,
+                          theme,
+                          onClick: onClickLegendElement
+                        }
+                      )
                     },
                     `legend-measure-${index}`
                   ))
@@ -30774,7 +30781,8 @@ var RenderLegend = ({
               {
                 entry,
                 index,
-                theme
+                theme,
+                onClick: onClickLegendElement
               },
               `legend-${index}`
             ))
@@ -30821,7 +30829,8 @@ var RenderLegend = ({
                   {
                     entry,
                     index,
-                    theme
+                    theme,
+                    onClick: onClickLegendElement
                   },
                   `legend-popover-${index}`
                 ))
@@ -31093,6 +31102,7 @@ var PieChartWrapper = React4.forwardRef(
       containerStyle,
       theme,
       onClickChartElement,
+      onClickLegendElement,
       yAxisFields,
       showLegend = false,
       ...other
@@ -31189,7 +31199,13 @@ var PieChartWrapper = React4.forwardRef(
                     paddingBottom: 20,
                     fontFamily: theme?.fontFamily
                   },
-                  content: /* @__PURE__ */ jsx28(RenderLegend, { limit: 5 })
+                  content: /* @__PURE__ */ jsx28(
+                    RenderLegend,
+                    {
+                      limit: 5,
+                      onClickLegendElement
+                    }
+                  )
                 }
               ),
               /* @__PURE__ */ jsx28(
@@ -32495,6 +32511,8 @@ function LineChart({
   cartesianGridLineColor,
   onClickChartElement = () => {
   },
+  onClickLegendElement = () => {
+  },
   dateFilter,
   referenceLines,
   showLegend = false
@@ -32591,7 +32609,7 @@ function LineChart({
                   paddingBottom: 20,
                   fontFamily: theme?.fontFamily
                 },
-                content: /* @__PURE__ */ jsx35(RenderLegend, {})
+                content: /* @__PURE__ */ jsx35(RenderLegend, { onClickLegendElement })
               }
             ),
             /* @__PURE__ */ jsx35(
@@ -32821,6 +32839,8 @@ function RadarChart({
   isAnimationActive = true,
   onClickChartElement = () => {
   },
+  onClickLegendElement = () => {
+  },
   dateFilter,
   showLegend = false
 }) {
@@ -32914,7 +32934,7 @@ function RadarChart({
                   paddingBottom: 20,
                   fontFamily: theme?.fontFamily
                 },
-                content: /* @__PURE__ */ jsx36(RenderLegend, {})
+                content: /* @__PURE__ */ jsx36(RenderLegend, { onClickLegendElement })
               }
             ),
             /* @__PURE__ */ jsx36(
@@ -33186,6 +33206,7 @@ function BarChart({
   hideYAxis = false,
   hideCartesianGrid = false,
   onClickChartElement,
+  onClickLegendElement,
   dateFilter,
   referenceLines,
   showLegend = false,
@@ -33279,9 +33300,7 @@ function BarChart({
             {
               data: data ?? [],
               layout,
-              onClick: (event) => onClickChartElement ? onClickChartElement(
-                event?.activePayload ? event.activePayload[0].payload : void 0
-              ) : void 0,
+              onClick: (event) => onClickChartElement ? onClickChartElement(event) : void 0,
               children: [
                 !hideCartesianGrid && /* @__PURE__ */ jsx38(
                   CartesianGrid2,
@@ -33301,7 +33320,7 @@ function BarChart({
                     wrapperStyle: {
                       paddingBottom: 20
                     },
-                    content: /* @__PURE__ */ jsx38(RenderLegend, {})
+                    content: /* @__PURE__ */ jsx38(RenderLegend, { onClickLegendElement })
                   }
                 ),
                 isHorizontalBars ? /* @__PURE__ */ jsxs28(Fragment3, { children: [
@@ -39041,6 +39060,7 @@ var ChartDisplay = ({
   onPageChange,
   onSortChange,
   onClickChartElement,
+  onClickLegendElement,
   overrideTheme,
   referenceLines,
   showLegend,
@@ -39109,6 +39129,7 @@ var ChartDisplay = ({
         theme: overrideTheme ?? theme,
         colorMap,
         onClickChartElement,
+        onClickLegendElement,
         yAxisFields: config?.yAxisFields,
         showLegend: resolvedShowLegend
       }
@@ -39182,6 +39203,7 @@ var ChartDisplay = ({
         hideCartesianGrid,
         colorMap,
         onClickChartElement,
+        onClickLegendElement,
         dateFilter: !hideDateRangeFilter ? dateFilter : void 0,
         referenceLines,
         showLegend: resolvedShowLegend
@@ -39209,6 +39231,7 @@ var ChartDisplay = ({
         hideCartesianGrid,
         colorMap,
         onClickChartElement,
+        onClickLegendElement,
         dateFilter: !hideDateRangeFilter ? dateFilter : void 0,
         referenceLines,
         showLegend: resolvedShowLegend,
@@ -39365,6 +39388,7 @@ var ChartDisplay = ({
         className,
         isAnimationActive,
         onClickChartElement,
+        onClickLegendElement,
         dateFilter: !hideDateRangeFilter ? dateFilter : void 0,
         showLegend: resolvedShowLegend
       }
@@ -39395,6 +39419,7 @@ var ChartDisplay = ({
       comparisonLineStyle: comparisonLineStyle ?? "solid",
       cartesianGridLineColor,
       onClickChartElement,
+      onClickLegendElement,
       dateFilter: !hideDateRangeFilter ? dateFilter : void 0,
       referenceLines,
       showLegend: resolvedShowLegend
@@ -41460,7 +41485,7 @@ function DashboardLegacy({
   const [filterValues, setFilterValues] = useState26({});
   const prevNameRef = useRef15(name2);
   const prevFlagsRef = useRef15(flags);
-  const prevClientRef = useRef15(client?.publicKey ?? "");
+  const prevClientRef = useRef15(client?.id ?? "");
   const addFilterPopoverButtonRef = useRef15(null);
   const viewFiltersPopoverButtonRef = useRef15(null);
   const previousFilters = useRef15(filters);
@@ -41516,15 +41541,15 @@ function DashboardLegacy({
     });
   }, [flags]);
   useEffect19(() => {
-    if (prevClientRef.current === client?.publicKey) {
+    if (prevClientRef.current === client?.id) {
       return;
     }
-    const isInitialKeySet = !prevClientRef.current && client?.publicKey;
+    const isInitialKeySet = !prevClientRef.current && client?.id;
     if (isInitialKeySet && Object.values(data?.sections ?? {}).flat().length) {
-      prevClientRef.current = client?.publicKey ?? "";
+      prevClientRef.current = client?.id ?? "";
       return;
     }
-    prevClientRef.current = client?.publicKey ?? "";
+    prevClientRef.current = client?.id ?? "";
     if (isClientLoading) {
       return;
     }
@@ -41536,7 +41561,7 @@ function DashboardLegacy({
       prevFlagsRef.current = flags;
       isInitialLoadOfDashboardRef.current = false;
     });
-  }, [client?.publicKey]);
+  }, [client?.id]);
   useEffect19(() => {
     setFilterValues(
       Object.values(populatedDashboardFilters ?? {}).reduce((acc, f) => {
@@ -42519,6 +42544,7 @@ function StaticChart(props) {
   const {
     reportId,
     onClickChartElement,
+    onClickLegendElement,
     containerStyle,
     showLegend,
     className
@@ -42571,6 +42597,7 @@ function StaticChart(props) {
       reportId,
       config,
       onClickChartElement,
+      onClickLegendElement,
       loading,
       className,
       containerStyle: safeContainerStyle,
@@ -47644,7 +47671,7 @@ function ChartBuilder({
       task: "dashboard",
       metadata: {
         name: dashboardName,
-        clientId: client.clientId,
+        clientId: client.id,
         databaseType: client.databaseType,
         useNewNodeSql: true,
         tenants
@@ -47704,11 +47731,11 @@ function ChartBuilder({
   const getReferencedTables = async (client2, dbTables, sqlQuery, reportBuilderState2, skipStar) => {
     const metadata = reportBuilderState2 ? {
       reportBuilderState: reportBuilderState2,
-      clientId: client2.clientId,
+      clientId: client2.id,
       useNewNodeSql: true
     } : {
       query: sqlQuery,
-      clientId: client2.clientId,
+      clientId: client2.id,
       useNewNodeSql: true
     };
     try {
@@ -47934,7 +47961,7 @@ function ChartBuilder({
           client,
           task: "dashnames",
           metadata: {
-            clientId: client.clientId
+            clientId: client.id
           }
         });
         dashNames = resp.dashboardNames;
@@ -51479,7 +51506,7 @@ function SQLEditor({
       setColumns([]);
       setDisplayTable(false);
     }
-  }, [client?.publicKey]);
+  }, [client?.id]);
   useEffect25(() => {
     if (isChartBuilderOpen === false) {
       onCloseChartBuilder && onCloseChartBuilder();
@@ -51738,7 +51765,7 @@ function SQLEditor({
       task: "astify",
       metadata: {
         query: sqlQuery,
-        clientId: client2.clientId,
+        clientId: client2.id,
         useNewNodeSql: true
       }
     });
@@ -51931,7 +51958,7 @@ function SQLEditor({
                                         query: query || "",
                                         schema: filteredSchema,
                                         databaseType: client?.databaseType ?? "postgresql",
-                                        clientName: client?.publicKey || "",
+                                        clientName: client?.id || "",
                                         setQuery,
                                         handleRunQuery: () => {
                                           handleRunQuery(currentProcessing, true);
@@ -54090,7 +54117,7 @@ var useReportBuilderInternal = ({
         !client.featureFlags?.["recommendedPivotsDisabled"]
       );
     }
-    if (!initialTableName && !reportId && client.publicKey) {
+    if (!initialTableName && !reportId && client.id) {
       clearAllState();
     }
   }, [client]);
@@ -59084,11 +59111,11 @@ function Chat({
     setIsLoading(false);
   };
   const submitDefaultMessage = async (nextMessages, abortController) => {
-    const clientId = client.clientId ?? client.publicKey;
+    const clientId = client.id;
     let responseBuffer = "";
     for await (const chunk of quillStream({
       client: {
-        clientId,
+        id: clientId,
         queryEndpoint: client.queryEndpoint,
         streamEndpoint: client.streamEndpoint,
         queryHeaders: client.queryHeaders,
@@ -59172,12 +59199,12 @@ function Chat({
     }
   };
   const submitAgentMessage = async (nextMessages, abortController) => {
-    const clientId = client.clientId ?? client.publicKey;
+    const clientId = client.id;
     let updatedMessages = [...nextMessages];
     for await (const event of quillAgentStream({
       endpoint: `${agentEndpoint}/agent/chat`,
       messages: updatedMessages,
-      sourceClientId: clientId,
+      sourceClientId: clientId ?? "<unknown>",
       getToken,
       abortSignal: abortController.signal
     })) {
@@ -59245,7 +59272,7 @@ function Chat({
     setIsLoading(true);
     const abortController = new AbortController();
     abortControllerRef.current = abortController;
-    const clientId = client.clientId ?? client.publicKey;
+    const clientId = client.id;
     if (!clientId) {
       setInputError("No client selected.");
       setIsLoading(false);
@@ -60135,7 +60162,7 @@ var useVirtualTables = () => {
     };
   };
   const handleRefreshSome = async (client, tables) => {
-    if (!client.clientId) return schemaData;
+    if (!client.id) return schemaData;
     setLoadingTables({
       ...loadingTables,
       ...tables.reduce((acc, table) => {
@@ -60153,7 +60180,7 @@ var useVirtualTables = () => {
             name: table.name,
             customFieldInfo: table.customFieldInfo,
             id: table._id,
-            clientId: client.clientId,
+            clientId: client.id,
             runQueryConfig: { getColumns: true },
             databaseType: client.databaseType,
             useNewNodeSql: true