Skip to content

Revert fix for making block editors read-only in trashed documents which causes a regression in certain multi-lingual block editing scenarios (closes #22472, re-opens #21973) #22656

Merged
nielslyngsoe merged 3 commits intorelease/17.3.5from
v17/hotfix/revert-parts-of-21982
Apr 30, 2026
Merged

Conversation

@nielslyngsoe
Copy link
Copy Markdown
Member

Reverts parts of #21982

To enable users to access Blocks as in 17.2, this will generall fix: #22472

But there is a follow-up PR #22522 which takes care of all permissions cases.

Meaning, are you unhappy with the revert in this PR, then upgrade to 17.4, where this will be working as expected in all cases.

Test-notes, read the issue.

Copilot AI review requested due to automatic review settings April 30, 2026 08:33
@nielslyngsoe nielslyngsoe enabled auto-merge (squash) April 30, 2026 08:33
@nielslyngsoe nielslyngsoe requested review from AndyButland and removed request for Copilot April 30, 2026 08:33
@AndyButland AndyButland changed the title V17/hotfix/revert parts of 21982 Revert fix for making block editors read-only in trashed documents which causes a regression in certain multi-lingual block editing scenarios (closes #22472, re-opens #21982) Apr 30, 2026
Copilot AI review requested due to automatic review settings April 30, 2026 08:50
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Reverts parts of the block-workspace read-only enforcement introduced in #21982 to restore block editing access in affected multi-language scenarios (notably with AllowEditInvariantFromNonDefault = false), aligning behavior closer to 17.2.x while a fuller permissions fix lands in a follow-up PR (#22522).

Changes:

  • Removes BlockWorkspaceIsReadOnly gating from block workspace submit actions.
  • Stops propagating read-only state into block workspace property write-guards.
  • Re-enables edit/settings action rendering for block entry UI components even when read-only.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/manifests.ts Removes read-only condition from Create/Update workspace actions.
src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.context.ts Stops applying read-only state to content/settings propertyWriteGuard.
src/Umbraco.Web.UI.Client/src/packages/block/block-single/components/block-single-entry/block-single-entry.element.ts Shows edit/settings actions even when _isReadOnly is true.
src/Umbraco.Web.UI.Client/src/packages/block/block-rte/components/block-rte-entry/block-rte-entry.element.ts Shows edit/settings actions even when _isReadOnly is true.
src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/block-list-entry.element.ts Shows edit/settings actions even when _isReadOnly is true.
src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entry/block-grid-entry.element.ts Shows edit/settings actions even when _isReadOnly is true.

@AndyButland
Copy link
Copy Markdown
Contributor

Just to recap what we discussed on first review of this PR @nielslyngsoe.

Setup: Block grid shared across cultures on a culture variant document. A single block is allowed with a shared and variant text field.

With "AllowEditInvariantFromNonDefault": false, using an editor that only has access to the non-default language:

  • I can edit the Italian variant text field. This fixes the regression as I can't do this in 17.3.4.
  • BUT I can also edit the default English variant field (and the English shared field from the English language), which I can't do in 17.3.4.

@AndyButland
Copy link
Copy Markdown
Contributor

AndyButland commented Apr 30, 2026

OK, having gone back to 17.2.2, I can confirm that:

  • 17.2.2 - can incorrectly edit English, can correctly edit Italian
  • 17.3.4 - am correctly blocked from editing English, but incorrectly cannot edit Italian
  • 17.3.5 (i.e. this PR) - back to can incorrectly edit English, can correctly edit Italian

So we are both fixing a regression and reverting a fix with this update, but given the regression is blocking of content editing it's more important to resolve that.

Then as noted #22522, aimed for 17.4-rc2, should resolve all scenarios.

@nielslyngsoe nielslyngsoe merged commit 1486121 into release/17.3.5 Apr 30, 2026
29 checks passed
@nielslyngsoe nielslyngsoe deleted the v17/hotfix/revert-parts-of-21982 branch April 30, 2026 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants