Skip to content

Commit b197539

Browse files
refactor: partially replace UIKit Loader with project Loader
1 parent e0da2a1 commit b197539

File tree

13 files changed

+27
-63
lines changed

13 files changed

+27
-63
lines changed

src/components/Loader/Loader.scss

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
@import '../../styles/mixins.scss';
1+
.ydb-loader {
2+
display: flex;
3+
flex: 1 1 auto;
4+
justify-content: center;
5+
align-items: center;
26

3-
.kv-loader {
4-
@include loader();
7+
height: 100%;
58
}

src/components/Loader/Loader.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@ import {Loader as KitLoader, LoaderSize} from '@gravity-ui/uikit';
33

44
import './Loader.scss';
55

6-
const b = cn('kv-loader');
6+
const b = cn('ydb-loader');
77

8-
function Loader({size = 'l'}: {size?: LoaderSize}) {
8+
interface LoaderProps {
9+
size?: LoaderSize;
10+
}
11+
12+
export const Loader = ({size = 'm'}: LoaderProps) => {
913
return (
1014
<div className={b()}>
1115
<KitLoader size={size} />
1216
</div>
1317
);
14-
}
15-
16-
export default Loader;
18+
};

src/components/Loader/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './Loader';

src/containers/Node/Node.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
}
4646

4747
&__node-page-wrapper {
48+
height: 100%;
4849
padding: 20px;
4950
}
5051
}

src/containers/Node/Node.tsx

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import Tablets from '../Tablets/Tablets';
1212
import Storage from '../Storage/Storage';
1313
import NodeOverview from './NodeOverview/NodeOverview';
1414
import NodeStructure from './NodeStructure/NodeStructure';
15-
import Loader from '../../components/Loader/Loader';
15+
import {Loader} from '../../components/Loader';
1616
import {BasicNodeViewer} from '../../components/BasicNodeViewer';
1717

1818
import {getNodeInfo, resetNode} from '../../store/reducers/node';
@@ -132,12 +132,7 @@ function Node(props: NodeProps) {
132132
}
133133

134134
case OVERVIEW: {
135-
return (
136-
<NodeOverview
137-
node={node}
138-
className={b('overview-wrapper')}
139-
/>
140-
);
135+
return <NodeOverview node={node} className={b('overview-wrapper')} />;
141136
}
142137

143138
case STRUCTURE: {
@@ -155,7 +150,7 @@ function Node(props: NodeProps) {
155150
};
156151

157152
if (loading && !wasLoaded) {
158-
return <Loader />;
153+
return <Loader size="l" />;
159154
} else if (error) {
160155
return <div>{error.statusText}</div>;
161156
} else {

src/containers/Node/NodeStructure/NodeStructure.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@
1010
@include flex-container();
1111
@include body2-typography();
1212

13-
&__loader {
14-
display: flex;
15-
flex-grow: 1;
16-
justify-content: center;
17-
}
18-
1913
&__pdisk {
2014
display: flex;
2115
flex-direction: column;

src/containers/Node/NodeStructure/NodeStructure.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import _ from 'lodash';
66
import cn from 'bem-cn-lite';
77

88
import {PDisk} from './Pdisk';
9-
import Loader from '../.././../components/Loader/Loader';
9+
import {Loader} from '../.././../components/Loader';
1010

1111
import {getNodeStructure, selectNodeStructure} from '../../../store/reducers/node';
1212

src/containers/Tenant/Diagnostics/Consumers/Consumers.scss

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,4 @@
33
width: 200px;
44
margin-bottom: 20px;
55
}
6-
&__loader {
7-
display: flex;
8-
justify-content: center;
9-
align-items: center;
10-
11-
height: 100%;
12-
}
136
}

src/containers/Tenant/Diagnostics/Consumers/Consumers.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import {useCallback, useEffect, useState} from 'react';
22
import {useDispatch} from 'react-redux';
33
import block from 'bem-cn-lite';
44

5-
import {Loader} from '@gravity-ui/uikit';
65
import DataTable, {Column} from '@yandex-cloud/react-data-table';
76

7+
import { Loader } from '../../../../components/Loader';
88
import {prepareQueryError} from '../../../../utils/query';
99
import {DEFAULT_TABLE_SETTINGS} from '../../../../utils/constants';
1010
import {useAutofetcher, useTypedSelector} from '../../../../utils/hooks';
@@ -78,11 +78,7 @@ export const Consumers = ({path}: ConsumersProps) => {
7878
];
7979

8080
if (loading && !wasLoaded) {
81-
return (
82-
<div className={b('loader')}>
83-
<Loader size="m" />
84-
</div>
85-
);
81+
return <Loader size="m" />;
8682
}
8783

8884
if (!loading && error) {

src/containers/Tenant/Diagnostics/Describe/Describe.scss

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@
1313
padding: 10px 20px 20px 0;
1414
}
1515

16-
&__loader-container {
17-
display: flex;
18-
justify-content: center;
19-
align-items: center;
20-
21-
height: 100%;
22-
}
23-
2416
&__tree {
2517
@include json-tree-styles();
2618
}

0 commit comments

Comments
 (0)