Add site preparation screen

jkmassel · jkmassel · commit 1aca406771b7 · 2025-12-08T23:25:10.000-07:00
diff --git a/ios/Demo-iOS/Sources/ConfigurationItem.swift b/ios/Demo-iOS/Sources/ConfigurationItem.swift
@@ -1,7 +1,8 @@
 import Foundation
+import GutenbergKit
 
 /// Represents a configuration item for the editor
-enum ConfigurationItem: Codable, Identifiable, Equatable {
+enum ConfigurationItem: Codable, Identifiable, Equatable, Hashable {
     case bundledEditor
     case editorConfiguration(ConfiguredEditor)
 
@@ -24,8 +25,13 @@ enum ConfigurationItem: Codable, Identifiable, Equatable {
     }
 }
 
+struct RunnableEditor: Equatable, Hashable {
+    let configuration: EditorConfiguration
+    let dependencies: EditorDependencies?
+}
+
 /// Configuration for an editor with site integration
-struct ConfiguredEditor: Codable, Identifiable, Equatable {
+struct ConfiguredEditor: Codable, Identifiable, Equatable, Hashable {
     let id: String
     let name: String
     let siteUrl: String
diff --git a/ios/Demo-iOS/Sources/GutenbergApp.swift b/ios/Demo-iOS/Sources/GutenbergApp.swift
@@ -2,8 +2,33 @@ import SwiftUI
 import OSLog
 import GutenbergKit
 
+final class Navigation: ObservableObject {
+    @Published var path = NavigationPath()
+
+    func push(_ path: any Hashable) {
+        self.path.append(path)
+    }
+}
+
+extension EnvironmentValues {
+    private struct NavigationKey: EnvironmentKey {
+        static let defaultValue = Navigation()
+    }
+
+    var navigation: Navigation {
+        get { self[NavigationKey.self] }
+        set { self[NavigationKey.self] = newValue }
+    }
+}
+
 @main
 struct GutenbergApp: App {
+    @StateObject
+    private var navigation = Navigation()
+
+    private let configurationStorage = ConfigurationStorage()
+    private let authenticationManager = AuthenticationManager()
+
     init() {
         // Configure logger for GutenbergKit
         EditorLogger.shared = OSLogEditorLogger()
@@ -12,12 +37,19 @@ struct GutenbergApp: App {
 
     var body: some Scene {
         WindowGroup {
-            NavigationStack {
+            NavigationStack(path: $navigation.path) {
                 AppRootView()
+                .navigationDestination(for: RunnableEditor.self) { editor in
+                    EditorView(configuration: editor.configuration, dependencies: editor.dependencies)
+                }
+                .navigationDestination(for: ConfigurationItem.self) { item in
+                    SitePreparationView(site: item)
+                }
             }
         }
-        .environmentObject(ConfigurationStorage())
-        .environmentObject(AuthenticationManager())
+        .environment(\.navigation, navigation)
+        .environmentObject(configurationStorage)
+        .environmentObject(authenticationManager)
     }
 }
 
diff --git a/ios/Demo-iOS/Sources/Views/AppRootView.swift b/ios/Demo-iOS/Sources/Views/AppRootView.swift
@@ -11,7 +11,6 @@ struct AppRootView: View {
     @EnvironmentObject
     private var authenticationManager: AuthenticationManager
 
-    @State private var selectedConfiguration: ConfigurationItem?
     @State private var configurations: [ConfigurationItem] = [.bundledEditor]
     @State private var siteUrlInput = ""
 
@@ -23,7 +22,7 @@ struct AppRootView: View {
     @AppStorage("isNativeInserterEnabled") private var isNativeInserterEnabled = false
 
     var body: some View {
-        EditorList(isNativeInserterEnabled: $isNativeInserterEnabled, selectedConfiguration: $selectedConfiguration)
+        EditorList()
         .alert(isPresented: $hasError, error: error, actions: {
             Button {
                 self.hasError = false
@@ -35,67 +34,6 @@ struct AppRootView: View {
                 }
             }.buttonStyle(.borderedProminent)
         })
-        .fullScreenCover(item: $selectedConfiguration) { config in
-            editor
-        }
-        .onChange(of: self.selectedConfiguration) { oldValue, newValue in
-            switch newValue {
-            case .bundledEditor:
-                activeEditorConfiguration = EditorConfiguration.bundled
-                    .toBuilder()
-                    .setNativeInserterEnabled(self.isNativeInserterEnabled)
-                    .build()
-            case .editorConfiguration(let config):
-                self.loadEditorConfiguration(for: config)
-            case .none:
-                self.activeEditorConfiguration = nil
-            }
-        }
-    }
-
-    @ViewBuilder
-    var editor: some View {
-        NavigationView {
-            if let activeEditorConfiguration {
-                EditorView(configuration: activeEditorConfiguration)
-            } else {
-                ProgressView("Preparing Editor")
-            }
-        }
-    }
-
-    private func loadEditorConfiguration(for config: ConfiguredEditor) {
-        Task {
-            do {
-                let parsedApiRoot = try ParsedUrl.parse(input: config.siteApiRoot)
-                let client = WordPressAPI(
-                    urlSession: .shared,
-                    apiRootUrl: parsedApiRoot,
-                    authentication: .authorizationHeader(token: config.authHeader)
-                )
-
-                let apiRoot = try await client.apiRoot.get().data
-
-                let canUsePlugins = apiRoot.hasRoute(route: "/wpcom/v2/editor-assets")
-                let canUseEditorStyles = apiRoot.hasRoute(route: "/wp-block-editor/v1/settings")
-
-                self.activeEditorConfiguration = EditorConfigurationBuilder(
-                    postType: "post",
-                    siteURL: URL(string: apiRoot.siteUrlString())!,
-                    siteApiRoot: parsedApiRoot.asURL()
-                )
-                .setShouldUseThemeStyles(canUseEditorStyles)
-                .setShouldUsePlugins(canUsePlugins)
-                .setAuthHeader(config.authHeader)
-                .setNativeInserterEnabled(isNativeInserterEnabled)
-                .setLogLevel(.debug)
-                .setEnableNetworkLogging(true)
-                .build()
-            } catch {
-                self.hasError = true
-                self.error = AppError(errorDescription: error.localizedDescription)
-            }
-        }
     }
 
     private func deleteConfiguration(_ config: ConfigurationItem) {
diff --git a/ios/Demo-iOS/Sources/Views/EditorList.swift b/ios/Demo-iOS/Sources/Views/EditorList.swift
@@ -7,17 +7,15 @@ struct EditorList: View {
 
     @State private var showAddDialog = false
     @State private var showDebugSettings = false
-    @Binding var isNativeInserterEnabled: Bool
-
-    @Binding var selectedConfiguration: ConfigurationItem?
 
     @State var configurationToDelete: ConfigurationItem?
 
     var body: some View {
         List {
             Section {
-                Button("Default Editor") {
-                    selectedConfiguration = .bundledEditor
+                NavigationLink("Default Editor") {
+                    SitePreparationView(site: .bundledEditor)
+
                 }
             } header: {
                 if ProcessInfo.processInfo.environment["GUTENBERG_EDITOR_URL"] != nil
@@ -47,10 +45,6 @@ struct EditorList: View {
             } footer: {
                 Text("Editors with site configuration; enabling media uploads, plugin support, etc.")
             }
-
-            Section("Feature Configuration") {
-                Toggle("Native Inserter", isOn: $isNativeInserterEnabled)
-            }
         }
         .alert(
             "Delete Editor Configuration?",
@@ -105,9 +99,7 @@ struct EditorList: View {
             if case .editorConfiguration = $0 { return true }
             return false
         }) { config in
-            Button(config.displayName) {
-                self.selectedConfiguration = config
-            }
+            NavigationLink(config.displayName, value: config)
             .swipeActions(edge: .trailing) {
                 Button(role: .destructive) {
                     configurationToDelete = config
diff --git a/ios/Demo-iOS/Sources/Views/EditorView.swift b/ios/Demo-iOS/Sources/Views/EditorView.swift
@@ -3,31 +3,26 @@ import GutenbergKit
 
 struct EditorView: View {
     private let configuration: EditorConfiguration
+    private let dependencies: EditorDependencies?
 
-    @State private var viewModel = EditorViewModel()
+    @ObservedObject private var viewModel = EditorViewModel()
 
-    @Environment(\.dismiss) private var dismiss
-
-    init(configuration: EditorConfiguration) {
+    init(configuration: EditorConfiguration, dependencies: EditorDependencies? = nil) {
         self.configuration = configuration
+        self.dependencies = dependencies
     }
 
     var body: some View {
-        _EditorView(configuration: configuration, viewModel: viewModel)
+        _EditorView(
+            configuration: configuration,
+            dependencies: dependencies,
+            viewModel: viewModel
+        )
             .toolbar { toolbar }
     }
 
     @ToolbarContentBuilder
     private var toolbar: some ToolbarContent {
-        ToolbarItem(placement: .topBarLeading) {
-            Button {
-                dismiss()
-            } label: {
-                Image(systemName: "xmark")
-            }
-            .disabled(viewModel.isModalDialogOpen)
-        }
-
         ToolbarItemGroup(placement: .topBarTrailing) {
             Group {
                 Button {
@@ -90,13 +85,16 @@ struct EditorView: View {
 
 private struct _EditorView: UIViewControllerRepresentable {
     private let configuration: EditorConfiguration
+    private let dependencies: EditorDependencies?
     private let viewModel: EditorViewModel
 
     init(
         configuration: EditorConfiguration,
+        dependencies: EditorDependencies? = nil,
         viewModel: EditorViewModel
     ) {
         self.configuration = configuration
+        self.dependencies = dependencies
         self.viewModel = viewModel
     }
 
@@ -105,7 +103,7 @@ private struct _EditorView: UIViewControllerRepresentable {
     }
 
     func makeUIViewController(context: Context) -> EditorViewController {
-        let viewController = EditorViewController(configuration: configuration)
+        let viewController = EditorViewController(configuration: configuration, dependencies: dependencies)
         viewController.delegate = context.coordinator
         viewController.webView.isInspectable = true
 
@@ -209,8 +207,7 @@ private struct _EditorView: UIViewControllerRepresentable {
     }
 }
 
-@Observable
-private final class EditorViewModel {
+private final class EditorViewModel: ObservableObject {
     var isModalDialogOpen = false
     var hasUndo = false
     var hasRedo = false
diff --git a/ios/Demo-iOS/Sources/Views/SitePreparationView.swift b/ios/Demo-iOS/Sources/Views/SitePreparationView.swift
