move collection extension manifests into collection module

madsrasmussen · madsrasmussen · commit bb3fbea0b155 · 2024-09-13T13:18:49.000+02:00
diff --git a/src/packages/block/block-custom-view/block-editor-custom-view.extension.ts b/src/packages/block/block-custom-view/block-editor-custom-view.extension.ts
@@ -21,6 +21,6 @@ export interface ManifestBlockEditorCustomView extends ManifestElement<UmbBlockE
 
 declare global {
 	interface UmbExtensionManifestMap {
-		blockEditorCustomView: ManifestBlockEditorCustomView;
+		umbBlockEditorCustomView: ManifestBlockEditorCustomView;
 	}
 }
diff --git a/src/packages/core/collection/action/collection-action-button.element.ts b/src/packages/core/collection/action/collection-action-button.element.ts
@@ -4,7 +4,8 @@ import { html, customElement, property, state, ifDefined } from '@umbraco-cms/ba
 import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
-import type { UmbBackofficeManifestKind, ManifestCollectionAction } from '@umbraco-cms/backoffice/extension-registry';
+import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestCollectionAction } from '@umbraco-cms/backoffice/collection';
 import { createExtensionApi } from '@umbraco-cms/backoffice/extension-api';
 
 const manifest: UmbBackofficeManifestKind = {
diff --git a/src/packages/core/collection/collection-view.manager.test.ts b/src/packages/core/collection/collection-view.manager.test.ts
@@ -1,4 +1,4 @@
-import type { ManifestCollectionView } from '../extension-registry/models/index.js';
+import type { ManifestCollectionView } from './extensions/index.js';
 import { umbExtensionsRegistry } from '../extension-registry/index.js';
 import { UmbCollectionViewManager } from './collection-view.manager.js';
 import { expect } from '@open-wc/testing';
diff --git a/src/packages/core/collection/collection-view.manager.ts b/src/packages/core/collection/collection-view.manager.ts
@@ -1,8 +1,8 @@
+import type { ManifestCollectionView } from './extensions/index.js';
 import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbExtensionsManifestInitializer, createExtensionElement } from '@umbraco-cms/backoffice/extension-api';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbArrayState, UmbObjectState, UmbStringState } from '@umbraco-cms/backoffice/observable-api';
-import type { ManifestCollectionView } from '@umbraco-cms/backoffice/extension-registry';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import type { UmbRoute } from '@umbraco-cms/backoffice/router';
 
diff --git a/src/packages/core/collection/collection.element.ts b/src/packages/core/collection/collection.element.ts
@@ -1,7 +1,7 @@
 import type { UmbCollectionConfiguration } from './types.js';
+import type { ManifestCollection } from './extensions/index.js';
 import { customElement, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbExtensionElementAndApiSlotElementBase } from '@umbraco-cms/backoffice/extension-registry';
-import type { ManifestCollection } from '@umbraco-cms/backoffice/extension-registry';
 import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 
 const elementName = 'umb-collection';
diff --git a/src/packages/core/collection/components/collection-view-bundle.element.ts b/src/packages/core/collection/components/collection-view-bundle.element.ts
@@ -1,12 +1,12 @@
 import type { UmbDefaultCollectionContext } from '../default/index.js';
 import { UMB_COLLECTION_CONTEXT } from '../default/index.js';
 import type { UmbCollectionLayoutConfiguration } from '../types.js';
+import type { ManifestCollectionView } from '../extensions/index.js';
 import { css, html, customElement, state, nothing, repeat, query } from '@umbraco-cms/backoffice/external/lit';
 import { observeMultiple } from '@umbraco-cms/backoffice/observable-api';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace';
-import type { ManifestCollectionView } from '@umbraco-cms/backoffice/extension-registry';
 import type { UUIPopoverContainerElement } from '@umbraco-cms/backoffice/external/uui';
 
 interface UmbCollectionViewLayout {
diff --git a/src/packages/core/collection/default/collection-default.context.ts b/src/packages/core/collection/default/collection-default.context.ts
@@ -8,14 +8,15 @@ import type {
 } from '../types.js';
 import type { UmbCollectionFilterModel } from '../collection-filter-model.interface.js';
 import type { UmbCollectionRepository } from '../repository/collection-repository.interface.js';
+import type { ManifestCollection } from '../extensions/index.js';
 import { UMB_COLLECTION_CONTEXT } from './collection-default.context-token.js';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbArrayState, UmbNumberState, UmbObjectState } from '@umbraco-cms/backoffice/observable-api';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
 import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbExtensionApiInitializer } from '@umbraco-cms/backoffice/extension-api';
 import { UmbSelectionManager, UmbPaginationManager } from '@umbraco-cms/backoffice/utils';
-import type { ManifestCollection, ManifestRepository } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestRepository } from '@umbraco-cms/backoffice/extension-registry';
 import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import {
diff --git a/src/packages/core/collection/extensions/collection-action.extension.ts b/src/packages/core/collection/extensions/collection-action.extension.ts
@@ -1,4 +1,4 @@
-import type { ConditionTypes } from '../conditions/types.js';
+import type { ConditionTypes } from '@umbraco-cms/backoffice/extension-registry';
 import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api';
 
 /**
@@ -15,3 +15,9 @@ export interface MetaCollectionAction {
 	label: string;
 	href?: string;
 }
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbCollectionAction: ManifestCollectionAction;
+	}
+}
diff --git a/src/packages/core/collection/extensions/collection-view.extension.ts b/src/packages/core/collection/extensions/collection-view.extension.ts
@@ -1,4 +1,4 @@
-import type { ConditionTypes } from '../conditions/types.js';
+import type { ConditionTypes } from '@umbraco-cms/backoffice/extension-registry';
 import type { ManifestElement, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api';
 
 export interface ManifestCollectionView extends ManifestElement, ManifestWithDynamicConditions<ConditionTypes> {
@@ -37,3 +37,9 @@ export interface ConditionsCollectionView {
 	 */
 	entityType: string;
 }
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbCollectionView: ManifestCollectionView;
+	}
+}
diff --git a/src/packages/core/collection/extensions/collection.extension.ts b/src/packages/core/collection/extensions/collection.extension.ts
@@ -1,4 +1,4 @@
-import type { ConditionTypes } from '../conditions/types.js';
+import type { ConditionTypes } from '@umbraco-cms/backoffice/extension-registry';
 import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api';
 
 export interface ManifestCollection extends ManifestElementAndApi, ManifestWithDynamicConditions<ConditionTypes> {
@@ -9,3 +9,9 @@ export interface ManifestCollection extends ManifestElementAndApi, ManifestWithD
 export interface MetaCollection {
 	repositoryAlias: string;
 }
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbCollection: ManifestCollection;
+	}
+}
diff --git a/src/packages/core/collection/extensions/index.ts b/src/packages/core/collection/extensions/index.ts
@@ -0,0 +1,3 @@
+export * from './collection-action.extension.js';
+export * from './collection-view.extension.js';
+export * from './collection.extension.js';
diff --git a/src/packages/core/collection/index.ts b/src/packages/core/collection/index.ts
@@ -10,14 +10,10 @@ export * from './collection-item-picker-modal/index.js';
 export * from './default/collection-default.context.js';
 export * from './default/collection-default.context-token.js';
 export * from './collection-filter-model.interface.js';
+export * from './types.js';
 
 export { UMB_COLLECTION_ALIAS_CONDITION } from './collection-alias.manifest.js';
 export { UMB_COLLECTION_BULK_ACTION_PERMISSION_CONDITION } from './collection-bulk-action-permission.manifest.js';
 
 export { UmbCollectionActionElement, UmbCollectionActionBase } from './action/index.js';
 export type { UmbCollectionDataSource, UmbCollectionRepository } from './repository/index.js';
-export type {
-	UmbCollectionBulkActionPermissions,
-	UmbCollectionConfiguration,
-	UmbCollectionColumnConfiguration,
-} from './types.js';
diff --git a/src/packages/core/collection/types.ts b/src/packages/core/collection/types.ts
@@ -1,5 +1,5 @@
+import type { ManifestCollection } from './extensions/index.js';
 import type { Observable } from '@umbraco-cms/backoffice/external/rxjs';
-import type { ManifestCollection } from '@umbraco-cms/backoffice/extension-registry';
 import type { UmbPaginationManager } from '@umbraco-cms/backoffice/utils';
 
 export interface UmbCollectionBulkActionPermissions {
@@ -47,3 +47,5 @@ export interface UmbCollectionContext {
 	items: Observable<any[]>;
 	totalItems: Observable<number>;
 }
+
+export * from './extensions/index.js';
diff --git a/src/packages/core/extension-registry/collection/manifests.ts b/src/packages/core/extension-registry/collection/manifests.ts
@@ -1,7 +1,8 @@
 import { UMB_EXTENSION_COLLECTION_REPOSITORY_ALIAS } from './repository/index.js';
 import { manifests as collectionRepositoryManifests } from './repository/manifests.js';
 import { manifests as collectionViewManifests } from './views/manifests.js';
-import type { ManifestCollection, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestCollection } from '@umbraco-cms/backoffice/collection';
 
 export const UMB_EXTENSION_COLLECTION_ALIAS = 'Umb.Collection.Extension';
 
diff --git a/src/packages/core/extension-registry/collection/views/manifests.ts b/src/packages/core/extension-registry/collection/views/manifests.ts
@@ -1,5 +1,6 @@
 import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection';
-import type { ManifestCollectionView, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestCollectionView } from '@umbraco-cms/backoffice/collection';
 
 export const UMB_EXTENSION_TABLE_COLLECTION_VIEW_ALIAS = 'Umb.CollectionView.Extension.Table';
 
diff --git a/src/packages/core/extension-registry/conditions/index.ts b/src/packages/core/extension-registry/conditions/index.ts
@@ -1,4 +1,8 @@
 export { UmbSwitchCondition } from './switch.condition.js';
 export { UmbConditionBase } from './condition-base.controller.js';
 
-export type { BlockEntryShowContentEditConditionConfig, BlockWorkspaceHasSettingsConditionConfig } from './types.js';
+export type {
+	BlockEntryShowContentEditConditionConfig,
+	BlockWorkspaceHasSettingsConditionConfig,
+	ConditionTypes,
+} from './types.js';
diff --git a/src/packages/core/extension-registry/models/index.ts b/src/packages/core/extension-registry/models/index.ts
@@ -1,6 +1,4 @@
 import type { ManifestAuthProvider } from './auth-provider.model.js';
-import type { ManifestCollection } from './collection.models.js';
-import type { ManifestCollectionView } from './collection-view.model.js';
 import type { ManifestCurrentUserAction, ManifestCurrentUserActionDefaultKind } from './current-user-action.model.js';
 import type { ManifestDashboard } from './dashboard.model.js';
 import type { ManifestDashboardCollection } from './dashboard-collection.model.js';
@@ -62,7 +60,6 @@ import type {
 } from './workspace-view.model.js';
 import type { ManifestEntityUserPermission } from './entity-user-permission.model.js';
 import type { ManifestGranularUserPermission } from './user-granular-permission.model.js';
-import type { ManifestCollectionAction } from './collection-action.model.js';
 import type { ManifestMfaLoginProvider } from './mfa-login-provider.model.js';
 import type { ManifestSearchProvider } from './search-provider.model.js';
 import type { ManifestSearchResultItem } from './search-result-item.model.js';
@@ -77,9 +74,6 @@ import type { ManifestBase, ManifestBundle, ManifestCondition } from '@umbraco-c
 export type * from './app-entry-point.model.js';
 export type * from './auth-provider.model.js';
 export type * from './backoffice-entry-point.model.js';
-export type * from './collection-action.model.js';
-export type * from './collection-view.model.js';
-export type * from './collection.models.js';
 export type * from './current-user-action.model.js';
 export type * from './dashboard-collection.model.js';
 export type * from './dashboard.model.js';
@@ -159,9 +153,6 @@ export type ManifestTypes =
 	| ManifestAuthProvider
 	| ManifestBackofficeEntryPoint
 	| ManifestBundle<ManifestTypes>
-	| ManifestCollection
-	| ManifestCollectionAction
-	| ManifestCollectionView
 	| ManifestCondition
 	| ManifestCurrentUserAction
 	| ManifestCurrentUserActionDefaultKind
diff --git a/src/packages/data-type/collection/manifests.ts b/src/packages/data-type/collection/manifests.ts
@@ -1,17 +1,17 @@
 import { UMB_DATA_TYPE_COLLECTION_REPOSITORY_ALIAS } from './repository/index.js';
 import { manifests as collectionRepositoryManifests } from './repository/manifests.js';
-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
 export const UMB_DATA_TYPE_COLLECTION_ALIAS = 'Umb.Collection.DataType';
 
-const collectionManifest: ManifestTypes = {
-	type: 'collection',
-	kind: 'default',
-	alias: UMB_DATA_TYPE_COLLECTION_ALIAS,
-	name: 'Data Type Collection',
-	meta: {
-		repositoryAlias: UMB_DATA_TYPE_COLLECTION_REPOSITORY_ALIAS,
+export const manifests: Array<UmbExtensionManifest> = [
+	{
+		type: 'collection',
+		kind: 'default',
+		alias: UMB_DATA_TYPE_COLLECTION_ALIAS,
+		name: 'Data Type Collection',
+		meta: {
+			repositoryAlias: UMB_DATA_TYPE_COLLECTION_REPOSITORY_ALIAS,
+		},
 	},
-};
-
-export const manifests: Array<ManifestTypes> = [collectionManifest, ...collectionRepositoryManifests];
+	...collectionRepositoryManifests,
+];
diff --git a/src/packages/dictionary/collection/action/manifests.ts b/src/packages/dictionary/collection/action/manifests.ts
@@ -1,6 +1,7 @@
 import { UMB_DICTIONARY_ROOT_ENTITY_TYPE } from '../../entity.js';
 import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection';
-import type { ManifestCollectionAction, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestCollectionAction } from '@umbraco-cms/backoffice/collection';
 
 export const createManifest: ManifestCollectionAction = {
 	type: 'collectionAction',
diff --git a/src/packages/dictionary/collection/manifests.ts b/src/packages/dictionary/collection/manifests.ts
@@ -3,7 +3,7 @@ import { manifests as collectionRepositoryManifests } from './repository/manifes
 import { manifests as collectionViewManifests } from './views/manifests.js';
 import { manifests as collectionActionManifests } from './action/manifests.js';
 import { UMB_DICTIONARY_COLLECTION_ALIAS } from './constants.js';
-import type { ManifestCollection, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestCollection } from '@umbraco-cms/backoffice/collection';
 
 const collectionManifest: ManifestCollection = {
 	type: 'collection',
@@ -15,7 +15,7 @@ const collectionManifest: ManifestCollection = {
 	},
 };
 
-export const manifests: Array<ManifestTypes> = [
+export const manifests: Array<UmbExtensionManifest> = [
 	collectionManifest,
 	...collectionRepositoryManifests,
 	...collectionViewManifests,
diff --git a/src/packages/dictionary/collection/views/manifests.ts b/src/packages/dictionary/collection/views/manifests.ts
@@ -1,23 +1,22 @@
 import { UMB_DICTIONARY_TABLE_COLLECTION_VIEW_ALIAS } from './constants.js';
 import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection';
-import type { ManifestCollectionView, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
-const tableCollectionView: ManifestCollectionView = {
-	type: 'collectionView',
-	alias: UMB_DICTIONARY_TABLE_COLLECTION_VIEW_ALIAS,
-	name: 'Dictionary Table Collection View',
-	element: () => import('./table/dictionary-table-collection-view.element.js'),
-	meta: {
-		label: 'Table',
-		icon: 'icon-list',
-		pathName: 'table',
-	},
-	conditions: [
-		{
-			alias: UMB_COLLECTION_ALIAS_CONDITION,
-			match: 'Umb.Collection.Dictionary',
+export const manifests: Array<UmbExtensionManifest> = [
+	{
+		type: 'collectionView',
+		alias: UMB_DICTIONARY_TABLE_COLLECTION_VIEW_ALIAS,
+		name: 'Dictionary Table Collection View',
+		element: () => import('./table/dictionary-table-collection-view.element.js'),
+		meta: {
+			label: 'Table',
+			icon: 'icon-list',
+			pathName: 'table',
 		},
-	],
-};
-
-export const manifests: Array<ManifestTypes> = [tableCollectionView];
+		conditions: [
+			{
+				alias: UMB_COLLECTION_ALIAS_CONDITION,
+				match: 'Umb.Collection.Dictionary',
+			},
+		],
+	},
+];
diff --git a/src/packages/documents/documents/collection/action/create-document-collection-action.element.ts b/src/packages/documents/documents/collection/action/create-document-collection-action.element.ts
@@ -10,7 +10,7 @@ import {
 } from '@umbraco-cms/backoffice/document';
 import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/modal';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
-import type { ManifestCollectionAction } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestCollectionAction } from '@umbraco-cms/backoffice/collection';
 import type { UmbAllowedDocumentTypeModel } from '@umbraco-cms/backoffice/document-type';
 
 @customElement('umb-create-document-collection-action')
diff --git a/src/packages/documents/documents/collection/action/manifests.ts b/src/packages/documents/documents/collection/action/manifests.ts
@@ -1,5 +1,6 @@
 import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection';
-import type { ManifestCollectionAction, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestCollectionAction } from '@umbraco-cms/backoffice/collection';
 
 export const createManifest: ManifestCollectionAction = {
 	type: 'collectionAction',
diff --git a/src/packages/documents/documents/collection/manifests.ts b/src/packages/documents/documents/collection/manifests.ts
@@ -3,7 +3,9 @@ import { manifests as collectionActionManifests } from './action/manifests.js';
 import { manifests as collectionRepositoryManifests } from './repository/manifests.js';
 import { manifests as collectionViewManifests } from './views/manifests.js';
 import { UMB_DOCUMENT_COLLECTION_ALIAS } from './index.js';
-import type { ManifestCollection, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
+
+import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestCollection } from '@umbraco-cms/backoffice/collection';
 
 const collectionManifest: ManifestCollection = {
 	type: 'collection',
diff --git a/src/packages/documents/documents/collection/views/manifests.ts b/src/packages/documents/documents/collection/views/manifests.ts
diff --git a/src/packages/language/collection/action/manifests.ts b/src/packages/language/collection/action/manifests.ts
diff --git a/src/packages/user/user/collection/views/manifests.ts b/src/packages/user/user/collection/views/manifests.ts
diff --git a/src/packages/user/user/invite/collection-action/manifests.ts b/src/packages/user/user/invite/collection-action/manifests.ts
diff --git a/src/packages/webhook/collection/action/manifests.ts b/src/packages/webhook/collection/action/manifests.ts
diff --git a/src/packages/webhook/collection/manifests.ts b/src/packages/webhook/collection/manifests.ts
diff --git a/src/packages/webhook/collection/views/manifests.ts b/src/packages/webhook/collection/views/manifests.ts

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ export interface ManifestBlockEditorCustomView extends ManifestElement<UmbBlockE`
`21`	`21`
`22`	`22`	`declare global {`
`23`	`23`	`interface UmbExtensionManifestMap {`
`24`		`- blockEditorCustomView: ManifestBlockEditorCustomView;`
	`24`	`+ umbBlockEditorCustomView: ManifestBlockEditorCustomView;`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { ManifestCollectionView } from '../extension-registry/models/index.js';`
	`1`	`+import type { ManifestCollectionView } from './extensions/index.js';`
`2`	`2`	`import { umbExtensionsRegistry } from '../extension-registry/index.js';`
`3`	`3`	`import { UmbCollectionViewManager } from './collection-view.manager.js';`
`4`	`4`	`import { expect } from '@open-wc/testing';`