Merge pull request #1956 from hstastna/BZ_Improve_sysprep_section

CNV-41844: Improve displaying sysprep section when creating Windows VMs
kubevirt-ui · May 22, 2024 · ae4c3ff · ae4c3ff
2 parents c9ec07c + a4cf536
commit ae4c3ff
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 39 deletions.
diff --git a/src/utils/components/VirtualMachineDescriptionItem/VirtualMachineDescriptionItem.tsx b/src/utils/components/VirtualMachineDescriptionItem/VirtualMachineDescriptionItem.tsx
@@ -74,16 +74,18 @@ const VirtualMachineDescriptionItem: FC<VirtualMachineDescriptionItemProps> = ({
             default: editOnTitleJustify ? 'justifyContentSpaceBetween' : 'justifyContentFlexStart',
           }}
         >
-          <FlexItem>
-            <DescriptionItemHeader
-              bodyContent={bodyContent}
-              breadcrumb={breadcrumb}
-              descriptionHeader={descriptionHeader}
-              isPopover={isPopover}
-              label={label}
-              moreInfoURL={moreInfoURL}
-            />
-          </FlexItem>
+          {(bodyContent || breadcrumb || descriptionHeader || label || moreInfoURL) && (
+            <FlexItem>
+              <DescriptionItemHeader
+                bodyContent={bodyContent}
+                breadcrumb={breadcrumb}
+                descriptionHeader={descriptionHeader}
+                isPopover={isPopover}
+                label={label}
+                moreInfoURL={moreInfoURL}
+              />
+            </FlexItem>
+          )}
           {isEdit && showEditOnTitle && (
             <FlexItem>
               <Button

diff --git a/src/views/catalog/CreateFromInstanceTypes/components/VMDetailsSection/VMDetailsSection.tsx b/src/views/catalog/CreateFromInstanceTypes/components/VMDetailsSection/VMDetailsSection.tsx
@@ -20,7 +20,7 @@ const VMDetailsSection: FC<DetailsLeftGridProps> = ({ instanceTypesAndPreference
           <DetailsLeftGrid instanceTypesAndPreferencesData={instanceTypesAndPreferencesData} />
         </GridItem>
         <GridItem span={1}>{/* Spacer */}</GridItem>
-        <GridItem span={5}>
+        <GridItem span={6}>
           <DetailsRightGrid />
         </GridItem>
       </Grid>

diff --git a/...FromInstanceTypes/components/VMDetailsSection/components/SimplifiedSysprepDescription.tsx b/...FromInstanceTypes/components/VMDetailsSection/components/SimplifiedSysprepDescription.tsx
@@ -4,7 +4,6 @@ import { ConfigMapModel, modelToGroupVersionKind } from '@kubevirt-ui/kubevirt-a
 import VirtualMachineDescriptionItem from '@kubevirt-utils/components/VirtualMachineDescriptionItem/VirtualMachineDescriptionItem';
 import { useKubevirtTranslation } from '@kubevirt-utils/hooks/useKubevirtTranslation';
 import { ResourceLink } from '@openshift-console/dynamic-plugin-sdk';
-import { Stack, StackItem } from '@patternfly/react-core';
 
 type SimplifiedSysprepDescriptionProps = {
   hasAutoUnattend: boolean;
@@ -19,34 +18,27 @@ const SimplifiedSysprepDescription: FC<SimplifiedSysprepDescriptionProps> = ({
 }) => {
   const { t } = useKubevirtTranslation();
 
+  if (selectedSysprepName) {
+    return (
+      <ResourceLink
+        groupVersionKind={modelToGroupVersionKind(ConfigMapModel)}
+        linkTo={false}
+        name={selectedSysprepName}
+      />
+    );
+  }
+
   return (
-    <Stack hasGutter>
-      <StackItem>
-        {selectedSysprepName ? (
-          <VirtualMachineDescriptionItem
-            descriptionData={
-              <ResourceLink
-                groupVersionKind={modelToGroupVersionKind(ConfigMapModel)}
-                linkTo={false}
-                name={selectedSysprepName}
-              />
-            }
-            descriptionHeader={t('Selected sysprep')}
-          />
-        ) : (
-          <>
-            <VirtualMachineDescriptionItem
-              descriptionData={hasAutoUnattend ? t('Available') : t('Not available')}
-              descriptionHeader={t('Autounattend.xml answer file')}
-            />
-            <VirtualMachineDescriptionItem
-              descriptionData={hasUnattend ? t('Available') : t('Not available')}
-              descriptionHeader={t('Unattend.xml answer file')}
-            />
-          </>
-        )}
-      </StackItem>
-    </Stack>
+    <>
+      <VirtualMachineDescriptionItem
+        descriptionData={hasAutoUnattend ? t('Available') : t('Not available')}
+        descriptionHeader={t('Autounattend.xml answer file')}
+      />
+      <VirtualMachineDescriptionItem
+        descriptionData={hasUnattend ? t('Available') : t('Not available')}
+        descriptionHeader={t('Unattend.xml answer file')}
+      />
+    </>
   );
 };