CreateImageWizard: rename custom- to payload-repositories

To avoid confusion between custom and payload repositories.

Custom repositories will be embedded in the yum config, payload
repositories are used for installing packages.
This commit is contained in:
Sanne Raymaekers 2023-04-28 16:03:21 +02:00
parent 56118737da
commit f0679d1196
7 changed files with 15 additions and 13 deletions

View file

@ -48,8 +48,10 @@ const onSave = (values) => {
packages: values['selected-packages']?.map((p) => p.name),
};
if (values['custom-repositories']?.length > 0) {
customizations['payload_repositories'] = [...values['custom-repositories']];
if (values['payload-repositories']?.length > 0) {
customizations['payload_repositories'] = [
...values['payload-repositories'],
];
}
if (values['register-system'] === 'register-now-rhc') {
@ -425,9 +427,9 @@ const requestToState = (composeRequest, distroInfo, isBeta, isProd) => {
// Wizard as it is needed every time the repositories step is visited.
formState['original-payload-repositories'] =
composeRequest?.customizations?.payload_repositories;
// 'custom-repositories' is mutable and is used to generate the request
// 'payload-repositories' is mutable and is used to generate the request
// sent to image-builder
formState['custom-repositories'] =
formState['payload-repositories'] =
composeRequest?.customizations?.payload_repositories;
// filesystem
@ -647,7 +649,7 @@ const CreateImageWizard = () => {
crossroads: [
'target-environment',
'release',
'custom-repositories',
'payload-repositories',
],
description: (
<>

View file

@ -101,7 +101,7 @@ export const ContentSourcesPackages = () => {
const { getState } = useFormApi();
const getAllPackages = async (packagesSearchName) => {
const repos = getState()?.values?.['custom-repositories'];
const repos = getState()?.values?.['payload-repositories'];
const repoUrls = repos?.map((repo) => repo.baseurl);
return await api.getPackagesContentSources(repoUrls, packagesSearchName);
};

View file

@ -169,8 +169,8 @@ const Repositories = (props) => {
const [perPage, setPerPage] = useState(10);
const [page, setPage] = useState(1);
const [selected, setSelected] = useState(
getState()?.values?.['custom-repositories']
? getState().values['custom-repositories'].map((repo) => repo.baseurl)
getState()?.values?.['payload-repositories']
? getState().values['payload-repositories'].map((repo) => repo.baseurl)
: []
);

View file

@ -79,7 +79,7 @@ export const PackagesTable = () => {
export const RepositoriesTable = () => {
const { getState } = useFormApi();
const repositories = getState()?.values?.['custom-repositories'];
const repositories = getState()?.values?.['payload-repositories'];
return (
<Panel isScrollable>
<PanelMain maxHeight="30ch">

View file

@ -384,7 +384,7 @@ export const ContentList = () => {
component={TextListItemVariants.dd}
data-testid="custom-repositories-count"
>
{getState()?.values?.['custom-repositories']?.length > 0 ? (
{getState()?.values?.['payload-repositories']?.length > 0 ? (
<Popover
position="bottom"
headerContent="Custom repositories"
@ -397,7 +397,7 @@ export const ContentList = () => {
aria-label="About custom repositories"
className="pf-u-p-0"
>
{getState()?.values?.['custom-repositories']?.length || 0}
{getState()?.values?.['payload-repositories']?.length || 0}
</Button>
</Popover>
) : (

View file

@ -32,7 +32,7 @@ export default {
},
{
component: 'repositories-table',
name: 'custom-repositories',
name: 'payload-repositories',
label: 'Custom repositories',
},
],

View file

@ -1,4 +1,4 @@
export default ({ 'custom-repositories': customRepositories } = {}) => {
export default ({ 'payload-repositories': customRepositories } = {}) => {
if (customRepositories?.length > 0) {
return 'packages-content-sources';
}