Make sure we send correct pixel in broken site report

duckduckgo · Nov 6, 2024 · 845d4cc · 845d4cc
1 parent a98dedb
commit 845d4cc
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 16 deletions.
diff --git a/DuckDuckGo/BrokenSitePrompt/BrokenSitePromptLimiter.swift b/DuckDuckGo/BrokenSitePrompt/BrokenSitePromptLimiter.swift
@@ -21,6 +21,7 @@ import BrokenSitePrompt
 
 extension BrokenSitePromptLimiter {
 
-    static let shared: BrokenSitePromptLimiter = BrokenSitePromptLimiter(privacyConfigManager: ContentBlocking.shared.privacyConfigurationManager, store: BrokenSitePromptLimiterStore())
+    static let shared: BrokenSitePromptLimiter = BrokenSitePromptLimiter(privacyConfigManager: ContentBlocking.shared.privacyConfigurationManager,
+                                                                         store: BrokenSitePromptLimiterStore())
 
 }
diff --git a/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift b/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
@@ -23,6 +23,7 @@ import Combine
 import Common
 import Lottie
 import os.log
+import PrivacyDashboard
 
 protocol AddressBarButtonsViewControllerDelegate: AnyObject {
 
@@ -267,13 +268,13 @@ final class AddressBarButtonsViewController: NSViewController {
         openPrivacyDashboardPopover()
     }
 
-    func openPrivacyDashboardPopover() {
+    func openPrivacyDashboardPopover(entryPoint: PrivacyDashboardEntryPoint = .dashboard) {
         if let permissionAuthorizationPopover, permissionAuthorizationPopover.isShown {
             permissionAuthorizationPopover.close()
         }
         popupBlockedPopover?.close()
 
-        popovers?.togglePrivacyDashboardPopover(for: tabViewModel, from: privacyEntryPointButton)
+        popovers?.togglePrivacyDashboardPopover(for: tabViewModel, from: privacyEntryPointButton, entryPoint: entryPoint)
         onboardingPixelReporter.trackPrivacyDashboardOpened()
     }
 
@@ -385,7 +386,7 @@ final class AddressBarButtonsViewController: NSViewController {
 
     func openPrivacyDashboard() {
         guard let tabViewModel else { return }
-        popovers?.openPrivacyDashboard(for: tabViewModel, from: privacyEntryPointButton)
+        popovers?.openPrivacyDashboard(for: tabViewModel, from: privacyEntryPointButton, entryPoint: .dashboard)
     }
 
     func updateButtons() {

diff --git a/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift b/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift
@@ -24,6 +24,7 @@ import NetworkProtection
 import NetworkProtectionUI
 import NetworkProtectionIPC
 import PixelKit
+import PrivacyDashboard
 
 protocol PopoverPresenter {
     func show(_ popover: NSPopover, positionedBelow view: NSView)
@@ -162,11 +163,11 @@ final class NavigationBarPopovers: NSObject, PopoverPresenter {
         show(popover, positionedBelow: button)
     }
 
-    func togglePrivacyDashboardPopover(for tabViewModel: TabViewModel?, from button: MouseOverButton) {
+    func togglePrivacyDashboardPopover(for tabViewModel: TabViewModel?, from button: MouseOverButton, entryPoint: PrivacyDashboardEntryPoint) {
         if privacyDashboardPopover?.isShown == true {
             closePrivacyDashboard()
         } else if let tabViewModel {
-            openPrivacyDashboard(for: tabViewModel, from: button)
+            openPrivacyDashboard(for: tabViewModel, from: button, entryPoint: entryPoint)
         }
     }
 
@@ -314,10 +315,10 @@ final class NavigationBarPopovers: NSObject, PopoverPresenter {
         autofillOnboardingPopover?.close()
     }
 
-    func openPrivacyDashboard(for tabViewModel: TabViewModel, from button: MouseOverButton) {
+    func openPrivacyDashboard(for tabViewModel: TabViewModel, from button: MouseOverButton, entryPoint: PrivacyDashboardEntryPoint) {
         guard closeTransientPopovers() else { return }
 
-        let popover = PrivacyDashboardPopover()
+        let popover = PrivacyDashboardPopover(entryPoint: entryPoint)
         popover.delegate = self
         self.privacyDashboardPopover = popover
         self.subscribePrivacyDashboardPendingUpdates(for: popover)

diff --git a/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift b/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
@@ -553,13 +553,16 @@ final class NavigationBarViewController: NSViewController {
         guard brokenSitePromptLimiter.shouldShowToast(),
               let event = sender.userInfo?[PageRefreshEvent.key] as? PageRefreshEvent,
               let url = tabCollectionViewModel.selectedTabViewModel?.tab.url, !url.isDuckDuckGo,
-              OnboardingActionsManager.isOnboardingFinished,
-              Application.appDelegate.onboardingStateMachine.state == .onboardingCompleted
+              isOnboardingFinished
         else { return }
         showBrokenSitePrompt(after: event)
     }
 
-    private func showBrokenSitePrompt(after: PageRefreshEvent) {
+    private var isOnboardingFinished: Bool {
+        OnboardingActionsManager.isOnboardingFinished && Application.appDelegate.onboardingStateMachine.state == .onboardingCompleted
+    }
+
+    private func showBrokenSitePrompt(after event: PageRefreshEvent) {
         guard view.window?.isKeyWindow == true,
               let privacyButton = addressBarViewController?.addressBarButtonsViewController?.privacyEntryPointButton else { return }
         brokenSitePromptLimiter.didShowToast()
@@ -568,7 +571,7 @@ final class NavigationBarViewController: NSViewController {
                                                           buttonText: UserText.BrokenSitePrompt.buttonTitle,
                                                           buttonAction: {
             self.brokenSitePromptLimiter.didOpenReport()
-            self.addressBarViewController?.addressBarButtonsViewController?.openPrivacyDashboardPopover()
+            self.addressBarViewController?.addressBarButtonsViewController?.openPrivacyDashboardPopover(entryPoint: .prompt(event.rawValue))
             PixelKit.fire(GeneralPixel.siteNotWorkingWebsiteIsBroken)
         },
                                                           shouldShowCloseButton: true,

diff --git a/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboardPopover.swift b/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboardPopover.swift
@@ -17,6 +17,7 @@
 //
 
 import Cocoa
+import PrivacyDashboard
 
 final class PrivacyDashboardPopover: NSPopover {
 
@@ -35,22 +36,22 @@ final class PrivacyDashboardPopover: NSPopover {
         (contentViewController as? PrivacyDashboardViewController)!
     }
 
-    override init() {
+    init(entryPoint: PrivacyDashboardEntryPoint = .dashboard) {
         super.init()
 #if DEBUG
         self.behavior = .semitransient
 #else
         self.behavior = .transient
 #endif
-        setupContentController()
+        setupContentController(entryPoint: entryPoint)
     }
 
     required init?(coder: NSCoder) {
         fatalError("\(Self.self): Bad initializer")
     }
 
-    private func setupContentController() {
-        let controller = PrivacyDashboardViewController()
+    private func setupContentController(entryPoint: PrivacyDashboardEntryPoint) {
+        let controller = PrivacyDashboardViewController(entryPoint: entryPoint)
         controller.sizeDelegate = self
         contentViewController = controller
     }