Merge branch 'main' into workaround/jest-coverage

locales/nn-NO/settings.ftl

@@ -66,5 +66,6 @@ settings-alert-preferences-allow-monthly-monitor-report-subtitle = Ei månadleg
 
 settings-tab-label-edit-info = Rediger opplysningane dine
 settings-tab-label-notifications = Still inn varsel
+settings-tab-label-manage-account = Handsam kontoen
 settings-tab-subtitle-manage-account = Handsam { -product-name }-kontoen din.
 settings-tab-notifications-marketing-link-label = Gå til e-postinnstillingar for { -brand-mozilla }

src/db/migrations/20250214170135_add_data_broker_id_and_id_column_and_drop_onerep_profile_id_in_qa_custom_brokers.js

@@ -0,0 +1,27 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+export function up(knex) {
+  return knex.schema.table("qa_custom_brokers", (table) => {
+    table.integer("id").nullable();
+    table.dropColumn("onerep_profile_id");
+    table.string("data_broker_id").nullable();
+  });
+}
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+export function down(knex) {
+  return knex.schema.table("qa_custom_brokers", (table) => {
+    table.dropColumn("id");
+    table.string("onerep_profile_id").nullable();
+    table.dropColumn("data_broker_id");
+  });
+}

src/db/tables/onerep_scans.ts

@@ -184,15 +184,15 @@ async function getLatestOnerepScanResults(
       results = qaBrokers;
     } else {
       // Fetch initial results from onerep_scan_results
-      const scanResults = (await knex("onerep_scan_results")
-        .select("*")
+      const scanResults = (await knex("onerep_scan_results as sr")
+        .select(
+          "sr.*",
+          "s.created_at as scan_created_at",
+          "s.updated_at as scan_updated_at",
+        )
         .distinctOn("link")
         .where("onerep_profile_id", onerepProfileId)
-        .innerJoin(
-          "onerep_scans",
-          "onerep_scan_results.onerep_scan_id",
-          "onerep_scans.onerep_scan_id",
-        )
+        .innerJoin("onerep_scans as s", "sr.onerep_scan_id", "s.onerep_scan_id")
         .orderBy("link")
         .orderBy("onerep_scan_result_id", "desc")) as OnerepScanResultRow[];
       results = [...scanResults, ...qaBrokers];
@@ -473,7 +473,8 @@ async function getScanResultsWithBroker(
     scanResults = await knex("onerep_scan_results as sr")
       .select(
         "sr.*",
-        "s.*",
+        "s.created_at as scan_created_at",
+        "s.updated_at as scan_updated_at",
         "sr.status as scan_result_status", // rename to avoid collision
         "db.status as broker_status", // rename to avoid collision
       )