Merge pull request #13695 from canonical/main

Merge main into feature branch

konf/site.yaml

@@ -7,10 +7,10 @@ env:
     value: true
 
   - name: STORE_MAINTENANCE_START
-    value: 2023-10-02T03:00:00Z
+    value: 2024-03-27T03:00:00Z
 
   - name: STORE_MAINTENANCE_END
-    value: 2023-10-02T06:00:00Z
+    value: 2024-03-27T05:00:00Z
 
   - name: SEARCH_API_KEY
     secretKeyRef:
@@ -369,10 +369,10 @@ production:
           value: true
 
         - name: STORE_MAINTENANCE_START
-          value: 2023-10-02T03:00:00Z
+          value: 2024-03-27T03:00:00Z
 
         - name: STORE_MAINTENANCE_END
-          value: 2023-10-02T06:00:00Z
+          value: 2024-03-27T05:00:00Z
 
         - name: SEARCH_API_KEY
           secretKeyRef:
@@ -479,10 +479,10 @@ staging:
       value: true
 
     - name: STORE_MAINTENANCE_START
-      value: 2023-10-02T03:00:00Z
+      value: 2024-03-27T03:00:00Z
 
     - name: STORE_MAINTENANCE_END
-      value: 2023-10-02T06:00:00Z
+      value: 2024-03-27T05:00:00Z
 
     - name: SEARCH_API_KEY
       secretKeyRef:
@@ -862,10 +862,10 @@ staging:
           value: true
 
         - name: STORE_MAINTENANCE_START
-          value: 2023-10-02T03:00:00Z
+          value: 2024-03-27T03:00:00Z
 
         - name: STORE_MAINTENANCE_END
-          value: 2023-10-02T06:00:00Z
+          value: 2024-03-27T05:00:00Z
 
         - name: SEARCH_API_KEY
           secretKeyRef:
@@ -942,10 +942,10 @@ demo:
       value: true
 
     - name: STORE_MAINTENANCE_START
-      value: 2023-10-02T03:00:00Z
+      value: 2024-03-27T03:00:00Z
 
     - name: STORE_MAINTENANCE_END
-      value: 2023-10-02T06:00:00Z
+      value: 2024-03-27T05:00:00Z
 
     - name: SEARCH_API_KEY
       secretKeyRef:

requirements.txt

@@ -4,7 +4,7 @@ canonicalwebteam.blog==6.4.1
 canonicalwebteam.search==1.3.0
 canonicalwebteam.templatefinder==1.0.0
 canonicalwebteam.image-template==1.3.1
-canonicalwebteam.discourse==5.4.7
+canonicalwebteam.discourse==5.4.9
 python-dateutil==2.8.2
 pytz==2022.7.1
 maxminddb-geolite2==2018.703

static/js/src/advantage/credentials/api/keys.js

@@ -25,22 +25,6 @@ export async function rotateKey(activationKey) {
   return data;
 }
 
-export async function activateKey(activationKey) {
-  let response = await fetch("/credentials/keys/activate", {
-    method: "POST",
-    headers: {
-      Accept: "application/json",
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({
-      activationKey: activationKey,
-      productID: "cube-admintasks",
-    }),
-  });
-  const data = await response.json();
-  return data;
-}
-
 export async function getKeyProducts() {
   let response = await fetch("/credentials/keys/products", {
     method: "GET",

static/js/src/advantage/credentials/app.tsx

@@ -8,7 +8,6 @@ import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
 import CredManage from "./components/CredManage";
 import CredKeyShop from "./components/CredKeyShop";
 import CredExamShop from "./components/CredExamShop/CredExamShop";
-import CredWebhookResponses from "./components/CredWebhookResponses";
 
 const oneHour = 1000 * 60 * 60;
 const queryClient = new QueryClient({
@@ -42,10 +41,6 @@ function App() {
             <Route path="/" element={<CredExamShop />} />
             <Route path="/keys" element={<CredKeyShop />} />
             <Route path="/manage" element={<CredManage />} />
-            <Route
-              path="/webhook_responses"
-              element={<CredWebhookResponses />}
-            />
           </Routes>
         </Router>
         <ReactQueryDevtools initialIsOpen={false} />

static/js/src/advantage/users/components/ExplainingTable.tsx

@@ -25,10 +25,6 @@ const ExplainingTable = () => (
           content: "Payment & Invoices",
           className: "u-align--center",
         },
-        {
-          content: "Support Portal seat",
-          className: "u-align--center",
-        },
       ]}
       rows={[
         {
@@ -53,10 +49,6 @@ const ExplainingTable = () => (
               content: <Icon name={ICONS.success} />,
               className: "u-align--center",
             },
-            {
-              content: <Icon name={ICONS.success} />,
-              className: "u-align--center",
-            },
           ],
         },
         {
@@ -81,10 +73,6 @@ const ExplainingTable = () => (
               content: <Icon name={ICONS.error} />,
               className: "u-align--center",
             },
-            {
-              content: <Icon name={ICONS.success} />,
-              className: "u-align--center",
-            },
           ],
         },
         {
@@ -109,10 +97,6 @@ const ExplainingTable = () => (
               content: <Icon name={ICONS.success} />,
               className: "u-align--center",
             },
-            {
-              content: <Icon name={ICONS.error} />,
-              className: "u-align--center",
-            },
           ],
         },
       ]}

static/js/src/chart-data.js

@@ -1258,8 +1258,8 @@ export var desktopServerReleaseNames = [
 export var kernelReleaseNames = [
   "22.04.4 LTS",
   "23.10",
-  "22.04.1 LTS",
   "20.04.5 LTS",
+  "22.04.1 LTS",
   "22.04.0 LTS",
   "18.04.5 LTS",
   "20.04.1 LTS",
@@ -1326,25 +1326,25 @@ export var kernelReleaseNamesALL = [
   "Ubuntu 20.04.1 LTS (v5.4)",
   "Ubuntu 18.04.5 LTS (v5.4)",
   "Ubuntu 22.04.0 LTS (v5.15)",
-  "Ubuntu 20.04.5 LTS (v5.15)",
   "Ubuntu 22.04.1 LTS (v5.15)",
+  "Ubuntu 20.04.5 LTS (v5.15)",
   "Ubuntu 23.10 (v6.5)",
   "Ubuntu 22.04.4 LTS (v6.5)",
 ];
 
 export var kernelReleaseNamesLTS = [
   "Ubuntu 16.04.0 LTS (v4.4)",
-  "Ubuntu 14.04.5 LTS (v4.4)",
   "Ubuntu 16.04.1 LTS (v4.4)",
+  "Ubuntu 14.04.5 LTS (v4.4)",
   "Ubuntu 18.04.0 LTS (v4.15)",
   "Ubuntu 18.04.1 LTS (v4.15)",
   "Ubuntu 16.04.5 LTS (v4.15)",
   "Ubuntu 20.04.0 LTS (v5.4)",
   "Ubuntu 20.04.1 LTS (v5.4)",
   "Ubuntu 18.04.5 LTS (v5.4)",
   "Ubuntu 22.04.0 LTS (v5.15)",
-  "Ubuntu 20.04.5 LTS (v5.15)",
   "Ubuntu 22.04.1 LTS (v5.15)",
+  "Ubuntu 20.04.5 LTS (v5.15)",
   "Ubuntu 22.04.4 LTS (v6.5)",
 ];