Merge pull request #2181 from metalice/CNV-47206-change-pvc-to-volume

CNV-47206: Change PVC to volume
kubevirt-ui · Sep 18, 2024 · 6c8f8d2 · 6c8f8d2
2 parents c3bb68e + c6299a8
commit 6c8f8d2
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/locales/en/plugin__kubevirt-plugin.json b/locales/en/plugin__kubevirt-plugin.json
@@ -7,6 +7,8 @@
   "--- Select PVC name ---": "--- Select PVC name ---",
   "--- Select PVC project ---": "--- Select PVC project ---",
   "--- Select sysprep ---": "--- Select sysprep ---",
+  "--- Select Volume name ---": "--- Select Volume name ---",
+  "--- Select Volume project ---": "--- Select Volume project ---",
   "--- Select VolumeSnapshot name ---": "--- Select VolumeSnapshot name ---",
   "--- Select VolumeSnapshot project ---": "--- Select VolumeSnapshot project ---",
   ", {{prefferedQualifiedNodesSize}} matching preferred Nodes found": ", {{prefferedQualifiedNodesSize}} matching preferred Nodes found",
@@ -260,7 +262,7 @@
   "Clone {{sourceKind}}": "Clone {{sourceKind}}",
   "Clone a VirtualMachine": "Clone a VirtualMachine",
   "Clone a volume available on the cluster and add it to the VirtualMachine. ": "Clone a volume available on the cluster and add it to the VirtualMachine. ",
-  "Clone existing PVC": "Clone existing PVC",
+  "Clone existing Volume": "Clone existing Volume",
   "Clone in progress": "Clone in progress",
   "Clone template": "Clone template",
   "Clone volume": "Clone volume",
@@ -679,6 +681,7 @@
   "Loading Templates with available boot source": "Loading Templates with available boot source",
   "Local storage (LSO)": "Local storage (LSO)",
   "Location of the existing PVC": "Location of the existing PVC",
+  "Location of the existing Volume": "Location of the existing Volume",
   "Location of the existing VolumeSnapshot": "Location of the existing VolumeSnapshot",
   "Log into <2>Hybrid Cloud Console</2> to track your Organization ID.": "Log into <2>Hybrid Cloud Console</2> to track your Organization ID.",
   "M series": "M series",
@@ -1247,7 +1250,7 @@
   "This VirtualMachine has": "This VirtualMachine has",
   "This VirtualMachine is down. Please start it to access its console.": "This VirtualMachine is down. Please start it to access its console.",
   "This VirtualMachine is subject to the Descheduler profiles configured for eviction.": "This VirtualMachine is subject to the Descheduler profiles configured for eviction.",
-  "This will create a cloned copy of the PVC in the destination project.": "This will create a cloned copy of the PVC in the destination project.",
+  "This will create a cloned copy of the Volume in the destination project.": "This will create a cloned copy of the Volume in the destination project.",
   "Threads": "Threads",
   "Time axis": "Time axis",
   "Time is a wrapper around time.Time which supports correct marshaling to YAML and JSON.  Wrappers are provided for many of the factory methods that the time package offers.": "Time is a wrapper around time.Time which supports correct marshaling to YAML and JSON.  Wrappers are provided for many of the factory methods that the time package offers.",
@@ -1415,6 +1418,7 @@
   "Volume mode": "Volume mode",
   "Volume Mode": "Volume Mode",
   "Volume name": "Volume name",
+  "Volume project": "Volume project",
   "Volume snapshot": "Volume snapshot",
   "Volume snapshot status": "Volume snapshot status",
   "Volume Snapshot Status is a mechanism for reporting if a volume can be snapshotted or not.": "Volume Snapshot Status is a mechanism for reporting if a volume can be snapshotted or not.",

diff --git a/...nts/AddBootableVolumeModal/components/VolumeSource/components/DiskSourcePVCSelectName.tsx b/...nts/AddBootableVolumeModal/components/VolumeSource/components/DiskSourcePVCSelectName.tsx
@@ -29,17 +29,21 @@ const DiskSourcePVCSelectName: FC<DiskSourcePVCSelectNameProps> = ({
   const fieldId = 'pvc-name-select';
 
   return (
-    <FormGroup fieldId={fieldId} id={fieldId} isRequired label={t('PVC name')}>
+    <FormGroup fieldId={fieldId} id={fieldId} isRequired label={t('Volume name')}>
       {pvcsLoaded ? (
         <InlineFilterSelect
           options={pvcNames?.map((name) => ({
             children: name,
             groupVersionKind: modelToGroupVersionKind(PersistentVolumeClaimModel),
             value: name,
           }))}
+          toggleProps={{
+            isDisabled,
+            isFullWidth: true,
+            placeholder: t('--- Select Volume name ---'),
+          }}
           selected={pvcNameSelected}
           setSelected={onChange}
-          toggleProps={{ isDisabled, isFullWidth: true, placeholder: t('--- Select PVC name ---') }}
         />
       ) : (
         <Loading />

diff --git a/...ddBootableVolumeModal/components/VolumeSource/components/DiskSourcePVCSelectNamespace.tsx b/...ddBootableVolumeModal/components/VolumeSource/components/DiskSourcePVCSelectNamespace.tsx
@@ -32,7 +32,7 @@ const DiskSourcePVCSelectNamespace: FC<DiskSourcePVCSelectNamespaceProps> = ({
       fieldId={fieldId}
       id={fieldId}
       isRequired
-      label={t('PVC project')}
+      label={t('Volume project')}
     >
       {projectsLoaded ? (
         <>
@@ -45,12 +45,12 @@ const DiskSourcePVCSelectNamespace: FC<DiskSourcePVCSelectNamespaceProps> = ({
             toggleProps={{
               isDisabled,
               isFullWidth: true,
-              placeholder: t('--- Select PVC project ---'),
+              placeholder: t('--- Select Volume project ---'),
             }}
             selected={selectedProject}
             setSelected={onChange}
           />
-          <FormGroupHelperText>{t('Location of the existing PVC')}</FormGroupHelperText>
+          <FormGroupHelperText>{t('Location of the existing Volume')}</FormGroupHelperText>
         </>
       ) : (
         <Loading />

diff --git a/src/utils/components/AddBootableVolumeModal/components/VolumeSource/components/PVCSource.tsx b/src/utils/components/AddBootableVolumeModal/components/VolumeSource/components/PVCSource.tsx
@@ -39,11 +39,18 @@ const PVCSource: FC<PVCSourceProps> = ({ bootableVolume, setBootableVolumeField
       />
       <Split hasGutter>
         <SplitItem>
-          <Checkbox id="clone-pvc-checkbox" isChecked isDisabled label={t('Clone existing PVC')} />
+          <Checkbox
+            id="clone-pvc-checkbox"
+            isChecked
+            isDisabled
+            label={t('Clone existing Volume')}
+          />
         </SplitItem>
         <SplitItem>
           <HelpTextIcon
-            bodyContent={t('This will create a cloned copy of the PVC in the destination project.')}
+            bodyContent={t(
+              'This will create a cloned copy of the Volume in the destination project.',
+            )}
             position={PopoverPosition.right}
           />
         </SplitItem>