Skip to content

Commit 8d69beb

Browse files
committed
fix: only used props, move component
1 parent a080d85 commit 8d69beb

File tree

6 files changed

+32
-40
lines changed

6 files changed

+32
-40
lines changed

src/containers/Tenant/Diagnostics/TopQueries/CopyLinkButton.tsx renamed to src/containers/Tenant/Diagnostics/TopQueries/QueryDetails/CopyLinkButton.tsx

+13-21
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,27 @@
11
import React from 'react';
22

33
import {Link} from '@gravity-ui/icons';
4-
import type {ButtonProps, CopyToClipboardProps, CopyToClipboardStatus} from '@gravity-ui/uikit';
4+
import type {ButtonProps, CopyToClipboardStatus} from '@gravity-ui/uikit';
55
import {ActionTooltip, Button, CopyToClipboard, Icon} from '@gravity-ui/uikit';
66

7-
import {cn} from '../../../../utils/cn';
8-
9-
import i18n from './i18n';
7+
import {cn} from '../../../../../utils/cn';
8+
import i18n from '../i18n';
109

1110
import './QueryDetails.scss';
1211

1312
const b = cn('kv-query-details');
1413

15-
export interface ClipboardButtonProps
16-
extends Omit<CopyToClipboardProps, 'children'>,
17-
Omit<ClipboardButtonComponentProps, 'status' | 'closeDelay' | 'onClick'> {}
18-
19-
interface ClipboardButtonComponentProps
20-
extends Omit<ButtonProps, 'href' | 'component' | 'target' | 'rel' | 'loading'> {
21-
status: CopyToClipboardStatus;
22-
closeDelay: number | undefined;
23-
/** Disable tooltip. Tooltip won't be shown */
14+
interface LinkButtonComponentProps extends ButtonProps {
15+
size?: ButtonProps['size'];
2416
hasTooltip?: boolean;
25-
/** Text shown before copy */
26-
tooltipInitialText?: string;
27-
/** Text shown after copy */
28-
tooltipSuccessText?: string;
29-
/** Position of clipboard icon */
30-
iconPosition?: 'start' | 'end';
17+
status: CopyToClipboardStatus;
18+
closeDelay?: number;
3119
}
3220

3321
const DEFAULT_TIMEOUT = 1200;
3422
const TOOLTIP_ANIMATION = 200;
3523

36-
const LinkButtonComponent = (props: ClipboardButtonComponentProps) => {
24+
const LinkButtonComponent = (props: LinkButtonComponentProps) => {
3725
const {size = 'm', hasTooltip = true, status, closeDelay, ...rest} = props;
3826

3927
return (
@@ -55,7 +43,11 @@ const LinkButtonComponent = (props: ClipboardButtonComponentProps) => {
5543
);
5644
};
5745

58-
export function CopyLinkButton(props: ClipboardButtonProps) {
46+
export interface CopyLinkButtonProps extends ButtonProps {
47+
text: string;
48+
}
49+
50+
export function CopyLinkButton(props: CopyLinkButtonProps) {
5951
const {text, ...buttonProps} = props;
6052

6153
const timerIdRef = React.useRef<number>();

src/containers/Tenant/Diagnostics/TopQueries/QueryDetails.scss renamed to src/containers/Tenant/Diagnostics/TopQueries/QueryDetails/QueryDetails.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '../../../../styles/mixins.scss';
1+
@import '../../../../../styles/mixins.scss';
22

33
.kv-query-details {
44
display: flex;

src/containers/Tenant/Diagnostics/TopQueries/QueryDetails.tsx renamed to src/containers/Tenant/Diagnostics/TopQueries/QueryDetails/QueryDetails.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import React from 'react';
33
import {Code, Xmark} from '@gravity-ui/icons';
44
import {Button, Icon} from '@gravity-ui/uikit';
55

6-
import Fullscreen from '../../../../components/Fullscreen/Fullscreen';
7-
import type {InfoViewerItem} from '../../../../components/InfoViewer';
8-
import {InfoViewer} from '../../../../components/InfoViewer';
9-
import {YDBSyntaxHighlighter} from '../../../../components/SyntaxHighlighter/YDBSyntaxHighlighter';
10-
import {cn} from '../../../../utils/cn';
6+
import Fullscreen from '../../../../../components/Fullscreen/Fullscreen';
7+
import type {InfoViewerItem} from '../../../../../components/InfoViewer';
8+
import {InfoViewer} from '../../../../../components/InfoViewer';
9+
import {YDBSyntaxHighlighter} from '../../../../../components/SyntaxHighlighter/YDBSyntaxHighlighter';
10+
import {cn} from '../../../../../utils/cn';
11+
import i18n from '../i18n';
1112

1213
import {CopyLinkButton} from './CopyLinkButton';
13-
import i18n from './i18n';
1414

1515
import './QueryDetails.scss';
1616

src/containers/Tenant/Diagnostics/TopQueries/QueryDetailsDrawerContent.tsx renamed to src/containers/Tenant/Diagnostics/TopQueries/QueryDetails/QueryDetailsDrawerContent.tsx

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ import React from 'react';
33
import {Button, Icon, Text} from '@gravity-ui/uikit';
44
import {useHistory, useLocation} from 'react-router-dom';
55

6-
import {parseQuery} from '../../../../routes';
7-
import {changeUserInput, setIsDirty} from '../../../../store/reducers/query/query';
6+
import {parseQuery} from '../../../../../routes';
7+
import {changeUserInput, setIsDirty} from '../../../../../store/reducers/query/query';
88
import {
99
TENANT_PAGE,
1010
TENANT_PAGES_IDS,
1111
TENANT_QUERY_TABS_ID,
12-
} from '../../../../store/reducers/tenant/constants';
13-
import type {KeyValueRow} from '../../../../types/api/query';
14-
import {cn} from '../../../../utils/cn';
15-
import {useTypedDispatch} from '../../../../utils/hooks';
16-
import {TenantTabsGroups, getTenantPath} from '../../TenantPages';
12+
} from '../../../../../store/reducers/tenant/constants';
13+
import type {KeyValueRow} from '../../../../../types/api/query';
14+
import {cn} from '../../../../../utils/cn';
15+
import {useTypedDispatch} from '../../../../../utils/hooks';
16+
import {TenantTabsGroups, getTenantPath} from '../../../TenantPages';
17+
import i18n from '../i18n';
18+
import {createQueryInfoItems} from '../utils';
1719

1820
import {QueryDetails} from './QueryDetails';
19-
import i18n from './i18n';
20-
import {createQueryInfoItems} from './utils';
2121

22-
import CryCatIcon from '../../../../assets/icons/cry-cat.svg';
22+
import CryCatIcon from '../../../../../assets/icons/cry-cat.svg';
2323

2424
const b = cn('kv-top-queries');
2525

src/containers/Tenant/Diagnostics/TopQueries/RunningQueriesData.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {useSelectedColumns} from '../../../../utils/hooks/useSelectedColumns';
1515
import {parseQueryErrorToString} from '../../../../utils/query';
1616
import {Drawer} from '../../../Drawer/Drawer';
1717

18-
import {QueryDetailsDrawerContent} from './QueryDetailsDrawerContent';
18+
import {QueryDetailsDrawerContent} from './QueryDetails/QueryDetailsDrawerContent';
1919
import {getRunningQueriesColumns} from './columns/columns';
2020
import {
2121
DEFAULT_RUNNING_QUERIES_COLUMNS,

src/containers/Tenant/Diagnostics/TopQueries/TopQueriesData.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {useSelectedColumns} from '../../../../utils/hooks/useSelectedColumns';
1919
import {parseQueryErrorToString} from '../../../../utils/query';
2020
import {Drawer} from '../../../Drawer/Drawer';
2121

22-
import {QueryDetailsDrawerContent} from './QueryDetailsDrawerContent';
22+
import {QueryDetailsDrawerContent} from './QueryDetails/QueryDetailsDrawerContent';
2323
import {getTopQueriesColumns} from './columns/columns';
2424
import {
2525
DEFAULT_TOP_QUERIES_COLUMNS,

0 commit comments

Comments
 (0)