Merge branch 'main' into astandrik.2459

Author: astandrik

.github/workflows/release.yml

@@ -2,7 +2,7 @@ on:
   push:
     branches:
       - main
-      - hotfix/v[0-9]+.[0-9]+.[0-9]+ # match branches in format hotfix/v6.20.10
+      - hotfix/v[0-9]+.[0-9]+.[0-9]+* # match branches in format hotfix/v6.20.10 and hotfix/v6.20.10-hotfix.1
 
 name: Release
 

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

@@ -39,6 +39,7 @@ import {
     useTypedSelector,
 } from '../../../../utils/hooks';
 import {useChangedQuerySettings} from '../../../../utils/hooks/useChangedQuerySettings';
+import {useDisableOidcStreaming} from '../../../../utils/hooks/useDisableOidcStreaming';
 import {useLastQueryExecutionSettings} from '../../../../utils/hooks/useLastQueryExecutionSettings';
 import {DEFAULT_QUERY_SETTINGS, QUERY_ACTIONS, QUERY_MODES} from '../../../../utils/query';
 import {useCurrentSchema} from '../../TenantContext';
@@ -94,10 +95,14 @@ export default function QueryEditor(props: QueryEditorProps) {
     const [lastExecutedQueryText, setLastExecutedQueryText] = React.useState<string>('');
     const [isQueryStreamingEnabled] = useSetting<boolean>(ENABLE_QUERY_STREAMING);
 
+    // Temporary check: disable streaming if backend parameter contains "oidc"
+    const isOidcBackend = useDisableOidcStreaming();
+
     const isStreamingEnabled =
         useStreamingAvailable() &&
         isQueryStreamingEnabled &&
-        querySettings.queryMode === QUERY_MODES.query;
+        querySettings.queryMode === QUERY_MODES.query &&
+        !isOidcBackend;
 
     const [sendQuery] = queryApi.useUseSendQueryMutation();
     const [streamQuery] = queryApi.useUseStreamQueryMutation();

src/containers/Tenant/Query/QuerySettingsDialog/TimeoutLabel.tsx

@@ -3,6 +3,7 @@ import {HelpMark, Switch} from '@gravity-ui/uikit';
 import {cn} from '../../../../utils/cn';
 import {ENABLE_QUERY_STREAMING} from '../../../../utils/constants';
 import {useSetting} from '../../../../utils/hooks';
+import {useDisableOidcStreaming} from '../../../../utils/hooks/useDisableOidcStreaming';
 
 import {QUERY_SETTINGS_FIELD_SETTINGS} from './constants';
 import i18n from './i18n';
@@ -20,7 +21,12 @@ interface TimeoutLabelProps {
 export function TimeoutLabel({isDisabled, isChecked, onToggle}: TimeoutLabelProps) {
     const [isQueryStreamingEnabled] = useSetting<boolean>(ENABLE_QUERY_STREAMING);
 
-    if (isQueryStreamingEnabled) {
+    // Temporary check: disable streaming UI if backend parameter contains "oidc"
+    const isOidcBackend = useDisableOidcStreaming();
+
+    const shouldShowStreamingUI = isQueryStreamingEnabled && !isOidcBackend;
+
+    if (shouldShowStreamingUI) {
         return (
             <div className={b('switch-title')}>
                 <Switch

src/containers/Tenant/Tenant.tsx

@@ -52,16 +52,7 @@ export function Tenant(props: TenantProps) {
         getTenantSummaryState,
     );
 
-    // TODO: name is used together with database to keep old links valid, do not remove
-    const {database: queryDatabase, schema, name, handleDatabaseChange} = useTenantQueryParams();
-
-    React.useEffect(() => {
-        if (name && !queryDatabase) {
-            handleDatabaseChange(name);
-        }
-    }, [queryDatabase, name, handleDatabaseChange]);
-
-    const database = queryDatabase ?? name;
+    const {database, schema} = useTenantQueryParams();
 
     if (!database) {
         throw new Error('Tenant name is not defined');

src/containers/Tenant/useTenantQueryParams.ts

@@ -61,10 +61,16 @@ export function useTenantQueryParams() {
         [setQueryParams],
     );
 
+    React.useEffect(() => {
+        if (name && !database) {
+            setQueryParams({database: name, name: undefined}, 'replaceIn');
+        }
+    }, [database, name, setQueryParams]);
+
     return {
         showHealthcheck,
         handleShowHealthcheckChange,
-        database,
+        database: database || name,
         handleDatabaseChange,
         showGrantAccess,
         handleShowGrantAccessChange,
@@ -76,6 +82,5 @@ export function useTenantQueryParams() {
         handleIssuesFilterChange,
         aclSubject,
         handleAclSubjectChange,
-        name,
     };
 }

src/utils/hooks/useDisableOidcStreaming.ts

@@ -0,0 +1,10 @@
+import {StringParam, useQueryParams} from 'use-query-params';
+
+/**
+ * Temporary hook to check if streaming should be disabled for OIDC backends
+ * Returns true if the backend parameter contains "oidc"
+ */
+export const useDisableOidcStreaming = () => {
+    const [{backend}] = useQueryParams({backend: StringParam});
+    return backend && backend.includes('oidc');
+};

src/utils/hooks/useQueryExecutionSettings.ts

@@ -14,6 +14,7 @@ import {
     querySettingsRestoreSchema,
 } from '../query';
 
+import {useDisableOidcStreaming} from './useDisableOidcStreaming';
 import {useSetting} from './useSetting';
 
 export const useQueryExecutionSettings = () => {
@@ -24,6 +25,11 @@ export const useQueryExecutionSettings = () => {
     const [useShowPlanToSvg] = useSetting<boolean>(USE_SHOW_PLAN_SVG_KEY);
     const [enableQueryStreaming] = useSetting<boolean>(ENABLE_QUERY_STREAMING);
 
+    // Temporary check: disable streaming behavior if backend parameter contains "oidc"
+    const isOidcBackend = useDisableOidcStreaming();
+
+    const effectiveStreamingEnabled = enableQueryStreaming && !isOidcBackend;
+
     const setQueryExecutionSettings = React.useCallback(
         (settings: QuerySettings) => {
             setSettings({
@@ -39,7 +45,7 @@ export const useQueryExecutionSettings = () => {
     const settings: QuerySettings = {
         ...validatedSettings,
         timeout:
-            enableQueryStreaming && validatedSettings.queryMode === QUERY_MODES.query
+            effectiveStreamingEnabled && validatedSettings.queryMode === QUERY_MODES.query
                 ? validatedSettings.timeout || null
                 : validatedSettings.timeout || undefined,
         statisticsMode: useShowPlanToSvg ? STATISTICS_MODES.full : validatedSettings.statisticsMode,