From b433a2564a5cac4c8ebf5f9212b81cbe1dcbc067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 13 Sep 2024 17:15:01 +0200 Subject: [PATCH 1/2] clean up --- .../conditions/block-workspace-has-settings.condition.ts | 2 +- .../packages/core/extension-registry/conditions/index.ts | 6 +----- .../packages/core/extension-registry/conditions/types.ts | 9 --------- 3 files changed, 2 insertions(+), 15 deletions(-) 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 9134668906..d5d495203d 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,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'; 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 f58ee1c52c..6060ffdc81 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,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'; 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 0939e4845c..8d3cd3e091 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 @@ -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 From 6e00bb7c6d221579dabf2b53fd5f2ed47a18ad1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 13 Sep 2024 17:15:32 +0200 Subject: [PATCH 2/2] clean up --- .../block/conditions/block-entry-show-content-edit.condition.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7b0ea76395..31168a7944 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,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';