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

V1Wizard: masked services -> disabled services

Browse source 
For the UX the user doesn't really need to know that the services are masked,
rather than disabled in the backend. We can simplify this and show the masked
services as disabled.
This commit is contained in:
Gianluca Zuccarelli 2024-03-20 16:35:40 +00:00 • committed by Lucas Garfield
parent 94cbd04ef1
commit d57cd95c65
6 changed files with 3 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -103,8 +103,6 @@ const onSave = (values) => {
if (
(Array.isArray(values['enabledServices']) &&
values['enabledServices'].length > 0) ||
(Array.isArray(values['disabledServices']) &&
values['disabledServices'].length > 0) ||
(Array.isArray(values['maskedServices']) &&
values['maskedServices'].length > 0)
) {
@ -112,9 +110,6 @@ const onSave = (values) => {
if (values['enabledServices'].length > 0) {
customizations.services.enabled = values['enabledServices'];
}
if (values['disabledServices'].length > 0) {
customizations.services.disabled = values['disabledServices'];
}
if (values['maskedServices'].length > 0) {
customizations.services.masked = values['maskedServices'];
}
@ -540,8 +535,6 @@ const requestToState = (composeRequest, isProd, enableOscap) => {
formState['kernel'] = composeRequest?.customizations?.kernel;
formState['enabledServices'] =
composeRequest?.customizations?.services?.enabled;
formState['disabledServices'] =
composeRequest?.customizations?.services?.disabled;
formState['maskedServices'] =
composeRequest?.customizations?.services?.masked;
}

4
src/Components/CreateImageWizard/formComponents/Oscap.tsx
View file

@ -93,9 +93,6 @@ const ProfileSelector = ({ input }: ProfileSelectorProps) => {
if (data?.services?.enabled) {
change('enabledServices', data.services.enabled);
}
if (data?.services?.disabled) {
change('disabledServices', data.services.disabled);
}
if (data?.services?.masked) {
change('maskedServices', data.services.masked);
}
@ -112,7 +109,6 @@ const ProfileSelector = ({ input }: ProfileSelectorProps) => {
setProfile(undefined);
change(input.name, undefined);
change('kernel', undefined);
change('disabledServices', undefined);
change('enabledServices', undefined);
change('maskedServices', undefined);
setProfileName('');

15
src/Components/CreateImageWizard/formComponents/OscapProfileInformation.tsx
View file

@ -34,8 +34,6 @@ const OscapProfileInformation = (): JSX.Element => {
const enabledServicesDisplayString =
oscapProfileInfo?.services?.enabled?.join(' ');
const disabledServicesDisplayString =
oscapProfileInfo?.services?.disabled?.join(' ');
const maskedServicesDisplayString =
oscapProfileInfo?.services?.masked?.join(' ');
@ -95,7 +93,7 @@ const OscapProfileInformation = (): JSX.Element => {
</TextListItem>
<TextListItem component={TextListItemVariants.dd}>
<CodeBlock>
<CodeBlockCode>{disabledServicesDisplayString}</CodeBlockCode>
<CodeBlockCode>{maskedServicesDisplayString}</CodeBlockCode>
</CodeBlock>
</TextListItem>
<TextListItem
@ -109,17 +107,6 @@ const OscapProfileInformation = (): JSX.Element => {
<CodeBlockCode>{enabledServicesDisplayString}</CodeBlockCode>
</CodeBlock>
</TextListItem>
<TextListItem
component={TextListItemVariants.dt}
className="pf-u-min-width"
>
Masked services:
</TextListItem>
<TextListItem component={TextListItemVariants.dd}>
<CodeBlock>
<CodeBlockCode>{maskedServicesDisplayString}</CodeBlockCode>
</CodeBlock>
</TextListItem>
</TextList>
</TextContent>