yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1716 from umbraco/bugfix/remove-block-condition-circular-dependecy

Browse Source 
Bugfix: Remove block circular dependency
This commit is contained in:
Niels Lyngsø
2024-04-26 13:00:47 +02:00
committed by GitHub
parent 6f0118ae5c 6902ae6cbe
commit e2c6ff5ac2
6 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/block-entry-show-content-edit.condition.ts
View File

@@ -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'>;

10
src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/block-workspace-has-settings.condition.ts
View File

@@ -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'>;

2
src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/index.ts
View File

@@ -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';

1
src/Umbraco.Web.UI.Client/src/packages/block/block/index.ts
View File

@@ -1,4 +1,3 @@
export * from './conditions/index.js';
export * from './context/index.js';
export * from './modals/index.js';
export * from './types.js';

5
src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/index.ts
View File

@@ -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';

10
src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts
View File

@@ -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