diff --git a/src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx b/src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx index 78969c5d2..d4264bc15 100644 --- a/src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx +++ b/src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx @@ -39,7 +39,6 @@ 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'; @@ -95,14 +94,10 @@ export default function QueryEditor(props: QueryEditorProps) { const [lastExecutedQueryText, setLastExecutedQueryText] = React.useState(''); const [isQueryStreamingEnabled] = useSetting(ENABLE_QUERY_STREAMING); - // Temporary check: disable streaming if backend parameter contains "oidc" - const isOidcBackend = useDisableOidcStreaming(); - const isStreamingEnabled = useStreamingAvailable() && isQueryStreamingEnabled && - querySettings.queryMode === QUERY_MODES.query && - !isOidcBackend; + querySettings.queryMode === QUERY_MODES.query; const [sendQuery] = queryApi.useUseSendQueryMutation(); const [streamQuery] = queryApi.useUseStreamQueryMutation(); diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/TimeoutLabel.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/TimeoutLabel.tsx index a1c9fe479..4be744402 100644 --- a/src/containers/Tenant/Query/QuerySettingsDialog/TimeoutLabel.tsx +++ b/src/containers/Tenant/Query/QuerySettingsDialog/TimeoutLabel.tsx @@ -3,7 +3,6 @@ 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'; @@ -21,12 +20,7 @@ interface TimeoutLabelProps { export function TimeoutLabel({isDisabled, isChecked, onToggle}: TimeoutLabelProps) { const [isQueryStreamingEnabled] = useSetting(ENABLE_QUERY_STREAMING); - // Temporary check: disable streaming UI if backend parameter contains "oidc" - const isOidcBackend = useDisableOidcStreaming(); - - const shouldShowStreamingUI = isQueryStreamingEnabled && !isOidcBackend; - - if (shouldShowStreamingUI) { + if (isQueryStreamingEnabled) { return (
{ - const [{backend}] = useQueryParams({backend: StringParam}); - return backend && backend.includes('oidc'); -}; diff --git a/src/utils/hooks/useQueryExecutionSettings.ts b/src/utils/hooks/useQueryExecutionSettings.ts index e9b8dd1ef..769f6a7e2 100644 --- a/src/utils/hooks/useQueryExecutionSettings.ts +++ b/src/utils/hooks/useQueryExecutionSettings.ts @@ -14,7 +14,6 @@ import { querySettingsRestoreSchema, } from '../query'; -import {useDisableOidcStreaming} from './useDisableOidcStreaming'; import {useSetting} from './useSetting'; export const useQueryExecutionSettings = () => { @@ -25,11 +24,6 @@ export const useQueryExecutionSettings = () => { const [useShowPlanToSvg] = useSetting(USE_SHOW_PLAN_SVG_KEY); const [enableQueryStreaming] = useSetting(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({ @@ -45,7 +39,7 @@ export const useQueryExecutionSettings = () => { const settings: QuerySettings = { ...validatedSettings, timeout: - effectiveStreamingEnabled && validatedSettings.queryMode === QUERY_MODES.query + enableQueryStreaming && validatedSettings.queryMode === QUERY_MODES.query ? validatedSettings.timeout || null : validatedSettings.timeout || undefined, statisticsMode: useShowPlanToSvg ? STATISTICS_MODES.full : validatedSettings.statisticsMode,