Skip to content
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.

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

CNV-21974: clone in progress label #1034

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions locales/en/plugin__kubevirt-plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@
"Clone": "Clone",
"Clone a VirtualMachine": "Clone a VirtualMachine",
"Clone existing PVC": "Clone existing PVC",
"Clone in progress": "Clone in progress",
"Clone template": "Clone template",
"Clone VirtualMachine": "Clone VirtualMachine",
"Cloning": "Cloning",
Expand Down
13 changes: 13 additions & 0 deletions src/utils/resources/template/hooks/useVmTemplateSource/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,19 @@ export const getDataSourcePVC = (name: string, ns: string) =>
export const isDataSourceReady = (dataSource: V1beta1DataSource): boolean =>
dataSource?.status?.conditions?.some((c) => c.type === 'Ready' && c.status === 'True');

/**
* a function that returns true if the data source is cloning in progress
* @param dataSource the data source to check if cloning
* @returns true if the data source is in cloning state, false otherwise
*/
export const isDataSourceCloning = (dataSource: V1beta1DataSource): boolean =>
dataSource?.status?.conditions?.some(
(c) =>
c.type === 'Ready' &&
upalatucci marked this conversation as resolved.
Show resolved Hide resolved
c.status === 'False' &&
['CloneScheduled', 'CloneInProgress'].includes(c?.reason),
);

/**
* update template's boot source storage class
* @param template the template to get the boot source from
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { IoK8sApiCoreV1PersistentVolumeClaim } from '@kubevirt-ui/kubevirt-api/k
import { BOOT_SOURCE } from '@kubevirt-utils/resources/template';
import {
getTemplateBootSourceType,
isDataSourceCloning,
isDataSourceReady,
} from '@kubevirt-utils/resources/template/hooks/useVmTemplateSource/utils';
import {
Expand Down Expand Up @@ -81,14 +82,26 @@ export const useAvailableDataSourcesAndPVCs = (
(watchResource) => watchResource.loaded || watchResource.loadError,
);

const availableDatasources = Object.values(watchDataSources).reduce(
const { availableDatasources, cloneInProgressDatasources } = Object.values(
watchDataSources,
).reduce(
(acc, { data: dataSource }) => {
if (isDataSourceReady(dataSource as V1beta1DataSource)) {
acc[`${dataSource?.metadata?.namespace}-${dataSource?.metadata?.name}`] = dataSource;
acc.availableDatasources[
`${dataSource?.metadata?.namespace}-${dataSource?.metadata?.name}`
] = dataSource;
return acc;
}

if (isDataSourceCloning(dataSource)) {
acc.cloneInProgressDatasources[
`${dataSource?.metadata?.namespace}-${dataSource?.metadata?.name}`
] = dataSource;
return acc;
}
return acc;
},
{},
{ availableDatasources: {}, cloneInProgressDatasources: {} },
);

const availablePVCs = new Set(
Expand All @@ -97,5 +110,5 @@ export const useAvailableDataSourcesAndPVCs = (
),
);

return { availableDatasources, availablePVCs, loaded };
return { availableDatasources, cloneInProgressDatasources, availablePVCs, loaded };
};
4 changes: 3 additions & 1 deletion src/views/templates/list/VirtualMachineTemplatesList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const VirtualMachineTemplatesList: React.FC<RouteComponentProps<{ ns: string }>>
error,
availableTemplatesUID,
availableDatasources,
cloneInProgressDatasources,
bootSourcesLoaded,
} = useTemplatesWithAvailableSource({
namespace,
Expand Down Expand Up @@ -82,6 +83,7 @@ const VirtualMachineTemplatesList: React.FC<RouteComponentProps<{ ns: string }>>
{
availableTemplatesUID: Set<string>;
availableDatasources: Record<string, V1beta1DataSource>;
cloneInProgressDatasources: Record<string, V1beta1DataSource>;
}
>
data={filteredData}
Expand All @@ -90,7 +92,7 @@ const VirtualMachineTemplatesList: React.FC<RouteComponentProps<{ ns: string }>>
loadError={error}
columns={activeColumns}
Row={VirtualMachineTemplatesRow}
rowData={{ availableTemplatesUID, availableDatasources }}
rowData={{ availableTemplatesUID, availableDatasources, cloneInProgressDatasources }}
/>
</StackItem>
</Stack>
Expand Down
13 changes: 11 additions & 2 deletions src/views/templates/list/components/VirtualMachineTemplatesRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,17 @@ import VirtualMachineTemplatesSource from './VirtualMachineTemplatesSource';
const VirtualMachineTemplatesRow: React.FC<
RowProps<
V1Template,
{ availableTemplatesUID: Set<string>; availableDatasources: Record<string, V1beta1DataSource> }
{
availableTemplatesUID: Set<string>;
availableDatasources: Record<string, V1beta1DataSource>;
cloneInProgressDatasources: Record<string, V1beta1DataSource>;
}
>
> = ({ obj, activeColumnIDs, rowData: { availableDatasources, availableTemplatesUID } }) => {
> = ({
obj,
activeColumnIDs,
rowData: { availableDatasources, cloneInProgressDatasources, availableTemplatesUID },
}) => {
const { t } = useKubevirtTranslation();
const history = useHistory();

Expand Down Expand Up @@ -47,6 +55,7 @@ const VirtualMachineTemplatesRow: React.FC<
<VirtualMachineTemplatesSource
template={obj}
availableDatasources={availableDatasources}
cloneInProgressDatasources={cloneInProgressDatasources}
availableTemplatesUID={availableTemplatesUID}
/>
</TableData>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,18 @@ import { V1beta1DataSource } from '@kubevirt-ui/kubevirt-api/containerized-data-
import { useKubevirtTranslation } from '@kubevirt-utils/hooks/useKubevirtTranslation';
import { getTemplateBootSourceType } from '@kubevirt-utils/resources/template/hooks/useVmTemplateSource/utils';
import { getVMBootSourceLabel } from '@kubevirt-utils/resources/vm/utils/source';
import { Badge, Split, SplitItem } from '@patternfly/react-core';
import { Badge, Label, Split, SplitItem } from '@patternfly/react-core';

type VirtualMachineTemplatesSourceProps = {
template: V1Template;
availableDatasources: Record<string, V1beta1DataSource>;
cloneInProgressDatasources: Record<string, V1beta1DataSource>;
availableTemplatesUID: Set<string>;
};
const VirtualMachineTemplatesSource: React.FC<VirtualMachineTemplatesSourceProps> = ({
template,
availableDatasources,
cloneInProgressDatasources,
availableTemplatesUID,
}) => {
const { t } = useKubevirtTranslation();
Expand All @@ -26,6 +28,11 @@ const VirtualMachineTemplatesSource: React.FC<VirtualMachineTemplatesSourceProps
const bootSourceLabel = t(getVMBootSourceLabel(bootSource?.type, dataSource));
const isBootSourceAvailable = availableTemplatesUID.has(template?.metadata?.uid);

const isCloningSource =
!!cloneInProgressDatasources?.[
`${bootSource?.source?.sourceRef?.namespace}-${bootSource?.source?.sourceRef?.name}`
];

return (
<Split hasGutter>
<SplitItem>{bootSourceLabel}</SplitItem>
Expand All @@ -34,6 +41,11 @@ const VirtualMachineTemplatesSource: React.FC<VirtualMachineTemplatesSourceProps
<Badge key="available-boot">{t('Source available')}</Badge>
</SplitItem>
)}
{isCloningSource && (
<SplitItem>
<Label>{t('Clone in progress')}</Label>
</SplitItem>
)}
</Split>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export const useTemplatesWithAvailableSource = ({
});
const {
availableDatasources,
cloneInProgressDatasources,
availablePVCs,
loaded: bootSourcesLoaded,
} = useAvailableDataSourcesAndPVCs(templates, loaded);
Expand Down Expand Up @@ -98,6 +99,7 @@ export const useTemplatesWithAvailableSource = ({
templates: filteredTemplates,
availableTemplatesUID,
availableDatasources,
cloneInProgressDatasources,
loaded,
bootSourcesLoaded,
error: loadError,
Expand All @@ -108,6 +110,7 @@ type useTemplatesWithAvailableSourceValues = {
templates: V1Template[];
availableTemplatesUID: Set<string>;
availableDatasources: Record<string, V1beta1DataSource>;
cloneInProgressDatasources: Record<string, V1beta1DataSource>;
loaded: boolean;
bootSourcesLoaded: boolean;
error: any;
Expand Down