diff --git a/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx b/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx index 51e0f22c..d3ad5032 100644 --- a/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx +++ b/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx @@ -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') && } )} - {oscapProfile && ( + {complianceProfile && complianceType === 'openscap' && ( { )} + {compliancePolicy && complianceType === 'compliance' && ( + + onToggleComplianceDetails(isExpandedComplianceDetail) + } + isExpanded={isExpandedComplianceDetail} + isIndented + data-testid="compliance-detail-expandable" + > + + + )} { }; export const OscapList = () => { - return ; + return ; }; export const FirstBootList = () => {