Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 54 additions & 26 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"@gravity-ui/paranoid": "^1.4.0",
"@gravity-ui/react-data-table": "^1.2.0",
"@gravity-ui/uikit": "^5.30.1",
"@reduxjs/toolkit": "^2.2.1",
"axios": "^0.21.2",
"bem-cn-lite": "^4.1.0",
"copy-to-clipboard": "^3.3.3",
Expand All @@ -31,18 +32,16 @@
"path-to-regexp": "^3.0.0",
"qs": "^6.11.0",
"react-error-boundary": "^4.0.12",
"react-json-inspector": "^7.1.1",
"react-helmet-async": "2.0.4",
"react-json-inspector": "^7.1.1",
"react-list": "^0.8.11",
"react-monaco-editor": "^0.47.0",
"react-redux": "^7.2.6",
"react-router": "^5.2.1",
"react-router-dom": "^5.3.0",
"react-split": "^2.0.14",
"redux": "^4.0.1",
"redux-location-state": "^2.6.0",
"redux-thunk": "^2.3.0",
"reselect": "^4.1.6",
"redux": "^5.0.1",
"redux-location-state": "^2.8.2",
"url": "^0.11.0",
"use-query-params": "^2.2.1",
"web-vitals": "^1.1.2",
Expand Down Expand Up @@ -157,6 +156,6 @@
"overrides": {
"react": "^17.0.2",
"react-dom": "^17.0.2",
"redux": "^4.0.1"
"redux": "^5.0.1"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Button} from '@gravity-ui/uikit';
import {useDispatch} from 'react-redux';
import {useTypedDispatch} from '../../utils/hooks';
import {enableFullscreen} from '../../store/reducers/fullscreen';
import {Icon} from '../Icon';

Expand All @@ -8,7 +8,7 @@ interface EnableFullscreenButtonProps {
}

function EnableFullscreenButton({disabled}: EnableFullscreenButtonProps) {
const dispatch = useDispatch();
const dispatch = useTypedDispatch();
const onEnableFullscreen = () => {
dispatch(enableFullscreen());
};
Expand Down
26 changes: 14 additions & 12 deletions src/components/Fullscreen/Fullscreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import ReactDOM from 'react-dom';
import {Button} from '@gravity-ui/uikit';
import cn from 'bem-cn-lite';

import {useDispatch} from 'react-redux';
import {useTypedDispatch} from '../../utils/hooks';
import {disableFullscreen} from '../../store/reducers/fullscreen';
import {Icon} from '../Icon';

Expand Down Expand Up @@ -49,22 +49,24 @@ class FullscreenWrapper extends React.Component<FullscreenWrapperProps> {
}

function Fullscreen(props: FullscreenProps) {
const dispatch = useDispatch();
const escFunction = (event: KeyboardEvent) => {
if (event.key === 'Escape') {
onDisableFullScreen();
}
};
const dispatch = useTypedDispatch();

const onDisableFullScreen = React.useCallback(() => {
dispatch(disableFullscreen());
}, [dispatch]);

useEffect(() => {
const escFunction = (event: KeyboardEvent) => {
if (event.key === 'Escape') {
onDisableFullScreen();
}
};

document.addEventListener('keydown', escFunction, false);
return () => {
document.removeEventListener('keydown', escFunction, false);
};
}, []);

const onDisableFullScreen = () => {
dispatch(disableFullscreen());
};
}, [onDisableFullScreen]);

return (
<FullscreenWrapper>
Expand Down
4 changes: 2 additions & 2 deletions src/components/QueryResultTable/Cell/Cell.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {useEffect} from 'react';
import {useDispatch} from 'react-redux';

import {useTypedDispatch} from '../../../utils/hooks';
import {showTooltip, hideTooltip} from '../../../store/reducers/tooltip';

import {b} from '../QueryResultTable';
Expand All @@ -13,7 +13,7 @@ interface CellProps {
export const Cell = React.memo(function Cell(props: CellProps) {
const {className, value} = props;

const dispatch = useDispatch();
const dispatch = useTypedDispatch();

useEffect(
() => () => {
Expand Down
12 changes: 6 additions & 6 deletions src/components/TabletsOverall/TabletsOverall.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {useDispatch} from 'react-redux';
import cn from 'bem-cn-lite';

import {Progress} from '@gravity-ui/uikit';

import {hideTooltip, showTooltip} from '../../store/reducers/tooltip';
import {useTypedDispatch} from '../../utils/hooks';
import {COLORS_PRIORITY} from '../../utils/constants';

import './TabletsOverall.scss';
Expand All @@ -29,17 +29,17 @@ interface TabletsOverallProps {
}

function TabletsOverall({tablets}: TabletsOverallProps) {
const dispatch = useDispatch();
const dispatch = useTypedDispatch();

const tabletsCount = tablets.length;

const substractPercentsFromMaxPercents = (
const subtractPercentsFromMaxPercents = (
statesForOverallProgress: Record<Color, number>,
substractValue: number,
subtractValue: number,
) => {
Object.keys(statesForOverallProgress).some((key) => {
if (statesForOverallProgress[key as Color] > 10) {
statesForOverallProgress[key as Color] -= minOverallPercentValue - substractValue;
statesForOverallProgress[key as Color] -= minOverallPercentValue - subtractValue;
return true;
}
return false;
Expand Down Expand Up @@ -71,7 +71,7 @@ function TabletsOverall({tablets}: TabletsOverallProps) {
// replace percents which are smaller then 3 to 3.
Object.keys(statesForOverallProgress).forEach((key) => {
if (statesForOverallProgress[key] < minOverallPercentValue) {
substractPercentsFromMaxPercents(
subtractPercentsFromMaxPercents(
statesForOverallProgress,
statesForOverallProgress[key],
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/VirtualTable/TableHead.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export const TableHead = <T,>({
return new ResizeObserver((entries) => {
const columnsWidth: TableColumnsWidthSetup = {};
entries.forEach((entry) => {
// @ts-ignore ignore custrom property usage
// @ts-expect-error ignore custrom property usage
const id = entry.target.attributes[COLUMN_NAME_HTML_ATTRIBUTE]?.value;
columnsWidth[id] = entry.contentRect.width;
});
Expand Down
5 changes: 3 additions & 2 deletions src/containers/App/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ import {ErrorBoundary} from '../../components/ErrorBoundary/ErrorBoundary';
import {settings} from '../UserSettings/settings';
import {Providers} from './Providers';

import type {Store} from 'redux';
import type {Store} from '@reduxjs/toolkit';
import type {History} from 'history';
import type {YDBEmbeddedUISettings} from '../UserSettings/settings';
import type {RootState} from '../../store';

import './App.scss';

Expand Down Expand Up @@ -46,7 +47,7 @@ function App({store, history, singleClusterMode, children, userSettings = settin
);
}

function mapStateToProps(state: any) {
function mapStateToProps(state: RootState) {
return {
singleClusterMode: state.singleClusterMode,
};
Expand Down
9 changes: 5 additions & 4 deletions src/containers/App/Content.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import {Switch, Route, Redirect, RedirectProps} from 'react-router-dom';
import cn from 'bem-cn-lite';
import {connect, useDispatch} from 'react-redux';
import {connect} from 'react-redux';

import routes from '../../routes';

Expand All @@ -17,7 +17,7 @@ import Authentication from '../Authentication/Authentication';
import {getUser} from '../../store/reducers/authentication/authentication';
import {getClusterPath} from '../Cluster/utils';
import {useSlots} from '../../components/slots';
import {useTypedSelector} from '../../utils/hooks';
import {useTypedSelector, useTypedDispatch} from '../../utils/hooks';
import {
ClusterSlot,
ClustersSlot,
Expand All @@ -32,6 +32,7 @@ import {
import type {SlotComponent} from '../../components/slots/types';
import type {SlotMap} from '../../components/slots/SlotMap';
import type {RawBreadcrumbItem} from '../Header/breadcrumbs';
import type {RootState} from '../../store';

import i18n from './i18n';
import './App.scss';
Expand Down Expand Up @@ -142,7 +143,7 @@ export function Content(props: ContentProps) {
}

function GetUser() {
const dispatch = useDispatch();
const dispatch = useTypedDispatch();
const {isAuthenticated, isInternalUser} = useTypedSelector((state) => ({
isAuthenticated: state.authentication.isAuthenticated,
isInternalUser: Boolean(state.authentication.user),
Expand Down Expand Up @@ -180,7 +181,7 @@ function ContentWrapper(props: ContentWrapperProps) {
);
}

function mapStateToProps(state: any) {
function mapStateToProps(state: RootState) {
return {
isAuthenticated: state.authentication.isAuthenticated,
singleClusterMode: state.singleClusterMode,
Expand Down
2 changes: 1 addition & 1 deletion src/containers/App/Providers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {componentsRegistry as defaultComponentsRegistry} from '../../components/
import {useSetting} from '../../utils/hooks';
import {THEME_KEY} from '../../utils/constants';

import type {Store} from 'redux';
import type {Store} from '@reduxjs/toolkit';
import type {History} from 'history';
import type {ComponentsRegistry} from '../../components/ComponentsProvider/componentsRegistry';

Expand Down
2 changes: 1 addition & 1 deletion src/containers/AppWithClusters/AppWithClusters.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {App, AppSlots} from '../App';

import type {History} from 'history';
import type {Store} from 'redux';
import type {Store} from '@reduxjs/toolkit';

import type {GetMonitoringClusterLink, GetMonitoringLink} from '../../utils/monitoring';

Expand Down
Loading