From fcb3ed4347d26ebf249ade365144908cbf9a6a65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Thu, 1 Aug 2024 09:27:32 +0200
Subject: [PATCH] retrieve and render content type name

---
 ...block-grid-area-type-permission.element.ts | 40 +++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/packages/block/block-grid/property-editors/block-grid-area-type-permission/block-grid-area-type-permission.element.ts b/src/packages/block/block-grid/property-editors/block-grid-area-type-permission/block-grid-area-type-permission.element.ts
index 645906e4d7..3af917e303 100644
--- a/src/packages/block/block-grid/property-editors/block-grid-area-type-permission/block-grid-area-type-permission.element.ts
+++ b/src/packages/block/block-grid/property-editors/block-grid-area-type-permission/block-grid-area-type-permission.element.ts
@@ -7,6 +7,11 @@ import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-ed
 import { UMB_DATA_TYPE_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/data-type';
 import type { UmbBlockTypeWithGroupKey } from '@umbraco-cms/backoffice/block-type';
 import type { UUIComboboxElement, UUIComboboxEvent, UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
+import { UmbRepositoryItemsManager } from '@umbraco-cms/backoffice/repository';
+import {
+	UMB_DOCUMENT_TYPE_ITEM_REPOSITORY_ALIAS,
+	type UmbDocumentTypeItemModel,
+} from '@umbraco-cms/backoffice/document-type';
 
 @customElement('umb-property-editor-ui-block-grid-area-type-permission')
 export class UmbPropertyEditorUIBlockGridAreaTypePermissionElement
@@ -24,20 +29,41 @@ export class UmbPropertyEditorUIBlockGridAreaTypePermissionElement
 	@state()
 	private _value: Array<UmbBlockGridTypeAreaTypePermission> = [];
 
+	_blockTypes: Array<UmbBlockTypeWithGroupKey> = [];
+
 	@state()
-	private _blockTypes: Array<UmbBlockTypeWithGroupKey> = [];
+	private _blockTypesWithElementName: Array<{ type: UmbBlockTypeWithGroupKey; name: string }> = [];
 
 	@state()
 	private _blockGroups: Array<UmbBlockGridTypeGroupType> = [];
 
+	#itemsManager = new UmbRepositoryItemsManager<UmbDocumentTypeItemModel>(
+		this,
+		UMB_DOCUMENT_TYPE_ITEM_REPOSITORY_ALIAS,
+		(x) => x.unique,
+	);
+
 	constructor() {
 		super();
 
+		this.observe(this.#itemsManager.items, (items) => {
+			this._blockTypesWithElementName = items
+				.map((item) => {
+					const blockType = this._blockTypes.find((block) => block.contentElementTypeKey === item.unique);
+					if (blockType) {
+						return { type: blockType, name: item.name };
+					}
+					return undefined;
+				})
+				.filter((x) => x !== undefined) as Array<{ type: UmbBlockTypeWithGroupKey; name: string }>;
+		});
+
 		this.consumeContext(UMB_DATA_TYPE_WORKSPACE_CONTEXT, async (context) => {
 			this.observe(
 				await context.propertyValueByAlias<Array<UmbBlockTypeWithGroupKey>>('blocks'),
 				(blockTypes) => {
 					this._blockTypes = blockTypes ?? [];
+					this.#itemsManager.setUniques(blockTypes.map((block) => block.contentElementTypeKey));
 				},
 				'observeBlockType',
 			);
@@ -103,7 +129,7 @@ export class UmbPropertyEditorUIBlockGridAreaTypePermissionElement
 					this._value,
 					(permission) => permission,
 					(permission, index) => {
-						const showCategoryHeader = this._blockGroups.length && this._blockTypes.length;
+						const showCategoryHeader = this._blockGroups.length > 0 && this._blockTypesWithElementName.length > 0;
 
 						return html`<div class="permission-setting">
 							<uui-combobox
@@ -169,13 +195,13 @@ export class UmbPropertyEditorUIBlockGridAreaTypePermissionElement
 
 	#renderBlockTypes(area: UmbBlockGridTypeAreaTypePermission) {
 		return repeat(
-			this._blockTypes,
-			(block) => block.contentElementTypeKey,
+			this._blockTypesWithElementName,
+			(block) => block.type.contentElementTypeKey,
 			(block) =>
 				html`<uui-combobox-list-option
-					.value=${block.contentElementTypeKey}
-					?selected=${area.elementTypeKey === block.contentElementTypeKey}>
-					${block.label}
+					.value=${block.type.contentElementTypeKey}
+					?selected=${area.elementTypeKey === block.type.contentElementTypeKey}>
+					${block.name}
 				</uui-combobox-list-option>`,
 		);
 	}