fix: review fixes

Author: astandrik

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

@@ -313,7 +313,7 @@ function Result({
                 theme={theme}
                 tenantName={tenantName}
                 isResultsCollapsed={resultVisibilityState.collapsed}
-                isCancelError={Boolean(cancelQueryResponse?.isLoading)}
+                isCancelError={Boolean(cancelQueryResponse?.error)}
                 isCancelling={Boolean(cancelQueryResponse?.isLoading)}
                 onExpandResults={onExpandResultHandler}
                 onCollapseResults={onCollapseResultHandler}

src/services/api/streaming.ts

@@ -6,33 +6,19 @@ import {
     isSessionChunk,
     isStreamDataChunk,
 } from '../../store/reducers/query/utils';
-import type {Actions, TracingLevel} from '../../types/api/query';
-import type {QuerySyntax, StatisticsMode} from '../../types/store/query';
+import type {Actions, StreamQueryParams} from '../../types/api/query';
 import type {QueryResponseChunk, SessionChunk, StreamDataChunk} from '../../types/store/streaming';
 import {
     BINARY_DATA_IN_PLAIN_TEXT_DISPLAY,
     DEV_ENABLE_TRACING_FOR_ALL_REQUESTS,
 } from '../../utils/constants';
+import {isRedirectToAuth} from '../../utils/response';
 import {settingsManager} from '../settings';
 
 import {BaseYdbAPI} from './base';
 
 const BOUNDARY = 'boundary';
 
-export interface StreamQueryParams {
-    query?: string;
-    database?: string;
-    action?: Actions;
-    syntax?: QuerySyntax;
-    stats?: StatisticsMode;
-    tracingLevel?: TracingLevel;
-    transaction_mode?: string;
-    timeout?: number;
-    limit_rows?: number;
-    output_chunk_max_size: number;
-    concurrent_results?: boolean;
-}
-
 export interface StreamQueryOptions {
     signal?: AbortSignal;
     onStreamDataChunk: (chunk: StreamDataChunk) => void;
@@ -41,7 +27,10 @@ export interface StreamQueryOptions {
 }
 
 export class StreamingAPI extends BaseYdbAPI {
-    async streamQuery(params: StreamQueryParams, options: StreamQueryOptions) {
+    async streamQuery<Action extends Actions>(
+        params: StreamQueryParams<Action>,
+        options: StreamQueryOptions,
+    ) {
         const base64 = !settingsManager.readUserSettingsValue(
             BINARY_DATA_IN_PLAIN_TEXT_DISPLAY,
             true,
@@ -78,6 +67,11 @@ export class StreamingAPI extends BaseYdbAPI {
         });
 
         if (!response.ok) {
+            const responseData = await response.json().catch(() => ({}));
+            if (isRedirectToAuth({status: response.status, data: responseData})) {
+                window.location.assign(responseData.authUrl);
+                return;
+            }
             throw new Error(`${response.status}`);
         }
 

src/services/api/viewer.ts

@@ -15,9 +15,7 @@ import type {
     Actions,
     ErrorResponse,
     QueryAPIResponse,
-    Stats,
-    Timeout,
-    TracingLevel,
+    SendQueryParams,
 } from '../../types/api/query';
 import type {JsonRenderRequestParams, JsonRenderResponse} from '../../types/api/render';
 import type {TEvDescribeSchemeResult} from '../../types/api/schema';
@@ -32,7 +30,6 @@ import type {TTenantInfo, TTenants} from '../../types/api/tenant';
 import type {DescribeTopicResult} from '../../types/api/topic';
 import type {TEvVDiskStateResponse} from '../../types/api/vdisk';
 import type {TUserToken} from '../../types/api/whoami';
-import type {QuerySyntax, TransactionMode} from '../../types/store/query';
 import {BINARY_DATA_IN_PLAIN_TEXT_DISPLAY} from '../../utils/constants';
 import type {Nullable} from '../../utils/typecheckers';
 import {settingsManager} from '../settings';
@@ -329,18 +326,7 @@ export class ViewerAPI extends BaseYdbAPI {
     }
 
     sendQuery<Action extends Actions>(
-        params: {
-            query?: string;
-            database?: string;
-            action?: Action;
-            syntax?: QuerySyntax;
-            stats?: Stats;
-            tracingLevel?: TracingLevel;
-            transaction_mode?: TransactionMode;
-            timeout?: Timeout;
-            query_id?: string;
-            limit_rows?: number;
-        },
+        params: SendQueryParams<Action>,
         {concurrentId, signal, withRetries}: AxiosOptions = {},
     ) {
         const base64 = !settingsManager.readUserSettingsValue(

src/types/api/query.ts

@@ -1,5 +1,5 @@
 import {TRACING_LEVELS} from '../../utils/query';
-import type {StatisticsMode} from '../store/query';
+import type {QuerySyntax, StatisticsMode, TransactionMode} from '../store/query';
 
 // ==== types from backend protos ====
 interface Position {
@@ -315,6 +315,24 @@ export type CancelResponse = {
     stats?: TKqpStatsQuery;
 };
 
+export interface SendQueryParams<Action extends Actions> {
+    query?: string;
+    database?: string;
+    action?: Action;
+    syntax?: QuerySyntax;
+    stats?: Stats;
+    tracingLevel?: TracingLevel;
+    transaction_mode?: TransactionMode;
+    timeout?: Timeout;
+    query_id?: string;
+    limit_rows?: number;
+}
+
+export interface StreamQueryParams<Action extends Actions> extends SendQueryParams<Action> {
+    output_chunk_max_size?: number;
+    concurrent_results?: boolean;
+}
+
 // ==== Combined API response ====
 export type QueryAPIResponseByAction<Action extends Actions> = Action extends ExplainActions
     ? GenericExplainResponse<Action>