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

Fix block list inline mode (#20745)

Browse Source 
* Fix block list inline mode

https://github.com/umbraco/Umbraco-CMS/issues/20618

* Fixed potential runtime errors

* Code cleanup

* Fixed Code Health Review

* Revert some changes

Commented out unused state properties and related code.

* Remove commented-out state property in block workspace view

* fix localization

* no need for question mark after ids, they should be presented as required

---------

Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
Co-authored-by: Niels Lyngsø <nsl@umbraco.dk>
This commit is contained in:
Niels Lyngsø
2025-11-10 17:42:16 +01:00
parent 7502a38033
commit 12b483ff05
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.ts
View File

@@ -14,7 +14,7 @@ import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/workspace'
*/
@customElement('umb-block-workspace-view-edit-content-no-router')
export class UmbBlockWorkspaceViewEditContentNoRouterElement extends UmbLitElement implements UmbWorkspaceViewElement {
//private _hasRootProperties = false;
// private _hasRootProperties = false;
@state()
private _hasRootGroups = false;
@@ -25,9 +25,6 @@ export class UmbBlockWorkspaceViewEditContentNoRouterElement extends UmbLitEleme
@state()
private _activeTabKey?: string | null | undefined;
//@state()
//private _activeTabName?: string | null | undefined;
#blockWorkspace?: typeof UMB_BLOCK_WORKSPACE_CONTEXT.TYPE;
#tabsStructureHelper = new UmbContentTypeContainerStructureHelper(this);
@@ -67,46 +64,45 @@ export class UmbBlockWorkspaceViewEditContentNoRouterElement extends UmbLitEleme
#checkDefaultTabName() {
if (!this._tabs || !this.#blockWorkspace) return;
// Find the default tab to grab:
// Find the default tab to grab
if (this._activeTabKey === undefined) {
if (this._hasRootGroups) {
//this._activeTabName = null;
this._activeTabKey = null;
} else if (this._tabs.length > 0) {
//this._activeTabName = this._tabs[0].name;
this._activeTabKey = this._tabs[0].key;
const tab = this._tabs[0];
this._activeTabKey = tab.ownerId ?? tab.ids[0];
}
}
}
#setTabName(tabName: string | undefined | null, tabKey: string | null | undefined) {
//this._activeTabName = tabName;
#setTabKey(tabKey: string | null | undefined) {
this._activeTabKey = tabKey;
}
override render() {
if (!this._tabs) return;
return html`
${this._tabs.length > 1 || (this._tabs.length === 1 && this._hasRootGroups)
? html` <uui-tab-group slot="header">
? html`<uui-tab-group slot="header">
${this._hasRootGroups && this._tabs.length > 0
? html`
<uui-tab
label="Content"
.active=${null === this._activeTabKey}
@click=${() => this.#setTabName(null, null)}
? html`<uui-tab
label=${this.localize.term('general_generic')}
.active=${this._activeTabKey === null}
@click=${() => this.#setTabKey(null)}
>Content</uui-tab
>
`
>`
: nothing}
${repeat(
this._tabs,
(tab) => tab.name,
(tab) => {
const tabKey = tab.ownerId ?? tab.ids[0];
return html`<uui-tab
label=${tab.name ?? 'Unnamed'}
.active=${tab.key === this._activeTabKey}
@click=${() => this.#setTabName(tab.name, tab.key)}
label=${this.localize.string(tab.name ?? '#general_unnamed')}
.active=${this._activeTabKey === tabKey}
@click=${() => this.#setTabKey(tabKey)}
>${tab.name}</uui-tab
>`;
},