ui: Disable tip for sampled queries

querybook/webapp/components/QueryComposer/QueryComposer.tsx

@@ -395,14 +395,6 @@ function useTranspileQuery(
     };
 }
 
-function getQueryExecutionMetadata(sampleRate: number) {
-    const metadata = {};
-    if (sampleRate > 0) {
-        metadata['sample_rate'] = sampleRate;
-    }
-    return Object.keys(metadata).length === 0 ? null : metadata;
-}
-
 const QueryComposer: React.FC = () => {
     useTrackView(ComponentType.ADHOC_QUERY);
     useBrowserTitle('Adhoc Query');
@@ -507,9 +499,34 @@ const QueryComposer: React.FC = () => {
 
     const triggerSurvey = useSurveyTrigger();
 
-    const queryExecutionMetadata = getQueryExecutionMetadata(sampleRate);
+    const getSampleRate = useCallback(
+        () => (Object.keys(samplingTables).length > 0 ? sampleRate : -1),
+        [sampleRate, samplingTables]
+    );
+
+    const getSamplingTables = useCallback(() => {
+        Object.keys(samplingTables).forEach((tableName) => {
+            samplingTables[tableName].sample_rate = getSampleRate();
+        });
+        return samplingTables;
+    }, [getSampleRate, samplingTables]);
+
+    const getQueryExecutionMetadata = useCallback(() => {
+        const metadata = {};
+
+        const sampleRate = getSampleRate();
+        if (sampleRate > 0) {
+            metadata['sample_rate'] = sampleRate;
+        }
+
+        return Object.keys(metadata).length === 0 ? null : metadata;
+    }, [getSampleRate]);
 
     const handleRunQuery = React.useCallback(async () => {
+        const sampleRate = getSampleRate();
+        const samplingTables = getSamplingTables();
+        const queryExecutionMetadata = getQueryExecutionMetadata();
+
         trackClick({
             component: ComponentType.ADHOC_QUERY,
             element: ElementType.RUN_QUERY_BUTTON,
@@ -520,6 +537,7 @@ const QueryComposer: React.FC = () => {
         });
         // Throttle to prevent double run
         await sleep(250);
+
         const transformedQuery = await transformQuery(
             getCurrentSelectedQuery(),
             engine.language,
@@ -553,16 +571,16 @@ const QueryComposer: React.FC = () => {
             setResultsCollapsed(false);
         }
     }, [
+        getSampleRate,
+        getSamplingTables,
+        getQueryExecutionMetadata,
         hasLintErrors,
-        sampleRate,
         getCurrentSelectedQuery,
         engine,
         templatedVariables,
         rowLimit,
-        samplingTables,
         triggerSurvey,
         dispatch,
-        queryExecutionMetadata,
         setExecutionId,
     ]);
 
@@ -596,7 +614,6 @@ const QueryComposer: React.FC = () => {
                 if (table?.custom_properties?.sampling) {
                     samplingTables[tableName] = {
                         sampled_table: table.custom_properties?.sampled_table,
-                        sample_rate: sampleRate,
                     };
                 }
             });
@@ -693,7 +710,7 @@ const QueryComposer: React.FC = () => {
         <DataDocTableSamplingInfo
             query={getCurrentSelectedQuery()}
             language={engine.language}
-            samplingTables={samplingTables}
+            samplingTables={getSamplingTables()}
             onHide={() => setShowTableSamplingInfoModal(false)}
         />
     );
@@ -733,7 +750,7 @@ const QueryComposer: React.FC = () => {
                 rowLimit={rowLimit}
                 onRowLimitChange={setRowLimit}
                 hasSamplingTables={Object.keys(samplingTables).length > 0}
-                sampleRate={sampleRate}
+                sampleRate={getSampleRate()}
                 onSampleRateChange={setSampleRate}
                 onTableSamplingInfoClick={() =>
                     setShowTableSamplingInfoModal(true)

querybook/webapp/components/QueryRunButton/QueryRunButton.tsx

@@ -105,15 +105,16 @@ export const QueryRunButton = React.forwardRef<
             />
         );
 
-        const tableSamplingDOM =
-            !disabled && TABLE_SAMPLING_CONFIG.enabled && hasSamplingTables ? (
-                <TableSamplingSelector
-                    sampleRate={sampleRate}
-                    setSampleRate={onSampleRateChange}
-                    tooltipPos={runButtonTooltipPos}
-                    onTableSamplingInfoClick={onTableSamplingInfoClick}
-                />
-            ) : null;
+        const tableSamplingDOM = (
+            // !disabled && TABLE_SAMPLING_CONFIG.enabled && hasSamplingTables ? (
+            <TableSamplingSelector
+                sampleRate={sampleRate}
+                setSampleRate={onSampleRateChange}
+                tooltipPos={runButtonTooltipPos}
+                onTableSamplingInfoClick={onTableSamplingInfoClick}
+            />
+        );
+        // ) : null;
 
         const isRowLimitEnabled =
             queryEngineById[engineId]?.feature_params.row_limit;