Merge pull request #2202 from avivtur/bug-icon-actions-not-appearing-…

…while-vm-stopping CNV-43588: Start/Restart/Stop icon controls disappear during shutdown
kubevirt-ui · Sep 25, 2024 · da7789c · da7789c
2 parents fbe898d + d26daaf
commit da7789c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/...views/virtualmachines/actions/components/VMActionsIconBar/components/ActionIconButton.tsx b/...views/virtualmachines/actions/components/VMActionsIconBar/components/ActionIconButton.tsx
@@ -7,7 +7,13 @@ import { VMActionIconDetails } from '@virtualmachines/actions/components/VMActio
 
 import '../VMActionsIconBar.scss';
 
-const ActionIconButton: FC<VMActionIconDetails> = ({ action, Icon, iconClassname, isHidden }) => {
+const ActionIconButton: FC<VMActionIconDetails> = ({
+  action,
+  Icon,
+  iconClassname,
+  isDisabled,
+  isHidden,
+}) => {
   const [actionAllowed] = useAccessReview(action?.accessReview);
 
   const handleClick = () => {
@@ -23,7 +29,7 @@ const ActionIconButton: FC<VMActionIconDetails> = ({ action, Icon, iconClassname
           <Button
             className="vm-actions-icon-bar__button"
             data-test-id={`${action?.id}-button`}
-            isDisabled={!actionAllowed}
+            isDisabled={!actionAllowed || isDisabled}
             onClick={handleClick}
             variant={ButtonVariant.link}
           >

diff --git a/src/views/virtualmachines/actions/components/VMActionsIconBar/utils/types.ts b/src/views/virtualmachines/actions/components/VMActionsIconBar/utils/types.ts
@@ -7,5 +7,6 @@ export type VMActionIconDetails = {
   action: Action;
   Icon: ComponentClass<SVGIconProps, any>;
   iconClassname?: string;
-  isHidden: boolean;
+  isDisabled?: boolean;
+  isHidden?: boolean;
 };
diff --git a/src/views/virtualmachines/actions/components/VMActionsIconBar/utils/utils.ts b/src/views/virtualmachines/actions/components/VMActionsIconBar/utils/utils.ts
@@ -17,17 +17,18 @@ export const getVMActionIconsDetails = (vm: V1VirtualMachine): VMActionIconDetai
     {
       action: VirtualMachineActionFactory.stop(vm),
       Icon: SquareIcon,
-      isHidden: !isRunning(vm) && !isPaused(vm),
+      isDisabled: !isRunning(vm) && !isPaused(vm),
     },
     {
       action: VirtualMachineActionFactory.restart(vm),
       Icon: RedoIcon,
-      isHidden: !isRunning(vm) && !isPaused(vm),
+      isDisabled: !isRunning(vm) && !isPaused(vm),
     },
     {
       action: VirtualMachineActionFactory.pause(vm),
       Icon: PauseIcon,
-      isHidden: !isRunning(vm),
+      isDisabled: !isRunning(vm),
+      isHidden: isPaused(vm),
     },
     {
       action: VirtualMachineActionFactory.unpause(vm),
@@ -38,7 +39,7 @@ export const getVMActionIconsDetails = (vm: V1VirtualMachine): VMActionIconDetai
     {
       action: VirtualMachineActionFactory.start(vm),
       Icon: PlayIcon,
-      isHidden: !isStopped(vm),
+      isDisabled: !isStopped(vm),
     },
   ];
 };