Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Allow remote editor for WPCOM sites #24170

Draft
wants to merge 6 commits into
base: trunk
Choose a base branch
from
+22 −4
Draft

feat: Allow remote editor for WPCOM sites #24170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
89271c8
feat: Enable plugins for WPCOM sites
dcalhoun Mar 4, 2025
9e383b2
feat: Provide all REST API namespace patterns to editor
dcalhoun Mar 4, 2025
b83c90f
feat: Provide editor namespace excluded paths
dcalhoun Mar 4, 2025
90bb9a2
feat: Set site type global
dcalhoun Mar 7, 2025
7d64a3e
feat: Expose experimental editor plugins feature
dcalhoun Mar 24, 2025
9b577c6
feat: Limit experimental editor plugin support to WPCOM Simple sites
dcalhoun Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions WordPress/Classes/ViewRelated/Me/App Settings/ExperimentalFeaturesDataProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class ExperimentalFeaturesDataProvider: ExperimentalFeaturesViewModel.DataProvid
FeatureFlag.authenticateUsingApplicationPassword,
FeatureFlag.newGutenberg,
FeatureFlag.newGutenbergThemeStyles,
FeatureFlag.newGutenbergPlugins,
]

private let flagStore = FeatureFlagOverrideStore()
Expand Down
25 changes: 21 additions & 4 deletions WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,10 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
self.navigationBarManager = navigationBarManager ?? PostEditorNavigationBarManager()

let selfHostedApiUrl = post.blog.url(withPath: "wp-json/")
let isSelfHosted = !post.blog.isHostedAtWPcom && !post.blog.isAtomic()
let siteApiRoot = post.blog.isAccessibleThroughWPCom() && !isSelfHosted ? post.blog.wordPressComRestApi()?.baseURL.absoluteString : selfHostedApiUrl
let isWPComSite = post.blog.isHostedAtWPcom || post.blog.isAtomic()
let siteApiRoot = post.blog.isAccessibleThroughWPCom() && isWPComSite ? post.blog.wordPressComRestApi()?.baseURL.absoluteString : selfHostedApiUrl
let siteId = post.blog.dotComID?.stringValue
let siteDomain = post.blog.primaryDomainAddress
let authToken = post.blog.authToken ?? ""
var authHeader = "Bearer \(authToken)"

Expand All @@ -139,7 +140,14 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
}
}

let siteApiNamespace = post.blog.dotComID != nil && !isSelfHosted && applicationPassword == nil ? "sites/\(siteId ?? "")" : ""
// Must provide both namespace forms to detect usages of both forms in third-party code
var siteApiNamespace: [String] = []
if isWPComSite {
if let siteId {
siteApiNamespace.append("sites/\(siteId)")
}
siteApiNamespace.append("sites/\(siteDomain)")
}

var conf = EditorConfiguration(
title: post.postTitle ?? "",
Expand All @@ -151,10 +159,19 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
conf.siteURL = post.blog.url ?? ""
conf.siteApiRoot = siteApiRoot ?? ""
conf.siteApiNamespace = siteApiNamespace
conf.namespaceExcludedPaths = ["/wpcom/v2/following/recommendations", "/wpcom/v2/following/mine"]
conf.authHeader = authHeader

conf.themeStyles = FeatureFlag.newGutenbergThemeStyles.enabled
conf.plugins = FeatureFlag.newGutenbergPlugins.enabled && isSelfHosted
// Limited to Simple sites until application password auth is supported
conf.plugins = FeatureFlag.newGutenbergPlugins.enabled && post.blog.isHostedAtWPcom

if !post.blog.isSelfHosted {
let siteType: String = post.blog.isHostedAtWPcom ? "simple" : "atomic"
conf.webViewGlobals = [
WebViewGlobal(name: "_currentSiteType", value: .string(siteType))
]
}

self.editorViewController = GutenbergKit.EditorViewController(configuration: conf)

Expand Down