fix: add flag

Author: astandrik

package-lock.json

@@ -27,6 +27,7 @@ import {cn} from '../../../../utils/cn';
 import {
     DEFAULT_IS_QUERY_RESULT_COLLAPSED,
     DEFAULT_SIZE_RESULT_PANE_KEY,
+    ENABLE_QUERY_STREAMING,
     LAST_USED_QUERY_ACTION_KEY,
 } from '../../../../utils/constants';
 import {
@@ -90,7 +91,8 @@ export default function QueryEditor(props: QueryEditorProps) {
         LAST_USED_QUERY_ACTION_KEY,
     );
     const [lastExecutedQueryText, setLastExecutedQueryText] = React.useState<string>('');
-    const isStreamingSupported = useStreamingAvailable();
+    const [isQueryStreamingEnabled] = useSetting(ENABLE_QUERY_STREAMING);
+    const isStreamingEnabled = useStreamingAvailable() && isQueryStreamingEnabled;
 
     const [sendQuery] = queryApi.useUseSendQueryMutation();
     const [streamQuery] = queryApi.useUseStreamQueryMutation();
@@ -130,7 +132,7 @@ export default function QueryEditor(props: QueryEditorProps) {
         }
         const queryId = uuidv4();
 
-        if (isStreamingSupported) {
+        if (isStreamingEnabled) {
             runningQueryRef.current = streamQuery({
                 actionType: 'execute',
                 query: text,
@@ -190,12 +192,12 @@ export default function QueryEditor(props: QueryEditorProps) {
     });
 
     const handleCancelRunningQuery = React.useCallback(() => {
-        if (isStreamingSupported && runningQueryRef.current) {
+        if (isStreamingEnabled && runningQueryRef.current) {
             runningQueryRef.current.abort();
         } else if (result?.queryId) {
             sendCancelQuery({queryId: result?.queryId, database: tenantName});
         }
-    }, [isStreamingSupported, result?.queryId, sendCancelQuery, tenantName]);
+    }, [isStreamingEnabled, result?.queryId, sendCancelQuery, tenantName]);
 
     const onCollapseResultHandler = () => {
         dispatchResultVisibilityState(PaneVisibilityActionTypes.triggerCollapse);

src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx

@@ -17,6 +17,9 @@
   "settings.editor.codeAssistant.title": "Code Assistant",
   "settings.editor.codeAssistant.description": "Use Code Assistant for autocomplete.",
 
+  "settings.editor.queryStreaming.title": "Query Streaming",
+  "settings.editor.queryStreaming.description": "Use streaming api for query results.",
+
   "settings.editor.autocomplete-on-enter.title": "Accept suggestion on Enter",
   "settings.editor.autocomplete-on-enter.description": "Controls whether suggestions should be accepted on Enter, in addition to Tab. Helps to avoid ambiguity between inserting new lines or accepting suggestions.",
 

src/containers/UserSettings/i18n/en.json

@@ -8,6 +8,7 @@ import {
     ENABLE_AUTOCOMPLETE,
     ENABLE_CODE_ASSISTANT,
     ENABLE_NETWORK_TABLE_KEY,
+    ENABLE_QUERY_STREAMING,
     INVERTED_DISKS_KEY,
     LANGUAGE_KEY,
     SHOW_DOMAIN_DATABASE_KEY,
@@ -127,6 +128,12 @@ export const enableCodeAssistantSetting: SettingProps = {
     description: i18n('settings.editor.codeAssistant.description'),
 };
 
+export const enableQueryStreamingSetting: SettingProps = {
+    settingKey: ENABLE_QUERY_STREAMING,
+    title: i18n('settings.editor.queryStreaming.title'),
+    description: i18n('settings.editor.queryStreaming.description'),
+};
+
 export const autocompleteOnEnterSetting: SettingProps = {
     settingKey: AUTOCOMPLETE_ON_ENTER,
     title: i18n('settings.editor.autocomplete-on-enter.title'),

src/containers/UserSettings/settings.tsx

@@ -8,6 +8,7 @@ import {
     ENABLE_AUTOCOMPLETE,
     ENABLE_CODE_ASSISTANT,
     ENABLE_NETWORK_TABLE_KEY,
+    ENABLE_QUERY_STREAMING,
     INVERTED_DISKS_KEY,
     IS_HOTKEYS_HELP_HIDDEN_KEY,
     LANGUAGE_KEY,
@@ -44,6 +45,7 @@ export const DEFAULT_USER_SETTINGS = {
     [USE_CLUSTER_BALANCER_AS_BACKEND_KEY]: true,
     [ENABLE_AUTOCOMPLETE]: true,
     [ENABLE_CODE_ASSISTANT]: true,
+    [ENABLE_QUERY_STREAMING]: false,
     [AUTOCOMPLETE_ON_ENTER]: true,
     [IS_HOTKEYS_HELP_HIDDEN_KEY]: false,
     [AUTO_REFRESH_INTERVAL]: 0,

src/services/settings.ts

@@ -119,6 +119,8 @@ export const ENABLE_AUTOCOMPLETE = 'enableAutocomplete';
 
 export const ENABLE_CODE_ASSISTANT = 'enableCodeAssistant';
 
+export const ENABLE_QUERY_STREAMING = 'enableQueryStreaming';
+
 export const AUTOCOMPLETE_ON_ENTER = 'autocompleteOnEnter';
 
 export const IS_HOTKEYS_HELP_HIDDEN_KEY = 'isHotKeysHelpHidden';