From 49b95c1225701feb87f85b63b84e8ea14afe7aa8 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 30 Jun 2025 13:24:00 +0200 Subject: [PATCH] Introduce Section Alias condition const (#19633) * Refactor section conditions into subfolders Split section condition logic into 'section-alias' and 'section-user-permission' subfolders, each with their own constants, manifests, and types. Updated imports and manifest aggregation to use the new structure for improved modularity and maintainability. * use const * fix build * Refactor section alias condition to use constant Replaces hardcoded 'Umb.Condition.SectionAlias' strings with the UMB_SECTION_ALIAS_CONDITION_ALIAS constant across all manifests and related files. This improves maintainability and consistency by centralizing the section alias condition reference. --- .github/contributing-backoffice.md | 2 +- .../collection/collection/card-view/index.ts | 1 - .../collection/collection/table-view/index.ts | 1 - .../examples/validation-context/index.ts | 3 +- .../core/section/conditions/constants.ts | 3 +- .../core/section/conditions/manifests.ts | 20 ++-------- .../conditions/section-alias/constants.ts | 1 + .../conditions/section-alias/manifests.ts | 11 ++++++ .../section-alias.condition.ts | 6 +-- .../section/conditions/section-alias/types.ts | 22 +++++++++++ .../section-user-permission/constants.ts | 1 + .../section-user-permission/manifests.ts | 11 ++++++ .../section-user-permission.condition.test.ts | 4 +- .../section-user-permission.condition.ts | 2 +- .../section-user-permission/types.ts | 20 ++++++++++ .../packages/core/section/conditions/types.ts | 37 +------------------ .../dictionary/dashboard/manifests.ts | 3 +- .../document-redirect-management/manifests.ts | 3 +- .../packages/documents/section/manifests.ts | 7 +++- .../src/packages/health-check/manifests.ts | 3 +- .../language/app-language-select/manifests.ts | 3 +- .../packages/media/media-section/manifests.ts | 7 +++- .../media/media/dashboard/manifests.ts | 4 +- .../members/section/sidebar-app/manifests.ts | 3 +- .../src/packages/models-builder/manifests.ts | 3 +- .../packages/package-section/manifests.ts | 11 ++++-- .../performance-profiling/manifests.ts | 3 +- .../src/packages/publish-cache/manifests.ts | 3 +- .../src/packages/search/manifests.ts | 3 +- .../packages/settings/advanced/manifests.ts | 3 +- .../packages/settings/structure/manifests.ts | 3 +- .../packages/settings/welcome/manifests.ts | 3 +- .../src/packages/telemetry/manifests.ts | 3 +- .../src/packages/templating/menu/manifests.ts | 3 +- .../packages/translation/menu/manifests.ts | 3 +- .../src/packages/umbraco-news/manifests.ts | 3 +- .../user/section/sidebar-app/manifests.ts | 3 +- 37 files changed, 136 insertions(+), 89 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/examples/collection/collection/card-view/index.ts delete mode 100644 src/Umbraco.Web.UI.Client/examples/collection/collection/table-view/index.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-alias/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-alias/manifests.ts rename src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/{ => section-alias}/section-alias.condition.ts (82%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-alias/types.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission/manifests.ts rename src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/{ => section-user-permission}/section-user-permission.condition.test.ts (95%) rename src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/{ => section-user-permission}/section-user-permission.condition.ts (92%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission/types.ts diff --git a/.github/contributing-backoffice.md b/.github/contributing-backoffice.md index 21993dd92f..76b8246fff 100644 --- a/.github/contributing-backoffice.md +++ b/.github/contributing-backoffice.md @@ -114,7 +114,7 @@ To declare the Published Cache Status Dashboard as a new manifest, we need to ad }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: 'Umb.Section.Settings', }, ], diff --git a/src/Umbraco.Web.UI.Client/examples/collection/collection/card-view/index.ts b/src/Umbraco.Web.UI.Client/examples/collection/collection/card-view/index.ts deleted file mode 100644 index e9d6c50fc5..0000000000 --- a/src/Umbraco.Web.UI.Client/examples/collection/collection/card-view/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { UMB_LANGUAGE_TABLE_COLLECTION_VIEW_ALIAS } from './manifests.js'; diff --git a/src/Umbraco.Web.UI.Client/examples/collection/collection/table-view/index.ts b/src/Umbraco.Web.UI.Client/examples/collection/collection/table-view/index.ts deleted file mode 100644 index e9d6c50fc5..0000000000 --- a/src/Umbraco.Web.UI.Client/examples/collection/collection/table-view/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { UMB_LANGUAGE_TABLE_COLLECTION_VIEW_ALIAS } from './manifests.js'; diff --git a/src/Umbraco.Web.UI.Client/examples/validation-context/index.ts b/src/Umbraco.Web.UI.Client/examples/validation-context/index.ts index d21809b882..31668d7237 100644 --- a/src/Umbraco.Web.UI.Client/examples/validation-context/index.ts +++ b/src/Umbraco.Web.UI.Client/examples/validation-context/index.ts @@ -1,4 +1,5 @@ import type { ManifestDashboard } from '@umbraco-cms/backoffice/dashboard'; +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; const dashboard: ManifestDashboard = { type: 'dashboard', @@ -12,7 +13,7 @@ const dashboard: ManifestDashboard = { }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: 'Umb.Section.Content', }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/constants.ts index b09ab84caf..36d4b2350f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/constants.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/constants.ts @@ -1 +1,2 @@ -export const UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS = 'Umb.Condition.SectionUserPermission'; +export * from './section-alias/constants.js'; +export * from './section-user-permission/constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/manifests.ts index 8e11e8eeb0..68e9e244a8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/manifests.ts @@ -1,18 +1,4 @@ -import { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from './constants.js'; -import { UmbSectionAliasCondition } from './section-alias.condition.js'; -import { UmbSectionUserPermissionCondition } from './section-user-permission.condition.js'; +import { manifests as sectionAliasManifests } from './section-alias/manifests.js'; +import { manifests as sectionUserPermissionManifests } from './section-user-permission/manifests.js'; -export const manifests: Array = [ - { - type: 'condition', - name: 'Section User Permission Condition', - alias: UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS, - api: UmbSectionUserPermissionCondition, - }, - { - type: 'condition', - name: 'Section Alias Condition', - alias: 'Umb.Condition.SectionAlias', - api: UmbSectionAliasCondition, - }, -]; +export const manifests: Array = [...sectionAliasManifests, ...sectionUserPermissionManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-alias/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-alias/constants.ts new file mode 100644 index 0000000000..e097c49be4 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-alias/constants.ts @@ -0,0 +1 @@ +export const UMB_SECTION_ALIAS_CONDITION_ALIAS = 'Umb.Condition.SectionAlias'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-alias/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-alias/manifests.ts new file mode 100644 index 0000000000..bb24bca85a --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-alias/manifests.ts @@ -0,0 +1,11 @@ +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from './constants.js'; +import { UmbSectionAliasCondition } from './section-alias.condition.js'; + +export const manifests: Array = [ + { + type: 'condition', + name: 'Section Alias Condition', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, + api: UmbSectionAliasCondition, + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-alias.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-alias/section-alias.condition.ts similarity index 82% rename from src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-alias.condition.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-alias/section-alias.condition.ts index 9a18d0ce15..f18f3e75f6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-alias.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-alias/section-alias.condition.ts @@ -1,6 +1,6 @@ -import { UmbConditionBase } from '../../extension-registry/conditions/condition-base.controller.js'; -import { UMB_SECTION_CONTEXT } from '../section.context.js'; -import type { SectionAliasConditionConfig } from './types.js'; +import { UmbConditionBase } from '../../../extension-registry/conditions/condition-base.controller.js'; +import { UMB_SECTION_CONTEXT } from '../../section.context.js'; +import type { SectionAliasConditionConfig } from '../types.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbConditionControllerArguments, UmbExtensionCondition } from '@umbraco-cms/backoffice/extension-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-alias/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-alias/types.ts new file mode 100644 index 0000000000..5ef40e419d --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-alias/types.ts @@ -0,0 +1,22 @@ +import type { UMB_SECTION_ALIAS_CONDITION_ALIAS } from './constants.js'; +import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api'; + +export type SectionAliasConditionConfig = UmbConditionConfigBase & { + /** + * Define the section that this extension should be available in + * @example "Umb.Section.Content" + */ + match: string; + /** + * Define one or more workspaces that this extension should be available in + * @example + * ["Umb.Section.Content", "Umb.Section.Media"] + */ + oneOf?: Array; +}; + +declare global { + interface UmbExtensionConditionConfigMap { + UmbSectionAliasConditionConfig: SectionAliasConditionConfig; + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission/constants.ts new file mode 100644 index 0000000000..b09ab84caf --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission/constants.ts @@ -0,0 +1 @@ +export const UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS = 'Umb.Condition.SectionUserPermission'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission/manifests.ts new file mode 100644 index 0000000000..ba819fa346 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission/manifests.ts @@ -0,0 +1,11 @@ +import { UmbSectionUserPermissionCondition } from './section-user-permission.condition.js'; +import { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from './constants.js'; + +export const manifests: Array = [ + { + type: 'condition', + name: 'Section User Permission Condition', + alias: UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS, + api: UmbSectionUserPermissionCondition, + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission.condition.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission/section-user-permission.condition.test.ts similarity index 95% rename from src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission.condition.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission/section-user-permission.condition.test.ts index 59f3f92c86..c4c87f6624 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission.condition.test.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission/section-user-permission.condition.test.ts @@ -3,8 +3,8 @@ import { UmbNotificationContext } from '@umbraco-cms/backoffice/notification'; import { UmbControllerHostElementMixin } from '@umbraco-cms/backoffice/controller-api'; import { customElement } from '@umbraco-cms/backoffice/external/lit'; import { UmbCurrentUserContext, UmbCurrentUserStore } from '@umbraco-cms/backoffice/current-user'; -import { UmbSectionUserPermissionCondition } from './section-user-permission.condition'; -import { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from './constants.js'; +import { UmbSectionUserPermissionCondition } from './section-user-permission.condition.js'; +import { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from '../constants.js'; @customElement('test-controller-host') class UmbTestControllerHostElement extends UmbControllerHostElementMixin(HTMLElement) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission/section-user-permission.condition.ts similarity index 92% rename from src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission.condition.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission/section-user-permission.condition.ts index dc753e563d..3fc4518c56 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission/section-user-permission.condition.ts @@ -1,4 +1,4 @@ -import type { UmbSectionUserPermissionConditionConfig } from './types.js'; +import type { UmbSectionUserPermissionConditionConfig } from '../types.js'; import { UMB_CURRENT_USER_CONTEXT } from '@umbraco-cms/backoffice/current-user'; 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/section/conditions/section-user-permission/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission/types.ts new file mode 100644 index 0000000000..44b032d217 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/section-user-permission/types.ts @@ -0,0 +1,20 @@ +import type { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from './constants.js'; +import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api'; + +export type UmbSectionUserPermissionConditionConfig = UmbConditionConfigBase< + typeof UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS +> & { + /** + * + * + * @example + * "Umb.Section.Content" + */ + match: string; +}; + +declare global { + interface UmbExtensionConditionConfigMap { + UmbSectionUserPermissionConditionConfig: UmbSectionUserPermissionConditionConfig; + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/types.ts index f1f8f6ab52..02345913ab 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/conditions/types.ts @@ -1,35 +1,2 @@ -import type { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from './constants.js'; -import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api'; - -export type UmbSectionUserPermissionConditionConfig = UmbConditionConfigBase< - typeof UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS -> & { - /** - * - * - * @example - * "Umb.Section.Content" - */ - match: string; -}; - -export type SectionAliasConditionConfig = UmbConditionConfigBase<'Umb.Condition.SectionAlias'> & { - /** - * Define the section that this extension should be available in - * @example "Umb.Section.Content" - */ - match: string; - /** - * Define one or more workspaces that this extension should be available in - * @example - * ["Umb.Section.Content", "Umb.Section.Media"] - */ - oneOf?: Array; -}; - -declare global { - interface UmbExtensionConditionConfigMap { - UmbSectionUserPermissionConditionConfig: UmbSectionUserPermissionConditionConfig; - UmbSectionAliasConditionConfig: SectionAliasConditionConfig; - } -} +export type * from './section-alias/types.js'; +export type * from './section-user-permission/types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboard/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboard/manifests.ts index 3d3f01c245..f5fbb3d1e6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboard/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboard/manifests.ts @@ -1,3 +1,4 @@ +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; import { UMB_TRANSLATION_SECTION_ALIAS } from '@umbraco-cms/backoffice/translation'; export const manifests: Array = [ @@ -12,7 +13,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: UMB_TRANSLATION_SECTION_ALIAS, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-redirect-management/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-redirect-management/manifests.ts index 57d82f47f6..e8ba15e16a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-redirect-management/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-redirect-management/manifests.ts @@ -1,4 +1,5 @@ import { UMB_CONTENT_SECTION_ALIAS } from '@umbraco-cms/backoffice/content'; +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; export const manifests: Array = [ { @@ -13,7 +14,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: UMB_CONTENT_SECTION_ALIAS, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/section/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/section/manifests.ts index 46d3001e26..25a18c1917 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/section/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/section/manifests.ts @@ -1,6 +1,9 @@ import { UMB_CONTENT_SECTION_ALIAS } from '@umbraco-cms/backoffice/content'; import { UMB_DOCUMENT_ROOT_ENTITY_TYPE, UMB_CONTENT_MENU_ALIAS } from '@umbraco-cms/backoffice/document'; -import { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; +import { + UMB_SECTION_ALIAS_CONDITION_ALIAS, + UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS, +} from '@umbraco-cms/backoffice/section'; export const manifests: Array = [ { @@ -32,7 +35,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: UMB_CONTENT_SECTION_ALIAS, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/health-check/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/health-check/manifests.ts index f383dded95..cf14adac5e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/health-check/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/health-check/manifests.ts @@ -1,3 +1,4 @@ +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; import { UMB_SETTINGS_SECTION_ALIAS } from '@umbraco-cms/backoffice/settings'; export const manifests: Array = [ @@ -14,7 +15,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: UMB_SETTINGS_SECTION_ALIAS, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/manifests.ts index 5bb2dc5fd6..b1fbead97f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/manifests.ts @@ -1,4 +1,5 @@ import { UMB_CONTENT_SECTION_ALIAS } from '@umbraco-cms/backoffice/content'; +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; export const manifests: Array = [ { type: 'sectionSidebarApp', @@ -8,7 +9,7 @@ export const manifests: Array = [ weight: 900, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: UMB_CONTENT_SECTION_ALIAS, }, { diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-section/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-section/manifests.ts index d1fdb8bf24..23791a4c75 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-section/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-section/manifests.ts @@ -1,5 +1,8 @@ import { UMB_MEDIA_ROOT_ENTITY_TYPE, UMB_MEDIA_MENU_ALIAS } from '../media/index.js'; -import { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; +import { + UMB_SECTION_ALIAS_CONDITION_ALIAS, + UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS, +} from '@umbraco-cms/backoffice/section'; const sectionAlias = 'Umb.Section.Media'; @@ -33,7 +36,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: sectionAlias, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/dashboard/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/dashboard/manifests.ts index 0bfa3c6797..f08955e9fd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/dashboard/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/dashboard/manifests.ts @@ -1,3 +1,5 @@ +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; + export const manifests: Array = [ { type: 'dashboard', @@ -11,7 +13,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: 'Umb.Section.Media', }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/section/sidebar-app/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/section/sidebar-app/manifests.ts index ed9177516e..e814353f00 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/section/sidebar-app/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/section/sidebar-app/manifests.ts @@ -1,5 +1,6 @@ import { UMB_MEMBER_MANAGEMENT_SECTION_ALIAS } from '../constants.js'; import { UMB_MEMBER_MANAGEMENT_MENU_ALIAS } from '../menu/index.js'; +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; export const manifests: Array = [ { @@ -14,7 +15,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: UMB_MEMBER_MANAGEMENT_SECTION_ALIAS, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/models-builder/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/models-builder/manifests.ts index 862ab234b4..c74ca1cd2c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/models-builder/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/models-builder/manifests.ts @@ -1,3 +1,4 @@ +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; import { UMB_SETTINGS_SECTION_ALIAS } from '@umbraco-cms/backoffice/settings'; export const manifests: Array = [ @@ -13,7 +14,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: UMB_SETTINGS_SECTION_ALIAS, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/manifests.ts index 0dd57300c3..1118433040 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/manifests.ts @@ -1,4 +1,7 @@ -import { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; +import { + UMB_SECTION_ALIAS_CONDITION_ALIAS, + UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS, +} from '@umbraco-cms/backoffice/section'; const sectionAlias = 'Umb.Section.Packages'; @@ -32,7 +35,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: sectionAlias, }, ], @@ -50,7 +53,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: sectionAlias, }, ], @@ -68,7 +71,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: sectionAlias, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/performance-profiling/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/performance-profiling/manifests.ts index 67f5747cae..51b65e2308 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/performance-profiling/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/performance-profiling/manifests.ts @@ -1,3 +1,4 @@ +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; import { UMB_SETTINGS_SECTION_ALIAS } from '@umbraco-cms/backoffice/settings'; export const manifests = [ @@ -13,7 +14,7 @@ export const manifests = [ }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: UMB_SETTINGS_SECTION_ALIAS, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/publish-cache/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/publish-cache/manifests.ts index 203dfd16fb..37edcd745d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/publish-cache/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/publish-cache/manifests.ts @@ -1,3 +1,4 @@ +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; import { UMB_SETTINGS_SECTION_ALIAS } from '@umbraco-cms/backoffice/settings'; export const manifests = [ @@ -13,7 +14,7 @@ export const manifests = [ }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: UMB_SETTINGS_SECTION_ALIAS, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/search/manifests.ts index 92e972641c..bcdee40ae3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/search/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/search/manifests.ts @@ -1,4 +1,5 @@ import { manifests as examineManifests } from './examine-management-dashboard/manifests.js'; +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; import { UMB_SETTINGS_SECTION_ALIAS } from '@umbraco-cms/backoffice/settings'; export const manifests: Array = [ @@ -32,7 +33,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: UMB_SETTINGS_SECTION_ALIAS, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/advanced/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/advanced/manifests.ts index c94fa669de..e36e2846e0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/advanced/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/advanced/manifests.ts @@ -1,5 +1,6 @@ import { UMB_SETTINGS_SECTION_ALIAS } from '../constants.js'; import { UMB_ADVANCED_SETTINGS_MENU_ALIAS } from './constants.js'; +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; export const manifests = [ { @@ -19,7 +20,7 @@ export const manifests = [ }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: UMB_SETTINGS_SECTION_ALIAS, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/structure/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/structure/manifests.ts index f66f848986..e9cbb29f10 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/structure/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/structure/manifests.ts @@ -1,5 +1,6 @@ import { UMB_SETTINGS_SECTION_ALIAS } from '../constants.js'; import { UMB_STRUCTURE_SETTINGS_MENU_ALIAS } from './constants.js'; +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; export const manifests: Array = [ @@ -20,7 +21,7 @@ export const manifests: Array = }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: UMB_SETTINGS_SECTION_ALIAS, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/welcome/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/welcome/manifests.ts index ae001f27cd..c7f1d141f4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/welcome/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/welcome/manifests.ts @@ -1,4 +1,5 @@ import { UMB_SETTINGS_SECTION_ALIAS } from '../constants.js'; +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; export const manifests: Array = [ @@ -14,7 +15,7 @@ export const manifests: Array = }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: UMB_SETTINGS_SECTION_ALIAS, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/telemetry/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/telemetry/manifests.ts index 1d179068fc..05bba7100c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/telemetry/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/telemetry/manifests.ts @@ -1,3 +1,4 @@ +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; import { UMB_SETTINGS_SECTION_ALIAS } from '@umbraco-cms/backoffice/settings'; export const manifests = [ @@ -13,7 +14,7 @@ export const manifests = [ }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: UMB_SETTINGS_SECTION_ALIAS, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/menu/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/menu/manifests.ts index 7ff3fe0b79..b204c22dac 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/menu/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/menu/manifests.ts @@ -1,3 +1,4 @@ +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; import { UMB_SETTINGS_SECTION_ALIAS } from '@umbraco-cms/backoffice/settings'; export const manifests: Array = [ @@ -18,7 +19,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: UMB_SETTINGS_SECTION_ALIAS, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/translation/menu/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/translation/menu/manifests.ts index 67b9c47ac6..9022a60266 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/translation/menu/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/translation/menu/manifests.ts @@ -1,3 +1,4 @@ +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; import { UMB_TRANSLATION_SECTION_ALIAS } from '../section/index.js'; import { UMB_TRANSLATION_MENU_ALIAS } from './constants.js'; @@ -20,7 +21,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: UMB_TRANSLATION_SECTION_ALIAS, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/manifests.ts index 202efc257c..4621106db5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/manifests.ts @@ -1,5 +1,6 @@ import type { ManifestDashboard } from '@umbraco-cms/backoffice/dashboard'; import { UMB_CONTENT_SECTION_ALIAS } from '@umbraco-cms/backoffice/content'; +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; export const dashboard: ManifestDashboard = { type: 'dashboard', @@ -12,7 +13,7 @@ export const dashboard: ManifestDashboard = { }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: UMB_CONTENT_SECTION_ALIAS, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/section/sidebar-app/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/section/sidebar-app/manifests.ts index 4b5fcd9bb2..cba6d25c4f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/section/sidebar-app/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/section/sidebar-app/manifests.ts @@ -1,5 +1,6 @@ import { UMB_USER_MANAGEMENT_SECTION_ALIAS } from '../constants.js'; import { UMB_USER_MANAGEMENT_MENU_ALIAS } from '../menu/index.js'; +import { UMB_SECTION_ALIAS_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; export const manifests: Array = [ { @@ -14,7 +15,7 @@ export const manifests: Array = [ }, conditions: [ { - alias: 'Umb.Condition.SectionAlias', + alias: UMB_SECTION_ALIAS_CONDITION_ALIAS, match: UMB_USER_MANAGEMENT_SECTION_ALIAS, }, ],