Merge pull request #351 from DanaOrr/fixing-vm-conditions-column

Fixing the conditions column in vm
kubevirt-ui · May 1, 2022 · 9a11cd9 · 9a11cd9
2 parents 44c1c5b + 26bf972
commit 9a11cd9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/views/virtualmachines/list/components/VMStatusConditionLabel/VMStatusConditionLabel.tsx b/src/views/virtualmachines/list/components/VMStatusConditionLabel/VMStatusConditionLabel.tsx
@@ -9,7 +9,7 @@ export const VMStatusConditionLabel: React.FC<V1VirtualMachineCondition> = React
       <Popover
         position={PopoverPosition.top}
         aria-label="Condition Popover"
-        bodyContent={() => <div>{condition?.message}</div>}
+        bodyContent={() => <div>{condition?.message ?? condition?.reason}</div>}
       >
         <Label
           color="grey"
@@ -19,7 +19,7 @@ export const VMStatusConditionLabel: React.FC<V1VirtualMachineCondition> = React
             e.preventDefault();
           }}
         >
-          {condition?.reason}={condition?.status}
+          {condition?.type}={condition?.status}
         </Label>
       </Popover>
     );

diff --git a/...tualmachines/list/components/VMStatusConditionLabel/tests/VMStatusConditionLabel.test.tsx b/...tualmachines/list/components/VMStatusConditionLabel/tests/VMStatusConditionLabel.test.tsx
@@ -18,7 +18,7 @@ test('VMStatusConditionLabel', async () => {
   expect(firstRender).toMatchSnapshot();
 
   // click on condition to open popover
-  fireEvent.click(getByText(`${reason}=${status}`));
+  fireEvent.click(getByText(`${type}=${status}`));
   const popoverMessage = await screen.findByText(message);
 
   expect(popoverMessage).toHaveTextContent(message);

diff --git a/...omponents/VMStatusConditionLabel/tests/__snapshots__/VMStatusConditionLabel.test.tsx.snap b/...omponents/VMStatusConditionLabel/tests/__snapshots__/VMStatusConditionLabel.test.tsx.snap
@@ -12,7 +12,7 @@ exports[`VMStatusConditionLabel 1`] = `
       <span
         class="pf-c-label__text"
       >
-        no_vmi=true
+        Failure=true
       </span>
     </a>
   </span>

diff --git a/...nents/VMStatusConditionLabel/tests/__snapshots__/VMStatusConditionLabelList.test.tsx.snap b/...nents/VMStatusConditionLabel/tests/__snapshots__/VMStatusConditionLabelList.test.tsx.snap
@@ -26,7 +26,7 @@ exports[`Render VMStatusConditionLabelList 1`] = `
               <span
                 class="pf-c-label__text"
               >
-                no_vmi=true
+                Failure=true
               </span>
             </a>
           </span>
@@ -44,7 +44,7 @@ exports[`Render VMStatusConditionLabelList 1`] = `
               <span
                 class="pf-c-label__text"
               >
-                ready=true
+                Ready=true
               </span>
             </a>
           </span>