Merge branch 'main' into v15/feature/validate-specific-cultures

Author: madsrasmussen

src/packages/core/collection/manifests.ts

@@ -1,7 +1,10 @@
+import type { UmbExtensionManifestKind } from '../extension-registry/registry.js';
 import { manifest as collectionAliasCondition } from './collection-alias.manifest.js';
 import { manifest as collectionBulkActionPermissionCondition } from './collection-bulk-action-permission.manifest.js';
+import { manifests as workspaceViewManifests } from './workspace-view/manifests.js';
 
-export const manifests: Array<UmbExtensionManifest> = [
+export const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind> = [
+	...workspaceViewManifests,
 	collectionAliasCondition,
 	collectionBulkActionPermissionCondition,
 ];

src/packages/core/collection/workspace-view/collection-workspace-view.element.ts

@@ -0,0 +1,24 @@
+import type { ManifestWorkspaceViewCollectionKind } from './types.js';
+import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+
+const elementName = 'umb-collection-workspace-view';
+@customElement(elementName)
+export class UmbCollectionWorkspaceViewElement extends UmbLitElement {
+	@property({ type: Object, attribute: false })
+	manifest?: ManifestWorkspaceViewCollectionKind;
+
+	override render() {
+		if (!this.manifest) return html` <div>No Manifest</div>`;
+		if (!this.manifest.meta.collectionAlias) return html` <div>No Collection Alias in Manifest</div>`;
+		return html`<umb-collection alias=${this.manifest.meta.collectionAlias}></umb-collection>`;
+	}
+}
+
+export { UmbCollectionWorkspaceViewElement as element };
+
+declare global {
+	interface HTMLElementTagNameMap {
+		[elementName]: UmbCollectionWorkspaceViewElement;
+	}
+}

src/packages/core/collection/workspace-view/index.ts

@@ -0,0 +1 @@
+export * from './collection-workspace-view.element.js';

src/packages/core/workspace/components/workspace-collection/manifests.ts renamed to src/packages/core/collection/workspace-view/manifests.ts

@@ -1,6 +1,6 @@
 import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
 
-export const manifests: Array<UmbExtensionManifestKind> = [
+export const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind> = [
 	{
 		type: 'kind',
 		alias: 'Umb.Kind.WorkspaceView.Collection',
@@ -9,12 +9,11 @@ export const manifests: Array<UmbExtensionManifestKind> = [
 		manifest: {
 			type: 'workspaceView',
 			kind: 'collection',
-			element: () => import('./workspace-view-collection.element.js'),
-			weight: 300,
+			element: () => import('./collection-workspace-view.element.js'),
 			meta: {
 				label: 'Collection',
 				pathname: 'collection',
-				icon: 'icon-grid',
+				icon: 'icon-layers',
 			},
 		},
 	},

src/packages/core/collection/workspace-view/types.ts

@@ -0,0 +1,17 @@
+import type { ManifestWorkspaceView, MetaWorkspaceView } from '@umbraco-cms/backoffice/workspace';
+
+export interface ManifestWorkspaceViewCollectionKind extends ManifestWorkspaceView {
+	type: 'workspaceView';
+	kind: 'collection';
+	meta: MetaWorkspaceViewCollectionKind;
+}
+
+export interface MetaWorkspaceViewCollectionKind extends MetaWorkspaceView {
+	collectionAlias: string;
+}
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbManifestWorkspaceViewCollectionKind: ManifestWorkspaceViewCollectionKind;
+	}
+}

src/packages/core/components/entity-actions-bundle/entity-actions-bundle.element.ts

@@ -45,7 +45,7 @@ export class UmbEntityActionsBundleElement extends UmbLitElement {
 	protected override updated(_changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void {
 		if (_changedProperties.has('entityType') && _changedProperties.has('unique')) {
 			this.#entityContext.setEntityType(this.entityType);
-			this.#entityContext.setUnique(this.unique);
+			this.#entityContext.setUnique(this.unique ?? null);
 			this.#observeEntityActions();
 		}
 	}

src/packages/core/workspace/contexts/tokens/collection-workspace-context.interface.ts renamed to src/packages/core/content/collection/content-collection-workspace-context.interface.ts

@@ -1,8 +1,8 @@
-import type { UmbEntityWorkspaceContext } from './entity-workspace-context.interface.js';
 import type { Observable } from '@umbraco-cms/backoffice/external/rxjs';
 import type { UmbContentTypeModel, UmbContentTypeStructureManager } from '@umbraco-cms/backoffice/content-type';
+import type { UmbEntityWorkspaceContext } from '@umbraco-cms/backoffice/workspace';
 
-export interface UmbCollectionWorkspaceContext<T extends UmbContentTypeModel> extends UmbEntityWorkspaceContext {
+export interface UmbContentCollectionWorkspaceContext<T extends UmbContentTypeModel> extends UmbEntityWorkspaceContext {
 	contentTypeHasCollection: Observable<boolean>;
 	getCollectionAlias(): string;
 	structure: UmbContentTypeStructureManager<T>;

src/packages/core/workspace/components/workspace-collection/workspace-view-collection.element.ts renamed to src/packages/core/content/collection/content-collection-workspace-view.element.ts

@@ -1,14 +1,15 @@
-import type { UmbCollectionBulkActionPermissions, UmbCollectionConfiguration } from '../../../collection/types.js';
+import type { UmbCollectionBulkActionPermissions, UmbCollectionConfiguration } from '../../collection/types.js';
+import { UMB_CONTENT_COLLECTION_WORKSPACE_CONTEXT } from './content-collection-workspace.context-token.js';
 import { customElement, html, nothing, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbDataTypeDetailRepository } from '@umbraco-cms/backoffice/data-type';
 import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
-import { UMB_COLLECTION_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace';
 import type { UmbDataTypeDetailModel } from '@umbraco-cms/backoffice/data-type';
 import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/workspace';
 
-@customElement('umb-workspace-view-collection')
-export class UmbWorkspaceViewCollectionElement extends UmbLitElement implements UmbWorkspaceViewElement {
+const elementName = 'umb-content-collection-workspace-view';
+@customElement('umb-content-collection-workspace-view')
+export class UmbContentCollectionWorkspaceViewElement extends UmbLitElement implements UmbWorkspaceViewElement {
 	@state()
 	private _loading = true;
 
@@ -29,7 +30,7 @@ export class UmbWorkspaceViewCollectionElement extends UmbLitElement implements
 	}
 
 	async #observeConfig() {
-		this.consumeContext(UMB_COLLECTION_WORKSPACE_CONTEXT, (workspaceContext) => {
+		this.consumeContext(UMB_CONTENT_COLLECTION_WORKSPACE_CONTEXT, (workspaceContext) => {
 			this._collectionAlias = workspaceContext.getCollectionAlias();
 			this._documentUnique = workspaceContext.getUnique() ?? '';
 
@@ -78,10 +79,10 @@ export class UmbWorkspaceViewCollectionElement extends UmbLitElement implements
 	}
 }
 
-export default UmbWorkspaceViewCollectionElement;
+export { UmbContentCollectionWorkspaceViewElement as element };
 
 declare global {
 	interface HTMLElementTagNameMap {
-		'umb-workspace-view-collection': UmbWorkspaceViewCollectionElement;
+		[elementName]: UmbContentCollectionWorkspaceViewElement;
 	}
 }

src/packages/core/content/collection/content-collection-workspace.context-token.ts

@@ -0,0 +1,14 @@
+import type { UmbContentCollectionWorkspaceContext } from './content-collection-workspace-context.interface.js';
+import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
+import type { UmbContentTypeModel } from '@umbraco-cms/backoffice/content-type';
+import type { UmbWorkspaceContext } from '@umbraco-cms/backoffice/workspace';
+
+export const UMB_CONTENT_COLLECTION_WORKSPACE_CONTEXT = new UmbContextToken<
+	UmbWorkspaceContext,
+	UmbContentCollectionWorkspaceContext<UmbContentTypeModel>
+>(
+	'UmbWorkspaceContext',
+	undefined,
+	(context): context is UmbContentCollectionWorkspaceContext<UmbContentTypeModel> =>
+		(context as UmbContentCollectionWorkspaceContext<UmbContentTypeModel>).contentTypeHasCollection !== undefined,
+);

src/packages/core/content/collection/index.ts

@@ -0,0 +1,2 @@
+export type * from './content-collection-workspace-context.interface.js';
+export * from './content-collection-workspace.context-token.js';