Skip to content

Commit 498b37f

Browse files
committed
fix(Cluster): layout for tabs content
1 parent c12fed4 commit 498b37f

File tree

7 files changed

+43
-34
lines changed

7 files changed

+43
-34
lines changed

src/containers/Cluster/Cluster.scss

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,7 @@
3232
&__tabs-sticky-wrapper {
3333
z-index: 3;
3434

35-
margin-top: 20px;
36-
margin-right: -40px;
37-
padding-right: 40px;
38-
padding-left: 20px;
39-
40-
transform: translateX(-20px);
35+
@include mixins.cluster-full-width-area();
4136
@include mixins.sticky-top();
4237
}
4338
&__tabs {

src/containers/Storage/Storage.scss

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@
2121
}
2222

2323
&__controls {
24-
width: unset;
25-
margin-right: -40px;
26-
padding-right: 40px;
27-
padding-left: 20px;
28-
29-
transform: translateX(-20px);
24+
@include mixins.cluster-full-width-area();
3025
}
3126
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
@use '../../styles/mixins.scss';
2+
3+
.ydb-tablets-table {
4+
&__controls {
5+
@include mixins.cluster-full-width-area();
6+
}
7+
}

src/containers/Tablets/TabletsTable.tsx

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,17 @@ import {TabletUptime} from '../../components/UptimeViewer/UptimeViewer';
1919
import {tabletApi} from '../../store/reducers/tablet';
2020
import {ETabletState} from '../../types/api/tablet';
2121
import type {TTabletStateInfo} from '../../types/api/tablet';
22+
import {cn} from '../../utils/cn';
2223
import {DEFAULT_TABLE_SETTINGS, EMPTY_DATA_PLACEHOLDER} from '../../utils/constants';
2324
import {useIsUserAllowedToMakeChanges} from '../../utils/hooks/useIsUserAllowedToMakeChanges';
2425
import {getDefaultNodePath} from '../Node/NodePages';
2526

2627
import i18n from './i18n';
2728

29+
import './TabletsTable.scss';
30+
31+
const b = cn('ydb-tablets-table');
32+
2833
function getColumns({database}: {database?: string}) {
2934
const columns: DataTableColumn<TTabletStateInfo & {fqdn?: string}>[] = [
3035
{
@@ -189,8 +194,8 @@ export function TabletsTable({database, tablets, loading, error}: TabletsTablePr
189194
};
190195

191196
return (
192-
<TableWithControlsLayout>
193-
<TableWithControlsLayout.Controls>
197+
<React.Fragment>
198+
<TableWithControlsLayout.Controls wrapperClassName={b('controls')}>
194199
<Search
195200
placeholder={i18n('controls.search-placeholder')}
196201
onChange={handleSearchQueryChange}
@@ -204,15 +209,17 @@ export function TabletsTable({database, tablets, loading, error}: TabletsTablePr
204209
current={filteredTablets.length}
205210
/>
206211
</TableWithControlsLayout.Controls>
207-
{error ? <ResponseError error={error} /> : null}
208-
<TableWithControlsLayout.Table loading={loading}>
209-
<ResizeableDataTable
210-
columns={columns}
211-
data={filteredTablets}
212-
settings={DEFAULT_TABLE_SETTINGS}
213-
emptyDataMessage={i18n('noTabletsData')}
214-
/>
215-
</TableWithControlsLayout.Table>
216-
</TableWithControlsLayout>
212+
<TableWithControlsLayout>
213+
{error ? <ResponseError error={error} /> : null}
214+
<TableWithControlsLayout.Table loading={loading}>
215+
<ResizeableDataTable
216+
columns={columns}
217+
data={filteredTablets}
218+
settings={DEFAULT_TABLE_SETTINGS}
219+
emptyDataMessage={i18n('noTabletsData')}
220+
/>
221+
</TableWithControlsLayout.Table>
222+
</TableWithControlsLayout>
223+
</React.Fragment>
217224
);
218225
}

src/containers/Tenants/Tenants.scss

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,7 @@
5454
}
5555

5656
&__controls {
57-
width: 100%;
58-
}
59-
60-
&__table-wrapper {
61-
width: max-content;
57+
@include mixins.cluster-full-width-area();
6258
}
6359

6460
&__create-database {

src/containers/Tenants/Tenants.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -301,16 +301,16 @@ export const Tenants = ({additionalTenantsProps}: TenantsProps) => {
301301
};
302302

303303
return (
304-
<div className={b('table-wrapper')}>
304+
<React.Fragment>
305+
<TableWithControlsLayout.Controls wrapperClassName={b('controls')}>
306+
{renderControls()}
307+
</TableWithControlsLayout.Controls>
305308
<TableWithControlsLayout>
306-
<TableWithControlsLayout.Controls className={b('controls')}>
307-
{renderControls()}
308-
</TableWithControlsLayout.Controls>
309309
{error ? <ResponseError error={error} /> : null}
310310
<TableWithControlsLayout.Table loading={loading}>
311311
{currentData ? renderTable() : null}
312312
</TableWithControlsLayout.Table>
313313
</TableWithControlsLayout>
314-
</div>
314+
</React.Fragment>
315315
);
316316
};

src/styles/mixins.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
@forward '@gravity-ui/uikit/styles/mixins.scss';
22

3+
@mixin cluster-full-width-area() {
4+
width: unset;
5+
margin-right: -40px;
6+
padding-right: 40px;
7+
padding-left: 20px;
8+
9+
transform: translateX(-20px);
10+
}
11+
312
@mixin container() {
413
max-width: 1170px;
514
margin: 0 auto;

0 commit comments

Comments
 (0)