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

Wizard: support compliance in review step

Browse source 
Reuses the existing oscap profile information.
This commit is contained in:
Sanne Raymaekers 2024-09-11 12:12:01 +02:00 • committed by Klara Simickova
parent 110e1d7d75
commit 1a19684d97
2 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx
View file

@ -37,9 +37,11 @@ import { useAppSelector } from '../../../../store/hooks';
import {
selectBlueprintDescription,
selectBlueprintName,
selectComplianceType,
selectCompliancePolicyID,
selectComplianceProfileID,
selectDistribution,
selectImageTypes,
selectProfile,
selectRegistrationType,
} from '../../../../store/wizardSlice';
@ -50,7 +52,9 @@ const Review = ({ snapshottingEnabled }: { snapshottingEnabled: boolean }) => {
const blueprintDescription = useAppSelector(selectBlueprintDescription);
const distribution = useAppSelector(selectDistribution);
const environments = useAppSelector(selectImageTypes);
const oscapProfile = useAppSelector(selectProfile);
const complianceType = useAppSelector(selectComplianceType);
const complianceProfile = useAppSelector(selectComplianceProfileID);
const compliancePolicy = useAppSelector(selectCompliancePolicyID);
const registrationType = useAppSelector(selectRegistrationType);
const [isExpandedImageOutput, setIsExpandedImageOutput] = useState(true);
@ -60,6 +64,8 @@ const Review = ({ snapshottingEnabled }: { snapshottingEnabled: boolean }) => {
const [isExpandedRegistration, setIsExpandedRegistration] = useState(true);
const [isExpandedImageDetail, setIsExpandedImageDetail] = useState(true);
const [isExpandedOscapDetail, setIsExpandedOscapDetail] = useState(true);
const [isExpandedComplianceDetail, setIsExpandedComplianceDetail] =
useState(true);
const [isExpandableFirstBoot, setIsExpandedFirstBoot] = useState(true);
const onToggleImageOutput = (isExpandedImageOutput: boolean) =>
@ -76,6 +82,8 @@ const Review = ({ snapshottingEnabled }: { snapshottingEnabled: boolean }) => {
setIsExpandedImageDetail(isExpandedImageDetail);
const onToggleOscapDetails = (isExpandedOscapDetail: boolean) =>
setIsExpandedOscapDetail(isExpandedOscapDetail);
const onToggleComplianceDetails = (isExpandedComplianceDetail: boolean) =>
setIsExpandedComplianceDetail(isExpandedComplianceDetail);
const onToggleFirstBoot = (isExpandableFirstBoot: boolean) =>
setIsExpandedFirstBoot(isExpandableFirstBoot);
@ -227,7 +235,7 @@ const Review = ({ snapshottingEnabled }: { snapshottingEnabled: boolean }) => {
{registrationType.startsWith('register-now') && <RegisterNowList />}
</ExpandableSection>
)}
{oscapProfile && (
{complianceProfile && complianceType === 'openscap' && (
<ExpandableSection
toggleContent={composeExpandable(
'OpenSCAP',
@ -244,6 +252,23 @@ const Review = ({ snapshottingEnabled }: { snapshottingEnabled: boolean }) => {
<OscapList />
</ExpandableSection>
)}
{compliancePolicy && complianceType === 'compliance' && (
<ExpandableSection
toggleContent={composeExpandable(
'Compliance',
'revisit-compliance',
'step-oscap'
)}
onToggle={(_event, isExpandedComplianceDetail) =>
onToggleComplianceDetails(isExpandedComplianceDetail)
}
isExpanded={isExpandedComplianceDetail}
isIndented
data-testid="compliance-detail-expandable"
>
<OscapList />
</ExpandableSection>
)}
<ExpandableSection
toggleContent={composeExpandable(
'File system configuration',

2
src/Components/CreateImageWizard/steps/Review/ReviewStepTextLists.tsx
View file

@ -738,7 +738,7 @@ export const DetailsList = () => {
};
export const OscapList = () => {
return <OscapProfileInformation />;
return <OscapProfileInformation allowChangingCompliancePolicy={true} />;
};
export const FirstBootList = () => {