Skip to content

fix(Storage): display unavailable vdisks with average size #1511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2024
Merged

fix(Storage): display unavailable vdisks with average size #1511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 0 additions & 9 deletions src/containers/Storage/Disks/Disks.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,6 @@

width: max-content;

&__vdisks-wrapper {
display: flex;
flex-grow: 1;
flex-direction: row;
gap: 4px;

width: 300px;
}

&__pdisks-wrapper {
display: flex;
flex-direction: row;
Expand Down
37 changes: 28 additions & 9 deletions src/containers/Storage/Disks/Disks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import React from 'react';

import {Flex, useLayoutContext} from '@gravity-ui/uikit';

import {VDisk} from '../../../components/VDisk/VDisk';
import {valueIsDefined} from '../../../utils';
import {cn} from '../../../utils/cn';
import {getPDiskId} from '../../../utils/disks/helpers';
import type {PreparedVDisk} from '../../../utils/disks/types';
Expand All @@ -12,6 +15,8 @@ import './Disks.scss';

const b = cn('ydb-storage-disks');

const VDISKS_CONTAINER_WIDTH = 300;

interface DisksProps {
vDisks?: PreparedVDisk[];
viewContext?: StorageViewContext;
Expand All @@ -20,23 +25,31 @@ interface DisksProps {
export function Disks({vDisks = [], viewContext}: DisksProps) {
const [highlightedVDisk, setHighlightedVDisk] = React.useState<string | undefined>();

const {
theme: {spaceBaseSize},
} = useLayoutContext();

if (!vDisks.length) {
return null;
}

const unavailableVDiskWidth =
(VDISKS_CONTAINER_WIDTH - spaceBaseSize * (vDisks.length - 1)) / vDisks.length;

return (
<div className={b(null)}>
<div className={b('vdisks-wrapper')}>
<Flex direction={'row'} gap={1} grow style={{width: VDISKS_CONTAINER_WIDTH}}>
{vDisks?.map((vDisk) => (
<VDiskItem
key={vDisk.StringifiedId}
vDisk={vDisk}
inactive={!isVdiskActive(vDisk, viewContext)}
highlightedVDisk={highlightedVDisk}
setHighlightedVDisk={setHighlightedVDisk}
unavailableVDiskWidth={unavailableVDiskWidth}
/>
))}
</div>
</Flex>

<div className={b('pdisks-wrapper')}>
{vDisks?.map((vDisk) => (
Expand All @@ -57,21 +70,27 @@ interface DisksItemProps {
inactive?: boolean;
highlightedVDisk: string | undefined;
setHighlightedVDisk: (id: string | undefined) => void;
unavailableVDiskWidth?: number;
}

function VDiskItem({vDisk, highlightedVDisk, inactive, setHighlightedVDisk}: DisksItemProps) {
function VDiskItem({
vDisk,
highlightedVDisk,
inactive,
setHighlightedVDisk,
unavailableVDiskWidth,
}: DisksItemProps) {
// Do not show PDisk popup for VDisk
const vDiskToShow = {...vDisk, PDisk: undefined};

const vDiskId = vDisk.StringifiedId;

// show vdisks without AllocatedSize as having average width (#1433)
const minWidth = valueIsDefined(vDiskToShow.AllocatedSize) ? undefined : unavailableVDiskWidth;
const flexGrow = Number(vDiskToShow.AllocatedSize) || 1;

return (
<div
style={{
flexGrow: Number(vDisk.AllocatedSize) || 1,
}}
className={b('vdisk-item')}
>
<div style={{flexGrow, minWidth}} className={b('vdisk-item')}>
<VDisk
data={vDiskToShow}
compact
Expand Down
Loading