Skip to content

Commit fa98022

Browse files
authored
fix: enable oidc streaming (#2537)
1 parent 4821f40 commit fa98022

File tree

4 files changed

+3
-30
lines changed

4 files changed

+3
-30
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import {
3939
useTypedSelector,
4040
} from '../../../../utils/hooks';
4141
import {useChangedQuerySettings} from '../../../../utils/hooks/useChangedQuerySettings';
42-
import {useDisableOidcStreaming} from '../../../../utils/hooks/useDisableOidcStreaming';
4342
import {useLastQueryExecutionSettings} from '../../../../utils/hooks/useLastQueryExecutionSettings';
4443
import {DEFAULT_QUERY_SETTINGS, QUERY_ACTIONS, QUERY_MODES} from '../../../../utils/query';
4544
import {useCurrentSchema} from '../../TenantContext';
@@ -95,14 +94,10 @@ export default function QueryEditor(props: QueryEditorProps) {
9594
const [lastExecutedQueryText, setLastExecutedQueryText] = React.useState<string>('');
9695
const [isQueryStreamingEnabled] = useSetting<boolean>(ENABLE_QUERY_STREAMING);
9796

98-
// Temporary check: disable streaming if backend parameter contains "oidc"
99-
const isOidcBackend = useDisableOidcStreaming();
100-
10197
const isStreamingEnabled =
10298
useStreamingAvailable() &&
10399
isQueryStreamingEnabled &&
104-
querySettings.queryMode === QUERY_MODES.query &&
105-
!isOidcBackend;
100+
querySettings.queryMode === QUERY_MODES.query;
106101

107102
const [sendQuery] = queryApi.useUseSendQueryMutation();
108103
const [streamQuery] = queryApi.useUseStreamQueryMutation();

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import {HelpMark, Switch} from '@gravity-ui/uikit';
33
import {cn} from '../../../../utils/cn';
44
import {ENABLE_QUERY_STREAMING} from '../../../../utils/constants';
55
import {useSetting} from '../../../../utils/hooks';
6-
import {useDisableOidcStreaming} from '../../../../utils/hooks/useDisableOidcStreaming';
76

87
import {QUERY_SETTINGS_FIELD_SETTINGS} from './constants';
98
import i18n from './i18n';
@@ -21,12 +20,7 @@ interface TimeoutLabelProps {
2120
export function TimeoutLabel({isDisabled, isChecked, onToggle}: TimeoutLabelProps) {
2221
const [isQueryStreamingEnabled] = useSetting<boolean>(ENABLE_QUERY_STREAMING);
2322

24-
// Temporary check: disable streaming UI if backend parameter contains "oidc"
25-
const isOidcBackend = useDisableOidcStreaming();
26-
27-
const shouldShowStreamingUI = isQueryStreamingEnabled && !isOidcBackend;
28-
29-
if (shouldShowStreamingUI) {
23+
if (isQueryStreamingEnabled) {
3024
return (
3125
<div className={b('switch-title')}>
3226
<Switch

src/utils/hooks/useDisableOidcStreaming.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/utils/hooks/useQueryExecutionSettings.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
querySettingsRestoreSchema,
1515
} from '../query';
1616

17-
import {useDisableOidcStreaming} from './useDisableOidcStreaming';
1817
import {useSetting} from './useSetting';
1918

2019
export const useQueryExecutionSettings = () => {
@@ -25,11 +24,6 @@ export const useQueryExecutionSettings = () => {
2524
const [useShowPlanToSvg] = useSetting<boolean>(USE_SHOW_PLAN_SVG_KEY);
2625
const [enableQueryStreaming] = useSetting<boolean>(ENABLE_QUERY_STREAMING);
2726

28-
// Temporary check: disable streaming behavior if backend parameter contains "oidc"
29-
const isOidcBackend = useDisableOidcStreaming();
30-
31-
const effectiveStreamingEnabled = enableQueryStreaming && !isOidcBackend;
32-
3327
const setQueryExecutionSettings = React.useCallback(
3428
(settings: QuerySettings) => {
3529
setSettings({
@@ -45,7 +39,7 @@ export const useQueryExecutionSettings = () => {
4539
const settings: QuerySettings = {
4640
...validatedSettings,
4741
timeout:
48-
effectiveStreamingEnabled && validatedSettings.queryMode === QUERY_MODES.query
42+
enableQueryStreaming && validatedSettings.queryMode === QUERY_MODES.query
4943
? validatedSettings.timeout || null
5044
: validatedSettings.timeout || undefined,
5145
statisticsMode: useShowPlanToSvg ? STATISTICS_MODES.full : validatedSettings.statisticsMode,

0 commit comments

Comments
 (0)