Merge pull request #14329 from mtruj013/ignored-message

bug: fix missing status description for ignored status and update switch functionality
canonical · Sep 24, 2024 · acf6c22 · acf6c22
2 parents 71b7214 + 6831696
commit acf6c22
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/templates/security/cves/cve.html b/templates/security/cves/cve.html
@@ -279,7 +279,7 @@ <h2>Status</h2>
                             <td style="overflow: visible; display: flex;" class="{% if status.maintained == False %} js-unmaintained-cell u-hide--cell{% endif %} cve-td-status" >
                               <i class="p-icon--{{ status.icon }}" style="margin-top: .2rem; margin-right: 0.5rem;"></i>
                               <div style="display: block;">
-                                {{ status.name }} {% if status.name == "Fixed" or status.status == "ignored" %}<span class="u-text--muted">{{ status.description }} </span> {% endif %}
+                                {{ status.name }} {% if status.name == "Fixed" %}<span class="u-text--muted">{{ status.description }} </span> {% endif %}
                                 {% if status.pocket_desc and status.pocket_desc.label == "Ubuntu Pro" %}
                                   <div>
                                     <a class="p-chip p-tooltip--top-center u-no-margin--bottom" href="/pro" aria-describedby="{{ status.pocket }}-tooltip">
@@ -292,7 +292,7 @@ <h2>Status</h2>
                             </td>     
                           {% else %}
                             <td class="{% if status.maintained == False %}js-unmaintained-cell u-hide--cell{% endif %} cve-td-status {% if status.status == 'DNE' %}u-text--muted{% endif %}" style="padding-left: 2rem;">
-                              {{ status.name }}
+                              {{ status.name }} {% if status.status == "ignored" %} <span class="u-text--muted">{{ status.description }} </span> {% endif %}
                             </td>
                           {% endif %}
 
@@ -577,18 +577,17 @@ <h3>Other references</h3>
     // Updates notification text and aria-describedby attribute for the switch
     // depending on if the releases are all maintained, unmaintained or only upstream
     function handleNotificationText(maintainedCount, isOnlyUpstream, hiddenCells, maintainedReleasesSwitch) {
-      let notification = document.querySelector(".js-conditional-notification");
-
+      const notification = document.querySelector(".js-conditional-notification");
+      const maintainedReleasesSwitchLabel = document.querySelector(".p-switch");
+
       if (maintainedCount < 1 && !isOnlyUpstream) {
         notification.classList.remove("u-hide");
         notification.querySelector(".p-notification__message").textContent = "No maintained releases are affected by this CVE.";
         notification.id = "disabled-switch-notification";
       }
 
       if (hiddenCells.length === 0 && !isOnlyUpstream) {
-        notification.classList.remove("u-hide");
-        notification.querySelector(".p-notification__message").textContent = "No unmaintained releases are affected by this CVE.";
-        notification.id = "disabled-switch-notification-only-maintained";
+        maintainedReleasesSwitchLabel.classList.add("u-hide");
       }
 
       if (isOnlyUpstream) {