Merge branch 'main' into v14/chore/eslint-jsdocs

Author: madsrasmussen

examples/block-custom-view/block-custom-view.ts

@@ -3,7 +3,9 @@ import { html, customElement, LitElement, property, css } from '@umbraco-cms/bac
 import { UmbElementMixin } from '@umbraco-cms/backoffice/element-api';
 import type { UmbBlockDataType, UmbBlockEditorCustomViewElement } from '@umbraco-cms/backoffice/extension-registry';
 
+// eslint-disable-next-line local-rules/enforce-umb-prefix-on-element-name
 @customElement('example-block-custom-view')
+// eslint-disable-next-line local-rules/umb-class-prefix
 export class ExampleBlockCustomView extends UmbElementMixin(LitElement) implements UmbBlockEditorCustomViewElement {
 	//
 	@property({ attribute: false })
@@ -13,7 +15,7 @@ export class ExampleBlockCustomView extends UmbElementMixin(LitElement) implemen
 		return html`
 			<div class="uui-text">
 				<h5 class="uui-text">My Custom View</h5>
-				<p>Headline: ${this.content.headline}</p>
+				<p>Headline: ${this.content?.headline}</p>
 			</div>
 		`;
 	}

src/apps/backoffice/backoffice.context.ts

@@ -19,8 +19,8 @@ export class UmbBackofficeContext extends UmbContextBase<UmbBackofficeContext> {
 	#allowedSections = new UmbBasicState<Array<UmbExtensionManifestInitializer<ManifestSection>>>([]);
 	public readonly allowedSections = this.#allowedSections.asObservable();
 
-	#verison = new UmbStringState(undefined);
-	public readonly version = this.#verison.asObservable();
+	#version = new UmbStringState(undefined);
+	public readonly version = this.#version.asObservable();
 
 	constructor(host: UmbControllerHost) {
 		super(host, UMB_BACKOFFICE_CONTEXT);
@@ -70,7 +70,7 @@ export class UmbBackofficeContext extends UmbContextBase<UmbBackofficeContext> {
 			) ?? [];
 
 		const version = [major, minor, patch].join('.') + (prerelease ? `-${prerelease}` : '');
-		this.#verison.setValue(version);
+		this.#version.setValue(version);
 	}
 
 	public setActiveSectionAlias(alias: string) {

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>`,
 		);
 	}

src/packages/core/extension-registry/conditions/manifests.ts

@@ -1,10 +1,12 @@
 import type { ManifestTypes } from '../models/index.js';
 import { manifest as menuAliasConditionManifest } from './menu-alias.condition.js';
+import { manifest as multipleAppLanguagesConditionManifest } from './multiple-app-languages.condition.js';
 import { manifest as sectionAliasConditionManifest } from './section-alias.condition.js';
 import { manifest as switchConditionManifest } from './switch.condition.js';
 
 export const manifests: Array<ManifestTypes> = [
 	menuAliasConditionManifest,
+	multipleAppLanguagesConditionManifest,
 	sectionAliasConditionManifest,
 	switchConditionManifest,
 ];

src/packages/core/extension-registry/conditions/menu-alias.condition.ts

@@ -17,9 +17,13 @@ export class UmbMenuAliasCondition extends UmbConditionBase<MenuAliasConditionCo
 		super(host, args);
 
 		this.consumeContext(UMB_MENU_CONTEXT, (context) => {
-			this.observe(context.alias, (MenuAlias) => {
-				this.permitted = MenuAlias === this.config.match;
-			});
+			this.observe(
+				context.alias,
+				(MenuAlias) => {
+					this.permitted = MenuAlias === this.config.match;
+				},
+				'observeAlias',
+			);
 		});
 	}
 }

src/packages/core/extension-registry/conditions/multiple-app-languages.condition.ts

@@ -0,0 +1,37 @@
+import { UmbConditionBase } from './condition-base.controller.js';
+import { UMB_APP_LANGUAGE_CONTEXT } from '@umbraco-cms/backoffice/language';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import type {
+	ManifestCondition,
+	UmbConditionConfigBase,
+	UmbConditionControllerArguments,
+	UmbExtensionCondition,
+} from '@umbraco-cms/backoffice/extension-api';
+
+export type UmbMultipleAppLanguageConditionConfig = UmbConditionConfigBase;
+
+export class UmbMultipleAppLanguageCondition
+	extends UmbConditionBase<UmbMultipleAppLanguageConditionConfig>
+	implements UmbExtensionCondition
+{
+	constructor(host: UmbControllerHost, args: UmbConditionControllerArguments<UmbMultipleAppLanguageConditionConfig>) {
+		super(host, args);
+
+		this.consumeContext(UMB_APP_LANGUAGE_CONTEXT, (context) => {
+			this.observe(
+				context.moreThanOneLanguage,
+				(moreThanOneLanguage) => {
+					this.permitted = moreThanOneLanguage;
+				},
+				'observeLanguages',
+			);
+		});
+	}
+}
+
+export const manifest: ManifestCondition = {
+	type: 'condition',
+	name: 'Multiple App Languages Condition',
+	alias: 'Umb.Condition.MultipleAppLanguages',
+	api: UmbMultipleAppLanguageCondition,
+};

src/packages/core/extension-registry/conditions/section-alias.condition.ts

@@ -24,9 +24,13 @@ export class UmbSectionAliasCondition
 
 		if (permissionCheck !== undefined) {
 			this.consumeContext(UMB_SECTION_CONTEXT, (context) => {
-				this.observe(context.alias, (sectionAlias) => {
-					this.permitted = sectionAlias ? permissionCheck!(sectionAlias) : false;
-				});
+				this.observe(
+					context.alias,
+					(sectionAlias) => {
+						this.permitted = sectionAlias ? permissionCheck!(sectionAlias) : false;
+					},
+					'observeAlias',
+				);
 			});
 		}
 	}

src/packages/core/extension-registry/conditions/types.ts

@@ -3,6 +3,7 @@ import type { CollectionBulkActionPermissionConditionConfig } from '../../collec
 import type { UmbSectionUserPermissionConditionConfig } from '../../section/conditions/index.js';
 import type { SectionAliasConditionConfig } from './section-alias.condition.js';
 import type { SwitchConditionConfig } from './switch.condition.js';
+import type { UmbMultipleAppLanguageConditionConfig } from './multiple-app-languages.condition.js';
 import type {
 	WorkspaceAliasConditionConfig,
 	WorkspaceEntityTypeConditionConfig,
@@ -29,8 +30,9 @@ export type ConditionTypes =
 	| CollectionBulkActionPermissionConditionConfig
 	| SectionAliasConditionConfig
 	| SwitchConditionConfig
+	| UmbConditionConfigBase
 	| UmbDocumentUserPermissionConditionConfig
+	| UmbMultipleAppLanguageConditionConfig
 	| UmbSectionUserPermissionConditionConfig
 	| WorkspaceAliasConditionConfig
-	| WorkspaceEntityTypeConditionConfig
-	| UmbConditionConfigBase;
+	| WorkspaceEntityTypeConditionConfig;

src/packages/documents/document-types/property-editors/document-type-picker/property-editor-ui-document-type-picker.element.ts

@@ -45,7 +45,7 @@ export class UmbPropertyEditorUIDocumentTypePickerElement extends UmbLitElement
 				.min=${this.min}
 				.max=${this.max}
 				.value=${this.value}
-				?elementTypesOnly=${this.onlyElementTypes}
+				.elementTypesOnly=${this.onlyElementTypes ?? false}
 				?showOpenButton=${this.showOpenButton}
 				@change=${this.#onChange}>
 			</umb-input-document-type>

src/packages/language/app-language-select/manifests.ts

@@ -12,6 +12,9 @@ const entityActions: Array<ManifestSectionSidebarApp> = [
 				alias: 'Umb.Condition.SectionAlias',
 				match: 'Umb.Section.Content',
 			},
+			{
+				alias: 'Umb.Condition.MultipleAppLanguages',
+			},
 		],
 	},
 ];