Skip to content

Commit 10f4b7f

Browse files
committed
fix: loader position for tenant
1 parent ce13b7f commit 10f4b7f

File tree

2 files changed

+22
-31
lines changed

2 files changed

+22
-31
lines changed

src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
height: 100%;
77
padding-bottom: 20px;
88

9-
&__loader {
10-
display: flex;
11-
justify-content: center;
12-
}
139
&__tenant-name-wrapper {
1410
display: flex;
1511
overflow: hidden;

src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import {Flex, Loader} from '@gravity-ui/uikit';
1+
import {Flex} from '@gravity-ui/uikit';
22

33
import {EntityStatus} from '../../../../components/EntityStatus/EntityStatus';
4+
import {LoaderWrapper} from '../../../../components/LoaderWrapper/LoaderWrapper';
45
import {LogsButton} from '../../../../components/LogsButton/LogsButton';
56
import {MonitoringButton} from '../../../../components/MonitoringButton/MonitoringButton';
67
import {overviewApi} from '../../../../store/reducers/overview/overview';
@@ -142,37 +143,31 @@ export function TenantOverview({
142143
}
143144
};
144145

145-
if (tenantLoading) {
146-
return (
147-
<div className={b('loader')}>
148-
<Loader size="m" />
149-
</div>
150-
);
151-
}
152-
153146
const monitoringLink = additionalTenantProps?.getMonitoringLink?.(Name, Type);
154147
const logsLink = additionalTenantProps?.getLogsLink?.(Name);
155148

156149
return (
157-
<div className={b()}>
158-
<div className={b('info')}>
159-
<div className={b('top-label')}>{tenantType}</div>
160-
<Flex alignItems="center" gap="1" className={b('top')}>
161-
{renderName()}
162-
<Flex gap="2">
163-
{monitoringLink && <MonitoringButton href={monitoringLink} />}
164-
{logsLink && <LogsButton href={logsLink} />}
150+
<LoaderWrapper loading={tenantLoading}>
151+
<div className={b()}>
152+
<div className={b('info')}>
153+
<div className={b('top-label')}>{tenantType}</div>
154+
<Flex alignItems="center" gap="1" className={b('top')}>
155+
{renderName()}
156+
<Flex gap="2">
157+
{monitoringLink && <MonitoringButton href={monitoringLink} />}
158+
{logsLink && <LogsButton href={logsLink} />}
159+
</Flex>
165160
</Flex>
166-
</Flex>
167-
<MetricsCards
168-
poolsCpuStats={poolsStats}
169-
memoryStats={memoryStats}
170-
blobStorageStats={blobStorageStats}
171-
tabletStorageStats={tabletStorageStats}
172-
tenantName={tenantName}
173-
/>
161+
<MetricsCards
162+
poolsCpuStats={poolsStats}
163+
memoryStats={memoryStats}
164+
blobStorageStats={blobStorageStats}
165+
tabletStorageStats={tabletStorageStats}
166+
tenantName={tenantName}
167+
/>
168+
</div>
169+
{renderTabContent()}
174170
</div>
175-
{renderTabContent()}
176-
</div>
171+
</LoaderWrapper>
177172
);
178173
}

0 commit comments

Comments
 (0)