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

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

Merged
nielslyngsoe merged 3 commits into from
Apr 30, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88231f0
do not inherit property write permissions
nielslyngsoe Apr 30, 2026
95c6cb6
revert hidding edit actions
nielslyngsoe Apr 30, 2026
27e2a4e
remove condition from create/update block action
nielslyngsoe Apr 30, 2026
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
2 changes: 0 additions & 2 deletions ...ent/src/packages/block/block-grid/components/block-grid-entry/block-grid-entry.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,6 @@ export class UmbBlockGridEntryElement extends UmbLitElement implements UmbProper
}

#renderEditAction() {
if (this._isReadOnly) return nothing;
return html`
${when(
this._showContentEdit && this._workspaceEditContentPath,
Expand Down Expand Up @@ -616,7 +615,6 @@ export class UmbBlockGridEntryElement extends UmbLitElement implements UmbProper
}

#renderEditSettingsAction() {
if (this._isReadOnly) return nothing;
return html`
${this._hasSettings && this._workspaceEditSettingsPath
? html`
Expand Down
2 changes: 0 additions & 2 deletions ...ent/src/packages/block/block-list/components/block-list-entry/block-list-entry.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,6 @@ export class UmbBlockListEntryElement extends UmbLitElement implements UmbProper
}

#renderEditContentAction() {
if (this._isReadOnly) return nothing;
return this._showContentEdit && this._workspaceEditContentPath
? html`<uui-button
label="edit"
Expand All @@ -479,7 +478,6 @@ export class UmbBlockListEntryElement extends UmbLitElement implements UmbProper
}

#renderEditSettingsAction() {
if (this._isReadOnly) return nothing;
return html`
${this._hasSettings && this._workspaceEditSettingsPath
? html`<uui-button
Expand Down
2 changes: 0 additions & 2 deletions ...Client/src/packages/block/block-rte/components/block-rte-entry/block-rte-entry.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,6 @@ export class UmbBlockRteEntryElement extends UmbLitElement implements UmbPropert
}

#renderEditAction() {
if (this._isReadOnly) return nothing;
return this._showContentEdit && this._workspaceEditContentPath
? html`<uui-button
label="edit"
Expand All @@ -394,7 +393,6 @@ export class UmbBlockRteEntryElement extends UmbLitElement implements UmbPropert
}

#renderEditSettingsAction() {
if (this._isReadOnly) return nothing;
return html`
${this._hasSettings && this._workspaceEditSettingsPath
? html`<uui-button
Expand Down
2 changes: 0 additions & 2 deletions ...c/packages/block/block-single/components/block-single-entry/block-single-entry.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,6 @@ export class UmbBlockSingleEntryElement extends UmbLitElement implements UmbProp
}

#renderEditContentAction() {
if (this._isReadOnly) return nothing;
return this._showContentEdit && this._workspaceEditContentPath
? html`<uui-button
label="edit"
Expand All @@ -464,7 +463,6 @@ export class UmbBlockSingleEntryElement extends UmbLitElement implements UmbProp
}

#renderEditSettingsAction() {
if (this._isReadOnly) return nothing;
return html`
${this._hasSettings && this._workspaceEditSettingsPath
? html`<uui-button
Expand Down
4 changes: 0 additions & 4 deletions src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,8 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
};

this.readOnlyGuard?.addRule(rule);
this.content.propertyWriteGuard.addRule({ unique, permitted: false });
this.settings.propertyWriteGuard.addRule({ unique, permitted: false });
} else {
this.readOnlyGuard?.removeRule(unique);
this.content.propertyWriteGuard.removeRule(unique);
this.settings.propertyWriteGuard.removeRule(unique);
}
},
'observeIsReadOnly',
Expand Down
8 changes: 0 additions & 8 deletions src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/manifests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ export const manifests: Array<UmbExtensionManifest> = [
alias: 'Umb.Condition.BlockWorkspaceIsExposed',
match: false,
},
{
alias: 'Umb.Condition.BlockWorkspaceIsReadOnly',
match: false,
},
],
},
{
Expand All @@ -51,10 +47,6 @@ export const manifests: Array<UmbExtensionManifest> = [
{
alias: 'Umb.Condition.BlockWorkspaceIsExposed',
},
Comment thread
nielslyngsoe marked this conversation as resolved.
{
alias: 'Umb.Condition.BlockWorkspaceIsReadOnly',
match: false,
},
],
},
{
Expand Down
Loading