diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/manifests.ts index e12a228710..e5ae132cc1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/manifests.ts @@ -1,10 +1,5 @@ import type { ManifestTypes } from '../models/index.js'; -import { manifest as multipleAppLanguagesConditionManifest } from './multiple-app-languages.condition.js'; import { manifest as sectionAliasConditionManifest } from './section-alias.condition.js'; import { manifest as switchConditionManifest } from './switch.condition.js'; -export const manifests: Array = [ - multipleAppLanguagesConditionManifest, - sectionAliasConditionManifest, - switchConditionManifest, -]; +export const manifests: Array = [sectionAliasConditionManifest, switchConditionManifest]; 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 49bb6910a9..4ec44812a4 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 @@ -2,7 +2,6 @@ import type { CollectionAliasConditionConfig } from '../../collection/collection import type { CollectionBulkActionPermissionConditionConfig } from '../../collection/collection-bulk-action-permission.manifest.js'; import type { SectionAliasConditionConfig } from './section-alias.condition.js'; import type { SwitchConditionConfig } from './switch.condition.js'; -import type { UmbMultipleAppLanguageConditionConfig } from './multiple-app-languages.condition.js'; import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api'; export type ConditionTypes = @@ -10,7 +9,6 @@ export type ConditionTypes = | CollectionBulkActionPermissionConditionConfig | SectionAliasConditionConfig | SwitchConditionConfig - | UmbMultipleAppLanguageConditionConfig | UmbConditionConfigBase; type UnionOfProperties = T extends object ? T[keyof T] : never; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/multiple-app-languages.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/language/conditions/multiple-app-languages.condition.ts similarity index 85% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/multiple-app-languages.condition.ts rename to src/Umbraco.Web.UI.Client/src/packages/language/conditions/multiple-app-languages.condition.ts index 361cbbcb38..f1217715f2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/multiple-app-languages.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/conditions/multiple-app-languages.condition.ts @@ -1,14 +1,12 @@ -import { UmbConditionBase } from './condition-base.controller.js'; +import type { UmbMultipleAppLanguageConditionConfig } from './types.js'; import { UMB_APP_LANGUAGE_CONTEXT } from '@umbraco-cms/backoffice/language'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { ManifestCondition, - UmbConditionConfigBase, UmbConditionControllerArguments, UmbExtensionCondition, } from '@umbraco-cms/backoffice/extension-api'; - -export type UmbMultipleAppLanguageConditionConfig = UmbConditionConfigBase; +import { UmbConditionBase } from '@umbraco-cms/backoffice/extension-registry'; export class UmbMultipleAppLanguageCondition extends UmbConditionBase diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/conditions/types.ts b/src/Umbraco.Web.UI.Client/src/packages/language/conditions/types.ts new file mode 100644 index 0000000000..51ad954307 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/language/conditions/types.ts @@ -0,0 +1,3 @@ +import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api'; + +export type UmbMultipleAppLanguageConditionConfig = UmbConditionConfigBase; diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/language/manifests.ts index 64b2ce2f3f..d6478f7ada 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/manifests.ts @@ -6,6 +6,7 @@ import { manifests as appLanguageSelect } from './app-language-select/manifests. import { manifests as modalManifests } from './modals/manifests.js'; import { manifests as collectionManifests } from './collection/manifests.js'; import { manifests as globalContextManifests } from './global-contexts/manifests.js'; +import { manifest as conditionsManifest } from './conditions/multiple-app-languages.condition.js'; import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; export const manifests: Array = [ @@ -17,6 +18,7 @@ export const manifests: Array = [ ...modalManifests, ...collectionManifests, ...globalContextManifests, + conditionsManifest, { type: 'workspaceContext', name: 'Document Language Access Workspace Context', diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/types.ts b/src/Umbraco.Web.UI.Client/src/packages/language/types.ts index 4bf52812c6..ea976f305a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/types.ts @@ -1,4 +1,5 @@ import type { UmbLanguageEntityType } from './entity.js'; +export type * from './conditions/types.js'; export interface UmbLanguageDetailModel { entityType: UmbLanguageEntityType;