src: Rename FscDiskPartition to DiskPartition

This should add more clarity to which type are needed for basic partitioning (filesystem customization) and which are needed for advanced (disk).

Author: regexowl

src/Components/CreateImageWizard/steps/FileSystem/components/DiskRow.tsx

@@ -16,12 +16,12 @@ import {
   removeDiskPartition,
   selectDiskPartitions,
 } from '../../../../../store/wizardSlice';
-import { FilesystemPartition, FscDiskPartition } from '../fscTypes';
+import { DiskPartition, FilesystemPartition } from '../fscTypes';
 
 export const FileSystemContext = React.createContext<boolean>(true);
 
 type DiskRowPropTypes = {
-  partition: FscDiskPartition;
+  partition: DiskPartition;
   onDrop?: (event: React.DragEvent<HTMLTableRowElement>) => void;
   onDragEnd?: (event: React.DragEvent<HTMLTableRowElement>) => void;
   onDragStart?: (event: React.DragEvent<HTMLTableRowElement>) => void;

src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemTable.tsx

@@ -17,15 +17,15 @@ import Row from './Row';
 
 import { useAppDispatch } from '../../../../../store/hooks';
 import { changePartitionOrder } from '../../../../../store/wizardSlice';
-import { FilesystemPartition, FscDiskPartition } from '../fscTypes';
+import { DiskPartition, FilesystemPartition } from '../fscTypes';
 
 type FileSystemTableTypes =
   | {
       partitions: FilesystemPartition[];
       mode: 'filesystem';
     }
   | {
-      partitions: FscDiskPartition[];
+      partitions: DiskPartition[];
       mode: 'disk-plain' | 'disk-lvm';
     };
 
@@ -162,7 +162,7 @@ const FileSystemTable = ({ partitions, mode }: FileSystemTableTypes) => {
   };
 
   const isFilesystemPartition = (
-    p: FilesystemPartition | FscDiskPartition,
+    p: FilesystemPartition | DiskPartition,
   ): p is FilesystemPartition => !('type' in p);
 
   const rootPartitionsCount = useMemo(
@@ -219,7 +219,7 @@ const FileSystemTable = ({ partitions, mode }: FileSystemTableTypes) => {
                 onDragEnd={onDragEnd}
                 onDragStart={onDragStart}
                 key={partition.id}
-                partition={partition as FscDiskPartition}
+                partition={partition as DiskPartition}
               />
             ))}
       </Tbody>

src/Components/CreateImageWizard/steps/FileSystem/components/PartitionName.tsx

@@ -5,10 +5,10 @@ import { VolumeGroup } from '../../../../../store/imageBuilderApi';
 import { changePartitionName } from '../../../../../store/wizardSlice';
 import { useFilesystemValidation } from '../../../utilities/useValidation';
 import { ValidatedInputAndTextArea } from '../../../ValidatedInput';
-import { FscDiskPartitionBase, LogicalVolumeWithBase } from '../fscTypes';
+import { DiskPartitionBase, LogicalVolumeWithBase } from '../fscTypes';
 
 type PartitionNamePropTypes = {
-  partition: (VolumeGroup & FscDiskPartitionBase) | LogicalVolumeWithBase;
+  partition: (VolumeGroup & DiskPartitionBase) | LogicalVolumeWithBase;
   customization: 'disk' | 'fileSystem';
 };
 

src/Components/CreateImageWizard/steps/FileSystem/components/VolumeGroups.tsx

@@ -26,10 +26,10 @@ import {
 } from '../../../../../store/wizardSlice';
 import { useFilesystemValidation } from '../../../utilities/useValidation';
 import { ValidatedInputAndTextArea } from '../../../ValidatedInput';
-import { FscDiskPartition, FscDiskPartitionBase } from '../fscTypes';
+import { DiskPartition, DiskPartitionBase } from '../fscTypes';
 
 type VolumeGroupsType = {
-  volumeGroups: Extract<FscDiskPartition, VolumeGroup & FscDiskPartitionBase>[];
+  volumeGroups: Extract<DiskPartition, VolumeGroup & DiskPartitionBase>[];
 };
 
 const VolumeGroups = ({ volumeGroups }: VolumeGroupsType) => {

src/Components/CreateImageWizard/steps/FileSystem/fscTypes.ts

@@ -18,27 +18,27 @@ export type FSType = 'ext4' | 'xfs' | 'vfat' | 'swap';
 
 export type FscDisk = {
   minsize: string;
-  partitions: FscDiskPartition[];
+  partitions: DiskPartition[];
   type?: 'gpt' | 'dos' | undefined;
 };
 
-export type FscDiskPartitionBase = {
+export type DiskPartitionBase = {
   id: string;
   min_size: string | undefined;
   unit: Units | undefined;
 };
 
-export type LogicalVolumeWithBase = LogicalVolume & FscDiskPartitionBase;
+export type LogicalVolumeWithBase = LogicalVolume & DiskPartitionBase;
 
-export type VolumeGroupWithExtendedLV = FscDiskPartitionBase & {
+export type VolumeGroupWithExtendedLV = DiskPartitionBase & {
   type: 'lvm';
   part_type?: string | undefined;
   name?: string | undefined;
   minsize?: Minsize | undefined;
   logical_volumes: LogicalVolumeWithBase[];
 };
 
-export type FscDiskPartition =
-  | (FilesystemTyped & FscDiskPartitionBase)
+export type DiskPartition =
+  | (FilesystemTyped & DiskPartitionBase)
   | VolumeGroupWithExtendedLV
-  | (BtrfsVolume & FscDiskPartitionBase);
+  | (BtrfsVolume & DiskPartitionBase);

src/Components/CreateImageWizard/utilities/requestMapper.ts

@@ -119,8 +119,8 @@ import {
 import isRhel from '../../../Utilities/isRhel';
 import { FscModeType } from '../steps/FileSystem';
 import {
+  DiskPartition,
   FilesystemPartition,
-  FscDiskPartition,
   Units,
 } from '../steps/FileSystem/fscTypes';
 import { getConversionFactor } from '../steps/FileSystem/fscUtilities';
@@ -173,7 +173,7 @@ const convertFilesystemToPartition = (
 
 const convertDiskToFscDisk = (
   disk: FilesystemTyped | VolumeGroup | BtrfsVolume,
-): FscDiskPartition => {
+): DiskPartition => {
   const id = uuidv4();
   let size;
   let unit;

src/store/wizardSlice.ts

@@ -18,10 +18,10 @@ import type { ActivationKeys } from './rhsmApi';
 
 import type { FscModeType } from '../Components/CreateImageWizard/steps/FileSystem';
 import type {
+  DiskPartition,
+  DiskPartitionBase,
   FilesystemPartition,
   FscDisk,
-  FscDiskPartition,
-  FscDiskPartitionBase,
   FSType,
   Units,
 } from '../Components/CreateImageWizard/steps/FileSystem/fscTypes';
@@ -965,12 +965,12 @@ export const wizardSlice = createSlice({
     ) => {
       state.disk.type = action.payload;
     },
-    addDiskPartition: (state, action: PayloadAction<FscDiskPartition>) => {
+    addDiskPartition: (state, action: PayloadAction<DiskPartition>) => {
       state.disk.partitions.push(action.payload);
     },
     removeDiskPartition: (
       state,
-      action: PayloadAction<FscDiskPartition['id']>,
+      action: PayloadAction<DiskPartition['id']>,
     ) => {
       const index = state.disk.partitions.findIndex(
         (partition) => partition.id === action.payload,
@@ -1023,7 +1023,7 @@ export const wizardSlice = createSlice({
       state,
       action: PayloadAction<{
         vgId: string;
-        logicalVolume: LogicalVolume & FscDiskPartitionBase;
+        logicalVolume: LogicalVolume & DiskPartitionBase;
       }>,
     ) => {
       const { vgId, logicalVolume } = action.payload;