From 391fe9104614d2188021c637f063d331075c050f Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 26 Apr 2024 07:31:07 +0200 Subject: [PATCH 1/3] move export of block types to extension registry --- .../block-entry-show-content-edit.condition.ts | 10 ++-------- .../block-workspace-has-settings.condition.ts | 10 ++-------- .../core/extension-registry/conditions/types.ts | 10 +++++++++- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/block-entry-show-content-edit.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/block-entry-show-content-edit.condition.ts index c0bed4622c..7b0ea76395 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/block-entry-show-content-edit.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/block-entry-show-content-edit.condition.ts @@ -1,10 +1,7 @@ import { UMB_BLOCK_ENTRY_CONTEXT } from '../context/block-entry.context-token.js'; +import type { BlockEntryShowContentEditConditionConfig } from '@umbraco-cms/backoffice/extension-registry'; import { UmbConditionBase } from '@umbraco-cms/backoffice/extension-registry'; -import type { - UmbConditionConfigBase, - UmbConditionControllerArguments, - UmbExtensionCondition, -} from '@umbraco-cms/backoffice/extension-api'; +import type { UmbConditionControllerArguments, UmbExtensionCondition } from '@umbraco-cms/backoffice/extension-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export class UmbBlockEntryShowContentEditCondition @@ -30,6 +27,3 @@ export class UmbBlockEntryShowContentEditCondition } export default UmbBlockEntryShowContentEditCondition; - -export type BlockEntryShowContentEditConditionConfig = - UmbConditionConfigBase<'Umb.Condition.BlockEntryShowContentEdit'>; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/block-workspace-has-settings.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/block-workspace-has-settings.condition.ts index 07cb74f5d6..778051154a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/block-workspace-has-settings.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/block-workspace-has-settings.condition.ts @@ -1,10 +1,7 @@ import { UMB_BLOCK_WORKSPACE_CONTEXT } from '../workspace/block-workspace.context-token.js'; import { UmbConditionBase } from '@umbraco-cms/backoffice/extension-registry'; -import type { - UmbConditionConfigBase, - UmbConditionControllerArguments, - UmbExtensionCondition, -} from '@umbraco-cms/backoffice/extension-api'; +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'; export class UmbBlockWorkspaceHasSettingsCondition @@ -30,6 +27,3 @@ export class UmbBlockWorkspaceHasSettingsCondition } export default UmbBlockWorkspaceHasSettingsCondition; - -export type BlockWorkspaceHasSettingsConditionConfig = - UmbConditionConfigBase<'Umb.Condition.BlockWorkspaceHasSettings'>; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts index 3c893630a7..0481a6cb5f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts @@ -3,7 +3,6 @@ import type { CollectionBulkActionPermissionConditionConfig } from '../../collec import type { UmbSectionUserPermissionConditionConfig } from '../../section/conditions/index.js'; import type { SectionAliasConditionConfig } from './section-alias.condition.js'; import type { SwitchConditionConfig } from './switch.condition.js'; -import type { BlockWorkspaceHasSettingsConditionConfig } from '@umbraco-cms/backoffice/block'; import type { WorkspaceAliasConditionConfig, WorkspaceEntityTypeConditionConfig, @@ -15,7 +14,16 @@ import type { UmbDocumentUserPermissionConditionConfig } from '@umbraco-cms/back Are there any other way we can do this? Niels: Sadly I don't see any other solutions currently. But are very open for ideas :-) now that I think about it maybe there is some ability to extend a global type, similar to the 'declare global' trick we use on Elements. */ + +// 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 From 9cc28fa9afd61ef1c7366b565a1bc662749cd28f Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 26 Apr 2024 07:31:26 +0200 Subject: [PATCH 2/3] remove exports from block --- .../src/packages/block/block/conditions/index.ts | 2 -- src/Umbraco.Web.UI.Client/src/packages/block/block/index.ts | 1 - 2 files changed, 3 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/index.ts deleted file mode 100644 index ddc37aff2e..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export type { BlockEntryShowContentEditConditionConfig } from './block-entry-show-content-edit.condition.js'; -export type { BlockWorkspaceHasSettingsConditionConfig } from './block-workspace-has-settings.condition.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/index.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/index.ts index c056977285..828e8f118c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/index.ts @@ -1,4 +1,3 @@ -export * from './conditions/index.js'; export * from './context/index.js'; export * from './modals/index.js'; export * from './types.js'; From 6902ae6cbeccd3d0c1eb201abdc74ede5deaf1d3 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 26 Apr 2024 07:31:41 +0200 Subject: [PATCH 3/3] add export from extension registry --- .../src/packages/core/extension-registry/conditions/index.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/index.ts index 8e97418b79..debe3bb4f9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/index.ts @@ -1,5 +1,4 @@ export { UmbSwitchCondition } from './switch.condition.js'; export { UmbConditionBase } from './condition-base.controller.js'; -/* -export { UmbSectionAliasCondition } from './section-alias.condition.js'; -*/ + +export type { BlockEntryShowContentEditConditionConfig, BlockWorkspaceHasSettingsConditionConfig } from './types.js';