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

Content Type Designer tabs sorting improvement (#20074)

Browse Source 
* fix style and localization

* Update src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor.element.ts

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

* fix class name as well

* minor fixes to sorting of tabs

* clean up

* add data-marks

* Updated package version to include test fixes for tab name

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Andreas Zerbst <andr317c@live.dk>
This commit is contained in:
Niels Lyngsø
2025-09-05 09:53:27 +02:00
committed by GitHub
parent f07d691ff6
commit 472be3d40e
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI.Client/src/packages/content/content-type/structure/content-type-container-structure-helper.class.ts
View File

@@ -55,6 +55,7 @@ export class UmbContentTypeContainerStructureHelper<T extends UmbContentTypeMode
this.#initRejector = reject;
});
this.#childContainersMerged.sortBy((a, b) => (a.sortOrder || 0) - (b.sortOrder || 0));
this.#legacyMergedChildContainers.sortBy((a, b) => (a.sortOrder || 0) - (b.sortOrder || 0));
}

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

@@ -941,12 +941,13 @@ export class UmbContentTypeStructureManager<
for (const container of containers) {
const path = getContainerChainKey(container, containerByIdCache, chainCache);
const key = path?.join('|') ?? null;
const isOwner = this.isOwnerContainer(container.id);
if (!mergedMap.has(key)) {
// Store the first occurrence
mergedMap.set(key, {
key: key,
ids: [container.id],
ownerId: this.isOwnerContainer(container.id) ? container.id : undefined,
ownerId: isOwner ? container.id : undefined,
parentIds: new Set([container.parent?.id ?? null]),
path: path,
type: container.type,
@@ -958,7 +959,11 @@ export class UmbContentTypeStructureManager<
const existing = mergedMap.get(key)!;
existing.ids.push(container.id);
existing.parentIds.add(container.parent?.id ?? null);
existing.ownerId ??= this.isOwnerContainer(container.id) ? container.id : undefined;
existing.ownerId ??= isOwner ? container.id : undefined;
if (isOwner) {
// If this is the owner container, then we should update the sort order to ensure it is the one from the owner instance: [NL]
existing.sortOrder = container.sortOrder;
}
}
}

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

@@ -37,9 +37,10 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
getUniqueOfElement: (element) => element.getAttribute('data-umb-tab-key'),
getUniqueOfModel: (tab) => tab.key,
identifier: 'content-type-tabs-sorter',
itemSelector: 'uui-tab',
itemSelector: 'uui-tab:not(#root-tab)',
containerSelector: 'uui-tab-group',
disabledItemSelector: ':not([sortable])',
ignorerSelector: 'uui-input',
resolvePlacement: (args) => args.relatedRect.left + args.relatedRect.width * 0.5 > args.pointerX,
onChange: ({ model }) => {
this._tabs = model;
@@ -724,6 +725,10 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
justify-content: center;
gap: var(--uui-size-space-2);
margin-right: calc(var(--uui-size-space-3) * -1);
pointer-events: none;
}
.tab-inner > uui-input {
pointer-events: auto;
}
.not-active uui-button {