yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Workspace Editor slotted fallback content should be displayed when no routes (#20006)

Browse Source 
* fix + notes

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Niels Lyngsø
2025-08-27 13:09:21 +02:00
committed by GitHub
parent f0c5ecf086
commit 279409d6ee
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.context.ts
View File

@@ -38,9 +38,9 @@ export class UmbWorkspaceEditorContext extends UmbContextBase {
(view) => !workspaceViews.some((x) => x.manifest.alias === view.manifest.alias),
);
const diff = viewsToKeep.length !== workspaceViews.length;
const hasDiff = viewsToKeep.length !== workspaceViews.length;
if (diff) {
if (hasDiff) {
const newViews = [...viewsToKeep];
// Add ones that are new:

42
src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts
View File

@@ -136,26 +136,26 @@ export class UmbWorkspaceEditorElement extends UmbLitElement {
}
override render() {
return this._routes
? html`
<umb-body-layout main-no-padding .headline=${this.headline} ?loading=${this.loading}>
${this.#renderBackButton()}
<slot name="header" slot="header"></slot>
<slot name="action-menu" slot="action-menu"></slot>
${this.#renderViews()} ${this.#renderRoutes()}
<slot></slot>
${when(
!this.enforceNoFooter,
() => html`
<umb-workspace-footer slot="footer" data-mark="workspace:footer">
<slot name="footer-info"></slot>
<slot name="actions" slot="actions" data-mark="workspace:footer-actions"></slot>
</umb-workspace-footer>
`,
)}
</umb-body-layout>
`
: nothing;
// Notice if no routes then fallback to use a slot.
// TODO: Deprecate the slot feature, to rely purely on routes, cause currently bringing an additional route would mean the slotted content would never be shown. [NL]
return html`
<umb-body-layout main-no-padding .headline=${this.headline} ?loading=${this.loading}>
${this.#renderBackButton()}
<slot name="header" slot="header"></slot>
<slot name="action-menu" slot="action-menu"></slot>
${this.#renderViews()} ${this.#renderRoutes()}
<slot></slot>
${when(
!this.enforceNoFooter,
() => html`
<umb-workspace-footer slot="footer" data-mark="workspace:footer">
<slot name="footer-info"></slot>
<slot name="actions" slot="actions" data-mark="workspace:footer-actions"></slot>
</umb-workspace-footer>
`,
)}
</umb-body-layout>
`;
}
#renderViews() {
@@ -213,7 +213,7 @@ export class UmbWorkspaceEditorElement extends UmbLitElement {
}
#renderRoutes() {
if (!this._routes || this._routes.length === 0) return nothing;
if (!this._routes || this._routes.length === 0 || !this._workspaceViews || this._workspaceViews.length === 0) return nothing;
return html`
<umb-router-slot
inherit-addendum