Add Install Plugin Prompt

Modules/Package.swift

@@ -21,6 +21,8 @@ let package = Package(
         .library(name: "WordPressShared", targets: ["WordPressShared"]),
         .library(name: "WordPressUI", targets: ["WordPressUI"]),
         .library(name: "WordPressReader", targets: ["WordPressReader"]),
+        .library(name: "WordPressCore", targets: ["WordPressCore"]),
+        .library(name: "WordPressCoreProtocols", targets: ["WordPressCore"]),
     ],
     dependencies: [
         .package(url: "https://github.com/airbnb/lottie-ios", from: "4.4.0"),
@@ -137,7 +139,7 @@ let package = Package(
             name: "Support",
             dependencies: [
                 "AsyncImageKit",
-                "WordPressCore",
+                "WordPressCoreProtocols",
             ]
         ),
         .target(name: "TextBundle"),
@@ -152,10 +154,15 @@ let package = Package(
         ], swiftSettings: [.swiftLanguageMode(.v5)]),
         .target(name: "WordPressFlux", swiftSettings: [.swiftLanguageMode(.v5)]),
         .target(name: "WordPressCore", dependencies: [
+                "WordPressCoreProtocols",
                 "WordPressShared",
-                .product(name: "WordPressAPI", package: "wordpress-rs")
+                .product(name: "WordPressAPI", package: "wordpress-rs"),
             ]
         ),
+        .target(name: "WordPressCoreProtocols", dependencies: [
+            // This package should never have dependencies – it exists to expose protocols implemented in WordPressCore
+            // to UI code, because `wordpress-rs` doesn't work nicely with previews.
+        ]),
         .target(name: "WordPressLegacy", dependencies: ["DesignSystem", "WordPressShared"]),
         .target(name: "WordPressSharedObjC", resources: [.process("Resources")], swiftSettings: [.swiftLanguageMode(.v5)]),
         .target(

Modules/Sources/Support/Extensions/Foundation.swift

@@ -93,4 +93,20 @@ extension Task where Failure == Error {
             return try await MainActor.run(body: operation)
         }
     }
+
+    enum RunForAtLeastResult<T>: Sendable where T: Sendable {
+        case result(T)
+        case wait
+    }
+
+    static func runForAtLeast<C>(
+        _ duration: C.Instant.Duration,
+        operation: @escaping @Sendable () async throws -> Success,
+        clock: C = .continuous
+    ) async throws -> Success where C: Clock {
+        async let waitResult: () = try await clock.sleep(for: duration)
+        async let performTask = try await operation()
+
+        return try await (waitResult, performTask).1
+    }
 }

Modules/Sources/Support/InternalDataProvider.swift

@@ -1,5 +1,5 @@
 import Foundation
-import WordPressCore
+import WordPressCoreProtocols
 
 // This file is all module-internal and provides sample data for UI development
 
@@ -8,7 +8,8 @@ extension SupportDataProvider {
         applicationLogProvider: InternalLogDataProvider(),
         botConversationDataProvider: InternalBotConversationDataProvider(),
         userDataProvider: InternalUserDataProvider(),
-        supportConversationDataProvider: InternalSupportConversationDataProvider()
+        supportConversationDataProvider: InternalSupportConversationDataProvider(),
+        diagnosticsDataProvider: InternalDiagnosticsDataProvider()
     )
 
     static let applicationLog = ApplicationLog(path: URL(filePath: #filePath), createdAt: Date(), modifiedAt: Date())
@@ -391,3 +392,31 @@ actor InternalSupportConversationDataProvider: SupportConversationDataProvider {
         self.conversations[value.id] = value
     }
 }
+
+actor InternalDiagnosticsDataProvider: DiagnosticsDataProvider {
+
+    func fetchDiskCacheUsage() async throws -> WordPressCoreProtocols.DiskCacheUsage {
+        DiskCacheUsage(fileCount: 64, byteCount: 623_423_562)
+    }
+
+    func clearDiskCache(progress: @Sendable (CacheDeletionProgress) async throws -> Void) async throws {
+        let totalFiles = 12
+
+        // Initial progress (0%)
+        try await progress(CacheDeletionProgress(filesDeleted: 0, totalFileCount: totalFiles))
+
+        for i in 1...totalFiles {
+            // Pretend each file takes a short time to delete
+            try await Task.sleep(for: .milliseconds(150))
+
+            // Report incremental progress
+            try await progress(CacheDeletionProgress(filesDeleted: i, totalFileCount: totalFiles))
+        }
+    }
+
+    func resetPluginRecommendations() async throws {
+        if Bool.random() {
+            throw CocoaError(.fileNoSuchFile)
+        }
+    }
+}

Modules/Sources/Support/SupportDataProvider.swift

@@ -1,5 +1,5 @@
 import Foundation
-import WordPressCore
+import WordPressCoreProtocols
 
 public enum SupportFormAction {
     case viewApplicationLogList
@@ -23,6 +23,7 @@ public enum SupportFormAction {
 
     case viewDiagnostics
     case emptyDiskCache(bytesSaved: Int64)
+    case resetPluginRecommendations
 }
 
 @MainActor
@@ -32,6 +33,7 @@ public final class SupportDataProvider: ObservableObject, Sendable {
     private let botConversationDataProvider: BotConversationDataProvider
     private let userDataProvider: CurrentUserDataProvider
     private let supportConversationDataProvider: SupportConversationDataProvider
+    private let diagnosticsDataProvider: DiagnosticsDataProvider
 
     private weak var supportDelegate: SupportDelegate?
 
@@ -40,12 +42,14 @@ public final class SupportDataProvider: ObservableObject, Sendable {
         botConversationDataProvider: BotConversationDataProvider,
         userDataProvider: CurrentUserDataProvider,
         supportConversationDataProvider: SupportConversationDataProvider,
+        diagnosticsDataProvider: DiagnosticsDataProvider,
         delegate: SupportDelegate? = nil
     ) {
         self.applicationLogProvider = applicationLogProvider
         self.botConversationDataProvider = botConversationDataProvider
         self.userDataProvider = userDataProvider
         self.supportConversationDataProvider = supportConversationDataProvider
+        self.diagnosticsDataProvider = diagnosticsDataProvider
         self.supportDelegate = delegate
     }
 
@@ -161,6 +165,20 @@ public final class SupportDataProvider: ObservableObject, Sendable {
         self.userDid(.deleteAllApplicationLogs)
         try await self.applicationLogProvider.deleteAllApplicationLogs()
     }
+
+    // Diagnostics
+    public func fetchDiskCacheUsage() async throws -> DiskCacheUsage {
+        try await self.diagnosticsDataProvider.fetchDiskCacheUsage()
+    }
+
+    public func clearDiskCache(progress: (@Sendable @escaping (CacheDeletionProgress) async throws -> Void)) async throws {
+        try await self.diagnosticsDataProvider.clearDiskCache(progress: progress)
+    }
+
+    public func resetPluginRecommendations() async throws {
+        self.userDid(.resetPluginRecommendations)
+        try await self.diagnosticsDataProvider.resetPluginRecommendations()
+    }
 }
 
 public protocol SupportFormDataProvider {
@@ -211,6 +229,13 @@ public protocol CurrentUserDataProvider: Actor {
     nonisolated func fetchCurrentSupportUser() throws -> any CachedAndFetchedResult<SupportUser>
 }
 
+public protocol DiagnosticsDataProvider: Actor {
+    func fetchDiskCacheUsage() async throws -> DiskCacheUsage
+    func clearDiskCache(progress: (@Sendable @escaping (CacheDeletionProgress) async throws -> Void)) async throws
+
+    func resetPluginRecommendations() async throws
+}
+
 public protocol ApplicationLogDataProvider: Actor {
     func readApplicationLog(_ log: ApplicationLog) async throws -> String
     func fetchApplicationLogs() async throws -> [ApplicationLog]

Modules/Sources/Support/UI/Diagnostics/DiagnosticsView.swift

@@ -1,5 +1,4 @@
 import SwiftUI
-import WordPressCore
 
 public struct DiagnosticsView: View {
 
@@ -15,6 +14,7 @@ public struct DiagnosticsView: View {
                     .foregroundStyle(.secondary)
 
                 EmptyDiskCacheView()
+                ResetPluginRecommendationsView()
             }
             .padding()
         }

Modules/Sources/Support/UI/Diagnostics/EmptyDiskCacheView.swift

@@ -1,5 +1,5 @@
 import SwiftUI
-import WordPressCore
+import WordPressCoreProtocols
 
 struct EmptyDiskCacheView: View {
 
@@ -8,7 +8,7 @@ struct EmptyDiskCacheView: View {
 
     enum ViewState: Equatable {
         case loading
-        case loaded(usage: DiskCache.DiskCacheUsage)
+        case loaded(usage: DiskCacheUsage)
         case clearing(progress: Double, result: String)
         case error(Error)
 
@@ -51,8 +51,6 @@ struct EmptyDiskCacheView: View {
     @State
     var state: ViewState = .loading
 
-    private let cache = DiskCache()
-
     var body: some View {
         // Clear Disk Cache card
         DiagnosticCard(
@@ -112,7 +110,7 @@ struct EmptyDiskCacheView: View {
 
     private func fetchDiskCacheUsage() async {
         do {
-            let usage = try await cache.diskUsage()
+            let usage = try await dataProvider.fetchDiskCacheUsage()
             await MainActor.run {
                 self.state = .loaded(usage: usage)
             }
@@ -134,18 +132,12 @@ struct EmptyDiskCacheView: View {
         self.state = .clearing(progress: 0, result: "")
 
         do {
-            try await cache.removeAll { count, total in
-                let progress: Double
-
-                if count > 0 && total > 0 {
-                    progress = Double(count) / Double(total)
-                } else {
-                    progress = 0
-                }
-
-                await MainActor.run {
-                    withAnimation {
-                        self.state = .clearing(progress: progress, result: "Working")
+            try await Task.runForAtLeast(.seconds(1.5)) {
+                try await dataProvider.clearDiskCache { progress in
+                    await MainActor.run {
+                        withAnimation {
+                            self.state = .clearing(progress: progress.progress, result: "Working")
+                        }
                     }
                 }
             }
@@ -166,5 +158,5 @@ struct EmptyDiskCacheView: View {
 }
 
 #Preview {
-    EmptyDiskCacheView()
+    EmptyDiskCacheView().environmentObject(SupportDataProvider.testing)
 }