From cc9f5f72b7ae6aa4764917fca3837b2c35dc35e2 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 8 Jan 2024 17:08:00 +0100 Subject: [PATCH] map items to unique tree store --- .../tree/partial-view-tree.server.data-source.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/partial-view-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/partial-view-tree.server.data-source.ts index af8d42c440..c909bd660a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/partial-view-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/partial-view-tree.server.data-source.ts @@ -1,3 +1,5 @@ +import { UMB_PARTIAL_VIEW_ENTITY_TYPE, UMB_PARTIAL_VIEW_FOLDER_ENTITY_TYPE } from '../entity.js'; +import { UmbServerPathUniqueSerializer } from '../../utils/server-path-unique-serializer.js'; import { UmbPartialViewTreeItemModel } from './types.js'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; import { FileSystemTreeItemPresentationModel, PartialViewResource } from '@umbraco-cms/backoffice/backend-api'; @@ -36,16 +38,19 @@ const getChildrenOf = (parentUnique: string | null) => { } else { // eslint-disable-next-line local-rules/no-direct-api-import return PartialViewResource.getTreePartialViewChildren({ - path: parentUnique, + parentPath: parentUnique, }); } }; const mapper = (item: FileSystemTreeItemPresentationModel): UmbPartialViewTreeItemModel => { + const serializer = new UmbServerPathUniqueSerializer(); + return { - path: item.path, + unique: serializer.toUnique(item.path), + parentUnique: item.parent ? serializer.toUnique(item.parent?.path) : null, + entityType: item.isFolder ? UMB_PARTIAL_VIEW_FOLDER_ENTITY_TYPE : UMB_PARTIAL_VIEW_ENTITY_TYPE, name: item.name, - entityType: 'partial-view', isFolder: item.isFolder, hasChildren: item.hasChildren, isContainer: false,