From 16ff6f16dd761df08505311f4417ceda21531853 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 14 May 2024 15:12:41 +0200 Subject: [PATCH] pass dataType unique to server --- .../tree/document-tree.server.data-source.ts | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.server.data-source.ts index f3f4c94b89..ee5d0c1839 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.server.data-source.ts @@ -1,10 +1,10 @@ import { UMB_DOCUMENT_ENTITY_TYPE, UMB_DOCUMENT_ROOT_ENTITY_TYPE } from '../entity.js'; -import type { UmbDocumentTreeItemModel } from './types.js'; import type { - UmbTreeAncestorsOfRequestArgs, - UmbTreeChildrenOfRequestArgs, - UmbTreeRootItemsRequestArgs, -} from '@umbraco-cms/backoffice/tree'; + UmbDocumentTreeChildrenOfRequestArgs, + UmbDocumentTreeItemModel, + UmbDocumentTreeRootItemsRequestArgs, +} from './types.js'; +import type { UmbTreeAncestorsOfRequestArgs } from '@umbraco-cms/backoffice/tree'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; import type { DocumentTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import { DocumentService } from '@umbraco-cms/backoffice/external/backend-api'; @@ -35,17 +35,22 @@ export class UmbDocumentTreeServerDataSource extends UmbTreeServerDataSourceBase } } -const getRootItems = (args: UmbTreeRootItemsRequestArgs) => +const getRootItems = (args: UmbDocumentTreeRootItemsRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - DocumentService.getTreeDocumentRoot({ skip: args.skip, take: args.take }); + DocumentService.getTreeDocumentRoot({ + dataTypeId: args.dataType.unique, + skip: args.skip, + take: args.take, + }); -const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { +const getChildrenOf = (args: UmbDocumentTreeChildrenOfRequestArgs) => { if (args.parent.unique === null) { return getRootItems(args); } else { // eslint-disable-next-line local-rules/no-direct-api-import return DocumentService.getTreeDocumentChildren({ parentId: args.parent.unique, + dataTypeId: args.dataType?.unique, skip: args.skip, take: args.take, });