Skip to content

MGMT-20351: selecting CNV - not able to deselect it using UI - new changes #2909

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
openshift-merge-bot merged 2 commits into from
Apr 11, 2025
Merged

MGMT-20351: selecting CNV - not able to deselect it using UI - new changes #2909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f06c672
Revert "selecting CNV - not able to deselect it using UI (#2906)"
ammont82 Apr 11, 2025
6456410
Selecting CNV - not able to deselect it using UI
ammont82 Apr 11, 2025
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: 0 additions & 1 deletion libs/ui-lib-tests/cypress/integration/ui-behaviour/cluster-updates.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ describe('Assisted Installer UI behaviour - cluster updates', () => {

navbar.clickOnNavItem('Operators');
operatorsPage.singleOperatorsToggle().click();
operatorsPage.migrationToolkitForVirtualization().click();
operatorsPage.openshiftVirtualization().click();
cy.wait('@update-cluster').then(() => {
commonActions.getDangerAlert().should('exist');
Expand Down
3 changes: 0 additions & 3 deletions libs/ui-lib-tests/cypress/views/operatorsPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ export const operatorsPage = {
openshiftVirtualization: () => {
return cy.get('#form-checkbox-useContainerNativeVirtualization-field');
},
migrationToolkitForVirtualization: () => {
return cy.get('#form-checkbox-useMigrationToolkitforVirtualization-field');
},
singleOperatorsToggle: () => {
return cy.contains('Single Operators ');
},
Expand Down
2 changes: 2 additions & 0 deletions libs/ui-lib/lib/ocm/components/clusterConfiguration/operators/CnvCheckbox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ const CnvCheckbox = ({
const fieldId = getFieldId(CNV_FIELD_NAME, 'input');
const selectOperatorsNeeded = (checked: boolean) => {
if (featureSupportLevelData.isFeatureSupported('LSO')) setFieldValue('useLso', checked);
if (featureSupportLevelData.isFeatureSupported('MTV'))
setFieldValue('useMigrationToolkitforVirtualization', checked);
};
return (
<FormGroup isInline fieldId={fieldId}>
Expand Down
6 changes: 0 additions & 6 deletions libs/ui-lib/lib/ocm/components/clusterWizard/OperatorsStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ import { useFormikContext } from 'formik';
import NewFeatureSupportLevelBadge from '../../../common/components/newFeatureSupportLevels/NewFeatureSupportLevelBadge';
import { useNewFeatureSupportLevel } from '../../../common/components/newFeatureSupportLevels';
import {
getCnvDisabledWithMtvReason,
getCnvIncompatibleWithLvmReason,
getLvmIncompatibleWithCnvReason,
getLvmsIncompatibleWithOdfReason,
Expand Down Expand Up @@ -255,11 +254,6 @@ export const OperatorsStep = (props: ClusterOperatorProps) => {
const lvmSupport = featureSupportLevelData.getFeatureSupportLevel('LVM');
disabledReason = getCnvIncompatibleWithLvmReason(values, lvmSupport);
}
if (!disabledReason) {
if (featureSupportLevelData.isFeatureSupported('MTV')) {
disabledReason = getCnvDisabledWithMtvReason(values);
}
}
}
if (operatorKey === 'lvm') {
if (!disabledReason) {
Expand Down
4 changes: 3 additions & 1 deletion libs/ui-lib/lib/ocm/components/featureSupportLevels/featureStateUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,9 @@ const getOpenShiftAIDisabledReason = (
};

export const getCnvDisabledWithMtvReason = (operatorValues: OperatorsValues) => {
const mustDisableCnv = !operatorValues.useMigrationToolkitforVirtualization;
const mustDisableCnv =
operatorValues.useContainerNativeVirtualization &&
!operatorValues.useMigrationToolkitforVirtualization;
return mustDisableCnv
? `Currently, you need to install ${CNV_OPERATOR_LABEL} operator at the same time as ${MTV_OPERATOR_LABEL} operator.`
: undefined;
Expand Down
Loading