Merge branch 'main' into v14/feature/block-type-custom-view-guide

nielslyngsoe · web-flow · commit be3218d3e13d · 2024-08-05T09:55:24.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -222,7 +222,7 @@
 		"@hey-api/openapi-ts": "^0.48.3",
 		"@mdx-js/react": "^3.0.1",
 		"@open-wc/testing": "^4.0.0",
-		"@playwright/test": "^1.45.2",
+		"@playwright/test": "^1.45.3",
 		"@rollup/plugin-commonjs": "^26.0.1",
 		"@rollup/plugin-json": "^6.1.0",
 		"@rollup/plugin-node-resolve": "^15.2.3",
@@ -267,7 +267,7 @@
 		"storybook": "^7.6.17",
 		"tiny-glob": "^0.2.9",
 		"tsc-alias": "^1.8.10",
-		"typedoc": "^0.26.4",
+		"typedoc": "^0.26.5",
 		"typescript": "^5.5.3",
 		"typescript-eslint": "^7.16.1",
 		"typescript-json-schema": "^0.64.0",
diff --git a/src/packages/core/content-type/modals/composition-picker/composition-picker-modal.element.ts b/src/packages/core/content-type/modals/composition-picker/composition-picker-modal.element.ts
@@ -90,17 +90,18 @@ export class UmbCompositionPickerModalElement extends UmbModalBaseElement<
 		await this.#init;
 		if (!this.#compositionRepository) return;
 
-		const isElement = this.data?.isElement;
-		const currentPropertyAliases = this.data?.currentPropertyAliases;
+		// Notice isElement is not available on all types that can be composed.
+		const isElement = this.data?.isElement ?? undefined;
+		const currentPropertyAliases = this.data?.currentPropertyAliases ?? [];
 
 		const { data } = await this.#compositionRepository.availableCompositions({
 			unique: this.#unique,
 			// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 			// @ts-ignore
 			// TODO: isElement is not available on all types that can be composed.
-			isElement: isElement ?? false,
+			isElement: isElement,
 			currentCompositeUniques: this._selection,
-			currentPropertyAliases: currentPropertyAliases ?? [],
+			currentPropertyAliases: currentPropertyAliases,
 		});
 
 		if (!data) return;
diff --git a/src/packages/documents/document-types/repository/composition/index.ts b/src/packages/documents/document-types/repository/composition/index.ts
@@ -1,2 +1 @@
-export { UmbDocumentTypeCompositionRepository } from './document-type-composition.repository.js';
 export { UMB_DOCUMENT_TYPE_COMPOSITION_REPOSITORY_ALIAS } from './manifests.js';
diff --git a/src/packages/documents/document-types/repository/composition/manifests.ts b/src/packages/documents/document-types/repository/composition/manifests.ts
@@ -2,11 +2,11 @@ import type { ManifestRepository, ManifestTypes } from '@umbraco-cms/backoffice/
 
 export const UMB_DOCUMENT_TYPE_COMPOSITION_REPOSITORY_ALIAS = 'Umb.Repository.DocumentType.Composition';
 
-const queryRepository: ManifestRepository = {
+const compositionRepository: ManifestRepository = {
 	type: 'repository',
 	alias: UMB_DOCUMENT_TYPE_COMPOSITION_REPOSITORY_ALIAS,
 	name: 'Document Type Composition Repository',
 	api: () => import('./document-type-composition.repository.js'),
 };
 
-export const manifests: Array<ManifestTypes> = [queryRepository];
+export const manifests: Array<ManifestTypes> = [compositionRepository];
diff --git a/src/packages/health-check/views/health-check-group-box-overview.element.ts b/src/packages/health-check/views/health-check-group-box-overview.element.ts
@@ -64,25 +64,25 @@ export class UmbHealthCheckGroupBoxOverviewElement extends UmbLitElement {
 	_renderCheckResults(resultObject: any) {
 		return html`${resultObject.success > 0
 			? html`<uui-tag look="secondary" color="positive">
-					<uui-icon name="icon-check"></uui-icon>
+					<uui-icon name="check"></uui-icon>
 					${resultObject.success}
 				</uui-tag> `
 			: nothing}
 		${resultObject.warning > 0
 			? html`<uui-tag look="secondary" color="warning">
-					<uui-icon name="icon-alert"></uui-icon>
+					<uui-icon name="alert"></uui-icon>
 					${resultObject.warning}
 				</uui-tag>`
 			: nothing}
 		${resultObject.error > 0
 			? html`<uui-tag look="secondary" color="danger">
-					<uui-icon name="icon-wrong"></uui-icon>
+					<uui-icon name="remove"></uui-icon>
 					${resultObject.error}
 				</uui-tag>`
 			: nothing}
 		${resultObject.info > 0
 			? html`<uui-tag look="secondary">
-					<uui-icon name="icon-info"></uui-icon>
+					<uui-icon name="info"></uui-icon>
 					${resultObject.info}
 				</uui-tag>`
 			: nothing} `;
diff --git a/src/packages/health-check/views/health-check-group.element.ts b/src/packages/health-check/views/health-check-group.element.ts
@@ -129,7 +129,7 @@ export class UmbDashboardHealthCheckGroupElement extends UmbLitElement {
 			case StatusResultTypeModel.SUCCESS:
 				return html`<uui-icon style="color: var(--uui-color-positive);" name="check"></uui-icon>`;
 			case StatusResultTypeModel.WARNING:
-				return html`<uui-icon style="color: var(--uui-color-warning);" name="alert"></uui-icon>`;
+				return html`<uui-icon style="color: var(--uui-color-warning-standalone);" name="alert"></uui-icon>`;
 			case StatusResultTypeModel.ERROR:
 				return html`<uui-icon style="color: var(--uui-color-danger);" name="remove"></uui-icon>`;
 			case StatusResultTypeModel.INFO:
diff --git a/src/packages/media/media-types/index.ts b/src/packages/media/media-types/index.ts
@@ -1,12 +1,11 @@
 import './components/index.js';
 
 export * from './components/index.js';
-export * from './workspace/index.js';
-
+export * from './entity.js';
 export * from './repository/index.js';
 export * from './tree/types.js';
-export * from './utils.ts/index.js';
 export * from './types.js';
-export * from './entity.js';
+export * from './utils.ts/index.js';
+export * from './workspace/index.js';
 
 export { UMB_MEDIA_TYPE_PICKER_MODAL } from './tree/index.js';
diff --git a/src/packages/media/media-types/repository/composition/index.ts b/src/packages/media/media-types/repository/composition/index.ts
@@ -0,0 +1 @@
+export { UMB_MEDIA_TYPE_COMPOSITION_REPOSITORY_ALIAS } from './manifests.js';
diff --git a/src/packages/media/media-types/repository/composition/manifests.ts b/src/packages/media/media-types/repository/composition/manifests.ts
@@ -0,0 +1,12 @@
+import type { ManifestRepository, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
+
+export const UMB_MEDIA_TYPE_COMPOSITION_REPOSITORY_ALIAS = 'Umb.Repository.MediaType.Composition';
+
+const compositionRepository: ManifestRepository = {
+	type: 'repository',
+	alias: UMB_MEDIA_TYPE_COMPOSITION_REPOSITORY_ALIAS,
+	name: 'Media Type Composition Repository',
+	api: () => import('./media-type-composition.repository.js'),
+};
+
+export const manifests: Array<ManifestTypes> = [compositionRepository];
diff --git a/src/packages/media/media-types/repository/composition/media-type-composition.repository.ts b/src/packages/media/media-types/repository/composition/media-type-composition.repository.ts
@@ -0,0 +1,36 @@
+import { UmbMediaTypeCompositionServerDataSource } from './media-type-composition.server.data-source.js';
+import type { UmbContentTypeCompositionRepository } from '@umbraco-cms/backoffice/content-type';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import type {
+	UmbMediaTypeAvailableCompositionRequestModel,
+	UmbMediaTypeCompositionCompatibleModel,
+	UmbMediaTypeCompositionReferenceModel,
+} from '@umbraco-cms/backoffice/media-type';
+import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository';
+
+export class UmbMediaTypeCompositionRepository
+	extends UmbRepositoryBase
+	implements
+		UmbContentTypeCompositionRepository<
+			UmbMediaTypeCompositionReferenceModel,
+			UmbMediaTypeCompositionCompatibleModel,
+			UmbMediaTypeAvailableCompositionRequestModel
+		>
+{
+	#compositionSource: UmbMediaTypeCompositionServerDataSource;
+
+	constructor(host: UmbControllerHost) {
+		super(host);
+		this.#compositionSource = new UmbMediaTypeCompositionServerDataSource(this);
+	}
+
+	async getReferences(unique: string) {
+		return this.#compositionSource.getReferences(unique);
+	}
+
+	async availableCompositions(args: UmbMediaTypeAvailableCompositionRequestModel) {
+		return this.#compositionSource.availableCompositions(args);
+	}
+}
+
+export { UmbMediaTypeCompositionRepository as api };
diff --git a/src/packages/media/media-types/repository/composition/media-type-composition.server.data-source.ts b/src/packages/media/media-types/repository/composition/media-type-composition.server.data-source.ts
@@ -0,0 +1,86 @@
+import type {
+	UmbMediaTypeCompositionCompatibleModel,
+	UmbMediaTypeCompositionReferenceModel,
+	UmbMediaTypeAvailableCompositionRequestModel,
+} from '../../types.js';
+import { type MediaTypeCompositionRequestModel, MediaTypeService } from '@umbraco-cms/backoffice/external/backend-api';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
+import type { UmbContentTypeCompositionDataSource } from '@umbraco-cms/backoffice/content-type';
+
+/**
+ * A data source for the Media Type Composition that fetches data from the server
+ * @export
+ * @class UmbMediaTypeCompositionServerDataSource
+ */
+export class UmbMediaTypeCompositionServerDataSource
+	implements
+		UmbContentTypeCompositionDataSource<
+			UmbMediaTypeCompositionReferenceModel,
+			UmbMediaTypeCompositionCompatibleModel,
+			UmbMediaTypeAvailableCompositionRequestModel
+		>
+{
+	#host: UmbControllerHost;
+
+	/**
+	 * Creates an instance of UmbMediaTypeCompositionServerDataSource.
+	 * @param {UmbControllerHost} host
+	 * @memberof UmbMediaTypeCompositionServerDataSource
+	 */
+	constructor(host: UmbControllerHost) {
+		this.#host = host;
+	}
+	/**
+	 * Fetches the compatible compositions for a Media type from the server
+	 * @param {string} unique
+	 * @return {*}
+	 * @memberof UmbMediaTypeCompositionServerDataSource
+	 */
+	async getReferences(unique: string) {
+		const response = await tryExecuteAndNotify(
+			this.#host,
+			MediaTypeService.getMediaTypeByIdCompositionReferences({ id: unique }),
+		);
+		const error = response.error;
+		const data: Array<UmbMediaTypeCompositionReferenceModel> | undefined = response.data?.map((reference) => {
+			return {
+				unique: reference.id,
+				icon: reference.icon,
+				name: reference.name,
+			};
+		});
+
+		return { data, error };
+	}
+	/**
+	 * Updates the compositions for a media type on the server
+	 * @param {MediaTypeCompositionRequestModel} requestBody
+	 * @return {*}
+	 * @memberof UmbMediaTypeCompositionServerDataSource
+	 */
+	async availableCompositions(args: UmbMediaTypeAvailableCompositionRequestModel) {
+		const requestBody: MediaTypeCompositionRequestModel = {
+			id: args.unique,
+			currentCompositeIds: args.currentCompositeUniques,
+			currentPropertyAliases: args.currentPropertyAliases,
+		};
+
+		const response = await tryExecuteAndNotify(
+			this.#host,
+			MediaTypeService.postMediaTypeAvailableCompositions({ requestBody }),
+		);
+		const error = response.error;
+		const data: Array<UmbMediaTypeCompositionCompatibleModel> | undefined = response.data?.map((composition) => {
+			return {
+				unique: composition.id,
+				name: composition.name,
+				icon: composition.icon,
+				folderPath: composition.folderPath,
+				isCompatible: composition.isCompatible,
+			};
+		});
+
+		return { data, error };
+	}
+}
diff --git a/src/packages/media/media-types/repository/index.ts b/src/packages/media/media-types/repository/index.ts
@@ -1,3 +1,4 @@
-export * from './item/index.js';
+export * from './composition/index.js';
 export * from './detail/index.js';
+export * from './item/index.js';
 export * from './structure/index.js';
diff --git a/src/packages/media/media-types/repository/manifests.ts b/src/packages/media/media-types/repository/manifests.ts
@@ -1,5 +1,6 @@
 import { manifests as detailManifests } from './detail/manifests.js';
 import { manifests as itemManifests } from './item/manifests.js';
+import { manifests as compositionManifests } from './composition/manifests.js';
 import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
-export const manifests: Array<ManifestTypes> = [...detailManifests, ...itemManifests];
+export const manifests: Array<ManifestTypes> = [...detailManifests, ...itemManifests, ...compositionManifests];
diff --git a/src/packages/media/media-types/types.ts b/src/packages/media/media-types/types.ts
@@ -1,6 +1,17 @@
 import type { UmbMediaTypeEntityType } from './entity.js';
-import type { UmbContentTypeModel } from '@umbraco-cms/backoffice/content-type';
+import type {
+	UmbContentTypeAvailableCompositionRequestModel,
+	UmbContentTypeCompositionCompatibleModel,
+	UmbContentTypeCompositionReferenceModel,
+	UmbContentTypeModel,
+} from '@umbraco-cms/backoffice/content-type';
 
 export interface UmbMediaTypeDetailModel extends UmbContentTypeModel {
 	entityType: UmbMediaTypeEntityType;
 }
+
+export interface UmbMediaTypeAvailableCompositionRequestModel extends UmbContentTypeAvailableCompositionRequestModel {}
+
+export interface UmbMediaTypeCompositionCompatibleModel extends UmbContentTypeCompositionCompatibleModel {}
+
+export interface UmbMediaTypeCompositionReferenceModel extends UmbContentTypeCompositionReferenceModel {}
diff --git a/src/packages/media/media-types/workspace/manifests.ts b/src/packages/media/media-types/workspace/manifests.ts
@@ -1,3 +1,4 @@
+import { UMB_MEDIA_TYPE_COMPOSITION_REPOSITORY_ALIAS } from '../repository/index.js';
 import { UMB_MEDIA_TYPE_WORKSPACE_ALIAS } from './constants.js';
 import type {
 	ManifestWorkspaces,
@@ -29,6 +30,7 @@ const workspaceViews: Array<ManifestWorkspaceViews> = [
 			label: '#general_design',
 			pathname: 'design',
 			icon: 'icon-document-dashed-line',
+			compositionRepositoryAlias: UMB_MEDIA_TYPE_COMPOSITION_REPOSITORY_ALIAS,
 		},
 		conditions: [
 			{
diff --git a/src/packages/members/member-type/index.ts b/src/packages/members/member-type/index.ts
@@ -1,10 +1,9 @@
 import './components/index.js';
 
-export * from './workspace/index.js';
 export * from './components/index.js';
-export * from './repository/index.js';
 export * from './entity.js';
-export * from './tree/index.js';
 export * from './modal/member-type-picker-modal.token.js';
-
-export type { UmbMemberTypeDetailModel } from './types.js';
+export * from './repository/index.js';
+export * from './tree/index.js';
+export * from './types.js';
+export * from './workspace/index.js';
diff --git a/src/packages/members/member-type/repository/composition/index.ts b/src/packages/members/member-type/repository/composition/index.ts
@@ -0,0 +1 @@
+export { UMB_MEMBER_TYPE_COMPOSITION_REPOSITORY_ALIAS } from './manifests.js';
diff --git a/src/packages/members/member-type/repository/composition/manifests.ts b/src/packages/members/member-type/repository/composition/manifests.ts
diff --git a/src/packages/members/member-type/repository/composition/member-type-composition.repository.ts b/src/packages/members/member-type/repository/composition/member-type-composition.repository.ts
diff --git a/src/packages/members/member-type/repository/composition/member-type-composition.server.data-source.ts b/src/packages/members/member-type/repository/composition/member-type-composition.server.data-source.ts
diff --git a/src/packages/members/member-type/repository/index.ts b/src/packages/members/member-type/repository/index.ts
diff --git a/src/packages/members/member-type/repository/manifests.ts b/src/packages/members/member-type/repository/manifests.ts
diff --git a/src/packages/members/member-type/types.ts b/src/packages/members/member-type/types.ts
diff --git a/src/packages/members/member-type/workspace/manifests.ts b/src/packages/members/member-type/workspace/manifests.ts

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-export { UmbDocumentTypeCompositionRepository } from './document-type-composition.repository.js';`
`2`	`1`	`export { UMB_DOCUMENT_TYPE_COMPOSITION_REPOSITORY_ALIAS } from './manifests.js';`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export { UMB_MEDIA_TYPE_COMPOSITION_REPOSITORY_ALIAS } from './manifests.js';`