feat: settings usage in requests and modification... #1060

ydb-platform · Jul 30, 2024 · 29917f9 · 29917f9
1 parent 8b2fb41
commit 29917f9
Show file tree

Hide file tree

Showing 35 changed files with 775 additions and 191 deletions.
diff --git a/src/components/LabelWithPopover/LabelWithPopover.tsx b/src/components/LabelWithPopover/LabelWithPopover.tsx
@@ -1,21 +1,31 @@
 import {HelpPopover} from '@gravity-ui/components';
+import type {ButtonProps} from '@gravity-ui/uikit';
 
 interface LabelWithPopoverProps {
     text: React.ReactNode;
     popoverContent: React.ReactNode;
+    popoverClassName?: string;
     className?: string;
     contentClassName?: string;
+    buttonProps?: ButtonProps;
 }
 
 export const LabelWithPopover = ({
     text,
     popoverContent,
+    popoverClassName,
     className,
     contentClassName,
+    buttonProps,
 }: LabelWithPopoverProps) => (
     <div className={className}>
         {text}
         {'\u00a0'}
-        <HelpPopover content={popoverContent} contentClassName={contentClassName} />
+        <HelpPopover
+            className={popoverClassName}
+            buttonProps={buttonProps}
+            content={popoverContent}
+            contentClassName={contentClassName}
+        />
     </div>
 );
diff --git a/src/components/QueryExecutionStatus/QueryExecutionStatus.scss b/src/components/QueryExecutionStatus/QueryExecutionStatus.scss
@@ -10,4 +10,15 @@
             color: var(--g-color-text-danger);
         }
     }
+
+    &__query-settings-icon {
+        color: var(--g-color-text-hint);
+    }
+
+    &__message {
+        display: flex;
+        flex-wrap: wrap;
+
+        white-space: pre;
+    }
 }
diff --git a/src/components/QueryExecutionStatus/QueryExecutionStatus.tsx b/src/components/QueryExecutionStatus/QueryExecutionStatus.tsx
@@ -1,8 +1,13 @@
-import {CircleCheck, CircleQuestionFill, CircleXmark} from '@gravity-ui/icons';
-import {Icon} from '@gravity-ui/uikit';
+import React from 'react';
+
+import {CircleCheck, CircleInfo, CircleQuestionFill, CircleXmark} from '@gravity-ui/icons';
+import {Icon, Tooltip} from '@gravity-ui/uikit';
 import {isAxiosError} from 'axios';
 
+import i18n from '../../containers/Tenant/Query/i18n';
+import {QUERY_SETTINGS, useSetting} from '../../lib';
 import {cn} from '../../utils/cn';
+import {useChangedQuerySettings} from '../../utils/hooks/useChangedQuerySettings';
 
 import './QueryExecutionStatus.scss';
 
@@ -13,6 +18,34 @@ interface QueryExecutionStatusProps {
     error?: unknown;
 }
 
+const QuerySettingsIndicator = () => {
+    const [useQuerySettings] = useSetting<boolean>(QUERY_SETTINGS);
+    const {isIndicatorShown, changedLastExecutionSettingsDescriptions} = useChangedQuerySettings();
+
+    if (!isIndicatorShown || !useQuerySettings) {
+        return null;
+    }
+
+    return (
+        <Tooltip
+            openDelay={0}
+            content={
+                <div className={b('message')}>
+                    {i18n('banner.query-settings.message')}
+                    {changedLastExecutionSettingsDescriptions.map((description, index, arr) => (
+                        <span key={index} className={b('description-item')}>
+                            {description}
+                            {index < arr.length - 1 ? ', ' : null}
+                        </span>
+                    ))}
+                </div>
+            }
+        >
+            <Icon data={CircleInfo} className={b('query-settings-icon')} />
+        </Tooltip>
+    );
+};
+
 export const QueryExecutionStatus = ({className, error}: QueryExecutionStatusProps) => {
     let icon: React.ReactNode;
     let label: string;
@@ -35,6 +68,7 @@ export const QueryExecutionStatus = ({className, error}: QueryExecutionStatusPro
         <div className={b(null, className)}>
             {icon}
             {label}
+            <QuerySettingsIndicator />
         </div>
     );
 };
diff --git a/src/containers/Tenant/Query/ExecuteResult/ExecuteResult.tsx b/src/containers/Tenant/Query/ExecuteResult/ExecuteResult.tsx
@@ -11,17 +11,19 @@ import Fullscreen from '../../../../components/Fullscreen/Fullscreen';
 import {YDBGraph} from '../../../../components/Graph/Graph';
 import {QueryExecutionStatus} from '../../../../components/QueryExecutionStatus';
 import {QueryResultTable} from '../../../../components/QueryResultTable/QueryResultTable';
+import {QUERY_SETTINGS} from '../../../../lib';
 import {disableFullscreen} from '../../../../store/reducers/fullscreen';
 import type {ColumnType, KeyValueRow} from '../../../../types/api/query';
 import type {ValueOf} from '../../../../types/common';
 import type {IQueryResult} from '../../../../types/store/query';
 import {getArray} from '../../../../utils';
 import {cn} from '../../../../utils/cn';
-import {useTypedDispatch, useTypedSelector} from '../../../../utils/hooks';
+import {useSetting, useTypedDispatch, useTypedSelector} from '../../../../utils/hooks';
 import {parseQueryError} from '../../../../utils/query';
 import {PaneVisibilityToggleButtons} from '../../utils/paneVisibilityToggleHelpers';
 import {ResultIssues} from '../Issues/Issues';
 import {QueryDuration} from '../QueryDuration/QueryDuration';
+import {QuerySettingsBanner} from '../QuerySettingsBanner/QuerySettingsBanner';
 import {getPreparedResult} from '../utils/getPreparedResult';
 
 import {getPlan} from './utils';
@@ -57,9 +59,9 @@ export function ExecuteResult({
 }: ExecuteResultProps) {
     const [selectedResultSet, setSelectedResultSet] = React.useState(0);
     const [activeSection, setActiveSection] = React.useState<SectionID>(resultOptionsIds.result);
-
     const isFullscreen = useTypedSelector((state) => state.fullscreen);
     const dispatch = useTypedDispatch();
+    const [useQuerySettings] = useSetting<boolean>(QUERY_SETTINGS);
 
     const stats = data?.stats;
     const resultsSetsCount = data?.resultSets?.length;
@@ -238,7 +240,6 @@ export function ExecuteResult({
             <div className={b('controls')}>
                 <div className={b('controls-right')}>
                     <QueryExecutionStatus error={error} />
-
                     {stats && !error && (
                         <React.Fragment>
                             <QueryDuration duration={stats?.DurationUs} />
@@ -262,7 +263,7 @@ export function ExecuteResult({
                     />
                 </div>
             </div>
-
+            {useQuerySettings && <QuerySettingsBanner />}
             {renderResultSection()}
         </React.Fragment>
     );

diff --git a/src/containers/Tenant/Query/ExplainResult/ExplainResult.js b/src/containers/Tenant/Query/ExplainResult/ExplainResult.js
@@ -9,19 +9,20 @@ import EnableFullscreenButton from '../../../../components/EnableFullscreenButto
 import Fullscreen from '../../../../components/Fullscreen/Fullscreen';
 import {MonacoEditor} from '../../../../components/MonacoEditor/MonacoEditor';
 import {QueryExecutionStatus} from '../../../../components/QueryExecutionStatus';
+import {QUERY_SETTINGS} from '../../../../lib';
 import {explainVersions} from '../../../../store/reducers/explainQuery/utils';
 import {disableFullscreen} from '../../../../store/reducers/fullscreen';
 import {cn} from '../../../../utils/cn';
-import {useTypedDispatch, useTypedSelector} from '../../../../utils/hooks';
+import {useSetting, useTypedDispatch, useTypedSelector} from '../../../../utils/hooks';
 import {S_EXPRESSION_LANGUAGE_ID} from '../../../../utils/monaco/constats';
 import {parseQueryErrorToString} from '../../../../utils/query';
 import {PaneVisibilityToggleButtons} from '../../utils/paneVisibilityToggleHelpers';
+import {QuerySettingsBanner} from '../QuerySettingsBanner/QuerySettingsBanner';
 
 import {renderExplainNode} from './utils';
 
 import './ExplainResult.scss';
 import 'react-json-inspector/json-inspector.css';
-
 const b = cn('ydb-query-explain-result');
 
 const EDITOR_OPTIONS = {
@@ -77,9 +78,10 @@ function GraphRoot(props) {
 export function ExplainResult(props) {
     const dispatch = useTypedDispatch();
     const [activeOption, setActiveOption] = React.useState(ExplainOptionIds.schema);
-
     const isFullscreen = useTypedSelector((state) => state.fullscreen);
 
+    const [useQuerySettings] = useSetting(QUERY_SETTINGS);
+
     React.useEffect(() => {
         return () => {
             dispatch(disableFullscreen());
@@ -258,6 +260,7 @@ export function ExplainResult(props) {
                     </React.Fragment>
                 )}
             </div>
+            {useQuerySettings && <QuerySettingsBanner />}
             <div className={b('result')}>{renderContent()}</div>
         </React.Fragment>
     );

diff --git a/src/containers/Tenant/Query/ExplainResult/ExplainResult.scss b/src/containers/Tenant/Query/ExplainResult/ExplainResult.scss
@@ -10,6 +10,7 @@
     &__text-message {
         padding: 15px 20px;
     }
+
     &__controls {
         position: sticky;
         z-index: 2;

diff --git a/src/containers/Tenant/Query/QueriesHistory/QueriesHistory.tsx b/src/containers/Tenant/Query/QueriesHistory/QueriesHistory.tsx
@@ -7,7 +7,11 @@ import {TENANT_QUERY_TABS_ID} from '../../../../store/reducers/tenant/constants'
 import {setQueryTab} from '../../../../store/reducers/tenant/tenant';
 import type {QueryInHistory} from '../../../../types/store/executeQuery';
 import {cn} from '../../../../utils/cn';
-import {useQueryModes, useTypedDispatch, useTypedSelector} from '../../../../utils/hooks';
+import {
+    useQueryExecutionSettings,
+    useTypedDispatch,
+    useTypedSelector,
+} from '../../../../utils/hooks';
 import {QUERY_MODES, QUERY_SYNTAX} from '../../../../utils/query';
 import {MAX_QUERY_HEIGHT, QUERY_TABLE_SETTINGS} from '../../utils/constants';
 import i18n from '../i18n';
@@ -25,17 +29,17 @@ interface QueriesHistoryProps {
 function QueriesHistory({changeUserInput}: QueriesHistoryProps) {
     const dispatch = useTypedDispatch();
 
-    const [queryMode, setQueryMode] = useQueryModes();
+    const [settings, setQuerySettings] = useQueryExecutionSettings();
 
     const queriesHistory = useTypedSelector(selectQueriesHistory);
     const reversedHistory = [...queriesHistory].reverse();
 
     const onQueryClick = (query: QueryInHistory) => {
-        if (query.syntax === QUERY_SYNTAX.pg && queryMode !== QUERY_MODES.pg) {
-            setQueryMode(QUERY_MODES.pg);
-        } else if (query.syntax !== QUERY_SYNTAX.pg && queryMode === QUERY_MODES.pg) {
+        if (query.syntax === QUERY_SYNTAX.pg && settings.queryMode !== QUERY_MODES.pg) {
+            setQuerySettings({...settings, queryMode: QUERY_MODES.pg});
+        } else if (query.syntax !== QUERY_SYNTAX.pg && settings.queryMode === QUERY_MODES.pg) {
             // Set query mode for queries with yql syntax
-            setQueryMode(QUERY_MODES.script);
+            setQuerySettings({...settings, queryMode: QUERY_MODES.script});
         }
 
         changeUserInput({input: query.queryText});

diff --git a/src/containers/Tenant/Query/QueryDuration/QueryDuration.scss b/src/containers/Tenant/Query/QueryDuration/QueryDuration.scss
@@ -7,10 +7,21 @@
     color: var(--g-color-text-complementary);
 
     &__item-with-popover {
+        display: flex;
+
         white-space: nowrap;
     }
 
     &__popover {
+        display: flex;
+        align-items: center;
+    }
+
+    &__popover-content {
         max-width: 300px;
     }
+
+    &__popover-button {
+        display: flex;
+    }
 }
diff --git a/src/containers/Tenant/Query/QueryDuration/QueryDuration.tsx b/src/containers/Tenant/Query/QueryDuration/QueryDuration.tsx
@@ -22,9 +22,11 @@ export const QueryDuration = ({duration}: QueryDurationProps) => {
         <span className={b()}>
             <LabelWithPopover
                 className={b('item-with-popover')}
-                contentClassName={b('popover')}
+                contentClassName={b('popover-content')}
                 text={parsedDuration}
+                popoverClassName={b('popover')}
                 popoverContent={i18n('query-duration.description')}
+                buttonProps={{className: b('popover-button')}}
             />
         </span>
     );