diff --git a/src/assets/icons/bug.svg b/src/assets/icons/bug.svg deleted file mode 100644 index 278a35fda..000000000 --- a/src/assets/icons/bug.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/assets/icons/circle-exclamation.svg b/src/assets/icons/circle-exclamation.svg deleted file mode 100644 index ec25a55c8..000000000 --- a/src/assets/icons/circle-exclamation.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/circle-info.svg b/src/assets/icons/circle-info.svg deleted file mode 100644 index cb01ce90c..000000000 --- a/src/assets/icons/circle-info.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/circle-xmark.svg b/src/assets/icons/circle-xmark.svg deleted file mode 100644 index 8f929b9c8..000000000 --- a/src/assets/icons/circle-xmark.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/close.svg b/src/assets/icons/close.svg deleted file mode 100644 index 7b07b9e0f..000000000 --- a/src/assets/icons/close.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/control-menu-button.svg b/src/assets/icons/control-menu-button.svg deleted file mode 100644 index 4dd7ee5a8..000000000 --- a/src/assets/icons/control-menu-button.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/disableFullscreen.svg b/src/assets/icons/disableFullscreen.svg new file mode 100644 index 000000000..2f6f65ec2 --- /dev/null +++ b/src/assets/icons/disableFullscreen.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/icons/dots.svg b/src/assets/icons/dots.svg deleted file mode 100644 index d77510f68..000000000 --- a/src/assets/icons/dots.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/emptyState.svg b/src/assets/icons/emptyState.svg new file mode 100644 index 000000000..11ff13ecd --- /dev/null +++ b/src/assets/icons/emptyState.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/hide.svg b/src/assets/icons/hide.svg deleted file mode 100644 index ea3a5f3da..000000000 --- a/src/assets/icons/hide.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/key.svg b/src/assets/icons/key.svg new file mode 100644 index 000000000..602a1554e --- /dev/null +++ b/src/assets/icons/key.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/src/assets/icons/monitoring.svg b/src/assets/icons/monitoring.svg new file mode 100644 index 000000000..7d0f96e55 --- /dev/null +++ b/src/assets/icons/monitoring.svg @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/src/assets/icons/network.svg b/src/assets/icons/network.svg new file mode 100644 index 000000000..b434bd059 --- /dev/null +++ b/src/assets/icons/network.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/question.svg b/src/assets/icons/question.svg deleted file mode 100644 index d9ad42d27..000000000 --- a/src/assets/icons/question.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/server.svg b/src/assets/icons/server.svg deleted file mode 100644 index fac772493..000000000 --- a/src/assets/icons/server.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/settings-with-dot.svg b/src/assets/icons/settings-with-dot.svg deleted file mode 100644 index d7a028965..000000000 --- a/src/assets/icons/settings-with-dot.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/assets/icons/settings.svg b/src/assets/icons/settings.svg deleted file mode 100644 index 8d95424ea..000000000 --- a/src/assets/icons/settings.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/assets/icons/shield.svg b/src/assets/icons/shield.svg deleted file mode 100644 index 4ddf05d0c..000000000 --- a/src/assets/icons/shield.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/icons/show.svg b/src/assets/icons/show.svg deleted file mode 100644 index 80da47682..000000000 --- a/src/assets/icons/show.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/signIn.svg b/src/assets/icons/signIn.svg deleted file mode 100644 index 55691d1f8..000000000 --- a/src/assets/icons/signIn.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/signOut.svg b/src/assets/icons/signOut.svg deleted file mode 100644 index 3b98ed0d1..000000000 --- a/src/assets/icons/signOut.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/storage.svg b/src/assets/icons/storage.svg deleted file mode 100644 index 8ce181d12..000000000 --- a/src/assets/icons/storage.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/support.svg b/src/assets/icons/support.svg deleted file mode 100644 index b684602a3..000000000 --- a/src/assets/icons/support.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/assets/icons/triangle-exclamation.svg b/src/assets/icons/triangle-exclamation.svg deleted file mode 100644 index 44d7813fd..000000000 --- a/src/assets/icons/triangle-exclamation.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/update-arrow.svg b/src/assets/icons/update-arrow.svg deleted file mode 100644 index c3ac97ce7..000000000 --- a/src/assets/icons/update-arrow.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/components/BasicNodeViewer/BasicNodeViewer.tsx b/src/components/BasicNodeViewer/BasicNodeViewer.tsx index 67625325a..ea64e8621 100644 --- a/src/components/BasicNodeViewer/BasicNodeViewer.tsx +++ b/src/components/BasicNodeViewer/BasicNodeViewer.tsx @@ -1,10 +1,12 @@ import React from 'react'; +import {ArrowUpRightFromSquare} from '@gravity-ui/icons'; +import {Icon} from '@gravity-ui/uikit'; + import type {PreparedNode} from '../../store/reducers/node/types'; import type {AdditionalNodesProps} from '../../types/additionalProps'; import {cn} from '../../utils/cn'; import {EntityStatus} from '../EntityStatus/EntityStatus'; -import {Icon} from '../Icon'; import {Tags} from '../Tags'; import './BasicNodeViewer.scss'; @@ -35,7 +37,7 @@ export const BasicNodeViewer = ({node, additionalNodesProps, className}: BasicNo href={nodeHref} target="_blank" > - + )} diff --git a/src/components/CriticalActionDialog/CriticalActionDialog.scss b/src/components/CriticalActionDialog/CriticalActionDialog.scss index 483cb7322..0676f2b26 100644 --- a/src/components/CriticalActionDialog/CriticalActionDialog.scss +++ b/src/components/CriticalActionDialog/CriticalActionDialog.scss @@ -3,6 +3,8 @@ &__warning-icon { margin-right: 16px; + + color: var(--ydb-color-status-yellow); } &__error-icon { diff --git a/src/components/CriticalActionDialog/CriticalActionDialog.tsx b/src/components/CriticalActionDialog/CriticalActionDialog.tsx index 756e13b0f..4e47b841f 100644 --- a/src/components/CriticalActionDialog/CriticalActionDialog.tsx +++ b/src/components/CriticalActionDialog/CriticalActionDialog.tsx @@ -1,11 +1,10 @@ import React from 'react'; -import {CircleXmarkFill} from '@gravity-ui/icons'; -import {Dialog} from '@gravity-ui/uikit'; +import {CircleXmarkFill, TriangleExclamationFill} from '@gravity-ui/icons'; +import {Dialog, Icon} from '@gravity-ui/uikit'; import type {IResponseError} from '../../types/api/error'; import {cn} from '../../utils/cn'; -import {Icon} from '../Icon'; import {criticalActionDialogKeyset} from './i18n'; @@ -87,7 +86,7 @@ export function CriticalActionDialog({
- + {text} diff --git a/src/components/EmptyState/EmptyState.tsx b/src/components/EmptyState/EmptyState.tsx index 8052bedbd..b7d44d3fa 100644 --- a/src/components/EmptyState/EmptyState.tsx +++ b/src/components/EmptyState/EmptyState.tsx @@ -1,5 +1,8 @@ +import {Icon} from '@gravity-ui/uikit'; + import {cn} from '../../utils/cn'; -import {Icon} from '../Icon'; + +import emptyStateIcon from '../../assets/icons/emptyState.svg'; import './EmptyState.scss'; @@ -35,12 +38,7 @@ export const EmptyState = ({ {image ? ( image ) : ( - + )} diff --git a/src/components/EnableFullscreenButton/EnableFullscreenButton.tsx b/src/components/EnableFullscreenButton/EnableFullscreenButton.tsx index 307e79126..7f13fe581 100644 --- a/src/components/EnableFullscreenButton/EnableFullscreenButton.tsx +++ b/src/components/EnableFullscreenButton/EnableFullscreenButton.tsx @@ -1,8 +1,8 @@ -import {Button} from '@gravity-ui/uikit'; +import {SquareDashed} from '@gravity-ui/icons'; +import {Button, Icon} from '@gravity-ui/uikit'; import {enableFullscreen} from '../../store/reducers/fullscreen'; import {useTypedDispatch} from '../../utils/hooks'; -import {Icon} from '../Icon'; interface EnableFullscreenButtonProps { disabled?: boolean; @@ -20,7 +20,7 @@ function EnableFullscreenButton({disabled}: EnableFullscreenButtonProps) { disabled={disabled} title="Fullscreen" > - + ); } diff --git a/src/components/Fullscreen/Fullscreen.tsx b/src/components/Fullscreen/Fullscreen.tsx index 104ac9c8c..e63a6d880 100644 --- a/src/components/Fullscreen/Fullscreen.tsx +++ b/src/components/Fullscreen/Fullscreen.tsx @@ -1,12 +1,13 @@ import React from 'react'; -import {Button} from '@gravity-ui/uikit'; +import {Button, Icon} from '@gravity-ui/uikit'; import ReactDOM from 'react-dom'; import {disableFullscreen} from '../../store/reducers/fullscreen'; import {cn} from '../../utils/cn'; import {useTypedDispatch} from '../../utils/hooks'; -import {Icon} from '../Icon'; + +import disableFullscreenIcon from '../../assets/icons/disableFullscreen.svg'; import './Fullscreen.scss'; @@ -72,7 +73,7 @@ function Fullscreen(props: FullscreenProps) {
{props.children}
diff --git a/src/components/Icon/Icon.tsx b/src/components/Icon/Icon.tsx deleted file mode 100644 index 5222e2b83..000000000 --- a/src/components/Icon/Icon.tsx +++ /dev/null @@ -1,35 +0,0 @@ -import {Icon as UiKitIcon} from '@gravity-ui/uikit'; - -interface IconProps { - name: string; - height?: number | string; - width?: number | string; - viewBox?: string; - className?: string; - onClick?: (event: React.MouseEvent) => void; -} - -export const Icon = ({ - name, - height = 16, - width = 16, - viewBox = '0 0 16 16', - className, - onClick, -}: IconProps) => { - return ( - - ); -}; - -Icon.displayName = 'Icon'; diff --git a/src/components/Icon/index.ts b/src/components/Icon/index.ts deleted file mode 100644 index e263cc0e6..000000000 --- a/src/components/Icon/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './Icon'; diff --git a/src/components/MonitoringButton/MonitoringButton.tsx b/src/components/MonitoringButton/MonitoringButton.tsx index e8dd0157f..8b5213f50 100644 --- a/src/components/MonitoringButton/MonitoringButton.tsx +++ b/src/components/MonitoringButton/MonitoringButton.tsx @@ -1,7 +1,8 @@ -import {Button} from '@gravity-ui/uikit'; +import {Button, Icon} from '@gravity-ui/uikit'; import {cn} from '../../utils/cn'; -import {Icon} from '../Icon'; + +import monitoringIcon from '../../assets/icons/monitoring.svg'; import './MonitoringButton.scss'; @@ -22,7 +23,7 @@ export function MonitoringButton({href, visible = false, className}: MonitoringB size="s" title="Monitoring dashboard" > - + ); } diff --git a/src/components/NodeHostWrapper/NodeHostWrapper.tsx b/src/components/NodeHostWrapper/NodeHostWrapper.tsx index d380a01d6..e31360163 100644 --- a/src/components/NodeHostWrapper/NodeHostWrapper.tsx +++ b/src/components/NodeHostWrapper/NodeHostWrapper.tsx @@ -1,4 +1,5 @@ -import {Button, PopoverBehavior} from '@gravity-ui/uikit'; +import {ArrowUpRightFromSquare} from '@gravity-ui/icons'; +import {Button, Icon, PopoverBehavior} from '@gravity-ui/uikit'; import {getDefaultNodePath} from '../../containers/Node/NodePages'; import type {NodesPreparedEntity} from '../../store/reducers/nodes/types'; @@ -7,7 +8,6 @@ import {cn} from '../../utils/cn'; import {isUnavailableNode} from '../../utils/nodes'; import {CellWithPopover} from '../CellWithPopover/CellWithPopover'; import {EntityStatus} from '../EntityStatus/EntityStatus'; -import {Icon} from '../Icon'; import {NodeEndpointsTooltipContent} from '../TooltipsContent'; import './NodeHostWrapper.scss'; @@ -34,7 +34,7 @@ export const NodeHostWrapper = ({node, getNodeRef}: NodeHostWrapperProps) => { const additionalControls = nodeRef ? ( ) : null; diff --git a/src/components/QueryExecutionStatus/QueryExecutionStatus.tsx b/src/components/QueryExecutionStatus/QueryExecutionStatus.tsx index b44baaa0f..3507a90a8 100644 --- a/src/components/QueryExecutionStatus/QueryExecutionStatus.tsx +++ b/src/components/QueryExecutionStatus/QueryExecutionStatus.tsx @@ -1,10 +1,8 @@ -import {Icon as UiKitIcon} from '@gravity-ui/uikit'; +import {CircleCheck, CircleQuestionFill, CircleXmark} from '@gravity-ui/icons'; +import {Icon} from '@gravity-ui/uikit'; import type {AxiosError} from 'axios'; import {cn} from '../../utils/cn'; -import {Icon} from '../Icon'; - -import questionIcon from '../../assets/icons/question.svg'; import './QueryExecutionStatus.scss'; @@ -21,16 +19,13 @@ export const QueryExecutionStatus = ({className, error}: QueryExecutionStatusPro let label: string; if (typeof error === 'object' && error?.code === 'ECONNABORTED') { - icon = ; + icon = ; label = 'Connection aborted'; } else { const hasError = Boolean(error); icon = ( ); diff --git a/src/components/StatusIcon/StatusIcon.tsx b/src/components/StatusIcon/StatusIcon.tsx index d3b7f9438..927e21bb3 100644 --- a/src/components/StatusIcon/StatusIcon.tsx +++ b/src/components/StatusIcon/StatusIcon.tsx @@ -1,21 +1,18 @@ +import {CircleExclamationFill, CircleInfoFill, TriangleExclamationFill} from '@gravity-ui/icons'; import {Icon} from '@gravity-ui/uikit'; import {EFlag} from '../../types/api/enums'; import {cn} from '../../utils/cn'; -import CircleExclamationFillIcon from '@gravity-ui/icons/svgs/circle-exclamation-fill.svg'; -import CircleInfoFillIcon from '@gravity-ui/icons/svgs/circle-info-fill.svg'; -import TriangleExclamationFillIcon from '@gravity-ui/icons/svgs/triangle-exclamation-fill.svg'; - import './StatusIcon.scss'; const b = cn('ydb-status-icon'); const icons = { - [EFlag.Blue]: CircleInfoFillIcon, - [EFlag.Yellow]: CircleExclamationFillIcon, - [EFlag.Orange]: TriangleExclamationFillIcon, - [EFlag.Red]: CircleExclamationFillIcon, + [EFlag.Blue]: CircleInfoFill, + [EFlag.Yellow]: CircleExclamationFill, + [EFlag.Orange]: TriangleExclamationFill, + [EFlag.Red]: CircleExclamationFill, }; export type StatusIconMode = 'color' | 'icons'; diff --git a/src/containers/App/App.tsx b/src/containers/App/App.tsx index 9c316531a..d10de9278 100644 --- a/src/containers/App/App.tsx +++ b/src/containers/App/App.tsx @@ -7,7 +7,6 @@ import {connect} from 'react-redux'; import {ErrorBoundary} from '../../components/ErrorBoundary/ErrorBoundary'; import type {RootState} from '../../store'; -import AppIcons from '../AppIcons/AppIcons'; import {Navigation} from '../AsideNavigation/Navigation'; import ReduxTooltip from '../ReduxTooltip/ReduxTooltip'; import {settings} from '../UserSettings/settings'; @@ -39,7 +38,6 @@ function App({store, history, singleClusterMode, children, userSettings = settin - ); } diff --git a/src/containers/AppIcons/AppIcons.js b/src/containers/AppIcons/AppIcons.js deleted file mode 100644 index 0839b714c..000000000 --- a/src/containers/AppIcons/AppIcons.js +++ /dev/null @@ -1,509 +0,0 @@ -const AppIcons = () => ( - /* eslint-disable */ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /* History controls */ - - - - - - - - - - - /* theme icons */ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -); - -export default AppIcons; diff --git a/src/containers/AsideNavigation/AsideNavigation.tsx b/src/containers/AsideNavigation/AsideNavigation.tsx index 58bcdab30..b4d86b76a 100644 --- a/src/containers/AsideNavigation/AsideNavigation.tsx +++ b/src/containers/AsideNavigation/AsideNavigation.tsx @@ -1,5 +1,6 @@ import React from 'react'; +import {CircleQuestion, Gear, Person} from '@gravity-ui/icons'; import type {MenuItem} from '@gravity-ui/navigation'; import {AsideHeader, FooterItem} from '@gravity-ui/navigation'; import {useHistory} from 'react-router-dom'; @@ -10,9 +11,6 @@ import {useSetting, useTypedSelector} from '../../utils/hooks'; import i18n from './i18n'; -import settingsIcon from '../../assets/icons/settings.svg'; -import supportIcon from '../../assets/icons/support.svg'; -import userChecked from '../../assets/icons/user-check.svg'; import userSecret from '../../assets/icons/user-secret.svg'; import ydbLogoIcon from '../../assets/icons/ydb.svg'; @@ -31,7 +29,7 @@ interface YdbUserDropdownProps { function YdbUserDropdown({isCompact, popupAnchor, ydbUser, children}: YdbUserDropdownProps) { const [isUserDropdownVisible, setIsUserDropdownVisible] = React.useState(false); - const iconData = ydbUser.login ? userChecked : userSecret; + const iconData = ydbUser.login ? Person : userSecret; return ( setIsUserDropdownVisible(true), }} enableTooltip={!isUserDropdownVisible} @@ -91,8 +88,7 @@ export function AsideNavigation(props: AsideNavigationProps) { item={{ id: 'documentation', title: i18n('navigation-item.documentation'), - icon: supportIcon, - iconSize: 24, + icon: CircleQuestion, onItemClick: () => { window.open('https://ydb.tech/docs', '_blank', 'noreferrer'); }, @@ -103,8 +99,7 @@ export function AsideNavigation(props: AsideNavigationProps) { item={{ id: 'user-settings', title: i18n('navigation-item.settings'), - icon: settingsIcon, - iconSize: 24, + icon: Gear, current: visiblePanel === Panel.UserSettings, onItemClick: () => { setVisiblePanel( diff --git a/src/containers/AsideNavigation/YdbInternalUser/YdbInternalUser.tsx b/src/containers/AsideNavigation/YdbInternalUser/YdbInternalUser.tsx index a6c150543..0a885f10d 100644 --- a/src/containers/AsideNavigation/YdbInternalUser/YdbInternalUser.tsx +++ b/src/containers/AsideNavigation/YdbInternalUser/YdbInternalUser.tsx @@ -1,3 +1,4 @@ +import {ArrowRightFromSquare, ArrowRightToSquare} from '@gravity-ui/icons'; import {Button, Icon} from '@gravity-ui/uikit'; import {useHistory} from 'react-router'; @@ -7,9 +8,6 @@ import {cn} from '../../../utils/cn'; import {useTypedDispatch, useTypedSelector} from '../../../utils/hooks'; import i18n from '../i18n'; -import signOutIcon from '@gravity-ui/icons/svgs/arrow-right-from-square.svg'; -import signInIcon from '@gravity-ui/icons/svgs/arrow-right-to-square.svg'; - import './YdbInternalUser.scss'; const b = cn('kv-ydb-internal-user'); @@ -37,7 +35,7 @@ export function YdbInternalUser() { {ydbUser ? ( ) : ( )} diff --git a/src/containers/AsideNavigation/useNavigationMenuItems.ts b/src/containers/AsideNavigation/useNavigationMenuItems.ts index da35c42af..7614cc575 100644 --- a/src/containers/AsideNavigation/useNavigationMenuItems.ts +++ b/src/containers/AsideNavigation/useNavigationMenuItems.ts @@ -1,5 +1,6 @@ import React from 'react'; +import {Pulse, Terminal} from '@gravity-ui/icons'; import type {MenuItem as AsideHeaderMenuItem} from '@gravity-ui/navigation'; import type {IconData} from '@gravity-ui/uikit'; import {useHistory, useLocation} from 'react-router'; @@ -12,9 +13,6 @@ import {getTenantPath} from '../Tenant/TenantPages'; import i18n from './i18n'; -import pulseIcon from '@gravity-ui/icons/svgs/pulse.svg'; -import terminalIcon from '@gravity-ui/icons/svgs/terminal.svg'; - interface MenuItem { id: string; title: string; @@ -45,7 +43,7 @@ export function useNavigationMenuItems() { { id: TENANT_PAGES_IDS.query, title: i18n('pages.query'), - icon: terminalIcon, + icon: Terminal, iconSize: 20, location: getTenantPath({ ...queryParams, @@ -55,7 +53,7 @@ export function useNavigationMenuItems() { { id: TENANT_PAGES_IDS.diagnostics, title: i18n('pages.diagnostics'), - icon: pulseIcon, + icon: Pulse, iconSize: 20, location: getTenantPath({ ...queryParams, diff --git a/src/containers/Authentication/Authentication.tsx b/src/containers/Authentication/Authentication.tsx index cb81a9b78..e7b08d118 100644 --- a/src/containers/Authentication/Authentication.tsx +++ b/src/containers/Authentication/Authentication.tsx @@ -1,5 +1,6 @@ import React from 'react'; +import {Eye, EyeSlash, Xmark} from '@gravity-ui/icons'; import {Button, Link as ExternalLink, Icon, TextInput} from '@gravity-ui/uikit'; import {useHistory, useLocation} from 'react-router'; @@ -8,9 +9,6 @@ import {authenticate} from '../../store/reducers/authentication/authentication'; import {cn} from '../../utils/cn'; import {useTypedDispatch, useTypedSelector} from '../../utils/hooks'; -import closeIcon from '../../assets/icons/close.svg'; -import hideIcon from '../../assets/icons/hide.svg'; -import showIcon from '../../assets/icons/show.svg'; import ydbLogoIcon from '../../assets/icons/ydb.svg'; import './Authentication.scss'; @@ -123,7 +121,7 @@ function Authentication({closable = false}: AuthenticationProps) { size="l" className={b('show-password-button')} > - + )} diff --git a/src/containers/Node/NodeStructure/Pdisk.tsx b/src/containers/Node/NodeStructure/Pdisk.tsx index 9e24df939..a9b6e182b 100644 --- a/src/containers/Node/NodeStructure/Pdisk.tsx +++ b/src/containers/Node/NodeStructure/Pdisk.tsx @@ -1,12 +1,12 @@ import React from 'react'; +import {ArrowUpRightFromSquare, CircleInfoFill} from '@gravity-ui/icons'; import DataTable from '@gravity-ui/react-data-table'; import type {Column} from '@gravity-ui/react-data-table'; -import {ArrowToggle, Button, Popover} from '@gravity-ui/uikit'; +import {ArrowToggle, Button, Icon, Popover} from '@gravity-ui/uikit'; import isEmpty from 'lodash/isEmpty'; import {EntityStatus} from '../../../components/EntityStatus/EntityStatus'; -import {Icon} from '../../../components/Icon'; import {PDiskInfo} from '../../../components/PDiskInfo/PDiskInfo'; import {ProgressViewer} from '../../../components/ProgressViewer/ProgressViewer'; import type { @@ -93,7 +93,7 @@ function getColumns({ target="_blank" title={i18n('vdisk.developer-ui-button-title')} > - + )} @@ -149,7 +149,7 @@ function getColumns({ selected: row.id === selectedVdiskId, })} > - + ); diff --git a/src/containers/PDiskPage/PDiskPage.tsx b/src/containers/PDiskPage/PDiskPage.tsx index fae70f92a..18d2bb762 100644 --- a/src/containers/PDiskPage/PDiskPage.tsx +++ b/src/containers/PDiskPage/PDiskPage.tsx @@ -1,5 +1,6 @@ import React from 'react'; +import {ArrowRotateLeft} from '@gravity-ui/icons'; import {Icon} from '@gravity-ui/uikit'; import {skipToken} from '@reduxjs/toolkit/query'; import {Helmet} from 'react-helmet-async'; @@ -22,8 +23,6 @@ import {PDiskGroups} from './PDiskGroups'; import {pDiskPageKeyset} from './i18n'; import {pdiskPageCn} from './shared'; -import ArrowRotateLeftIcon from '@gravity-ui/icons/svgs/arrow-rotate-left.svg'; - import './PDiskPage.scss'; export function PDiskPage() { @@ -122,7 +121,7 @@ export function PDiskPage() { buttonView="normal" dialogContent={pDiskPageKeyset('restart-pdisk-dialog')} > - + {pDiskPageKeyset('restart-pdisk-button')} diff --git a/src/containers/Storage/StorageGroups/getStorageGroupsColumns.tsx b/src/containers/Storage/StorageGroups/getStorageGroupsColumns.tsx index c53b0932a..eb554831c 100644 --- a/src/containers/Storage/StorageGroups/getStorageGroupsColumns.tsx +++ b/src/containers/Storage/StorageGroups/getStorageGroupsColumns.tsx @@ -1,5 +1,6 @@ import React from 'react'; +import {ShieldKeyhole} from '@gravity-ui/icons'; import DataTable from '@gravity-ui/react-data-table'; import type {Column as DataTableColumn} from '@gravity-ui/react-data-table'; import {Icon, Label, Popover, PopoverBehavior} from '@gravity-ui/uikit'; @@ -21,8 +22,6 @@ import {getDegradedSeverity, getUsageSeverityForStorageGroup} from '../utils'; import i18n from './i18n'; -import shieldIcon from '../../../assets/icons/shield.svg'; - import './StorageGroups.scss'; const b = cn('global-storage-groups'); @@ -86,7 +85,7 @@ const typeColumn: StorageGroupsColumn = { behavior={PopoverBehavior.Immediate} > )} diff --git a/src/containers/Tablet/Tablet.tsx b/src/containers/Tablet/Tablet.tsx index c7e2d3f47..f066f7dca 100644 --- a/src/containers/Tablet/Tablet.tsx +++ b/src/containers/Tablet/Tablet.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import {Link as ExternalLink} from '@gravity-ui/uikit'; +import {ArrowUpRightFromSquare} from '@gravity-ui/icons'; +import {Link as ExternalLink, Icon} from '@gravity-ui/uikit'; import {skipToken} from '@reduxjs/toolkit/query'; import {Helmet} from 'react-helmet-async'; import {useLocation, useParams} from 'react-router'; @@ -8,7 +9,6 @@ import {useLocation, useParams} from 'react-router'; import {EmptyState} from '../../components/EmptyState'; import {EntityStatus} from '../../components/EntityStatus/EntityStatus'; import {ResponseError} from '../../components/Errors/ResponseError'; -import {Icon} from '../../components/Icon'; import {Loader} from '../../components/Loader'; import {Tag} from '../../components/Tag'; import {parseQuery} from '../../routes'; @@ -126,7 +126,7 @@ export const Tablet = () => { href={`${backend}/tablets?TabletID=${TabletId}`} target="_blank" > - + {Leader && } {loading && } diff --git a/src/containers/Tenant/Diagnostics/HotKeys/HotKeys.tsx b/src/containers/Tenant/Diagnostics/HotKeys/HotKeys.tsx index dbabd542d..f923e2074 100644 --- a/src/containers/Tenant/Diagnostics/HotKeys/HotKeys.tsx +++ b/src/containers/Tenant/Diagnostics/HotKeys/HotKeys.tsx @@ -2,9 +2,9 @@ import React from 'react'; import DataTable from '@gravity-ui/react-data-table'; import type {Column} from '@gravity-ui/react-data-table'; +import {Icon} from '@gravity-ui/uikit'; import {ResponseError} from '../../../../components/Errors/ResponseError'; -import {Icon} from '../../../../components/Icon'; import {ResizeableDataTable} from '../../../../components/ResizeableDataTable/ResizeableDataTable'; import { setHotKeysData, @@ -20,6 +20,8 @@ import {useTypedDispatch, useTypedSelector} from '../../../../utils/hooks'; import i18n from './i18n'; +import keyIcon from '../../../../assets/icons/key.svg'; + import './HotKeys.scss'; const b = cn('ydb-hot-keys'); @@ -34,7 +36,7 @@ const getHotKeysColumns = (keyColumnsIds: string[] = []): Column[] => { name: col, header: (
- + {col}
), diff --git a/src/containers/Tenant/Diagnostics/Network/Network.tsx b/src/containers/Tenant/Diagnostics/Network/Network.tsx index 0390d8766..3b5328856 100644 --- a/src/containers/Tenant/Diagnostics/Network/Network.tsx +++ b/src/containers/Tenant/Diagnostics/Network/Network.tsx @@ -1,10 +1,9 @@ import React from 'react'; -import {Checkbox, Loader} from '@gravity-ui/uikit'; +import {Checkbox, Icon, Loader} from '@gravity-ui/uikit'; import {Link} from 'react-router-dom'; import {ResponseError} from '../../../../components/Errors/ResponseError'; -import {Icon} from '../../../../components/Icon'; import {Illustration} from '../../../../components/Illustration'; import {ProblemFilter} from '../../../../components/ProblemFilter'; import {networkApi} from '../../../../store/reducers/network/network'; @@ -22,6 +21,8 @@ import {getDefaultNodePath} from '../../../Node/NodePages'; import {NodeNetwork} from './NodeNetwork/NodeNetwork'; import {getConnectedNodesCount} from './utils'; +import networkIcon from '../../../../assets/icons/network.svg'; + import './Network.scss'; const b = cn('network'); @@ -136,12 +137,7 @@ export function Network({path}: NetworkProps) { ) : (
- +
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/Healthcheck/HealthcheckPreview.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/Healthcheck/HealthcheckPreview.tsx index fb14e5bf0..9bdf3b86d 100644 --- a/src/containers/Tenant/Diagnostics/TenantOverview/Healthcheck/HealthcheckPreview.tsx +++ b/src/containers/Tenant/Diagnostics/TenantOverview/Healthcheck/HealthcheckPreview.tsx @@ -1,5 +1,6 @@ import React from 'react'; +import {ArrowsRotateRight} from '@gravity-ui/icons'; import {Button, Icon} from '@gravity-ui/uikit'; import {DiagnosticCard} from '../../../../../components/DiagnosticCard/DiagnosticCard'; @@ -12,8 +13,6 @@ import {cn} from '../../../../../utils/cn'; import i18n from './i18n'; -import updateArrow from '../../../../../assets/icons/update-arrow.svg'; - import './Healthcheck.scss'; const b = cn('healthcheck'); @@ -51,7 +50,7 @@ export function HealthcheckPreview(props: HealthcheckPreviewProps) { loading={loading} view="flat-secondary" > - +
diff --git a/src/containers/Tenant/ObjectSummary/ObjectSummary.tsx b/src/containers/Tenant/ObjectSummary/ObjectSummary.tsx index de196ce60..e75bda62e 100644 --- a/src/containers/Tenant/ObjectSummary/ObjectSummary.tsx +++ b/src/containers/Tenant/ObjectSummary/ObjectSummary.tsx @@ -1,13 +1,13 @@ import React from 'react'; import {HelpPopover} from '@gravity-ui/components'; -import {Button, Tabs} from '@gravity-ui/uikit'; +import {LayoutHeaderCellsLargeFill} from '@gravity-ui/icons'; +import {Button, Icon, Tabs} from '@gravity-ui/uikit'; import qs from 'qs'; import {useLocation} from 'react-router'; import {Link} from 'react-router-dom'; import {ClipboardButton} from '../../../components/ClipboardButton'; -import {Icon} from '../../../components/Icon'; import InfoViewer from '../../../components/InfoViewer/InfoViewer'; import { CDCStreamOverview, @@ -251,7 +251,7 @@ export function ObjectSummary({ onClick={onOpenPreview} title={i18n('summary.showPreview')} > - + )} {currentSchemaPath && ( diff --git a/src/containers/Tenant/Query/Issues/Issues.tsx b/src/containers/Tenant/Query/Issues/Issues.tsx index 38ba5af1e..691f0f9df 100644 --- a/src/containers/Tenant/Query/Issues/Issues.tsx +++ b/src/containers/Tenant/Query/Issues/Issues.tsx @@ -1,5 +1,11 @@ import React from 'react'; +import { + CircleExclamationFill, + CircleInfoFill, + CircleXmarkFill, + TriangleExclamationFill, +} from '@gravity-ui/icons'; import type {IconData} from '@gravity-ui/uikit'; import {ArrowToggle, Button, Icon} from '@gravity-ui/uikit'; @@ -10,11 +16,6 @@ import {cn} from '../../../../utils/cn'; import type {SEVERITY} from './models'; import {getSeverity} from './models'; -import warningIcon from '../../../../assets/icons/circle-exclamation.svg'; -import infoIcon from '../../../../assets/icons/circle-info.svg'; -import fatalIcon from '../../../../assets/icons/circle-xmark.svg'; -import errorIcon from '../../../../assets/icons/triangle-exclamation.svg'; - import './Issues.scss'; const blockWrapper = cn('kv-result-issues'); @@ -146,17 +147,17 @@ function IssueList(props: {issues: IssueMessage[]; expanded: boolean; level: num } const severityIcons: Record = { - S_INFO: infoIcon, - S_WARNING: warningIcon, - S_ERROR: errorIcon, - S_FATAL: fatalIcon, + S_INFO: CircleInfoFill, + S_WARNING: CircleExclamationFill, + S_ERROR: TriangleExclamationFill, + S_FATAL: CircleXmarkFill, }; const blockIssueSeverity = cn('yql-issue-severity'); function IssueSeverity({severity}: {severity: SEVERITY}) { const shortenSeverity = severity.slice(2).toLowerCase(); return ( - + {shortenSeverity} ); diff --git a/src/containers/Tenant/Query/Preview/Preview.tsx b/src/containers/Tenant/Query/Preview/Preview.tsx index d2e322d02..e66a29ef8 100644 --- a/src/containers/Tenant/Query/Preview/Preview.tsx +++ b/src/containers/Tenant/Query/Preview/Preview.tsx @@ -1,8 +1,8 @@ -import {Button, Loader} from '@gravity-ui/uikit'; +import {Xmark} from '@gravity-ui/icons'; +import {Button, Icon, Loader} from '@gravity-ui/uikit'; import EnableFullscreenButton from '../../../../components/EnableFullscreenButton/EnableFullscreenButton'; import Fullscreen from '../../../../components/Fullscreen/Fullscreen'; -import {Icon} from '../../../../components/Icon'; import {QueryResultTable} from '../../../../components/QueryResultTable'; import {previewApi} from '../../../../store/reducers/preview'; import {setShowPreview} from '../../../../store/reducers/schema/schema'; @@ -56,7 +56,7 @@ export const Preview = ({database, type}: PreviewProps) => { onClick={handleClosePreview} title={i18n('preview.close')} > - +
diff --git a/src/containers/Tenant/Query/QueryEditorControls/QueryEditorControls.tsx b/src/containers/Tenant/Query/QueryEditorControls/QueryEditorControls.tsx index 5486de6a5..01f38ff28 100644 --- a/src/containers/Tenant/Query/QueryEditorControls/QueryEditorControls.tsx +++ b/src/containers/Tenant/Query/QueryEditorControls/QueryEditorControls.tsx @@ -1,9 +1,9 @@ import React from 'react'; +import {ChevronDown, PlayFill} from '@gravity-ui/icons'; import type {ButtonView} from '@gravity-ui/uikit'; -import {Button, DropdownMenu} from '@gravity-ui/uikit'; +import {Button, DropdownMenu, Icon} from '@gravity-ui/uikit'; -import {Icon} from '../../../../components/Icon'; import {LabelWithPopover} from '../../../../components/LabelWithPopover'; import type {QueryAction, QueryMode} from '../../../../types/store/query'; import {cn} from '../../../../utils/cn'; @@ -99,7 +99,7 @@ export const QueryEditorControls = ({ loading={runIsLoading} view={runView} > - + {'Run'} } diff --git a/src/containers/Tenant/Query/SavedQueries/SavedQueries.tsx b/src/containers/Tenant/Query/SavedQueries/SavedQueries.tsx index e1459f9b9..599c8563b 100644 --- a/src/containers/Tenant/Query/SavedQueries/SavedQueries.tsx +++ b/src/containers/Tenant/Query/SavedQueries/SavedQueries.tsx @@ -1,10 +1,10 @@ import React from 'react'; +import {Pencil, TrashBin} from '@gravity-ui/icons'; import type {Column} from '@gravity-ui/react-data-table'; import DataTable from '@gravity-ui/react-data-table'; -import {Button, Dialog} from '@gravity-ui/uikit'; +import {Button, Dialog, Icon} from '@gravity-ui/uikit'; -import {Icon} from '../../../../components/Icon'; import {ResizeableDataTable} from '../../../../components/ResizeableDataTable/ResizeableDataTable'; import {TruncatedQuery} from '../../../../components/TruncatedQuery/TruncatedQuery'; import {setQueryNameToEdit} from '../../../../store/reducers/saveQuery'; @@ -111,10 +111,10 @@ export const SavedQueries = ({savedQueries, changeUserInput, onDeleteQuery}: Sav diff --git a/src/containers/Tenant/Schema/SchemaViewer/helpers.tsx b/src/containers/Tenant/Schema/SchemaViewer/helpers.tsx index 94fe093cb..d94c47bbd 100644 --- a/src/containers/Tenant/Schema/SchemaViewer/helpers.tsx +++ b/src/containers/Tenant/Schema/SchemaViewer/helpers.tsx @@ -1,8 +1,8 @@ import type {ClassNameFormatter} from '@bem-react/classname'; import DataTable from '@gravity-ui/react-data-table'; import type {Column} from '@gravity-ui/react-data-table'; +import {Icon} from '@gravity-ui/uikit'; -import {Icon} from '../../../../components/Icon'; import type { EPathType, TColumnDescription, @@ -18,6 +18,8 @@ import { isTableType, } from '../../utils/schema'; +import keyIcon from '../../../../assets/icons/key.svg'; + export const SchemaViewerColumns = { id: 'Id', name: 'Name', @@ -138,7 +140,7 @@ export function prepareSchemaTableColumns(options: { render: ({row}) => { return row.Id && options.keyColumnIds.includes(row.Id) ? (
- +
) : null; }, diff --git a/src/containers/Tenant/utils/ToggleButton.scss b/src/containers/Tenant/utils/ToggleButton.scss index d9e874be7..c76f229de 100644 --- a/src/containers/Tenant/utils/ToggleButton.scss +++ b/src/containers/Tenant/utils/ToggleButton.scss @@ -17,8 +17,6 @@ &_left.rotate { transform: rotate(90deg); } - &_top { - } &_top.rotate { transform: rotate(180deg); diff --git a/src/containers/Tenant/utils/paneVisibilityToggleHelpers.tsx b/src/containers/Tenant/utils/paneVisibilityToggleHelpers.tsx index e756b8668..05ca284bf 100644 --- a/src/containers/Tenant/utils/paneVisibilityToggleHelpers.tsx +++ b/src/containers/Tenant/utils/paneVisibilityToggleHelpers.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import {Button} from '@gravity-ui/uikit'; +import {ChevronsUp} from '@gravity-ui/icons'; +import {Button, Icon} from '@gravity-ui/uikit'; -import {Icon} from '../../../components/Icon'; import {cn} from '../../../utils/cn'; import './ToggleButton.scss'; @@ -95,13 +95,7 @@ export function PaneVisibilityToggleButtons({ )} title="Collapse" > - + ); diff --git a/src/containers/Tenant/utils/schemaControls.tsx b/src/containers/Tenant/utils/schemaControls.tsx index 62c77c511..9ddcfdd20 100644 --- a/src/containers/Tenant/utils/schemaControls.tsx +++ b/src/containers/Tenant/utils/schemaControls.tsx @@ -1,7 +1,7 @@ -import {Button} from '@gravity-ui/uikit'; +import {LayoutHeaderCellsLargeFill} from '@gravity-ui/icons'; +import {Button, Icon} from '@gravity-ui/uikit'; import type {NavigationTreeNodeType, NavigationTreeProps} from 'ydb-ui-components'; -import {Icon} from '../../../components/Icon'; import {setShowPreview} from '../../../store/reducers/schema/schema'; import {TENANT_PAGES_IDS, TENANT_QUERY_TABS_ID} from '../../../store/reducers/tenant/constants'; import {setQueryTab, setTenantPage} from '../../../store/reducers/tenant/tenant'; @@ -41,7 +41,7 @@ export const getControls = title={i18n('actions.openPreview')} size="s" > - + ); diff --git a/src/containers/VDiskPage/VDiskPage.tsx b/src/containers/VDiskPage/VDiskPage.tsx index c136bd29c..1416a6888 100644 --- a/src/containers/VDiskPage/VDiskPage.tsx +++ b/src/containers/VDiskPage/VDiskPage.tsx @@ -1,5 +1,6 @@ import React from 'react'; +import {ArrowsOppositeToDots} from '@gravity-ui/icons'; import {Icon} from '@gravity-ui/uikit'; import {skipToken} from '@reduxjs/toolkit/query'; import {Helmet} from 'react-helmet-async'; @@ -24,8 +25,6 @@ import {useTypedDispatch, useTypedSelector} from '../../utils/hooks'; import {vDiskPageKeyset} from './i18n'; -import ArrowsOppositeToDotsIcon from '@gravity-ui/icons/svgs/arrows-opposite-to-dots.svg'; - import './VDiskPage.scss'; const vDiskPageCn = cn('ydb-vdisk-page'); @@ -134,7 +133,7 @@ export function VDiskPage() { buttonView="normal" dialogContent={vDiskPageKeyset('evict-vdisk-dialog')} > - + {vDiskPageKeyset('evict-vdisk-button')}