Merge pull request #2292 from umbraco/v15/feature/emm-clean-up-block-conditions

Feature: clean up block conditions

Author: nielslyngsoe

src/packages/block/block/conditions/block-entry-show-content-edit.condition.ts

@@ -1,5 +1,5 @@
 import { UMB_BLOCK_ENTRY_CONTEXT } from '../context/block-entry.context-token.js';
-import type { BlockEntryShowContentEditConditionConfig } from '@umbraco-cms/backoffice/extension-registry';
+import type { BlockEntryShowContentEditConditionConfig } from './types.js';
 import { UmbConditionBase } from '@umbraco-cms/backoffice/extension-registry';
 import type { UmbConditionControllerArguments, UmbExtensionCondition } from '@umbraco-cms/backoffice/extension-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';

src/packages/block/block/conditions/block-workspace-has-settings.condition.ts

@@ -1,6 +1,6 @@
 import { UMB_BLOCK_WORKSPACE_CONTEXT } from '../workspace/block-workspace.context-token.js';
+import type { BlockWorkspaceHasSettingsConditionConfig } from './types.js';
 import { UmbConditionBase } from '@umbraco-cms/backoffice/extension-registry';
-import type { BlockWorkspaceHasSettingsConditionConfig } from '@umbraco-cms/backoffice/extension-registry';
 import type { UmbConditionControllerArguments, UmbExtensionCondition } from '@umbraco-cms/backoffice/extension-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 

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

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

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

@@ -7,16 +7,7 @@ import type { UmbMultipleAppLanguageConditionConfig } from './multiple-app-langu
 import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api';
 import type { UmbDocumentUserPermissionConditionConfig } from '@umbraco-cms/backoffice/document';
 
-// temp location to avoid circular dependencies
-export type BlockWorkspaceHasSettingsConditionConfig =
-	UmbConditionConfigBase<'Umb.Condition.BlockWorkspaceHasSettings'>;
-
-export type BlockEntryShowContentEditConditionConfig =
-	UmbConditionConfigBase<'Umb.Condition.BlockEntryShowContentEdit'>;
-
 export type ConditionTypes =
-	| BlockEntryShowContentEditConditionConfig
-	| BlockWorkspaceHasSettingsConditionConfig
 	| CollectionAliasConditionConfig
 	| CollectionBulkActionPermissionConditionConfig
 	| SectionAliasConditionConfig