fix: better code

Author: astandrik

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

@@ -110,6 +110,9 @@ export default function QueryEditor(props: QueryEditorProps) {
 
     const [sendQuery] = queryApi.useUseSendQueryMutation();
 
+    const isStreamingSupported = useStreamingAvailable();
+    const [streamQuery] = queryApi.useUseStreamQueryMutation();
+
     React.useEffect(() => {
         if (savedPath !== tenantName) {
             dispatch(setTenantPath(tenantName));
@@ -140,8 +143,6 @@ export default function QueryEditor(props: QueryEditorProps) {
         return historyQueries[historyQueries.length - 1].queryText;
     });
 
-    const isStreamingSupported = useStreamingAvailable();
-
     const handleSendExecuteClick = useEventHandler((text?: string) => {
         const query = text ?? input;
 
@@ -153,15 +154,25 @@ export default function QueryEditor(props: QueryEditorProps) {
         }
         const queryId = uuidv4();
 
-        sendQuery({
-            actionType: 'execute',
-            query,
-            database: tenantName,
-            querySettings,
-            enableTracingLevel,
-            queryId,
-            isStreaming: isStreamingSupported,
-        });
+        if (isStreamingSupported) {
+            streamQuery({
+                actionType: 'execute',
+                query,
+                database: tenantName,
+                querySettings,
+                enableTracingLevel,
+                queryId,
+            });
+        } else {
+            sendQuery({
+                actionType: 'execute',
+                query,
+                database: tenantName,
+                querySettings,
+                enableTracingLevel,
+                queryId,
+            });
+        }
 
         dispatch(setShowPreview(false));
 

src/store/reducers/query/query.ts

@@ -57,11 +57,6 @@ const slice = createSlice({
             }
         },
         setQueryResult: (state, action: PayloadAction<QueryResult | undefined>) => {
-            console.log('[QueryState] Setting query result:', {
-                type: action.payload?.type,
-                isLoading: action.payload?.isLoading,
-                hasError: Boolean(action.payload?.error),
-            });
             state.result = action.payload;
         },
         saveQueryToHistory: (
@@ -235,7 +230,6 @@ interface SendQueryParams extends QueryRequestParams {
     // flag whether to send new tracing header or not
     // default: not send
     enableTracingLevel?: boolean;
-    isStreaming?: boolean;
 }
 
 interface QueryStats {
@@ -245,6 +239,65 @@ interface QueryStats {
 
 export const queryApi = api.injectEndpoints({
     endpoints: (build) => ({
+        useStreamQuery: build.mutation<null, SendQueryParams>({
+            queryFn: async (
+                {query, database, querySettings = {}, enableTracingLevel, queryId},
+                {signal, dispatch},
+            ) => {
+                dispatch(setQueryResult({type: 'execute', queryId, isLoading: true}));
+                dispatch(setStreamingState(true));
+
+                const {action, syntax} = getActionAndSyntaxFromQueryMode(
+                    'execute',
+                    querySettings?.queryMode,
+                );
+
+                try {
+                    await window.api.viewer.streamQuery(
+                        {
+                            query,
+                            database,
+                            action,
+                            syntax,
+                            stats: querySettings.statisticsMode,
+                            tracingLevel:
+                                querySettings.tracingLevel && enableTracingLevel
+                                    ? TracingLevelNumber[querySettings.tracingLevel]
+                                    : undefined,
+                            limit_rows: isNumeric(querySettings.limitRows)
+                                ? Number(querySettings.limitRows)
+                                : undefined,
+                            transaction_mode:
+                                querySettings.transactionMode === 'implicit'
+                                    ? undefined
+                                    : querySettings.transactionMode,
+                            timeout: isNumeric(querySettings.timeout)
+                                ? Number(querySettings.timeout) * 1000
+                                : undefined,
+                            output_chunk_max_size: 10,
+                        },
+                        {
+                            signal,
+                            onChunk: (chunk) => {
+                                dispatch(addStreamingChunk(chunk));
+                            },
+                        },
+                    );
+
+                    return {data: null};
+                } catch (error) {
+                    dispatch(
+                        setQueryResult({
+                            type: 'execute',
+                            error,
+                            isLoading: false,
+                            queryId,
+                        }),
+                    );
+                    return {error};
+                }
+            },
+        }),
         useSendQuery: build.mutation<null, SendQueryParams>({
             queryFn: async (
                 {
@@ -254,7 +307,6 @@ export const queryApi = api.injectEndpoints({
                     querySettings = {},
                     enableTracingLevel,
                     queryId,
-                    isStreaming,
                 },
                 {signal, dispatch},
             ) => {
@@ -267,44 +319,6 @@ export const queryApi = api.injectEndpoints({
                 );
 
                 try {
-                    if (isStreaming && actionType === 'execute') {
-                        dispatch(setStreamingState(true));
-
-                        await window.api.viewer.streamQuery(
-                            {
-                                query,
-                                database,
-                                action,
-                                syntax,
-                                stats: querySettings.statisticsMode,
-                                tracingLevel:
-                                    querySettings.tracingLevel && enableTracingLevel
-                                        ? TracingLevelNumber[querySettings.tracingLevel]
-                                        : undefined,
-                                limit_rows: isNumeric(querySettings.limitRows)
-                                    ? Number(querySettings.limitRows)
-                                    : undefined,
-                                transaction_mode:
-                                    querySettings.transactionMode === 'implicit'
-                                        ? undefined
-                                        : querySettings.transactionMode,
-                                timeout: isNumeric(querySettings.timeout)
-                                    ? Number(querySettings.timeout) * 1000
-                                    : undefined,
-                                output_chunk_max_size: 10,
-                            },
-                            {
-                                signal,
-                                onChunk: (chunk) => {
-                                    dispatch(addStreamingChunk(chunk));
-                                },
-                            },
-                        );
-
-                        return {data: null};
-                    }
-
-                    // Legacy implementation for older versions and non-execute queries
                     const response = await window.api.viewer.sendQuery(
                         {
                             query,