particle-os/debian-image-builder-frontend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CreateImageWizard: Use stage candlepin urls on stage consoledot

Browse source
This commit is contained in:
Sanne Raymaekers 2022-05-23 14:59:43 +02:00
parent 19fb2273ad
commit 1c5542ca81
3 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/Components/CreateImageWizard/CreateImageWizard.js
View file

@ -44,16 +44,16 @@ const onSave = (values) => {
'activation-key': values['subscription-activation-key'],
insights: true,
organization: Number(values['subscription-organization-id']),
'server-url': 'subscription.rhsm.redhat.com',
'base-url': 'https://cdn.redhat.com/',
'server-url': values['subscription-server-url'],
'base-url': values['subscription-base-url'],
};
} else if (values['register-system'] === 'register-now') {
customizations.subscription = {
'activation-key': values['subscription-activation-key'],
insights: false,
organization: Number(values['subscription-organization-id']),
'server-url': 'subscription.rhsm.redhat.com',
'base-url': 'https://cdn.redhat.com/',
'server-url': values['subscription-server-url'],
'base-url': values['subscription-base-url'],
};
}
@ -359,6 +359,15 @@ const requestToState = (composeRequest) => {
formState['subscription-activation-key'] = subscription['activation-key'];
formState['subscription-organization-id'] = subscription.organization;
if (insights.chrome.isProd()) {
formState['subscription-server-url'] = 'subscription.rhsm.redhat.com';
formState['subscription-base-url'] = 'https://cdn.redhat.com/';
} else {
formState['subscription-server-url'] =
'subscription.rhsm.stage.redhat.com';
formState['subscription-base-url'] = 'https://cdn.stage.redhat.com/';
}
} else {
formState['register-system'] = 'register-later';
}

8
src/Components/CreateImageWizard/formComponents/ActivationKeys.js
View file

@ -28,6 +28,14 @@ const ActivationKeys = ({ label, isRequired, ...props }) => {
setActivationKeys(keys);
setIsLoading(false);
});
if (insights.chrome.isProd()) {
change('subscription-server-url', 'subscription.rhsm.redhat.com');
change('subscription-base-url', 'https://cdn.redhat.com/');
} else {
change('subscription-server-url', 'subscription.rhsm.stage.redhat.com');
change('subscription-base-url', 'https://cdn.stage.redhat.com/');
}
}, []);
const setActivationKey = (_, selection) => {

3
src/test/Components/CreateImageWizard/CreateImageWizard.test.js
View file

@ -151,6 +151,9 @@ beforeAll(() => {
isBeta: () => {
return true;
},
isProd: () => {
return true;
},
},
};
});