From 069b8647d8ff211b5b2dfbdb2630c8104072a1cf Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 30 May 2024 20:50:18 +0200 Subject: [PATCH 1/2] add sidebar bottom space --- .../core/section/section-sidebar/section-sidebar.element.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar/section-sidebar.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar/section-sidebar.element.ts index 5c86779064..ba7a4a2081 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar/section-sidebar.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar/section-sidebar.element.ts @@ -30,6 +30,8 @@ export class UmbSectionSidebarElement extends UmbLitElement { flex-direction: column; z-index: 10; position: relative; + padding-bottom: var(--uui-size-4); + box-sizing: border-box; } #scroll-container { From 72da0c4c0b4f603af96091a9bbc9a694fc08cb69 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 30 May 2024 14:57:42 +0200 Subject: [PATCH 2/2] only render folders for move document-type --- .../entity-actions/move-to/manifests.ts | 1 + .../tree/document-type.tree.server.data-source.ts | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/move-to/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/move-to/manifests.ts index b53091d713..ebb3f30c81 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/move-to/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/move-to/manifests.ts @@ -15,6 +15,7 @@ const entityActions: Array = [ treeRepositoryAlias: UMB_DOCUMENT_TYPE_TREE_REPOSITORY_ALIAS, moveRepositoryAlias: UMB_MOVE_DOCUMENT_TYPE_REPOSITORY_ALIAS, treeAlias: UMB_DOCUMENT_TYPE_TREE_ALIAS, + foldersOnly: true, }, }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/document-type.tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/document-type.tree.server.data-source.ts index f24ada9e7d..04f34144bb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/document-type.tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/document-type.tree.server.data-source.ts @@ -41,15 +41,24 @@ export class UmbDocumentTypeTreeServerDataSource extends UmbTreeServerDataSource const getRootItems = (args: UmbTreeRootItemsRequestArgs) => // eslint-disable-next-line local-rules/no-direct-api-import - DocumentTypeService.getTreeDocumentTypeRoot({ skip: args.skip, take: args.take }); + DocumentTypeService.getTreeDocumentTypeRoot({ + foldersOnly: args.foldersOnly, + skip: args.skip, + take: args.take, + }); const getChildrenOf = (args: UmbTreeChildrenOfRequestArgs) => { if (args.parent.unique === null) { - return getRootItems({ skip: args.skip, take: args.take }); + return getRootItems({ + foldersOnly: args.foldersOnly, + skip: args.skip, + take: args.take, + }); } else { // eslint-disable-next-line local-rules/no-direct-api-import return DocumentTypeService.getTreeDocumentTypeChildren({ parentId: args.parent.unique, + foldersOnly: args.foldersOnly, skip: args.skip, take: args.take, });