WD-16847 Rebranded /observability/what-is-observability

konf/site.yaml

@@ -368,17 +368,10 @@ production:
         - name: SENTRY_DSN
           value: https://[email protected]//13
 
-    - paths: [/security/notices\.json]
-      service_name: ubuntu-com-security-api-notices
-
-    - paths: [/security/notices/.*\.json]
-      service_name: ubuntu-com-security-api-notices-detail
-
-    - paths: [/security/updates/.*]
-      service_name: ubuntu-com-security-api-updates
-
     - paths:
         [
+          /security/notices\.json,
+          /security/notices/.*\.json,
           /security/cves\.json,
           /security/cves/.*\.json,
           /security/releases\.json,
@@ -388,6 +381,11 @@ production:
         ]
       service_name: ubuntu-com-security-api
 
+    - paths: [/security/updates/.*]
+      service_name: ubuntu-com-security-api-updates
+      replicas: 2
+      memoryLimit: 1Gi
+
     - paths: [/security]
       name: ubuntu-com-security
       app_name: ubuntu.com-security

navigation.yaml

@@ -317,7 +317,7 @@ support:
     - title: Pricing
       path: /pricing/pro
     - title: Discourse
-      path: https://discourse.ubuntu.com/c/ubuntu-pro
+      path: https://discourse.ubuntu.com/c/project/ubuntu-pro/116/
 
 pro:
   title: Ubuntu Pro
@@ -335,7 +335,7 @@ pro:
     - title: Docs
       path: https://documentation.ubuntu.com/pro
     - title: Discourse
-      path: https://discourse.ubuntu.com/c/ubuntu-pro
+      path: https://discourse.ubuntu.com/c/project/ubuntu-pro/116/
 
 Distributor:
   title: Ubuntu Pro Distributor

package.json

@@ -120,7 +120,7 @@
     "typescript": "5.5.4",
     "url-polyfill": "1.1.12",
     "url-search-params-polyfill": "8.2.5",
-    "vanilla-framework": "4.18.2",
+    "vanilla-framework": "4.18.3",
     "yup": "1.4.0"
   },
   "resolutions": {

redirects.yaml

@@ -844,6 +844,7 @@ tour/?: "/desktop"
 tour/en/?: "/desktop"
 tour/zh-CN/?: "/desktop"
 trademark-policy/?: "/legal/intellectual-property-policy"
+tutorials/secure-ubuntu-kiosk: "https://mir-server.io/docs/make-a-secure-ubuntu-web-kiosk"
 tuxaward/?: "/blog/ubuntu-wins-tux-award/"
 ua/?: "/support"
 ua-assurance-terms/?: "/legal/ubuntu-advantage-assurance"

static/js/src/advantage/credentials/dashboard/components/ExamResults/ExamResults.tsx

@@ -102,6 +102,11 @@ const ExamResults = () => {
             </small>
           ),
       },
+      {
+        Header: "First Name",
+        accessor: "user.first_name",
+        sortType: "basic",
+      },
       {
         Header: "User Email",
         accessor: "user_email",
@@ -295,6 +300,8 @@ const ExamResults = () => {
       {flatData && flatData?.length > 0 && (
         <>
           <ModularTable
+            initialSortColumn="completed_at"
+            initialSortDirection="descending"
             data={currentRows}
             columns={columns}
             sortable

static/js/src/advantage/subscribe/checkout/components/Summary/Summary.tsx

@@ -330,7 +330,10 @@ function Summary({ products, action, coupon, setError }: Props) {
                 {format(new Date(priceData?.end_of_cycle), DATE_FORMAT)}
               </strong>
             </p>
-            <p>The same date as your existing subscription.</p>
+            <p>
+              This subscription is co-termed with your existing subscription.
+              Both subscriptions will end on the same date.
+            </p>
           </Col>
         ) : (
           <Col size={8}>

static/js/src/navigation.js

@@ -66,6 +66,8 @@ mainList.addEventListener("click", function (e) {
       goBackOneLevel(e, target);
     } else {
       handleDropdownClick(e.target.parentNode);
+      // This is a temporary fix until we migrate to use the vanilla meganav
+      closeNotifications();
     }
   } else if (
     target.classList.contains("p-navigation__dropdown-item") ||
@@ -78,6 +80,12 @@ mainList.addEventListener("click", function (e) {
   }
 });
 
+// The current set up of the meganav doesn't work well with notifications. The simplest fix for this is to close all notifications when a dropdown is clicked. Can be removed on migration to vanilla meganav.
+function closeNotifications() {
+  const notification = document.querySelector(".p-popup-notification:target");
+  notification.style.display = "none";
+}
+
 let wasBelowSpecificWidth = window.innerWidth < MOBILE_VIEW_BREAKPOINT;
 window.addEventListener("resize", function () {
   // Only closeAll if the resize event crosses the MOBILE_VIEW_BREAKPOINT threshold

static/js/src/tabbed-content.js

@@ -150,17 +150,15 @@
 
       attachEvents(tabs, persistURLHash);
 
-      const isInsideCurrentContainer =
-        null !==
-        tabContainer.querySelector(".p-tabs__link[href='" + currentHash + "']");
-
-      if (persistURLHash && currentHash && isInsideCurrentContainer) {
-        const activeTab = document.querySelector(
+      if (persistURLHash && currentHash) {
+        const activeTabLink = document.querySelector(
           ".p-tabs__link[href='" + currentHash + "']",
         );
-
-        if (activeTab) {
-          setActiveTab(activeTab, tabs);
+        const activeTabButton = document.querySelector(
+          ".p-tabs__item[id='" + currentHash.replace("#", "") + "']",
+        );
+        if (activeTabLink || activeTabButton) {
+          setActiveTab(activeTabLink || activeTabButton, tabs);
         }
 
         return;

static/sass/styles.scss

@@ -841,53 +841,18 @@ td.p-accordion {
 }
 
 // Styling to display a success message when forms are successfully submitted.
-#success {
+.p-popup-notification {
   display: none;
-  position: absolute;
-}
-
-#success:target {
-  display: block;
-  z-index: 10;
-}
-
-#newsletter-signup {
-  display: none;
-  position: absolute;
-}
-
-#newsletter-signup:target {
-  display: block;
-  z-index: 10;
-}
-
-#contact-form-success {
-  display: none;
-  position: absolute;
-}
-
-#contact-form-success:target {
-  display: block;
-  z-index: 10;
-}
-
-#updated {
-  display: none;
-}
-
-#updated:target {
-  display: block;
-  z-index: 10;
-}
-
-#unsubscribed {
-  display: none;
-  position: absolute;
+  position: relative;
+  padding-bottom: 0;
+  .p-notification__content {
+    margin-bottom: 0.6rem;
+  }
 }
 
-#unsubscribed:target {
+.p-popup-notification:target {
   display: block;
-  z-index: 10;
+  z-index: 9;
 }
 
 html {
@@ -1463,6 +1428,10 @@ $color-link-dark: #69c !default;
   &.is-product {
     background-color: #f3f3f3;
   }
+
+  &--logo {
+    margin-top: $spv--large;
+  }
 }
 
 .p-icon-section {
@@ -1727,6 +1696,7 @@ legend {
     padding-top: 0.5rem;
   }
 }
+
 // XXX: MPT: Can be removed once this is upstreamed in Vanilla
 // https://github.com/canonical/vanilla-framework/issues/5293
 .list-matrix {
@@ -1784,3 +1754,15 @@ legend {
 .p-footer-list {
   @extend %paragraph;
 }
+
+.u-additional-spacing--large {
+  @media screen and ($breakpoint-large <= width) {
+    margin-bottom: $sp-unit * 12.5;
+  }
+}
+
+.u-responsive-cta {
+  @media screen and ($breakpoint-large <= width) {
+    height: 15rem;
+  }
+}

templates/base_index.html

@@ -1266,7 +1266,6 @@ <h2 class="p-heading--1 u-no-margin--bottom">Multi-cloud applications&nbsp;&ndas
         xhr.send();
         fetchUserCountry.open("GET", "/user-country.json", true);
         fetchUserCountry.send();
-        takeoverAnimation.className += " is-loading";
       }
 
       function showTakeover(takeovers, index) {

templates/case-study/esa.html

@@ -9,9 +9,9 @@
 {% from "macros/_macros-image.jinja" import image_wrapper %}
 
 {% block title %}Canonical deploys infrastructure solutions and managed IT services for critical space mission operations{% endblock %}
-{% block meta_description %}{% endblock %}
+{% block meta_description %}Thanks to Canonical, the ESA has unlocked cost savings, easier operations, and more confidence in providing infrastructure in their roadmap for doubling their number of space missions by 2030.{% endblock %}
 {% block meta_company_name %}European Space Agency{% endblock %}
-{% block meta_copydoc %}{% endblock %}
+{% block meta_copydoc %}https://docs.google.com/document/d/1jc5DY4-9pDYQC04Egdt0If4_jrYn1mIBDwhJfILO46w/edit{% endblock %}
 
 {% block content %}
   <!-- Hero section -->

templates/certified/hardware-details/_hardware-table.html

@@ -0,0 +1,33 @@
+<div class="p-section--deep row">
+  <div class="col-9 col-start-large-4">
+    <hr class="p-rule" />
+    <table aria-label="Hardware details for {{ release_details.make }} {{ release_details.model }}">
+      <tbody>
+        {% for category, devices in hardware_details.items() %}
+          {% if category != "Other" %}
+            <tr>
+              <th colspan="3" class="u-text--muted">{{ category }}</th>
+              <td colspan="6">
+                <ul class="p-list u-no-margin--bottom">
+                  {% for device in devices %}
+                    <li class="p-list__item u-no-padding--top">
+                      {{ device.name }}
+                      {% if device.bus in ["usb", "pci"] %}
+                        ({{ device.identifier -}}
+                        {% if device.subsystem %}
+                          {{ device.subsystem -}}
+                        {% endif %})
+                      {% endif %}
+                    </li>
+                  {% endfor %}
+                </ul>
+              </td>
+            </tr>
+          {% endif %}
+        {% else %}
+          There are no hardware details available for this machine.
+        {% endfor %}
+      </tbody>
+    </table>
+  </div>
+</div>

templates/certified/hardware-details/_hero-section.html

@@ -0,0 +1,25 @@
+<section class="p-section--hero">
+  <div class="row">
+    <div class="col-9 col-medium-4 col-start-medium-3 col-start-large-4">
+      <h1 class="p-muted-heading">
+        <a href="/certified/{{ category_pathname }}">{{ category_pathname }}</a> &rsaquo; <a href="/certified/platforms/{{ release_details.platform_id }}">{{ release_details.platform_name }}</a>
+        &rsaquo; <a href="/certified/{{ release_details.canonical_id }}"> {{ release_details.model }}</a>
+      </h1>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-3 col-medium-2 u-hide--small">
+      <div class="p-section--shallow">
+        {% with category=release_details.category %}
+          {% include "certified/shared/category-image.html" %}
+        {% endwith %}
+      </div>
+    </div>
+    <div class="col-9 col-medium-4">
+      <div class="p-section--shallow u-no-padding--bottom">
+        <h1 class="u-no-margin--bottom">{{ release_details.make }} {{ release_details.model }} certified on Ubuntu {{ release_details.certified_release }}</h1>
+        <h2>Hardware details</h2>
+      </div>
+    </div>
+  </div>
+</section>