Merge branch 'release/15.0'

Author: iOvergaard

src/libs/extension-api/types/condition.types.ts

@@ -4,23 +4,23 @@ export interface UmbConditionConfigBase<AliasType extends string = string> {
 	alias: AliasType;
 }
 
-export type ConditionTypeMap<ConditionTypes extends UmbConditionConfigBase> = {
-	[Condition in ConditionTypes as Condition['alias']]: Condition;
+export type ConditionTypeMap<ConditionConfigs extends UmbConditionConfigBase> = {
+	[Condition in ConditionConfigs as Condition['alias']]: Condition;
 } & {
 	[key: string]: UmbConditionConfigBase;
 };
 
 export type SpecificConditionTypeOrUmbConditionConfigBase<
-	ConditionTypes extends UmbConditionConfigBase,
-	T extends keyof ConditionTypeMap<ConditionTypes> | string,
-> = T extends keyof ConditionTypeMap<ConditionTypes> ? ConditionTypeMap<ConditionTypes>[T] : UmbConditionConfigBase;
+	ConditionConfigs extends UmbConditionConfigBase,
+	T extends keyof ConditionTypeMap<ConditionConfigs> | string,
+> = T extends keyof ConditionTypeMap<ConditionConfigs> ? ConditionTypeMap<ConditionConfigs>[T] : UmbConditionConfigBase;
 
-export interface ManifestWithDynamicConditions<ConditionTypes extends UmbConditionConfigBase = UmbConditionConfigBase>
+export interface ManifestWithDynamicConditions<ConditionConfigs extends UmbConditionConfigBase = UmbConditionConfigBase>
 	extends ManifestBase {
 	/**
 	 * Set the conditions for when the extension should be loaded
 	 */
-	conditions?: Array<ConditionTypes>;
+	conditions?: Array<ConditionConfigs>;
 	/**
 	 * Define one or more extension aliases that this extension should overwrite.
 	 */

src/packages/block/block/conditions/types.ts

@@ -12,7 +12,7 @@ export interface BlockEntryIsExposedConditionConfig
 }
 
 declare global {
-	interface UmbExtensionConditionMap {
+	interface UmbExtensionConditionConfigMap {
 		umbBlock:
 			| BlockEntryShowContentEditConditionConfig
 			| BlockWorkspaceHasSettingsConditionConfig

src/packages/core/collection/extensions/collection-action.extension.ts

@@ -7,7 +7,7 @@ import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbr
 // TODO: create interface for API
 export interface ManifestCollectionAction
 	extends ManifestElementAndApi,
-		ManifestWithDynamicConditions<UmbExtensionCondition> {
+		ManifestWithDynamicConditions<UmbExtensionConditionConfig> {
 	type: 'collectionAction';
 	meta: MetaCollectionAction;
 }

src/packages/core/collection/extensions/collection-view.extension.ts

@@ -1,6 +1,8 @@
 import type { ManifestElement, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api';
 
-export interface ManifestCollectionView extends ManifestElement, ManifestWithDynamicConditions<UmbExtensionCondition> {
+export interface ManifestCollectionView
+	extends ManifestElement,
+		ManifestWithDynamicConditions<UmbExtensionConditionConfig> {
 	type: 'collectionView';
 	meta: MetaCollectionView;
 }

src/packages/core/collection/extensions/collection.extension.ts

@@ -2,7 +2,7 @@ import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbr
 
 export interface ManifestCollection
 	extends ManifestElementAndApi,
-		ManifestWithDynamicConditions<UmbExtensionCondition> {
+		ManifestWithDynamicConditions<UmbExtensionConditionConfig> {
 	type: 'collection';
 	meta: MetaCollection;
 }

src/packages/core/dashboard/dashboard.extension.ts

@@ -3,7 +3,7 @@ import type { ManifestElement, ManifestWithDynamicConditions } from '@umbraco-cm
 
 export interface ManifestDashboard
 	extends ManifestElement<UmbDashboardElement>,
-		ManifestWithDynamicConditions<UmbExtensionCondition> {
+		ManifestWithDynamicConditions<UmbExtensionConditionConfig> {
 	type: 'dashboard';
 	meta: MetaDashboard;
 }

src/packages/core/entity-action/entity-action.extension.ts

@@ -7,7 +7,7 @@ import type { UmbEntityAction, UmbEntityActionElement } from '@umbraco-cms/backo
  */
 export interface ManifestEntityAction<MetaType extends MetaEntityAction = MetaEntityAction>
 	extends ManifestElementAndApi<UmbEntityActionElement, UmbEntityAction<MetaType>>,
-		ManifestWithDynamicConditions<UmbExtensionCondition> {
+		ManifestWithDynamicConditions<UmbExtensionConditionConfig> {
 	type: 'entityAction';
 	forEntityTypes: Array<string>;
 	meta: MetaType;

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

@@ -1,4 +1,4 @@
 export { UmbSwitchCondition } from './switch.condition.js';
 export { UmbConditionBase } from './condition-base.controller.js';
 
-export type { ConditionTypes } from './types.js';
+export type { UmbCoreConditionConfigs } from './types.js';

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

@@ -3,12 +3,17 @@ import type { CollectionBulkActionPermissionConditionConfig } from '../../collec
 import type { SwitchConditionConfig } from './switch.condition.js';
 import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api';
 
-export type ConditionTypes =
+export type UmbCoreConditionConfigs =
 	| CollectionAliasConditionConfig
 	| CollectionBulkActionPermissionConditionConfig
 	| SwitchConditionConfig
 	| UmbConditionConfigBase;
 
+/**
+ * @deprecated instead use global UmbExtensionConditionConfig
+ */
+export type ConditionTypes = UmbCoreConditionConfigs;
+
 type UnionOfProperties<T> = T extends object ? T[keyof T] : never;
 
 declare global {
@@ -17,27 +22,27 @@ declare global {
 	 * @example
 	 ```js
  	 	declare global {
- 	 		interface UmbExtensionConditionMap {
+ 	 		interface UmbExtensionConditionConfigMap {
  	 			My_UNIQUE_CONDITION_NAME: MyExtensionConditionType;
   		}
   	}
   	```
 	 If you have multiple types, you can declare them in this way:
 	 ```js
 		declare global {
-			interface UmbExtensionConditionMap {
+			interface UmbExtensionConditionConfigMap {
 				My_UNIQUE_CONDITION_NAME: MyExtensionConditionTypeA | MyExtensionConditionTypeB;
 			}
 		}
 	 ```
 	 */
-	interface UmbExtensionConditionMap {
-		UMB_CORE: ConditionTypes;
+	interface UmbExtensionConditionConfigMap {
+		UMB_CORE: UmbCoreConditionConfigs;
 	}
 
 	/**
 	 * This global type provides a union of all declared manifest types.
 	 * If this is a local package that declares additional Manifest Types, then these will also be included in this union.
 	 */
-	type UmbExtensionCondition = UnionOfProperties<UmbExtensionConditionMap>;
+	type UmbExtensionConditionConfig = UnionOfProperties<UmbExtensionConditionConfigMap>;
 }

src/packages/core/extension-registry/extensions/entity-bulk-action.extension.ts

@@ -8,7 +8,7 @@ import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbr
  */
 export interface ManifestEntityBulkAction<MetaType extends MetaEntityBulkAction = MetaEntityBulkAction>
 	extends ManifestElementAndApi<UmbEntityBulkActionElement, UmbEntityBulkAction<MetaType>>,
-		ManifestWithDynamicConditions<UmbExtensionCondition> {
+		ManifestWithDynamicConditions<UmbExtensionConditionConfig> {
 	type: 'entityBulkAction';
 	forEntityTypes: Array<string>;
 	meta: MetaType;