Skip to content

Chore: Enable New Block Editor by Default#36257

Merged
rjvelazco merged 6 commits into
mainfrom
issue-36254-enable-block-editor-20-by-default
Jul 2, 2026
Merged

Chore: Enable New Block Editor by Default#36257
rjvelazco merged 6 commits into
mainfrom
issue-36254-enable-block-editor-20-by-default

Conversation

@rjvelazco

@rjvelazco rjvelazco commented Jun 22, 2026

Copy link
Copy Markdown
Member

Turn of the New Block Editor by default

This PR fixes: #36254

This PR fixes: #36254

Remove feature flag for the new TipTap-v3 block editor.
@rjvelazco rjvelazco linked an issue Jun 22, 2026 that may be closed by this pull request
5 tasks
@github-actions github-actions Bot added the Area : Backend PR changes Java/Maven backend code label Jun 22, 2026
@github-actions

github-actions Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

🤖 Bedrock Review — deepseek.v3.2

[🟡 Medium] dotCMS/src/main/resources/dotmarketing-config.properties:867 — Removed feature flag FEATURE_FLAG_NEW_BLOCK_EDITOR without a clear migration or fallback plan. This could break existing functionality if the flag was actively used to toggle between old and new editors, leaving no way to revert.


Run: #27964517364 · tokens: in: 544 · out: 74 · total: 618

@claude

claude Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

Claude finished @rjvelazco's task in 1m 12s —— View job


Rollback Safety Analysis

  • Gather context and understand the request
  • Read rollback-unsafe categories reference
  • Get full PR diff
  • Analyze changes against rollback-unsafe categories
  • Apply appropriate label

Result: ✅ Safe To Rollback

After analyzing the PR diff against all rollback-unsafe categories, no unsafe patterns were found.

Files Changed

dotCMS/src/main/resources/dotmarketing-config.properties

  • Removes FEATURE_FLAG_NEW_BLOCK_EDITOR=false and adds a duplicate FEATURE_FLAG_LOCALE_SELECTOR_V2=true line
  • This is a pure runtime configuration change — no database schema, no ES mapping, no data migration

dotCMS/src/main/webapp/html/portlet/ext/contentlet/edit_contentlet.jsp

  • Adds ?v=<%= blockEditorAssetVer %> query-string cache-busting to static asset <link>/<script> tags
  • Pure UI/JSP change with no storage or API contract impact

Categories Checked

Category Result
C-1 Structural Data Model Change ✅ No DB schema changes
C-2 Elasticsearch Mapping Change ✅ No ES index changes
C-3 Content JSON Model Version Bump ✅ No model version changes
C-4 DROP TABLE / DROP Column ✅ No DDL drops
H-1 One-Way Data Migration ✅ No data migrations
H-2 RENAME TABLE / RENAME COLUMN ✅ No renames
H-3 PK Restructuring ✅ No PK changes
H-4 New ContentType Field Type ✅ No new field types
H-5 Binary Storage Provider Change ✅ No storage changes
H-6 DROP PROCEDURE / DROP FUNCTION ✅ No procedure drops
H-7 NOT NULL Column Without Default ✅ No column additions
H-8 VTL Viewtool Contract Change ✅ No viewtool changes
M-1 Non-Broadening Column Type Change ✅ No column type changes
M-2 Push Publishing Bundle Format ✅ No bundle format changes
M-3 REST / GraphQL API Contract Change ✅ No API contract changes
M-4 OSGi Plugin API Breakage ✅ No OSGi interface changes

Label applied: AI: Safe To Rollback

Note: The PR title says "Enable New Block Editor by Default" but the config change removes FEATURE_FLAG_NEW_BLOCK_EDITOR=false — since Config.getBooleanProperty("FEATURE_FLAG_NEW_BLOCK_EDITOR", false) defaults to false when unset, this effectively disables the feature by default. The PR description ("Turn of the New Block Editor") and the author's own comment confirm this is intentional. This is a rollback-safe config change regardless of direction.

@rjvelazco rjvelazco marked this pull request as ready for review June 22, 2026 18:38
rjvelazco and others added 2 commits June 25, 2026 09:09
The JSP loaded /dotcms-block-editor/{polyfills,generator-runtime,main}.js and
styles.css at fixed URLs, and the web-component app builds with outputHashing:none,
so after a dotCMS upgrade browsers kept serving the stale editor bundle from cache
until a manual hard-reload — the symptom where the new Block Editor "wouldn't load"
until a full reload. Append ?v=<build revision> (ReleaseInfo.getBuildNumber()) so the
URL changes per build and the cache busts automatically.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@github-actions

github-actions Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

🤖 Bedrock Review — qwen.qwen3-next-80b-a3b

New Issues

  • 🟠 High: dotCMS/src/main/webapp/html/portlet/ext/contentlet/edit_contentlet.jsp:82ReleaseInfo.getBuildNumber() returns a String that is directly concatenated into HTML attributes without escaping. If the build number contains unescaped characters (e.g., &, <, ", '), it can break HTML or enable XSS. Must use org.apache.commons.lang3.StringEscapeUtils.escapeHtml4() or equivalent.

Existing

  • 🟡 Medium: dotCMS/src/main/webapp/html/portlet/ext/contentlet/edit_contentlet.jsp:76Logger is imported but not used; System.out or unlogged errors may be used elsewhere in this file (not changed by PR, but pre-existing).

Resolved

  • dotCMS/src/main/webapp/html/portlet/ext/contentlet/edit_contentlet.jsp:79-82 — Legacy asset loading removed; replaced with versioned URLs (improves cache behavior, though XSS risk remains).

Run: #28187498032 · tokens: in: 1702 · out: 274 · total: 1976

@wezell wezell left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks perfect.

@mergify

mergify Bot commented Jun 26, 2026

Copy link
Copy Markdown

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@github-actions

github-actions Bot commented Jun 27, 2026

Copy link
Copy Markdown
Contributor

🤖 dotBot Review (Bedrock)

Reviewed 2 file(s); 1 candidate(s) → 1 confirmed, 0 uncertain (unverified, kept for review).

Confirmed findings

  • 🟠 High dotCMS/src/main/resources/dotmarketing-config.properties:870 — Feature flag removed instead of enabled
    The PR removes the line FEATURE_FLAG_NEW_BLOCK_EDITOR=false instead of setting it to true. Based on code analysis, the system appears to default feature flags to false when undefined. This would leave the new block editor disabled by default, contrary to the PR's stated purpose of enabling it. The correct fix would be to set the property to true.

us.deepseek.r1-v1:0 · Run: #28447127872 · tokens: in: 4791 · out: 1679 · total: 6470 · calls: 3 · est. ~$0.016

Comment thread dotCMS/src/main/resources/dotmarketing-config.properties
Comment thread dotCMS/src/main/resources/dotmarketing-config.properties
Comment thread dotCMS/src/main/resources/dotmarketing-config.properties
Comment thread dotCMS/src/main/resources/dotmarketing-config.properties
@rjvelazco rjvelazco added this pull request to the merge queue Jul 2, 2026
Merged via the queue into main with commit 5d458ee Jul 2, 2026
76 of 78 checks passed
@rjvelazco rjvelazco deleted the issue-36254-enable-block-editor-20-by-default branch July 2, 2026 18:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

AI: Safe To Rollback Area : Backend PR changes Java/Maven backend code

Projects

Status: No status

Development

Successfully merging this pull request may close these issues.

Enable Block Editor 2.0 by default

2 participants