Wizard: send template name in image request
This commit is contained in:
parent
00438ce2dc
commit
854ff93594
3 changed files with 23 additions and 2 deletions
|
|
@ -20,6 +20,7 @@ import {
|
|||
selectDistribution,
|
||||
selectTemplate,
|
||||
changeTemplate,
|
||||
changeTemplateName,
|
||||
} from '../../../../../store/wizardSlice';
|
||||
import { releaseToVersion } from '../../../../../Utilities/releaseToVersion';
|
||||
import { Error } from '../../Repositories/components/Error';
|
||||
|
|
@ -53,10 +54,16 @@ const Templates = () => {
|
|||
{ refetchOnMountOrArgChange: 60 }
|
||||
);
|
||||
|
||||
const handleRowSelect = (templateUuid: string | undefined): void => {
|
||||
const handleRowSelect = (
|
||||
templateUuid: string | undefined,
|
||||
templateName: string | undefined
|
||||
): void => {
|
||||
if (templateUuid) {
|
||||
dispatch(changeTemplate(templateUuid));
|
||||
}
|
||||
if (templateName) {
|
||||
dispatch(changeTemplateName(templateName));
|
||||
}
|
||||
};
|
||||
|
||||
const handlePerPageSelect = (
|
||||
|
|
@ -123,7 +130,7 @@ const Templates = () => {
|
|||
variant: 'radio',
|
||||
isSelected: uuid === templateUuid,
|
||||
rowIndex: rowIndex,
|
||||
onSelect: () => handleRowSelect(uuid),
|
||||
onSelect: () => handleRowSelect(uuid, name),
|
||||
}}
|
||||
/>
|
||||
<Td dataLabel={'Name'}>{name}</Td>
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@ import {
|
|||
selectMetadata,
|
||||
selectFirewall,
|
||||
selectTemplate,
|
||||
selectTemplateName,
|
||||
selectSatelliteCaCertificate,
|
||||
selectSatelliteRegistrationCommand,
|
||||
selectModules,
|
||||
|
|
@ -307,6 +308,7 @@ function commonRequestToState(
|
|||
useLatest: !snapshot_date && !request.image_requests[0]?.content_template,
|
||||
snapshotDate: snapshot_date,
|
||||
template: request.image_requests[0]?.content_template || '',
|
||||
templateName: request.image_requests[0]?.content_template_name || '',
|
||||
},
|
||||
repositories: {
|
||||
customRepositories: request.customizations?.custom_repositories || [],
|
||||
|
|
@ -457,6 +459,7 @@ const getImageRequests = (state: RootState): ImageRequest[] => {
|
|||
const snapshotDate = selectSnapshotDate(state);
|
||||
const useLatest = selectUseLatest(state);
|
||||
const template = selectTemplate(state);
|
||||
const templateName = selectTemplateName(state);
|
||||
return imageTypes.map((type) => ({
|
||||
architecture: selectArchitecture(state),
|
||||
image_type: type,
|
||||
|
|
@ -466,6 +469,7 @@ const getImageRequests = (state: RootState): ImageRequest[] => {
|
|||
},
|
||||
snapshot_date: !useLatest && !template ? snapshotDate : undefined,
|
||||
content_template: template || undefined,
|
||||
content_template_name: templateName || undefined,
|
||||
}));
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -130,6 +130,7 @@ export type wizardState = {
|
|||
useLatest: boolean;
|
||||
snapshotDate: string;
|
||||
template: string;
|
||||
templateName: string;
|
||||
};
|
||||
users: UserWithAdditionalInfo[];
|
||||
firstBoot: {
|
||||
|
|
@ -226,6 +227,7 @@ export const initialState: wizardState = {
|
|||
useLatest: true,
|
||||
snapshotDate: '',
|
||||
template: '',
|
||||
templateName: '',
|
||||
},
|
||||
repositories: {
|
||||
customRepositories: [],
|
||||
|
|
@ -398,6 +400,10 @@ export const selectTemplate = (state: RootState) => {
|
|||
return state.wizard.snapshotting.template;
|
||||
};
|
||||
|
||||
export const selectTemplateName = (state: RootState) => {
|
||||
return state.wizard.snapshotting.templateName;
|
||||
};
|
||||
|
||||
export const selectCustomRepositories = (state: RootState) => {
|
||||
return state.wizard.repositories.customRepositories;
|
||||
};
|
||||
|
|
@ -751,6 +757,9 @@ export const wizardSlice = createSlice({
|
|||
changeTemplate: (state, action: PayloadAction<string>) => {
|
||||
state.snapshotting.template = action.payload;
|
||||
},
|
||||
changeTemplateName: (state, action: PayloadAction<string>) => {
|
||||
state.snapshotting.templateName = action.payload;
|
||||
},
|
||||
importCustomRepositories: (
|
||||
state,
|
||||
action: PayloadAction<CustomRepository[]>
|
||||
|
|
@ -1156,6 +1165,7 @@ export const {
|
|||
changeUseLatest,
|
||||
changeSnapshotDate,
|
||||
changeTemplate,
|
||||
changeTemplateName,
|
||||
changeCustomRepositories,
|
||||
importCustomRepositories,
|
||||
changePayloadRepositories,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue