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

Merge branch 'main' into bugfix/persisting-user-group-start-nodes

Browse Source
This commit is contained in:
Mads Rasmussen
2024-04-16 21:06:47 +02:00
committed by GitHub
parent 2c33b4cca4 f8c7630b8b
commit 13a1af0fc3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-manager.class.ts
View File

@@ -391,7 +391,7 @@ export class UmbContentTypeStructureManager<
throw new Error('Could not find the Content Type to remove container from');
}
const frozenContainers = contentType.containers ?? [];
const containers = frozenContainers.filter((x) => x.id !== containerId || x.parent?.id !== containerId);
const containers = frozenContainers.filter((x) => x.id !== containerId && x.parent?.id !== containerId);
const frozenProperties = contentType.properties ?? [];
const properties = frozenProperties.filter((x) => x.container?.id !== containerId);

8
src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor.element.ts
View File

@@ -228,7 +228,7 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
this._routes = routes;
}
async #requestRemoveTab(tab: UmbPropertyTypeContainerModel | undefined) {
async #requestDeleteTab(tab: UmbPropertyTypeContainerModel | undefined) {
// TODO: Localize this:
const modalData: UmbConfirmModalData = {
headline: 'Delete tab',
@@ -248,9 +248,9 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
await umbConfirmModal(this, modalData);
this.#remove(tab?.id);
this.#deleteTab(tab?.id);
}
#remove(tabId?: string) {
#deleteTab(tabId?: string) {
if (!tabId) return;
this.#workspaceContext?.structure.removeContainer(null, tabId);
// TODO: We should only navigate away if it was the last tab and if it was the active one... [NL]
@@ -495,7 +495,7 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
@click=${(e: MouseEvent) => {
e.stopPropagation();
e.preventDefault();
this.#requestRemoveTab(tab);
this.#requestDeleteTab(tab);
}}
compact>
<uui-icon name="icon-trash"></uui-icon>