Add shared registry of RawBlockEditorSettingsService objects

Author: kean

WordPress/Classes/Services/RawBlockEditorSettingsService.swift

@@ -4,22 +4,32 @@ import WordPressShared
 
 class RawBlockEditorSettingsService {
     private let blog: Blog
-    private let remoteAPI: WordPressOrgRestApi
     private var isRefreshing: Bool = false
     private var refreshTask: Task<[String: Any], Error>?
 
-    init?(blog: Blog) {
-        guard let remoteAPI = WordPressOrgRestApi(blog: blog) else {
-            return nil
-        }
-
+    init(blog: Blog) {
         self.blog = blog
-        self.remoteAPI = remoteAPI
+    }
+
+    private static var services: [TaggedManagedObjectID<Blog>: RawBlockEditorSettingsService] = [:]
+
+    @MainActor
+    static func getService(forBlog blog: Blog) -> RawBlockEditorSettingsService {
+        let objectID = TaggedManagedObjectID(blog)
+        if let service = services[objectID] {
+            return service
+        }
+        let service = RawBlockEditorSettingsService(blog: blog)
+        services[objectID] = service
+        return service
     }
 
     @MainActor
     private func fetchSettingsFromAPI() async throws -> [String: Any] {
-        let result = await self.remoteAPI.get(path: "/wp-block-editor/v1/settings")
+        guard let remoteAPI = WordPressOrgRestApi(blog: blog) else {
+            throw URLError(.unknown) // Should not happen
+        }
+        let result = await remoteAPI.get(path: "/wp-block-editor/v1/settings")
         switch result {
         case .success(let response):
             guard let dictionary = response as? [String: Any] else {

WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift

@@ -70,10 +70,6 @@ final class MySiteViewController: UIViewController, UIScrollViewDelegate, NoSite
     // MARK: - Dependencies
 
     private let overlaysCoordinator: MySiteOverlaysCoordinator
-    private lazy var editorSettingsService: RawBlockEditorSettingsService? = {
-        guard let blog, RemoteFeatureFlag.newGutenberg.enabled() else { return nil }
-        return RawBlockEditorSettingsService(blog: blog)
-    }()
 
     // TODO: (reader) factor if out of `MySiteVC` for a production version
     var isReaderAppModeEnabled = false
@@ -387,9 +383,7 @@ final class MySiteViewController: UIViewController, UIScrollViewDelegate, NoSite
         }
 
         if RemoteFeatureFlag.newGutenberg.enabled() {
-            // Update editor settings service with new blog and fetch settings
-            editorSettingsService = RawBlockEditorSettingsService(blog: blog)
-            editorSettingsService?.refreshSettings()
+            RawBlockEditorSettingsService.getService(forBlog: blog).refreshSettings()
         }
     }
 

WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift

@@ -65,11 +65,6 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
         BlockEditorSettingsService(blog: post.blog, coreDataStack: ContextManager.shared)
     }()
 
-    // New service for fetching raw block editor settings
-    lazy var rawBlockEditorSettingsService: RawBlockEditorSettingsService? = {
-        return RawBlockEditorSettingsService(blog: post.blog)
-    }()
-
     // MARK: - GutenbergKit
 
     private var editorViewController: GutenbergKit.EditorViewController
@@ -354,11 +349,7 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
     // MARK: - Block Editor Settings
 
     private func fetchBlockEditorSettings() {
-        guard let service = rawBlockEditorSettingsService else {
-            startEditor()
-            return
-        }
-
+        let service = RawBlockEditorSettingsService.getService(forBlog: post.blog)
         service.refreshSettings()
 
         Task { @MainActor in