Merge pull request #9618 from metalice/bz-1985737-boot-order

Bug 1985737: Edit button boot order
openshift · Jul 26, 2021 · 0873366 · 0873366
2 parents c07fa6d + 5a6ad5f
commit 0873366
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/frontend/packages/kubevirt-plugin/src/components/vms/VMDetailsItem.tsx b/frontend/packages/kubevirt-plugin/src/components/vms/VMDetailsItem.tsx
@@ -8,6 +8,8 @@ const VMDetailsItem: React.FC<VMDetailsItemProps> = ({
   title,
   canEdit = false,
   editButtonId,
+  customEditButton,
+  editClassName,
   onEditClick,
   idValue,
   isLoading = false,
@@ -35,8 +37,11 @@ const VMDetailsItem: React.FC<VMDetailsItemProps> = ({
   return (
     <>
       <dt>
-        <span>
-          {title} <EditButton id={editButtonId} canEdit={canEdit} onClick={onEditClick} />
+        <span className={editClassName}>
+          {title}{' '}
+          {customEditButton || (
+            <EditButton id={editButtonId} canEdit={canEdit} onClick={onEditClick} />
+          )}
           {arePendingChanges && (
             <Button
               className="co-modal-btn-link--inline"
@@ -60,6 +65,8 @@ type VMDetailsItemProps = {
   title: string;
   canEdit?: boolean;
   editButtonId?: string;
+  customEditButton?: React.ReactElement;
+  editClassName?: string;
   onEditClick?: () => void;
   idValue?: string;
   isLoading?: boolean;

diff --git a/frontend/packages/kubevirt-plugin/src/components/vms/vm-resource.tsx b/frontend/packages/kubevirt-plugin/src/components/vms/vm-resource.tsx
@@ -166,6 +166,15 @@ export const VMDetailsList: React.FC<VMResourceListProps> = ({
           isVMRunningOrExpectedRunning(vm, vmi) &&
           isBootOrderChanged(new VMWrapper(vm), new VMIWrapper(vmi))
         }
+        customEditButton={
+          <VMEditWithPencil
+            isEdit={canEditWhileVMRunning}
+            onEditClick={() => BootOrderModal({ vmLikeEntity: vm, modalClassName: 'modal-lg' })}
+          >
+            {t('kubevirt-plugin~Edit')}
+          </VMEditWithPencil>
+        }
+        editClassName="kv-vm-resource--boot-order"
       >
         <BootOrderSummary devices={devices} />
       </VMDetailsItem>

diff --git a/frontend/packages/kubevirt-plugin/src/components/vms/vm.scss b/frontend/packages/kubevirt-plugin/src/components/vms/vm.scss
@@ -17,3 +17,8 @@
     color: unset;
   }
 }
+
+.kv-vm-resource--boot-order {
+  display: flex;
+  justify-content: space-between;
+}