Wizard: fix activation key required for Satellite
Sometimes, the activation key is required when the Satellite option is needed. This is caused by missing condition.
This commit is contained in:
parent
4192ada532
commit
d5969a2c9e
3 changed files with 16 additions and 5 deletions
|
|
@ -217,14 +217,17 @@ const ActivationKeysList = () => {
|
|||
isExpanded={isOpen}
|
||||
data-testid="activation-key-select"
|
||||
isDisabled={
|
||||
!isSuccessActivationKeys || registrationType === 'register-later'
|
||||
!isSuccessActivationKeys ||
|
||||
registrationType === 'register-later' ||
|
||||
registrationType === 'register-satellite'
|
||||
}
|
||||
>
|
||||
<TextInputGroup isPlain>
|
||||
<TextInputGroupMain
|
||||
value={
|
||||
activationKey
|
||||
? registrationType === 'register-later'
|
||||
? registrationType === 'register-later' ||
|
||||
registrationType === 'register-satellite'
|
||||
? ''
|
||||
: activationKey
|
||||
: inputValue
|
||||
|
|
|
|||
|
|
@ -381,7 +381,7 @@ export const mapRequestToState = (request: BlueprintResponse): wizardState => {
|
|||
? request.customizations.subscription.rhc
|
||||
? 'register-now-rhc'
|
||||
: 'register-now-insights'
|
||||
: request.customizations.cacerts
|
||||
: getSatelliteCommand(request.customizations.files)
|
||||
? 'register-satellite'
|
||||
: 'register-later',
|
||||
activationKey: isRhel(request.distribution)
|
||||
|
|
@ -748,7 +748,10 @@ const getSubscription = (
|
|||
const registrationType = selectRegistrationType(state);
|
||||
const activationKey = selectActivationKey(state);
|
||||
|
||||
if (registrationType === 'register-later') {
|
||||
if (
|
||||
registrationType === 'register-later' ||
|
||||
registrationType === 'register-satellite'
|
||||
) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -177,7 +177,11 @@ export function useRegistrationValidation(): StepValidation {
|
|||
}
|
||||
);
|
||||
|
||||
if (registrationType !== 'register-later' && !activationKey) {
|
||||
if (
|
||||
registrationType !== 'register-later' &&
|
||||
registrationType !== 'register-satellite' &&
|
||||
!activationKey
|
||||
) {
|
||||
return {
|
||||
errors: { activationKey: 'No activation key selected' },
|
||||
disabledNext: true,
|
||||
|
|
@ -186,6 +190,7 @@ export function useRegistrationValidation(): StepValidation {
|
|||
|
||||
if (
|
||||
registrationType !== 'register-later' &&
|
||||
registrationType !== 'register-satellite' &&
|
||||
activationKey &&
|
||||
(isFetchingKeyInfo || isErrorKeyInfo)
|
||||
) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue