Merge branch 'main' into l10n_automation

mozilla · Dec 18, 2024 · 0283c3a · 0283c3a
2 parents 2506005 + 97bfd16
commit 0283c3a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/...r/(dashboard)/dashboard/fix/data-broker-profiles/automatic-remove/AutomaticRemoveView.tsx b/...r/(dashboard)/dashboard/fix/data-broker-profiles/automatic-remove/AutomaticRemoveView.tsx
@@ -248,7 +248,7 @@ export function AutomaticRemoveView(props: Props) {
                     )}
               </span>
               <Button
-                variant="primary"
+                variant="secondary"
                 /* c8 ignore start */
                 onPress={() => {
                   selectedPlanIsYearly

diff --git a/...cated)/user/(dashboard)/dashboard/fix/data-broker-profiles/dataBrokerProfiles.module.scss b/...cated)/user/(dashboard)/dashboard/fix/data-broker-profiles/dataBrokerProfiles.module.scss
@@ -197,6 +197,18 @@
       font: $text-title-sm;
       font-weight: 500;
     }
+
+    // Invert color for the plan selection CTA to increase visibility
+    // against the purple background.
+    & > a {
+      color: $color-white;
+      box-shadow: inset 0 0 0 2px $color-white;
+
+      &:hover {
+        background-color: $color-white;
+        color: $color-purple-70;
+      }
+    }
   }
 }
 

diff --git a/src/db/tables/onerep_scans.ts b/src/db/tables/onerep_scans.ts
@@ -431,6 +431,7 @@ async function getScanResultsWithBrokerUnderMaintenance(
       "sr.status as scan_result_status", // rename to avoid collision
       "db.status as broker_status", // rename to avoid collision
     )
+    .distinctOn("link")
     .innerJoin("onerep_scans as s", "sr.onerep_scan_id", "s.onerep_scan_id")
     .where("s.onerep_profile_id", onerepProfileId)
     .andWhere("sr.manually_resolved", "false")
@@ -470,6 +471,7 @@ async function getScanResultsWithBroker(
         "sr.status as scan_result_status", // rename to avoid collision
         "db.status as broker_status", // rename to avoid collision
       )
+      .distinctOn("link")
       .innerJoin("onerep_scans as s", "sr.onerep_scan_id", "s.onerep_scan_id")
       .where("s.onerep_profile_id", onerepProfileId)
       .join("onerep_data_brokers as db", "sr.data_broker", "db.data_broker")