-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
3edd128
commit fb71410
Showing
12 changed files
with
200 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
src/utils/resources/vm/hooks/useProvisioningPercentage.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| import { DataVolumeModelGroupVersionKind } from '@kubevirt-ui/kubevirt-api/console'; | ||
| import type { V1beta1DataVolume } from '@kubevirt-ui/kubevirt-api/containerized-data-importer/models'; | ||
| import { V1VirtualMachine } from '@kubevirt-ui/kubevirt-api/kubevirt'; | ||
| import { getNamespace } from '@kubevirt-utils/resources/shared'; | ||
| import { getVolumes } from '@kubevirt-utils/resources/vm'; | ||
| import { useK8sWatchResources, WatchK8sResource } from '@openshift-console/dynamic-plugin-sdk'; | ||
| import { printableVMStatus } from '@virtualmachines/utils'; | ||
|
|
||
| export type NameWithPercentages = { [name in string]: string }; | ||
|
|
||
| type UseProvisioningPercentageType = (vmi: V1VirtualMachine) => { | ||
| loaded: boolean; | ||
| percentages: NameWithPercentages; | ||
| }; | ||
|
|
||
| const useProvisioningPercentage: UseProvisioningPercentageType = (vm) => { | ||
| const volumes = getVolumes(vm); | ||
| const namespace = getNamespace(vm); | ||
|
|
||
| const dataVolumeNames = | ||
| volumes?.filter((v) => v.dataVolume).map((dvVolume) => dvVolume.dataVolume?.name) || []; | ||
|
|
||
| const watchRequest = dataVolumeNames.reduce((acc, current) => { | ||
| acc[current] = { | ||
| groupVersionKind: DataVolumeModelGroupVersionKind, | ||
| name: current, | ||
| namespace: namespace, | ||
| }; | ||
| return acc; | ||
| }, {} as { [key in string]: WatchK8sResource }); | ||
|
|
||
| const vmPrintableStatus = vm?.status?.printableStatus; | ||
|
|
||
| const dataVolumeWatch = useK8sWatchResources<{ | ||
| [key in string]: V1beta1DataVolume; | ||
| }>(vmPrintableStatus === printableVMStatus.Provisioning ? watchRequest : {}); | ||
|
|
||
| const loaded = Object.values(dataVolumeWatch || {}).every( | ||
| (watchResource) => watchResource.loaded || watchResource.loadError, | ||
| ); | ||
|
|
||
| const percentages = Object.keys(dataVolumeWatch || {}).reduce((acc, dataVolumeName) => { | ||
| acc[dataVolumeName] = dataVolumeWatch[dataVolumeName]?.data?.status?.progress; | ||
|
|
||
| return acc; | ||
| }, {} as NameWithPercentages); | ||
|
|
||
| return { loaded, percentages }; | ||
| }; | ||
|
|
||
| export default useProvisioningPercentage; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
...abDetails/components/VirtualMachineStatusWithPopover/VirtualMachineProvisioningStatus.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| import React, { FC } from 'react'; | ||
| import { Link } from 'react-router-dom-v5-compat'; | ||
| import { useLocation } from 'react-router-dom-v5-compat'; | ||
|
|
||
| import { V1VirtualMachine } from '@kubevirt-ui/kubevirt-api/kubevirt'; | ||
| import { useKubevirtTranslation } from '@kubevirt-utils/hooks/useKubevirtTranslation'; | ||
| import { Popover, PopoverPosition, Progress, ProgressSize, Text } from '@patternfly/react-core'; | ||
| import { createURL } from '@virtualmachines/details/tabs/overview/utils/utils'; | ||
|
|
||
| import useProvisioningPercentage from '../../../../../../../../../utils/resources/vm/hooks/useProvisioningPercentage'; | ||
|
|
||
| import './virtualmachine-provisioning-status.scss'; | ||
|
|
||
| type VirtualMachineProvisioningStatusProps = { | ||
| vm: V1VirtualMachine; | ||
| }; | ||
|
|
||
| const VirtualMachineProvisioningStatus: FC<VirtualMachineProvisioningStatusProps> = ({ | ||
| children, | ||
| vm, | ||
| }) => { | ||
| const vmPrintableStatus = vm?.status?.printableStatus; | ||
|
|
||
| const { t } = useKubevirtTranslation(); | ||
| const { percentages } = useProvisioningPercentage(vm); | ||
|
|
||
| const numberOfProvisioningDisks = Object.keys(percentages).length; | ||
|
|
||
| const location = useLocation(); | ||
|
|
||
| return ( | ||
| <> | ||
| <Popover | ||
| bodyContent={ | ||
| <> | ||
| <Text>{t('VirtualMachine is currently provisioning')}</Text> | ||
| <br /> | ||
|
|
||
| {Object.keys(percentages).map((diskName) => ( | ||
| <Progress | ||
| className="progress" | ||
| key={diskName} | ||
| size={ProgressSize.lg} | ||
| title={numberOfProvisioningDisks > 1 ? diskName : t('Copying files')} | ||
| value={parseFloat(percentages[diskName])} | ||
| /> | ||
| ))} | ||
| <br /> | ||
| <Text> | ||
| <Link to={createURL('diagnostics', location?.pathname)}>{t('View diagnostic')}</Link> | ||
| </Text> | ||
| </> | ||
| } | ||
| className="virtualmachine-privisioning-status" | ||
| headerContent={vmPrintableStatus} | ||
| position={PopoverPosition.right} | ||
| > | ||
| <>{children}</> | ||
| </Popover> | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export default VirtualMachineProvisioningStatus; |
34 changes: 34 additions & 0 deletions
34
...TabDetails/components/VirtualMachineStatusWithPopover/VirtualMachineStatusWithPopover.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| import React, { FC } from 'react'; | ||
|
|
||
| import { V1VirtualMachine, V1VirtualMachineInstance } from '@kubevirt-ui/kubevirt-api/kubevirt'; | ||
| import { printableVMStatus } from '@virtualmachines/utils'; | ||
|
|
||
| import MigrationProgressPopover from './MigrationProgressPopover'; | ||
| import StatusPopoverButton from './StatusPopoverButton'; | ||
| import VirtualMachineOverviewStatus from './VirtualMachineOverviewStatus'; | ||
| import VirtualMachineProvisioningStatus from './VirtualMachineProvisioningStatus'; | ||
|
|
||
| const Popovers = { | ||
| [printableVMStatus.Migrating]: MigrationProgressPopover, | ||
| [printableVMStatus.Provisioning]: VirtualMachineProvisioningStatus, | ||
| }; | ||
|
|
||
| type StatusWithPopoverProps = { | ||
| vm: V1VirtualMachine; | ||
| vmi: V1VirtualMachineInstance; | ||
| }; | ||
|
|
||
| const StatusWithPopover: FC<StatusWithPopoverProps> = ({ vm, vmi }) => { | ||
| const vmPrintableStatus = vm?.status?.printableStatus; | ||
|
|
||
| const Popover: FC<StatusWithPopoverProps> = | ||
| Popovers[vmPrintableStatus] || VirtualMachineOverviewStatus; | ||
|
|
||
| return ( | ||
| <Popover vm={vm} vmi={vmi}> | ||
| <StatusPopoverButton vmPrintableStatus={vmPrintableStatus} /> | ||
| </Popover> | ||
| ); | ||
| }; | ||
|
|
||
| export default StatusWithPopover; |
File renamed without changes.
5 changes: 5 additions & 0 deletions
5
...etails/components/VirtualMachineStatusWithPopover/virtualmachine-provisioning-status.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| .virtualmachine-privisioning-status { | ||
| .progress:not(:first-child) { | ||
| margin-top: var(--pf-global--spacer--sm); | ||
| } | ||
| } |