Merge pull request #4543 from pcbailey/fix-add-nic-disk-label

Bug 1780139: Change 'Create' disk/NIC label back to 'Add'

frontend/packages/kubevirt-plugin/src/components/create-vm-wizard/strings/networking.ts

@@ -1,4 +1,3 @@
-export const ADD_NETWORK_INTERFACE = 'Add Network Interface';
 export const PXE_NIC_NOT_FOUND_ERROR = 'A PXE-capable network interface could not be found.';
 export const PXE_INFO = 'Pod network is not PXE bootable';
 export const SELECT_PXE_NIC = '--- Select PXE network interface ---';

frontend/packages/kubevirt-plugin/src/components/create-vm-wizard/strings/storage.ts

@@ -1,4 +1,3 @@
-export const ADD_DISK = 'Add Disk';
 export const ATTACH_CD = 'Attach CD-ROM';
 export const NO_BOOTABLE_ATTACHED_DISK_ERROR = 'A bootable attached disk could not be found';
 export const SELECT_BOOTABLE_DISK = '--- Select Bootable Disk ---';

frontend/packages/kubevirt-plugin/src/components/create-vm-wizard/tabs/networking-tab/networking-tab.tsx

@@ -18,7 +18,6 @@ import { VMNicsTable } from '../../../vm-nics/vm-nics';
 import { nicTableColumnClasses } from '../../../vm-nics/utils';
 import { vmWizardActions } from '../../redux/actions';
 import { ActionType } from '../../redux/types';
-import { ADD_NETWORK_INTERFACE } from '../../strings/networking';
 import { iGetProvisionSource } from '../../selectors/immutable/vm-settings';
 import { getNetworksWithWrappers } from '../../selectors/selectors';
 import { wrapWithProgress } from '../../../../utils/utils';
@@ -30,6 +29,7 @@ import { VMWizardNetworkBundle } from './types';
 import { NetworkBootSource } from './network-boot-source';
 
 import './networking-tab.scss';
+import { ADD_NETWORK_INTERFACE } from '../../../../utils/strings';
 
 const getNicsData = (networks: VMWizardNetworkWithWrappers[]): VMWizardNetworkBundle[] =>
   networks.map((wizardNetworkData) => {

frontend/packages/kubevirt-plugin/src/components/create-vm-wizard/tabs/networking-tab/vm-wizard-nic-modal-enhanced.tsx

@@ -18,7 +18,6 @@ import { NetworkType } from '../../../../constants/vm';
 import { vmWizardActions } from '../../redux/actions';
 import { ActionType } from '../../redux/types';
 import { getNetworksWithWrappers } from '../../selectors/selectors';
-import { ADD } from '../../../../utils/strings';
 
 const VMWizardNICModal: React.FC<VMWizardNICModalProps> = (props) => {
   const {
@@ -61,7 +60,6 @@ const VMWizardNICModal: React.FC<VMWizardNICModalProps> = (props) => {
       allowPodNetwork={allowPodNetwork}
       nic={networkInterfaceWrapper}
       network={networkWrapper}
-      submitButtonText={ADD}
       onSubmit={(resultNetworkInterfaceWrapper, resultNetworkWrapper) => {
         addUpdateNIC({
           id,

frontend/packages/kubevirt-plugin/src/components/create-vm-wizard/tabs/storage-tab/storage-tab.tsx

@@ -28,7 +28,6 @@ import { diskTableColumnClasses } from '../../../vm-disks/utils';
 import { ProvisionSource } from '../../../../constants/vm/provision-source';
 import { CombinedDisk } from '../../../../k8s/wrapper/vm/combined-disk';
 import { isLoaded } from '../../../../utils';
-import { ADD_DISK } from '../../strings/storage';
 import { DeviceType } from '../../../../constants/vm';
 import { PersistentVolumeClaimWrapper } from '../../../../k8s/wrapper/vm/persistent-volume-claim-wrapper';
 import { VHW_TYPES } from '../virtual-hardware-tab/types';
@@ -38,6 +37,7 @@ import { vmWizardStorageModalEnhanced } from './vm-wizard-storage-modal-enhanced
 import { StorageBootSource } from './storage-boot-source';
 
 import './storage-tab.scss';
+import { ADD_DISK } from '../../../../utils/strings';
 
 const getStoragesData = (
   storages: VMWizardStorageWithWrappers[],

frontend/packages/kubevirt-plugin/src/components/create-vm-wizard/tabs/storage-tab/vm-wizard-storage-modal-enhanced.tsx

@@ -24,7 +24,6 @@ import { DataVolumeWrapper } from '../../../../k8s/wrapper/vm/data-volume-wrappe
 import { DiskModal } from '../../../modals/disk-modal';
 import { VM_TEMPLATE_NAME_PARAMETER } from '../../../../constants/vm-templates';
 import { PersistentVolumeClaimWrapper } from '../../../../k8s/wrapper/vm/persistent-volume-claim-wrapper';
-import { ADD } from '../../../../utils/strings';
 import { TemplateValidations } from '../../../../utils/validations/template/template-validations';
 import { getTemplateValidation } from '../../selectors/template';
 
@@ -105,7 +104,6 @@ const VMWizardStorageModal: React.FC<VMWizardStorageModalProps> = (props) => {
         ].includes(type)}
         isCreateTemplate={isCreateTemplate}
         isEditing={isEditing}
-        submitButtonText={ADD}
         onSubmit={(
           resultDiskWrapper,
           resultVolumeWrapper,

frontend/packages/kubevirt-plugin/src/components/modals/disk-modal/disk-modal.tsx

@@ -35,7 +35,7 @@ import {
   FormSelectPlaceholderOption,
 } from '../../form/form-select-placeholder-option';
 import {
-  CREATE,
+  ADD,
   DYNAMIC,
   EDIT,
   getDialogUIError,
@@ -78,7 +78,6 @@ export const DiskModal = withHandlePromise((props: DiskModalProps) => {
     close,
     cancel,
     templateValidations,
-    submitButtonText = CREATE,
   } = props;
   const asId = prefixedID.bind(null, 'disk');
   const disk = props.disk || DiskWrapper.EMPTY;
@@ -253,7 +252,7 @@ export const DiskModal = withHandlePromise((props: DiskModalProps) => {
   return (
     <div className="modal-content">
       <ModalTitle>
-        {isEditing ? EDIT : submitButtonText} {type.toString()}
+        {isEditing ? EDIT : ADD} {type.toString()}
       </ModalTitle>
       <ModalBody>
         <Form>
@@ -448,7 +447,7 @@ export const DiskModal = withHandlePromise((props: DiskModalProps) => {
       </ModalBody>
       <ModalFooter
         id="disk"
-        submitButtonText={isEditing ? SAVE : submitButtonText}
+        submitButtonText={isEditing ? SAVE : ADD}
         errorMessage={errorMessage || (showUIError ? getDialogUIError(hasAllRequiredFilled) : null)}
         isDisabled={inProgress}
         inProgress={inProgress}
@@ -487,7 +486,6 @@ export type DiskModalProps = {
   templateValidations?: TemplateValidations;
   usedDiskNames: Set<string>;
   usedPVCNames: Set<string>;
-  submitButtonText?: string;
 } & ModalComponentProps &
   HandlePromiseProps;
 

frontend/packages/kubevirt-plugin/src/components/modals/nic-modal/nic-modal.tsx

@@ -31,7 +31,7 @@ import {
 import { getNetworkChoices } from '../../../selectors/nad';
 import { NetworkInterfaceWrapper } from '../../../k8s/wrapper/vm/network-interface-wrapper';
 import { NetworkWrapper } from '../../../k8s/wrapper/vm/network-wrapper';
-import { CREATE, EDIT, getDialogUIError, getSequenceName, SAVE } from '../../../utils/strings';
+import { ADD, EDIT, getDialogUIError, getSequenceName, SAVE } from '../../../utils/strings';
 import { ModalFooter } from '../modal/modal-footer';
 import { useShowErrorToggler } from '../../../hooks/use-show-error-toggler';
 
@@ -124,7 +124,6 @@ export const NICModal = withHandlePromise((props: NICModalProps) => {
     handlePromise,
     close,
     cancel,
-    submitButtonText = CREATE,
   } = props;
   const asId = prefixedID.bind(null, 'nic');
   const nic = props.nic || NetworkInterfaceWrapper.EMPTY;
@@ -188,7 +187,7 @@ export const NICModal = withHandlePromise((props: NICModalProps) => {
 
   return (
     <div className="modal-content">
-      <ModalTitle>{isEditing ? EDIT : submitButtonText} Network Interface</ModalTitle>
+      <ModalTitle>{isEditing ? EDIT : ADD} Network Interface</ModalTitle>
       <ModalBody>
         <Form>
           <FormRow
@@ -274,7 +273,7 @@ export const NICModal = withHandlePromise((props: NICModalProps) => {
       </ModalBody>
       <ModalFooter
         id="nic"
-        submitButtonText={isEditing ? SAVE : submitButtonText}
+        submitButtonText={isEditing ? SAVE : ADD}
         errorMessage={errorMessage || (showUIError ? getDialogUIError(hasAllRequiredFilled) : null)}
         isDisabled={inProgress}
         isSimpleError={showUIError}
@@ -296,7 +295,6 @@ export type NICModalProps = {
   usedInterfacesNames: Set<string>;
   usedMultusNetworkNames: Set<string>;
   allowPodNetwork: boolean;
-  submitButtonText?: string;
 } & ModalComponentProps &
   HandlePromiseProps;
 

frontend/packages/kubevirt-plugin/src/components/vm-disks/vm-disks.tsx

@@ -20,6 +20,7 @@ import { StorageBundle } from './types';
 import { DiskRow } from './disk-row';
 import { diskTableColumnClasses } from './utils';
 import { isVMI } from '../../selectors/vm';
+import { ADD_DISK } from '../../utils/strings';
 
 const getStoragesData = ({
   vmLikeEntity,
@@ -140,7 +141,7 @@ export const VMDisks: React.FC<VMDisksProps> = ({ vmLikeEntity, pvcs, datavolume
               }
               isDisabled={isLocked}
             >
-              Create Disk
+              {ADD_DISK}
             </Button>
           </div>
         </div>

frontend/packages/kubevirt-plugin/src/components/vm-nics/vm-nics.tsx

@@ -17,6 +17,7 @@ import { NicRow } from './nic-row';
 import { NetworkBundle } from './types';
 import { nicTableColumnClasses } from './utils';
 import { asVMILikeWrapper } from '../../k8s/wrapper/utils/convert';
+import { ADD_NETWORK_INTERFACE } from '../../utils/strings';
 
 const getNicsData = (vmLikeEntity: VMGenericLikeEntityKind): NetworkBundle[] => {
   const vmiLikeWrapper = asVMILikeWrapper(vmLikeEntity);
@@ -127,7 +128,7 @@ export const VMNics: React.FC<VMLikeEntityTabProps> = ({ obj: vmLikeEntity }) =>
               }
               isDisabled={isLocked}
             >
-              Create Network Interface
+              {ADD_NETWORK_INTERFACE}
             </Button>
           </div>
         </div>

frontend/packages/kubevirt-plugin/src/utils/strings.ts

@@ -7,11 +7,13 @@ export const FAILED_TO_CREATE = 'failed to create';
 export const FAILED_TO_PATCH = 'failed to patch';
 export const DYNAMIC = 'Dynamic';
 
-export const CREATE = 'Create';
 export const EDIT = 'Edit';
 export const SAVE = 'Save';
 export const ADD = 'Add';
 
+export const ADD_DISK = 'Add Disk';
+export const ADD_NETWORK_INTERFACE = 'Add Network Interface';
+
 export const getDialogUIError = (hasAllRequiredFilled) =>
   hasAllRequiredFilled
     ? 'Please correct the invalid fields.'