Skip to content

Commit 0a20373

Browse files
committed
refactor: move renderPaginatedTableErrorMessage to utils
1 parent 3cd5090 commit 0a20373

File tree

6 files changed

+18
-25
lines changed

6 files changed

+18
-25
lines changed

src/containers/Nodes/NodesTable.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ import type {NodesFilters, NodesPreparedEntity} from '../../store/reducers/nodes
88
import type {ProblemFilterValue} from '../../store/reducers/settings/types';
99
import type {NodesGroupByField, NodesPeerRole} from '../../types/api/nodes';
1010
import {NodesUptimeFilterValues} from '../../utils/nodes';
11+
import {renderPaginatedTableErrorMessage} from '../../utils/renderPaginatedTableErrorMessage';
1112
import type {Column} from '../../utils/tableUtils/types';
1213

1314
import {getNodes} from './getNodes';
1415
import i18n from './i18n';
15-
import {getRowClassName, renderPaginatedTableErrorMessage} from './shared';
16+
import {getRowClassName} from './shared';
1617

1718
interface NodesTableProps {
1819
path?: string;

src/containers/Nodes/shared.tsx

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import {AccessDenied} from '../../components/Errors/403';
2-
import {ResponseError} from '../../components/Errors/ResponseError';
3-
import type {GetRowClassName, RenderErrorMessage} from '../../components/PaginatedTable';
1+
import type {GetRowClassName} from '../../components/PaginatedTable';
42
import type {NodesPreparedEntity} from '../../store/reducers/nodes/types';
53
import {cn} from '../../utils/cn';
64
import {isUnavailableNode} from '../../utils/nodes';
@@ -10,11 +8,3 @@ export const b = cn('ydb-nodes');
108
export const getRowClassName: GetRowClassName<NodesPreparedEntity> = (row) => {
119
return b('node', {unavailable: isUnavailableNode(row)});
1210
};
13-
14-
export const renderPaginatedTableErrorMessage: RenderErrorMessage = (error) => {
15-
if (error && error.status === 403) {
16-
return <AccessDenied position="left" />;
17-
}
18-
19-
return <ResponseError error={error} />;
20-
};

src/containers/Storage/PaginatedStorageGroups.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
} from '../../store/reducers/capabilities/hooks';
1111
import {storageApi} from '../../store/reducers/storage/storage';
1212
import {useAutoRefreshInterval} from '../../utils/hooks';
13+
import {renderPaginatedTableErrorMessage} from '../../utils/renderPaginatedTableErrorMessage';
1314

1415
import type {PaginatedStorageProps} from './PaginatedStorage';
1516
import {StorageGroupsControls} from './StorageControls/StorageControls';
@@ -18,7 +19,7 @@ import {useStorageGroupsSelectedColumns} from './StorageGroups/columns/hooks';
1819
import {TableGroup} from './TableGroup/TableGroup';
1920
import {useExpandedGroups} from './TableGroup/useExpandedTableGroups';
2021
import i18n from './i18n';
21-
import {b, renderPaginatedTableErrorMessage} from './shared';
22+
import {b} from './shared';
2223
import {useStorageQueryParams} from './useStorageQueryParams';
2324

2425
import './Storage.scss';

src/containers/Storage/PaginatedStorageNodes.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {storageApi} from '../../store/reducers/storage/storage';
1212
import {useAutoRefreshInterval} from '../../utils/hooks';
1313
import {useAdditionalNodesProps} from '../../utils/hooks/useAdditionalNodesProps';
1414
import {NodesUptimeFilterValues} from '../../utils/nodes';
15+
import {renderPaginatedTableErrorMessage} from '../../utils/renderPaginatedTableErrorMessage';
1516

1617
import type {PaginatedStorageProps} from './PaginatedStorage';
1718
import {StorageNodesControls} from './StorageControls/StorageControls';
@@ -20,7 +21,7 @@ import {useStorageNodesSelectedColumns} from './StorageNodes/columns/hooks';
2021
import {TableGroup} from './TableGroup/TableGroup';
2122
import {useExpandedGroups} from './TableGroup/useExpandedTableGroups';
2223
import i18n from './i18n';
23-
import {b, renderPaginatedTableErrorMessage} from './shared';
24+
import {b} from './shared';
2425
import type {StorageViewContext} from './types';
2526
import {useStorageQueryParams} from './useStorageQueryParams';
2627

src/containers/Storage/shared.tsx

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
import {AccessDenied} from '../../components/Errors/403';
2-
import {ResponseError} from '../../components/Errors/ResponseError';
3-
import type {RenderErrorMessage} from '../../components/PaginatedTable';
41
import {cn} from '../../utils/cn';
52

63
export const b = cn('global-storage');
7-
8-
export const renderPaginatedTableErrorMessage: RenderErrorMessage = (error) => {
9-
if (error.status === 403) {
10-
return <AccessDenied position="left" />;
11-
}
12-
13-
return <ResponseError error={error} />;
14-
};
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import {AccessDenied} from '../components/Errors/403';
2+
import {ResponseError} from '../components/Errors/ResponseError';
3+
import type {RenderErrorMessage} from '../components/PaginatedTable';
4+
5+
export const renderPaginatedTableErrorMessage: RenderErrorMessage = (error) => {
6+
if (error.status === 403) {
7+
return <AccessDenied position="left" />;
8+
}
9+
10+
return <ResponseError error={error} />;
11+
};

0 commit comments

Comments
 (0)