Merge branch 'v15/dev' into v15/feature/emm-section-conditions

# Conflicts:
#	src/packages/core/extension-registry/conditions/manifests.ts

Author: nielslyngsoe

src/packages/core/extension-registry/conditions/manifests.ts

@@ -1,5 +1,5 @@
 import type { ManifestTypes } from '../models/index.js';
-import { manifest as multipleAppLanguagesConditionManifest } from './multiple-app-languages.condition.js';
+
 import { manifest as switchConditionManifest } from './switch.condition.js';
 
-export const manifests: Array<ManifestTypes> = [multipleAppLanguagesConditionManifest, switchConditionManifest];
+export const manifests: Array<ManifestTypes> = [switchConditionManifest];

src/packages/core/extension-registry/conditions/types.ts

@@ -1,14 +1,12 @@
 import type { CollectionAliasConditionConfig } from '../../collection/collection-alias.manifest.js';
 import type { CollectionBulkActionPermissionConditionConfig } from '../../collection/collection-bulk-action-permission.manifest.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 =
 	| CollectionAliasConditionConfig
 	| CollectionBulkActionPermissionConditionConfig
 	| SwitchConditionConfig
-	| UmbMultipleAppLanguageConditionConfig
 	| UmbConditionConfigBase;
 
 type UnionOfProperties<T> = T extends object ? T[keyof T] : never;

src/packages/core/extension-registry/models/index.ts

@@ -39,8 +39,6 @@ import type { ManifestSectionView } from './section-view.model.js';
 import type { ManifestStore, ManifestTreeStore, ManifestItemStore } from './store.model.js';
 import type { ManifestTheme } from './theme.model.js';
 import type { ManifestTinyMcePlugin } from './tinymce-plugin.model.js';
-import type { ManifestTree } from './tree.model.js';
-import type { ManifestTreeItem } from './tree-item.model.js';
 import type { ManifestUfmComponent } from './ufm-component.model.js';
 import type { ManifestUfmFilter } from './ufm-filter.model.js';
 import type { ManifestUserProfileApp } from './user-profile-app.model.js';
@@ -101,8 +99,6 @@ export type * from './section.model.js';
 export type * from './store.model.js';
 export type * from './theme.model.js';
 export type * from './tinymce-plugin.model.js';
-export type * from './tree-item.model.js';
-export type * from './tree.model.js';
 export type * from './ufm-component.model.js';
 export type * from './ufm-filter.model.js';
 export type * from './user-granular-permission.model.js';
@@ -188,8 +184,6 @@ export type ManifestTypes =
 	| ManifestStore
 	| ManifestTheme
 	| ManifestTinyMcePlugin
-	| ManifestTree
-	| ManifestTreeItem
 	| ManifestTreeStore
 	| ManifestUfmComponent
 	| ManifestUfmFilter

src/packages/core/tree/default/default-tree.context.ts

@@ -2,13 +2,10 @@ import type { UmbTreeItemModel, UmbTreeRootModel, UmbTreeStartNode } from '../ty
 import type { UmbTreeRepository } from '../data/tree-repository.interface.js';
 import type { UmbTreeContext } from '../tree-context.interface.js';
 import type { UmbTreeRootItemsRequestArgs } from '../data/types.js';
+import type { ManifestTree } from '../extensions/index.js';
 import { UMB_TREE_CONTEXT } from './default-tree.context-token.js';
 import { type UmbActionEventContext, UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
-import {
-	type ManifestRepository,
-	type ManifestTree,
-	umbExtensionsRegistry,
-} from '@umbraco-cms/backoffice/extension-registry';
+import { type ManifestRepository, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbExtensionApiInitializer } from '@umbraco-cms/backoffice/extension-api';

src/packages/core/tree/default/manifests.ts

@@ -1,15 +1,15 @@
-import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
+import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
 
-const defaultTreeKind: UmbExtensionManifestKind = {
-	type: 'kind',
-	alias: 'Umb.Kind.Tree.Default',
-	matchKind: 'default',
-	matchType: 'tree',
-	manifest: {
-		type: 'tree',
-		api: () => import('./default-tree.context.js'),
-		element: () => import('./default-tree.element.js'),
+export const manifests: Array<UmbExtensionManifestKind> = [
+	{
+		type: 'kind',
+		alias: 'Umb.Kind.Tree.Default',
+		matchKind: 'default',
+		matchType: 'tree',
+		manifest: {
+			type: 'tree',
+			api: () => import('./default-tree.context.js'),
+			element: () => import('./default-tree.element.js'),
+		},
 	},
-};
-
-export const manifests: Array<ManifestTypes | UmbExtensionManifestKind> = [defaultTreeKind];
+];

src/packages/core/tree/extensions/index.ts

@@ -0,0 +1,2 @@
+export * from './tree-item.extension.js';
+export * from './tree.extension.js';

src/packages/core/extension-registry/models/tree-item.model.ts renamed to src/packages/core/tree/extensions/tree-item.extension.ts

@@ -1,5 +1,5 @@
-import type { UmbTreeItemModel } from '../../tree/types.js';
-import type { UmbTreeItemContext } from '../../tree/tree-item/index.js';
+import type { UmbTreeItemModel } from '../types.js';
+import type { UmbTreeItemContext } from '../tree-item/index.js';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import type { ManifestElementAndApi } from '@umbraco-cms/backoffice/extension-api';
 
@@ -8,3 +8,9 @@ export interface ManifestTreeItem
 	type: 'treeItem';
 	forEntityTypes: Array<string>;
 }
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbTreeItem: ManifestTreeItem;
+	}
+}

src/packages/core/extension-registry/models/tree.model.ts renamed to src/packages/core/tree/extensions/tree.extension.ts

@@ -8,3 +8,9 @@ export interface ManifestTree extends ManifestElementAndApi, ManifestWithDynamic
 export interface MetaTree {
 	repositoryAlias: string;
 }
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbTree: ManifestTree;
+	}
+}

src/packages/core/tree/index.ts

@@ -4,6 +4,7 @@ export * from './data/index.js';
 export * from './tree-menu-item-default/index.js';
 export * from './folder/index.js';
 export * from './tree.element.js';
+export * from './extensions/index.js';
 
 export * from './entity-actions/sort-children-of/index.js';
 export * from './entity-actions/reload-tree-item-children/index.js';

src/packages/core/tree/tree-item/tree-item-base/tree-item-context-base.ts

@@ -2,13 +2,13 @@ import type { UmbTreeItemContext } from '../tree-item-context.interface.js';
 import { UMB_TREE_CONTEXT, type UmbDefaultTreeContext } from '../../default/index.js';
 import type { UmbTreeItemModel, UmbTreeRootModel } from '../../types.js';
 import { UmbRequestReloadTreeItemChildrenEvent } from '../../entity-actions/reload-tree-item-children/index.js';
+import type { ManifestTreeItem } from '../../extensions/index.js';
 import { map } from '@umbraco-cms/backoffice/external/rxjs';
 import { UmbArrayState, UmbBooleanState, UmbObjectState, UmbStringState } from '@umbraco-cms/backoffice/observable-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { UMB_SECTION_CONTEXT, UMB_SECTION_SIDEBAR_CONTEXT } from '@umbraco-cms/backoffice/section';
-import type { ManifestTreeItem } from '@umbraco-cms/backoffice/extension-registry';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
 import {