Merge remote-tracking branch 'origin/main' into feature/documen-type-workspace

# Conflicts:
#	libs/workspace/actions/workspace-action-base.ts
#	libs/workspace/context/workspace-context.interface.ts
#	src/backoffice/documents/document-types/workspace/document-type-workspace.context.ts
#	src/backoffice/media/media/repository/media.repository.ts
#	src/backoffice/shared/components/code-editor/code-editor.stories.ts
#	src/backoffice/shared/components/input-document-type-picker/input-document-type-picker.element.ts
#	src/backoffice/shared/components/tree/tree-item.context.interface.ts
#	src/backoffice/shared/components/workspace/workspace-context/workspace-context.ts
#	src/backoffice/shared/components/workspace/workspace-context/workspace-property-structure-manager.class.ts
#	src/backoffice/shared/components/workspace/workspace-variant/workspace-variant.context.ts
#	src/backoffice/shared/modals/template/template-modal.element.ts
#	src/backoffice/templating/stylesheets/repository/manifests.ts
#	src/backoffice/templating/stylesheets/workspace/stylesheet-workspace.context.ts

src/Umbraco.Web.UI.Client/libs/modal/modal-handler.ts

@@ -10,7 +10,7 @@ import { UmbModalConfig, UmbModalType } from './modal.context';
 import { UmbModalToken } from './token/modal-token';
 import { createExtensionElement, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extensions-api';
 import { UmbObserverController } from '@umbraco-cms/backoffice/observable-api';
-import type { UmbControllerHostInterface } from '@umbraco-cms/backoffice/controller';
+import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller';
 import type { ManifestModal } from '@umbraco-cms/backoffice/extensions-registry';
 
 /**
@@ -42,7 +42,7 @@ export class UmbModalHandlerClass<ModalData extends object = object, ModalResult
 	private _submitPromise: Promise<ModalResult>;
 	private _submitResolver?: (value: ModalResult) => void;
 	private _submitRejecter?: () => void;
-	#host: UmbControllerHostInterface;
+	#host: UmbControllerHostElement;
 
 	public modalElement: UUIModalDialogElement | UUIModalSidebarElement;
 
@@ -56,7 +56,7 @@ export class UmbModalHandlerClass<ModalData extends object = object, ModalResult
 	public size: UUIModalSidebarSize = 'small';
 
 	constructor(
-		host: UmbControllerHostInterface,
+		host: UmbControllerHostElement,
 		modalAlias: string | UmbModalToken<ModalData, ModalResult>,
 		data?: ModalData,
 		config?: UmbModalConfig

src/Umbraco.Web.UI.Client/libs/modal/modal-route-registration.controller.ts

@@ -1,7 +1,7 @@
 // TODO: Be aware here we import a class from src!
 import { UMB_ROUTE_CONTEXT_TOKEN } from '../router/route.context';
-import type { UmbControllerHostInterface, UmbControllerInterface } from '../controller';
 import { UmbModalRouteRegistration } from './modal-route-registration';
+import type { UmbControllerHostElement, UmbControllerInterface } from '@umbraco-cms/backoffice/controller';
 import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
 import { UmbModalConfig, UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
@@ -22,7 +22,7 @@ export class UmbModalRouteRegistrationController<D extends object = object, R =
 	}
 
 	constructor(
-		host: UmbControllerHostInterface,
+		host: UmbControllerHostElement,
 		alias: UmbModalToken<D, R> | string,
 		path: string,
 		uniqueParts?: Map<string, string | undefined> | null,

src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts

@@ -6,7 +6,7 @@ import { BehaviorSubject } from 'rxjs';
 import { UmbModalHandler, UmbModalHandlerClass } from './modal-handler';
 import type { UmbModalToken } from './token/modal-token';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
-import { UmbControllerHostInterface } from '@umbraco-cms/backoffice/controller';
+import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller';
 
 export type UmbModalType = 'dialog' | 'sidebar';
 
@@ -19,12 +19,12 @@ export interface UmbModalConfig {
 // TODO: we should find a way to easily open a modal without adding custom methods to this context. It would result in a better separation of concerns.
 // TODO: move all layouts into their correct "silo" folders. User picker should live with users etc.
 export class UmbModalContext {
-	host: UmbControllerHostInterface;
+	host: UmbControllerHostElement;
 	// TODO: Investigate if we can get rid of HTML elements in our store, so we can use one of our states.
 	#modals = new BehaviorSubject(<Array<UmbModalHandler>>[]);
 	public readonly modals = this.#modals.asObservable();
 
-	constructor(host: UmbControllerHostInterface) {
+	constructor(host: UmbControllerHostElement) {
 		this.host = host;
 	}