fix: Conditionally present 'conflict' or 'conflicts' on TestQueue Sta…

…tus column (#1215) * Conditionally present 'conflict' or 'conflicts' on TestQueue Status column * Update snapshots
w3c · Sep 18, 2024 · 4e51862 · 4e51862
1 parent e86eab7
commit 4e51862
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/client/components/common/ReportStatusSummary/index.jsx b/client/components/common/ReportStatusSummary/index.jsx
@@ -33,12 +33,13 @@ const ReportStatusSummary = ({
 
   const getConflictsAnchor = conflictsCount => {
     if (conflictsCount === 0) return null;
+    const conflictsText = `conflict${conflictsCount === 1 ? '' : 's'}`;
     return (
       <a
         style={{ color: '#ce1b4c' }}
         href={`/test-queue/${testPlanReport.id}/conflicts`}
       >
-        with {conflictsCount} conflicts
+        with {conflictsCount} {conflictsText}
       </a>
     );
   };

diff --git a/client/tests/e2e/snapshots/saved/_data-management.html b/client/tests/e2e/snapshots/saved/_data-management.html
@@ -1087,7 +1087,7 @@ <h2>Test Plans Status Summary</h2>
                 <td>
                   <div class="css-bpz90">
                     <span class="rd full-width css-be9e2a">R&amp;D</span>
-                    <p class="review-text">Complete <b>Aug 21, 2024</b></p>
+                    <p class="review-text">Complete <b>Sep 18, 2024</b></p>
                   </div>
                 </td>
                 <td>
@@ -1110,7 +1110,7 @@ <h2>Test Plans Status Summary</h2>
                             <path
                               fill="currentColor"
                               d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM369 209L241 337c-9.4 9.4-24.6 9.4-33.9 0l-64-64c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l47 47L335 175c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9z"></path></svg
-                          ><b>V24.08.21</b></span
+                          ><b>V24.09.18</b></span
                         ></a
                       ></span
                     ><button