From b27fae1373861d6eab4e121cbd1b4dde53a1b708 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Wed, 3 Jan 2024 11:38:30 +0100
Subject: [PATCH 01/31] culture and hostnames

---
 .../culture-and-hostnames-modal.token.ts      |  25 +++
 .../src/packages/core/modal/token/index.ts    |   1 +
 .../culture-and-hostnames.action.ts           |  14 --
 .../culture-and-hostnames-domain.element.ts   |   0
 .../culture-and-hostnames-modal.element.ts    | 178 ++++++++++++++++++
 .../culture-and-hostnames.action.ts           |  38 ++++
 .../culture-and-hostnames/manifests.ts        |  31 +++
 .../documents/entity-actions/manifests.ts     |   5 +-
 8 files changed, 277 insertions(+), 15 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/modal/token/culture-and-hostnames-modal.token.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames.action.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-domain.element.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-modal.element.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/culture-and-hostnames-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/culture-and-hostnames-modal.token.ts
new file mode 100644
index 0000000000..9e23f9f0b8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/culture-and-hostnames-modal.token.ts
@@ -0,0 +1,25 @@
+import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
+
+export interface UmbCultureAndHostnamesModalData {
+	unique: string | null;
+	culture?: string | null;
+}
+
+export interface UmbCultureAndHostnamesModalValue {
+	data: Array<CultureAndHostnames>;
+}
+
+export interface CultureAndHostnames {
+	hostname: string;
+	culture: string;
+}
+
+export const UMB_CULTURE_AND_HOSTNAMES_MODAL = new UmbModalToken<
+	UmbCultureAndHostnamesModalData,
+	UmbCultureAndHostnamesModalValue
+>('Umb.Modal.CultureAndHostnames', {
+	modal: {
+		type: 'sidebar',
+		size: 'small',
+	},
+});
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/index.ts
index b6302f9905..aceb336063 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/index.ts
@@ -5,6 +5,7 @@ export * from './create-dictionary-modal.token.js';
 export * from './create-document-modal.token.js';
 export * from './create-user-modal.token.js';
 export * from './create-user-success-modal.token.js';
+export * from './culture-and-hostnames-modal.token.js';
 export * from './current-user-modal.token.js';
 export * from './data-type-picker-flow-data-type-picker-modal.token.js';
 export * from './data-type-picker-flow-modal.token.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames.action.ts
deleted file mode 100644
index 01932ae60e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames.action.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { UmbDocumentRepository } from '../repository/document.repository.js';
-import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
-import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
-
-export class UmbDocumentCultureAndHostnamesEntityAction extends UmbEntityActionBase<UmbDocumentRepository> {
-	constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) {
-		super(host, repositoryAlias, unique);
-	}
-
-	async execute() {
-		console.log(`execute for: ${this.unique}`);
-		await this.repository?.setCultureAndHostnames();
-	}
-}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-domain.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-domain.element.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-modal.element.ts
new file mode 100644
index 0000000000..102c4a26ea
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-modal.element.ts
@@ -0,0 +1,178 @@
+import { html, customElement, state, css, query, repeat } from '@umbraco-cms/backoffice/external/lit';
+import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
+import {
+	CultureAndHostnames,
+	UmbCultureAndHostnamesModalData,
+	UmbCultureAndHostnamesModalValue,
+	UmbModalBaseElement,
+} from '@umbraco-cms/backoffice/modal';
+import { UUIInputEvent, UUISelectEvent } from '@umbraco-cms/backoffice/external/uui';
+
+@customElement('umb-culture-and-hostnames-modal')
+export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
+	UmbCultureAndHostnamesModalData,
+	UmbCultureAndHostnamesModalValue
+> {
+	#unique?: string | null;
+
+	@state()
+	private _cultureOptions: Array<Option> = [{ name: 'Inherit', value: 'inherit', selected: true }];
+
+	@state()
+	private _domains: Array<CultureAndHostnames> = [];
+
+	constructor() {
+		super();
+		this.#getCultureAndDomains();
+	}
+
+	async #getCultureAndDomains() {
+		// TODO get this documents culture and domains data via repository
+	}
+
+	firstUpdated() {
+		this.#unique = this.data?.unique;
+	}
+
+	connectedCallback(): void {
+		super.connectedCallback();
+		if (!this.modalContext) return;
+
+		this.observe(this.modalContext.value, (value) => {
+			if (value) this._domains = value.data;
+		});
+	}
+
+	#handleCancel() {
+		this.modalContext?.reject();
+	}
+	#handleSave() {
+		// TODO validation before submitting
+		this.modalContext?.submit();
+	}
+
+	#addDomain(currentDomain?: boolean) {
+		if (currentDomain) {
+			this._domains = [...this._domains, { culture: 'en-us', hostname: window.location.host }];
+		} else {
+			this._domains = [...this._domains, { culture: 'en-us', hostname: '' }];
+		}
+
+		this.value = { data: this._domains };
+	}
+
+	#remove(index: number) {
+		this._domains = this._domains.filter((_, i) => i !== index);
+	}
+
+	#changeHostname(e: UUIInputEvent, index: number) {
+		this._domains[index] = { ...this._domains[index], hostname: e.target.value as string };
+	}
+
+	#changeCulture(e: UUISelectEvent, index: number) {
+		this._domains[index] = { ...this._domains[index], culture: e.target.value as string };
+	}
+
+	render() {
+		return html`
+			<umb-body-layout headline=${this.localize.term('actions_assigndomain')}>
+				<uui-box>
+					<h2>Culture</h2>
+					<uui-label for="select">${this.localize.term('assignDomain_language')}</uui-label>
+					<uui-select
+						id="select"
+						label=${this.localize.term('assignDomain_language')}
+						.options=${this._cultureOptions}></uui-select>
+
+					<h2>Domains</h2>
+					<p>
+						<umb-localize key="assignDomain_domainHelpWithVariants">
+							Valid domain names are: "example.com", "www.example.com", "example.com:8080", or
+							"https://www.example.com/".<br />Furthermore also one-level paths in domains are supported, eg.
+							"example.com/en" or "/en".
+						</umb-localize>
+					</p>
+					${this.#renderDomains()}
+					<uui-button-group>
+						<uui-button
+							label=${this.localize.term('assignDomain_addNew')}
+							look="placeholder"
+							@click=${() => this.#addDomain()}></uui-button>
+						<uui-button
+							id="dropdown"
+							label=${this.localize.term('buttons_select')}
+							look="placeholder"
+							compact
+							@click=${() => this.#addDomain(true)}>
+							<uui-icon name="icon-navigation-down"></uui-icon>
+						</uui-button>
+					</uui-button-group>
+				</uui-box>
+				<uui-button
+					slot="actions"
+					id="cancel"
+					label=${this.localize.term('buttons_confirmActionCancel')}
+					@click="${this.#handleCancel}"></uui-button>
+				<uui-button
+					slot="actions"
+					id="save"
+					look="primary"
+					color="positive"
+					label=${this.localize.term('buttons_save')}
+					@click="${this.#handleSave}"></uui-button>
+			</umb-body-layout>
+		`;
+	}
+
+	#renderDomains() {
+		return html` ${repeat(
+			this._domains,
+			(domain, index) => domain.hostname + domain.culture + index,
+			(domain, index) =>
+				html`<uui-button-group class="domain">
+					<uui-input
+						label=${this.localize.term('assignDomain_domain')}
+						value=${domain.hostname}
+						@change=${(e: UUIInputEvent) => this.#changeHostname(e, index)}></uui-input>
+					<uui-select
+						label=${this.localize.term('assignDomain_language')}
+						.options=${this._cultureOptions}></uui-select>
+					<uui-button look="outline" color="danger" label=${this.localize.term('assignDomain_remove')} compact>
+						<uui-icon name="icon-trash" @click=${() => this.#remove(index)}></uui-icon>
+					</uui-button>
+				</uui-button-group>`,
+		)}`;
+	}
+
+	static styles = [
+		UmbTextStyles,
+		css`
+			uui-button-group {
+				width: 100%;
+			}
+
+			#dropdown {
+				flex-grow: 0;
+			}
+
+			uui-select {
+				display: grid;
+			}
+
+			.domain {
+				display: grid;
+				margin-bottom: var(--uui-size-2);
+				grid-template-columns: 1fr 1fr auto;
+				background-color: var(--uui-interface-surface-alt);
+			}
+		`,
+	];
+}
+
+export default UmbCultureAndHostnamesModalElement;
+
+declare global {
+	interface HTMLElementTagNameMap {
+		'umb-culture-and-hostnames-modal': UmbCultureAndHostnamesModalElement;
+	}
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
new file mode 100644
index 0000000000..d77aecb887
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
@@ -0,0 +1,38 @@
+import { UmbDocumentRepository } from '../../repository/document.repository.js';
+import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
+import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
+import {
+	UmbModalManagerContext,
+	UMB_MODAL_MANAGER_CONTEXT_TOKEN,
+	UMB_CULTURE_AND_HOSTNAMES_MODAL as UMB_CULTURE_AND_HOSTNAMES_MODAL,
+} from '@umbraco-cms/backoffice/modal';
+
+export class UmbDocumentCultureAndHostnamesEntityAction extends UmbEntityActionBase<UmbDocumentRepository> {
+	#modalContext?: UmbModalManagerContext;
+
+	constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) {
+		super(host, repositoryAlias, unique);
+
+		this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
+			this.#modalContext = instance;
+		});
+	}
+
+	async execute() {
+		console.log(`execute for: ${this.unique}`);
+		//await this.repository?.setCultureAndHostnames();
+
+		if (!this.repository) return;
+		this._openModal(this.unique || null);
+	}
+
+	private async _openModal(unique: string | null) {
+		if (!this.#modalContext) return;
+		const modalContext = this.#modalContext.open(UMB_CULTURE_AND_HOSTNAMES_MODAL, {
+			data: { unique },
+		});
+
+		const { data } = await modalContext.onSubmit();
+		console.table(data);
+	}
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts
new file mode 100644
index 0000000000..9ce79086f8
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts
@@ -0,0 +1,31 @@
+import { UMB_DOCUMENT_REPOSITORY_ALIAS } from '../../repository/manifests.js';
+import { UMB_DOCUMENT_ENTITY_TYPE } from '../../entity.js';
+import { UmbDocumentCultureAndHostnamesEntityAction } from './culture-and-hostnames.action.js';
+import { ManifestEntityAction, ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+
+const entityActions: Array<ManifestEntityAction> = [
+	{
+		type: 'entityAction',
+		alias: 'Umb.EntityAction.Document.CultureAndHostnames',
+		name: 'Culture And Hostnames Document Entity Action',
+		weight: 400,
+		api: UmbDocumentCultureAndHostnamesEntityAction,
+		meta: {
+			icon: 'icon-home',
+			label: 'Culture and Hostnames',
+			repositoryAlias: UMB_DOCUMENT_REPOSITORY_ALIAS,
+			entityTypes: [UMB_DOCUMENT_ENTITY_TYPE],
+		},
+	},
+];
+
+const modals: Array<ManifestModal> = [
+	{
+		type: 'modal',
+		alias: 'Umb.Modal.CultureAndHostnames',
+		name: 'Create Document Modal',
+		js: () => import('./culture-and-hostnames-modal.element.js'),
+	},
+];
+
+export const manifests = [...entityActions, ...modals];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts
index 1c66694255..6f99c11fad 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts
@@ -1,13 +1,13 @@
 import { UMB_DOCUMENT_REPOSITORY_ALIAS } from '../repository/manifests.js';
 import { UMB_DOCUMENT_ENTITY_TYPE, UMB_DOCUMENT_ROOT_ENTITY_TYPE } from '../entity.js';
 import { UmbPublishDocumentEntityAction } from './publish.action.js';
-import { UmbDocumentCultureAndHostnamesEntityAction } from './culture-and-hostnames.action.js';
 import { UmbCreateDocumentBlueprintEntityAction } from './create-blueprint.action.js';
 import { UmbDocumentPublicAccessEntityAction } from './public-access.action.js';
 import { UmbUnpublishDocumentEntityAction } from './unpublish.action.js';
 import { UmbRollbackDocumentEntityAction } from './rollback.action.js';
 import { manifests as createManifests } from './create/manifests.js';
 import { manifests as permissionManifests } from './permissions/manifests.js';
+import { manifests as cultureAndHostnamesManifests } from './culture-and-hostnames/manifests.js';
 import {
 	UmbCopyEntityAction,
 	UmbMoveEntityAction,
@@ -18,6 +18,7 @@ import { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 const entityActions: Array<ManifestTypes> = [
 	...createManifests,
 	...permissionManifests,
+	...cultureAndHostnamesManifests,
 	{
 		type: 'entityAction',
 		alias: 'Umb.EntityAction.Document.CreateBlueprint',
@@ -70,6 +71,7 @@ const entityActions: Array<ManifestTypes> = [
 			entityTypes: [UMB_DOCUMENT_ROOT_ENTITY_TYPE, UMB_DOCUMENT_ENTITY_TYPE],
 		},
 	},
+	/*
 	{
 		type: 'entityAction',
 		alias: 'Umb.EntityAction.Document.CultureAndHostnames',
@@ -83,6 +85,7 @@ const entityActions: Array<ManifestTypes> = [
 			entityTypes: [UMB_DOCUMENT_ENTITY_TYPE],
 		},
 	},
+	*/
 	{
 		type: 'entityAction',
 		alias: 'Umb.EntityAction.Document.PublicAccess',

From bb32627b30fb9903b78ea4c109937eb89551fa08 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 18 Jan 2024 13:52:07 +0100
Subject: [PATCH 02/31] using repository

---
 .../DomainsPresentationModelBaseModel.ts      |   2 +-
 .../src/mocks/data/document.data.ts           |  21 +++
 .../handlers/document/document.handlers.ts    |  16 ++
 .../culture-and-hostnames-modal.token.ts      |   9 +-
 .../culture-and-hostnames-modal.element.ts    | 163 +++++++++++-------
 .../culture-and-hostnames.action.ts           |   5 +-
 .../repository/document.repository.ts         |  24 ++-
 .../sources/document.server.data.ts           |  17 ++
 8 files changed, 187 insertions(+), 70 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/DomainsPresentationModelBaseModel.ts b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/DomainsPresentationModelBaseModel.ts
index 193e811957..363b8a2aac 100644
--- a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/DomainsPresentationModelBaseModel.ts
+++ b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/DomainsPresentationModelBaseModel.ts
@@ -6,7 +6,7 @@
 import type { DomainPresentationModel } from './DomainPresentationModel';
 
 export type DomainsPresentationModelBaseModel = {
-    defaultIsoCode?: string | null;
+    defaultIsoCode: string;
     domains: Array<DomainPresentationModel>;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/document.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/document.data.ts
index 2073ead14a..7c3e746123 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/document.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/document.data.ts
@@ -9,6 +9,8 @@ import {
 	DocumentResponseModel,
 	DocumentTreeItemResponseModel,
 	DocumentTypeResponseModel,
+	DomainsPresentationModelBaseModel,
+	DomainsResponseModel,
 	PagedDocumentTreeItemResponseModel,
 	PagedDocumentTypeResponseModel,
 	PagedRecycleBinItemResponseModel,
@@ -17,6 +19,16 @@ import {
 } from '@umbraco-cms/backoffice/backend-api';
 import { UMB_DOCUMENT_ENTITY_TYPE } from '@umbraco-cms/backoffice/document';
 
+export const domainData: DomainsResponseModel = {
+	defaultIsoCode: 'en',
+	domains: [
+		{
+			isoCode: 'en',
+			domainName: 'google.com',
+		},
+	],
+};
+
 export const data: Array<DocumentResponseModel> = [
 	{
 		urls: [
@@ -723,6 +735,7 @@ const createDocumentItem = (item: DocumentResponseModel): DocumentItemResponseMo
 // @ts-ignore
 class UmbDocumentData extends UmbEntityData<DocumentResponseModel> {
 	private treeData = treeData;
+	private domainData = domainData;
 
 	constructor() {
 		super(data);
@@ -874,6 +887,14 @@ class UmbDocumentData extends UmbEntityData<DocumentResponseModel> {
 					permission.target.entityType === UMB_DOCUMENT_ENTITY_TYPE && permission.target.documentId === id,
 			);
 	}
+
+	// domains
+	getDomains(id: string): DomainsResponseModel {
+		return this.domainData;
+	}
+	setDomains(id: string, data: DomainsPresentationModelBaseModel) {
+		this.domainData = data;
+	}
 }
 
 const mapToDocumentType = (item: UmbMockDocumentTypeModel): DocumentTypeResponseModel => {
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/document.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/document.handlers.ts
index 6db43aa751..46d2db6629 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/document.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/document.handlers.ts
@@ -69,4 +69,20 @@ export const handlers = [
 		umbDocumentData.insert(data);
 		return res(ctx.status(200));
 	}),
+
+	rest.get(umbracoPath('/document/:id/domains'), (req, res, ctx) => {
+		const id = req.params.id as string;
+		if (!id) return;
+		const response = umbDocumentData.getDomains(id);
+		return res(ctx.status(200), ctx.json(response));
+	}),
+
+	rest.put(umbracoPath('/document/:id/domains'), async (req, res, ctx) => {
+		const id = req.params.id as string;
+		if (!id) return;
+		const data = await req.json();
+		if (!data) return;
+		umbDocumentData.setDomains(id, data);
+		return res(ctx.status(200));
+	}),
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/culture-and-hostnames-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/culture-and-hostnames-modal.token.ts
index 9e23f9f0b8..4f52f2abda 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/culture-and-hostnames-modal.token.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/culture-and-hostnames-modal.token.ts
@@ -1,3 +1,4 @@
+import { DomainPresentationModel } from '@umbraco-cms/backoffice/backend-api';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbCultureAndHostnamesModalData {
@@ -6,12 +7,8 @@ export interface UmbCultureAndHostnamesModalData {
 }
 
 export interface UmbCultureAndHostnamesModalValue {
-	data: Array<CultureAndHostnames>;
-}
-
-export interface CultureAndHostnames {
-	hostname: string;
-	culture: string;
+	defaultIsoCode?: string | null;
+	domains: Array<DomainPresentationModel>;
 }
 
 export const UMB_CULTURE_AND_HOSTNAMES_MODAL = new UmbModalToken<
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-modal.element.ts
index 102c4a26ea..99c3c4bc3d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-modal.element.ts
@@ -1,90 +1,125 @@
-import { html, customElement, state, css, query, repeat } from '@umbraco-cms/backoffice/external/lit';
+import { UmbDocumentRepository } from '../../repository/document.repository.js';
+import { html, customElement, state, css, repeat } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import {
-	CultureAndHostnames,
 	UmbCultureAndHostnamesModalData,
 	UmbCultureAndHostnamesModalValue,
 	UmbModalBaseElement,
 } from '@umbraco-cms/backoffice/modal';
 import { UUIInputEvent, UUISelectEvent } from '@umbraco-cms/backoffice/external/uui';
+import { UmbLanguageRepository } from '@umbraco-cms/backoffice/language';
+import { DomainPresentationModel, LanguageResponseModel } from '@umbraco-cms/backoffice/backend-api';
 
 @customElement('umb-culture-and-hostnames-modal')
 export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 	UmbCultureAndHostnamesModalData,
 	UmbCultureAndHostnamesModalValue
 > {
+	#documentRepository = new UmbDocumentRepository(this);
+	#languageRepository = new UmbLanguageRepository(this);
+
 	#unique?: string | null;
+	#defaultIsoCode = '';
+	#languageModel: Array<LanguageResponseModel> = [];
 
 	@state()
-	private _cultureOptions: Array<Option> = [{ name: 'Inherit', value: 'inherit', selected: true }];
+	private _options: Array<Option> = [];
 
 	@state()
-	private _domains: Array<CultureAndHostnames> = [];
-
-	constructor() {
-		super();
-		this.#getCultureAndDomains();
-	}
-
-	async #getCultureAndDomains() {
-		// TODO get this documents culture and domains data via repository
-	}
-
-	firstUpdated() {
-		this.#unique = this.data?.unique;
-	}
-
-	connectedCallback(): void {
-		super.connectedCallback();
-		if (!this.modalContext) return;
-
-		this.observe(this.modalContext.value, (value) => {
-			if (value) this._domains = value.data;
-		});
-	}
+	private _domains: Array<DomainPresentationModel> = [];
 
 	#handleCancel() {
 		this.modalContext?.reject();
 	}
 	#handleSave() {
 		// TODO validation before submitting
+		this.#documentRepository.saveCultureAndHostnames(this.#unique!, this.value);
 		this.modalContext?.submit();
 	}
 
+	async firstUpdated() {
+		this.#unique = this.data?.unique;
+		await this.#getDomains(); // Domains before Language as it is needed to set the pre selected value for language options
+		await this.#getLanguages();
+	}
+
+	async #getDomains() {
+		if (!this.#unique) return;
+		const { data } = await this.#documentRepository.getCultureAndHostnames(this.#unique);
+
+		if (!data) return;
+		this.#defaultIsoCode = data.defaultIsoCode ?? '';
+		this._domains = data.domains.map((domain) => ({ isoCode: domain.isoCode, domainName: domain.domainName }));
+
+		this.value = { defaultIsoCode: data.defaultIsoCode, domains: this._domains };
+		return;
+	}
+
+	async #getLanguages() {
+		const { data } = await this.#languageRepository.requestLanguages();
+		if (!data) return;
+
+		this.#languageModel = data.items;
+
+		const options = data.items.map((item) => ({
+			name: item.name,
+			selected: item.isoCode === this.#defaultIsoCode,
+			value: item.isoCode,
+		}));
+		options.unshift({ value: 'inherit', name: 'Inherit', selected: this.#defaultIsoCode ? false : true });
+		this._options = options;
+
+		return;
+	}
+
+	#onChangeLanguage(e: UUISelectEvent) {
+		//save new language
+		this.value = { ...this.value, defaultIsoCode: e.target.value as string };
+	}
+
 	#addDomain(currentDomain?: boolean) {
 		if (currentDomain) {
-			this._domains = [...this._domains, { culture: 'en-us', hostname: window.location.host }];
+			this._domains = [...this._domains, { isoCode: this.#defaultIsoCode, domainName: window.location.host }];
 		} else {
-			this._domains = [...this._domains, { culture: 'en-us', hostname: '' }];
+			this._domains = [...this._domains, { isoCode: this.#defaultIsoCode, domainName: '' }];
 		}
 
-		this.value = { data: this._domains };
+		this.value = { ...this.value, domains: this._domains };
 	}
 
 	#remove(index: number) {
-		this._domains = this._domains.filter((_, i) => i !== index);
+		this._domains = this._domains.filter((d, i) => index !== i);
+
+		this.value = { ...this.value, domains: this._domains };
 	}
 
-	#changeHostname(e: UUIInputEvent, index: number) {
-		this._domains[index] = { ...this._domains[index], hostname: e.target.value as string };
+	#changeDomainName(e: UUIInputEvent, index: number) {
+		const domainName = e.target.value as string;
+		this._domains = this._domains.map((domain, i) => (index === i ? { ...domain, domainName: domainName } : domain));
+
+		this.value = { ...this.value, domains: this._domains };
 	}
 
-	#changeCulture(e: UUISelectEvent, index: number) {
-		this._domains[index] = { ...this._domains[index], culture: e.target.value as string };
+	#changeIsoCode(e: UUISelectEvent, index: number) {
+		const isoCode = e.target.value as string;
+		this._domains = this._domains.map((domain, i) => (index === i ? { ...domain, isoCode: isoCode } : domain));
+
+		this.value = { ...this.value, domains: this._domains };
 	}
 
 	render() {
 		return html`
 			<umb-body-layout headline=${this.localize.term('actions_assigndomain')}>
 				<uui-box>
-					<h2>Culture</h2>
+					<h2><umb-localize key="assignDomain_setLanguage">Culture</umb-localize></h2>
 					<uui-label for="select">${this.localize.term('assignDomain_language')}</uui-label>
 					<uui-select
 						id="select"
 						label=${this.localize.term('assignDomain_language')}
-						.options=${this._cultureOptions}></uui-select>
+						@change=${this.#onChangeLanguage}
+						.options=${this._options}></uui-select>
 
-					<h2>Domains</h2>
+					<h2><umb-localize key="assignDomain_setDomains">Domains</umb-localize></h2>
 					<p>
 						<umb-localize key="assignDomain_domainHelpWithVariants">
 							Valid domain names are: "example.com", "www.example.com", "example.com:8080", or
@@ -92,21 +127,7 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 							"example.com/en" or "/en".
 						</umb-localize>
 					</p>
-					${this.#renderDomains()}
-					<uui-button-group>
-						<uui-button
-							label=${this.localize.term('assignDomain_addNew')}
-							look="placeholder"
-							@click=${() => this.#addDomain()}></uui-button>
-						<uui-button
-							id="dropdown"
-							label=${this.localize.term('buttons_select')}
-							look="placeholder"
-							compact
-							@click=${() => this.#addDomain(true)}>
-							<uui-icon name="icon-navigation-down"></uui-icon>
-						</uui-button>
-					</uui-button-group>
+					${this.#renderDomains()} ${this.#renderAddNewDomainButton()}
 				</uui-box>
 				<uui-button
 					slot="actions"
@@ -127,23 +148,47 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 	#renderDomains() {
 		return html` ${repeat(
 			this._domains,
-			(domain, index) => domain.hostname + domain.culture + index,
-			(domain, index) =>
-				html`<uui-button-group class="domain">
+			(domain) => domain,
+			(domain, index) => {
+				const options = this.#languageModel.map((model) => ({
+					name: model.name,
+					value: model.isoCode,
+					selected: domain.isoCode ? domain.isoCode === model.isoCode : model.isDefault,
+				}));
+				return html`<uui-button-group class="domain">
 					<uui-input
 						label=${this.localize.term('assignDomain_domain')}
-						value=${domain.hostname}
-						@change=${(e: UUIInputEvent) => this.#changeHostname(e, index)}></uui-input>
+						value=${domain.domainName}
+						@change=${(e: UUIInputEvent) => this.#changeDomainName(e, index)}></uui-input>
 					<uui-select
 						label=${this.localize.term('assignDomain_language')}
-						.options=${this._cultureOptions}></uui-select>
+						.options=${options}
+						@change=${(e: UUISelectEvent) => this.#changeIsoCode(e, index)}></uui-select>
 					<uui-button look="outline" color="danger" label=${this.localize.term('assignDomain_remove')} compact>
 						<uui-icon name="icon-trash" @click=${() => this.#remove(index)}></uui-icon>
 					</uui-button>
-				</uui-button-group>`,
+				</uui-button-group>`;
+			},
 		)}`;
 	}
 
+	#renderAddNewDomainButton() {
+		return html`<uui-button-group>
+			<uui-button
+				label=${this.localize.term('assignDomain_addNew')}
+				look="placeholder"
+				@click=${() => this.#addDomain()}></uui-button>
+			<uui-button
+				id="dropdown"
+				label=${this.localize.term('buttons_select')}
+				look="placeholder"
+				compact
+				@click=${() => this.#addDomain(true)}>
+				<uui-icon name="icon-navigation-down"></uui-icon>
+			</uui-button>
+		</uui-button-group>`;
+	}
+
 	static styles = [
 		UmbTextStyles,
 		css`
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
index d77aecb887..a33d836c09 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
@@ -32,7 +32,8 @@ export class UmbDocumentCultureAndHostnamesEntityAction extends UmbEntityActionB
 			data: { unique },
 		});
 
-		const { data } = await modalContext.onSubmit();
-		console.table(data);
+		const { defaultIsoCode, domains } = await modalContext.onSubmit();
+		console.log(defaultIsoCode);
+		console.table(domains);
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.repository.ts
index e4d22685cc..7fa3d62b04 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.repository.ts
@@ -277,8 +277,28 @@ export class UmbDocumentRepository
 		alert('sort');
 	}
 
-	async setCultureAndHostnames() {
-		alert('set culture and hostnames');
+	async getCultureAndHostnames(id: string) {
+		if (!id) throw new Error('Id is missing');
+		await this.#init;
+
+		const { data, error } = await this.#detailDataSource.getDomains(id);
+		if (!error) {
+			return { data };
+		}
+		return { error };
+	}
+
+	async saveCultureAndHostnames(id: string, data: any) {
+		if (!id) throw new Error('Id is missing');
+		if (!data) throw new Error('Data is missing');
+		await this.#init;
+
+		const { error } = await this.#detailDataSource.setDomains(id, data);
+		if (!error) {
+			const notification = { data: { message: `Cultures and hostnames saved` } };
+			this.#notificationContext?.peek('positive', notification);
+		}
+		return { error };
 	}
 
 	async setPermissions() {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/sources/document.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/sources/document.server.data.ts
index 805240d798..a0cefd7329 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/sources/document.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/sources/document.server.data.ts
@@ -8,6 +8,8 @@ import {
 	UpdateDocumentRequestModel,
 	PublishDocumentRequestModel,
 	UnpublishDocumentRequestModel,
+	DomainPresentationModel,
+	DomainsPresentationModelBaseModel,
 } from '@umbraco-cms/backoffice/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
@@ -191,4 +193,19 @@ export class UmbDocumentServerDataSource
 		// TODO: Notice, here we need to implement pagination.
 		return tryExecuteAndNotify(this.#host, DocumentResource.getDocumentAllowedDocumentTypes({ parentId: hackId }));
 	}
+
+	/**
+	 * Fetches the Document Domains from the given Document id
+	 * @param {string} id
+	 * @memberof UmbDocumentTypeServerDataSource
+	 */
+	async getDomains(id: string) {
+		if (!id) throw new Error('Id is missing');
+		return tryExecuteAndNotify(this.#host, DocumentResource.getDocumentByIdDomains({ id }));
+	}
+
+	async setDomains(id: string, data: DomainsPresentationModelBaseModel) {
+		if (!id) throw new Error('Id is missing');
+		return tryExecuteAndNotify(this.#host, DocumentResource.putDocumentByIdDomains({ id, requestBody: data }));
+	}
 }

From 6c0dd7f7d1de33e7d3e62a45f331f667b818f6f0 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 18 Jan 2024 14:00:50 +0100
Subject: [PATCH 03/31] fix default iso code to work on server

---
 .../culture-and-hostnames-modal.element.ts    | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-modal.element.ts
index 99c3c4bc3d..aa49bbcbe5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-modal.element.ts
@@ -19,7 +19,6 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 	#languageRepository = new UmbLanguageRepository(this);
 
 	#unique?: string | null;
-	#defaultIsoCode = '';
 	#languageModel: Array<LanguageResponseModel> = [];
 
 	@state()
@@ -37,10 +36,9 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 		this.modalContext?.submit();
 	}
 
-	async firstUpdated() {
+	firstUpdated() {
 		this.#unique = this.data?.unique;
-		await this.#getDomains(); // Domains before Language as it is needed to set the pre selected value for language options
-		await this.#getLanguages();
+		this.#getDomains();
 	}
 
 	async #getDomains() {
@@ -48,14 +46,13 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 		const { data } = await this.#documentRepository.getCultureAndHostnames(this.#unique);
 
 		if (!data) return;
-		this.#defaultIsoCode = data.defaultIsoCode ?? '';
 		this._domains = data.domains.map((domain) => ({ isoCode: domain.isoCode, domainName: domain.domainName }));
 
 		this.value = { defaultIsoCode: data.defaultIsoCode, domains: this._domains };
-		return;
+		this.#getLanguages(data.defaultIsoCode);
 	}
 
-	async #getLanguages() {
+	async #getLanguages(defaultIsoCode?: string) {
 		const { data } = await this.#languageRepository.requestLanguages();
 		if (!data) return;
 
@@ -63,25 +60,23 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 
 		const options = data.items.map((item) => ({
 			name: item.name,
-			selected: item.isoCode === this.#defaultIsoCode,
+			selected: item.isoCode === defaultIsoCode,
 			value: item.isoCode,
 		}));
-		options.unshift({ value: 'inherit', name: 'Inherit', selected: this.#defaultIsoCode ? false : true });
+		options.unshift({ value: 'inherit', name: 'Inherit', selected: defaultIsoCode ? false : true });
 		this._options = options;
-
-		return;
 	}
 
 	#onChangeLanguage(e: UUISelectEvent) {
-		//save new language
 		this.value = { ...this.value, defaultIsoCode: e.target.value as string };
 	}
 
 	#addDomain(currentDomain?: boolean) {
+		const defaultModel = this.#languageModel.find((model) => model.isDefault);
 		if (currentDomain) {
-			this._domains = [...this._domains, { isoCode: this.#defaultIsoCode, domainName: window.location.host }];
+			this._domains = [...this._domains, { isoCode: defaultModel?.isoCode ?? '', domainName: window.location.host }];
 		} else {
-			this._domains = [...this._domains, { isoCode: this.#defaultIsoCode, domainName: '' }];
+			this._domains = [...this._domains, { isoCode: defaultModel?.isoCode ?? '', domainName: '' }];
 		}
 
 		this.value = { ...this.value, domains: this._domains };

From 404222864212e47ed32ae3ea23cc42ac531c8dd0 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 18 Jan 2024 14:12:36 +0100
Subject: [PATCH 04/31] fix save issue on default iso code, change uui-box

---
 .../culture-and-hostnames-modal.element.ts    | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-modal.element.ts
index aa49bbcbe5..c9d60e732e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-modal.element.ts
@@ -68,7 +68,12 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 	}
 
 	#onChangeLanguage(e: UUISelectEvent) {
-		this.value = { ...this.value, defaultIsoCode: e.target.value as string };
+		const documentIsoCode = e.target.value as string;
+		if (documentIsoCode === 'inherit') {
+			this.value = { ...this.value, defaultIsoCode: undefined };
+		} else {
+			this.value = { ...this.value, defaultIsoCode: e.target.value as string };
+		}
 	}
 
 	#addDomain(currentDomain?: boolean) {
@@ -105,23 +110,20 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 	render() {
 		return html`
 			<umb-body-layout headline=${this.localize.term('actions_assigndomain')}>
-				<uui-box>
-					<h2><umb-localize key="assignDomain_setLanguage">Culture</umb-localize></h2>
+				<uui-box headline=${this.localize.term('assignDomain_setLanguage')}>
 					<uui-label for="select">${this.localize.term('assignDomain_language')}</uui-label>
 					<uui-select
 						id="select"
 						label=${this.localize.term('assignDomain_language')}
 						@change=${this.#onChangeLanguage}
 						.options=${this._options}></uui-select>
-
-					<h2><umb-localize key="assignDomain_setDomains">Domains</umb-localize></h2>
-					<p>
-						<umb-localize key="assignDomain_domainHelpWithVariants">
-							Valid domain names are: "example.com", "www.example.com", "example.com:8080", or
-							"https://www.example.com/".<br />Furthermore also one-level paths in domains are supported, eg.
-							"example.com/en" or "/en".
-						</umb-localize>
-					</p>
+				</uui-box>
+				<uui-box headline=${this.localize.term('assignDomain_setDomains')}>
+					<umb-localize key="assignDomain_domainHelpWithVariants">
+						Valid domain names are: "example.com", "www.example.com", "example.com:8080", or
+						"https://www.example.com/".<br />Furthermore also one-level paths in domains are supported, eg.
+						"example.com/en" or "/en".
+					</umb-localize>
 					${this.#renderDomains()} ${this.#renderAddNewDomainButton()}
 				</uui-box>
 				<uui-button
@@ -191,6 +193,10 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 				width: 100%;
 			}
 
+			uui-box:first-child {
+				margin-bottom: var(--uui-size-layout-1);
+			}
+
 			#dropdown {
 				flex-grow: 0;
 			}

From 20870f2599e87d3071deff72a15d898bc8443ae6 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 18 Jan 2024 14:24:42 +0100
Subject: [PATCH 05/31] remove leftovers

---
 .../modal/token/culture-and-hostnames-modal.token.ts     | 1 -
 .../culture-and-hostnames-domain.element.ts              | 0
 .../culture-and-hostnames.action.ts                      | 9 +--------
 3 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-domain.element.ts

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/culture-and-hostnames-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/culture-and-hostnames-modal.token.ts
index 4f52f2abda..7b8611d82d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/culture-and-hostnames-modal.token.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/culture-and-hostnames-modal.token.ts
@@ -3,7 +3,6 @@ import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbCultureAndHostnamesModalData {
 	unique: string | null;
-	culture?: string | null;
 }
 
 export interface UmbCultureAndHostnamesModalValue {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-domain.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-domain.element.ts
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
index a33d836c09..b785007e18 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
@@ -19,21 +19,14 @@ export class UmbDocumentCultureAndHostnamesEntityAction extends UmbEntityActionB
 	}
 
 	async execute() {
-		console.log(`execute for: ${this.unique}`);
-		//await this.repository?.setCultureAndHostnames();
-
 		if (!this.repository) return;
 		this._openModal(this.unique || null);
 	}
 
 	private async _openModal(unique: string | null) {
 		if (!this.#modalContext) return;
-		const modalContext = this.#modalContext.open(UMB_CULTURE_AND_HOSTNAMES_MODAL, {
+		this.#modalContext.open(UMB_CULTURE_AND_HOSTNAMES_MODAL, {
 			data: { unique },
 		});
-
-		const { defaultIsoCode, domains } = await modalContext.onSubmit();
-		console.log(defaultIsoCode);
-		console.table(domains);
 	}
 }

From 60e7cee1124875c7baf814d7da0b2c552e94b9a9 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Mon, 22 Jan 2024 13:21:23 +0100
Subject: [PATCH 06/31] revert edit of a file

---
 .../backend-api/src/models/DomainsPresentationModelBaseModel.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/DomainsPresentationModelBaseModel.ts b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/DomainsPresentationModelBaseModel.ts
index 44c265d2ea..d8588d7c51 100644
--- a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/DomainsPresentationModelBaseModel.ts
+++ b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/models/DomainsPresentationModelBaseModel.ts
@@ -6,6 +6,6 @@
 import type { DomainPresentationModel } from './DomainPresentationModel';
 
 export type DomainsPresentationModelBaseModel = {
-    defaultIsoCode: string;
+    defaultIsoCode?: string | null;
     domains: Array<DomainPresentationModel>;
 };

From 122025b9ee949dfe98d06ee500a445d0204f9e97 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Mon, 22 Jan 2024 13:40:47 +0100
Subject: [PATCH 07/31] move modals

---
 .../src/packages/core/modal/token/index.ts          |  1 -
 .../culture-and-hostnames.action.ts                 |  7 ++-----
 .../culture-and-hostnames/manifests.ts              | 13 ++-----------
 .../src/packages/documents/documents/index.ts       |  1 +
 .../src/packages/documents/documents/manifests.ts   |  2 ++
 .../culture-and-hostnames-modal.element.ts          |  9 +++------
 .../culture-and-hostnames-modal.token.ts            |  0
 .../documents/modals/culture-and-hostnames/index.ts |  2 ++
 .../packages/documents/documents/modals/index.ts    |  1 +
 .../documents/documents/modals/manifests.ts         | 12 ++++++++++++
 10 files changed, 25 insertions(+), 23 deletions(-)
 rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{entity-actions => modals}/culture-and-hostnames/culture-and-hostnames-modal.element.ts (96%)
 rename src/Umbraco.Web.UI.Client/src/packages/{core/modal/token => documents/documents/modals/culture-and-hostnames}/culture-and-hostnames-modal.token.ts (100%)
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/index.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/index.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/manifests.ts

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/index.ts
index 481eb23938..2b50aea71b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/index.ts
@@ -5,7 +5,6 @@ export * from './create-dictionary-modal.token.js';
 export * from './create-document-modal.token.js';
 export * from './create-user-modal.token.js';
 export * from './create-user-success-modal.token.js';
-export * from './culture-and-hostnames-modal.token.js';
 export * from './current-user-modal.token.js';
 export * from './data-type-picker-flow-data-type-picker-modal.token.js';
 export * from './data-type-picker-flow-modal.token.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
index b785007e18..9521403d4a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
@@ -1,11 +1,8 @@
 import { UmbDocumentRepository } from '../../repository/document.repository.js';
 import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
-import {
-	UmbModalManagerContext,
-	UMB_MODAL_MANAGER_CONTEXT_TOKEN,
-	UMB_CULTURE_AND_HOSTNAMES_MODAL as UMB_CULTURE_AND_HOSTNAMES_MODAL,
-} from '@umbraco-cms/backoffice/modal';
+import { UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
+import { UMB_CULTURE_AND_HOSTNAMES_MODAL } from '@umbraco-cms/backoffice/document';
 
 export class UmbDocumentCultureAndHostnamesEntityAction extends UmbEntityActionBase<UmbDocumentRepository> {
 	#modalContext?: UmbModalManagerContext;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts
index 9ce79086f8..06a93cac69 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts
@@ -1,7 +1,7 @@
 import { UMB_DOCUMENT_REPOSITORY_ALIAS } from '../../repository/manifests.js';
 import { UMB_DOCUMENT_ENTITY_TYPE } from '../../entity.js';
 import { UmbDocumentCultureAndHostnamesEntityAction } from './culture-and-hostnames.action.js';
-import { ManifestEntityAction, ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import { ManifestEntityAction } from '@umbraco-cms/backoffice/extension-registry';
 
 const entityActions: Array<ManifestEntityAction> = [
 	{
@@ -19,13 +19,4 @@ const entityActions: Array<ManifestEntityAction> = [
 	},
 ];
 
-const modals: Array<ManifestModal> = [
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.CultureAndHostnames',
-		name: 'Create Document Modal',
-		js: () => import('./culture-and-hostnames-modal.element.js'),
-	},
-];
-
-export const manifests = [...entityActions, ...modals];
+export const manifests = [...entityActions];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts
index 6791477575..572fb2c61e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts
@@ -7,6 +7,7 @@ export * from './recycle-bin/index.js';
 export * from './user-permissions/index.js';
 export * from './components/index.js';
 export * from './entity.js';
+export * from './modals/index.js';
 
 export { UMB_DOCUMENT_TREE_ALIAS } from './tree/index.js';
 export { UMB_CONTENT_MENU_ALIAS } from './menu.manifests.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts
index ba7ad261ff..dbd160f8a9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts
@@ -9,6 +9,7 @@ import { manifests as propertyEditorManifests } from './property-editors/manifes
 import { manifests as userPermissionManifests } from './user-permissions/manifests.js';
 import { manifests as recycleBinManifests } from './recycle-bin/manifests.js';
 import { manifests as trackedReferenceManifests } from './tracked-reference/manifests.js';
+import { manifests as modalManifests } from './modals/manifests.js';
 
 export const manifests = [
 	...collectionManifests,
@@ -22,4 +23,5 @@ export const manifests = [
 	...userPermissionManifests,
 	...recycleBinManifests,
 	...trackedReferenceManifests,
+	...modalManifests,
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
similarity index 96%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
index c9d60e732e..1a1eb7f6ca 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
@@ -1,14 +1,11 @@
 import { UmbDocumentRepository } from '../../repository/document.repository.js';
 import { html, customElement, state, css, repeat } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import {
-	UmbCultureAndHostnamesModalData,
-	UmbCultureAndHostnamesModalValue,
-	UmbModalBaseElement,
-} from '@umbraco-cms/backoffice/modal';
+import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import { UUIInputEvent, UUISelectEvent } from '@umbraco-cms/backoffice/external/uui';
 import { UmbLanguageRepository } from '@umbraco-cms/backoffice/language';
 import { DomainPresentationModel, LanguageResponseModel } from '@umbraco-cms/backoffice/backend-api';
+import { UmbCultureAndHostnamesModalData, UmbCultureAndHostnamesModalValue } from '@umbraco-cms/backoffice/document';
 
 @customElement('umb-culture-and-hostnames-modal')
 export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
@@ -52,7 +49,7 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 		this.#getLanguages(data.defaultIsoCode);
 	}
 
-	async #getLanguages(defaultIsoCode?: string) {
+	async #getLanguages(defaultIsoCode?: string | null) {
 		const { data } = await this.#languageRepository.requestLanguages();
 		if (!data) return;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/culture-and-hostnames-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.token.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/modal/token/culture-and-hostnames-modal.token.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.token.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/index.ts
new file mode 100644
index 0000000000..0b0238bc88
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/index.ts
@@ -0,0 +1,2 @@
+export * from './culture-and-hostnames-modal.token.js';
+export * from './culture-and-hostnames-modal.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/index.ts
new file mode 100644
index 0000000000..a25927e33b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/index.ts
@@ -0,0 +1 @@
+export * from './culture-and-hostnames/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/manifests.ts
new file mode 100644
index 0000000000..746c4d8a5b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/manifests.ts
@@ -0,0 +1,12 @@
+import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+
+const modals: Array<ManifestModal> = [
+	{
+		type: 'modal',
+		alias: 'Umb.Modal.CultureAndHostnames',
+		name: 'Culture And Hostnames Modal',
+		js: () => import('./culture-and-hostnames/culture-and-hostnames-modal.element.js'),
+	},
+];
+
+export const manifests = [...modals];

From 2eb1ef3c4614aceccc166c3d3887a443d6ef7a1b Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Mon, 22 Jan 2024 13:45:02 +0100
Subject: [PATCH 08/31] rename

---
 .../documents/repository/document.repository.ts          | 2 +-
 .../documents/repository/sources/document.server.data.ts | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.repository.ts
index 54c4155136..7ff6f5cbed 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.repository.ts
@@ -283,7 +283,7 @@ export class UmbDocumentRepository extends UmbBaseController implements UmbApi {
 		if (!data) throw new Error('Data is missing');
 		await this.#init;
 
-		const { error } = await this.#detailDataSource.setDomains(id, data);
+		const { error } = await this.#detailDataSource.updateDomains(id, data);
 		if (!error) {
 			const notification = { data: { message: `Cultures and hostnames saved` } };
 			this.#notificationContext?.peek('positive', notification);
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/sources/document.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/sources/document.server.data.ts
index a0cefd7329..cfdb69abd4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/sources/document.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/sources/document.server.data.ts
@@ -8,7 +8,6 @@ import {
 	UpdateDocumentRequestModel,
 	PublishDocumentRequestModel,
 	UnpublishDocumentRequestModel,
-	DomainPresentationModel,
 	DomainsPresentationModelBaseModel,
 } from '@umbraco-cms/backoffice/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
@@ -204,7 +203,13 @@ export class UmbDocumentServerDataSource
 		return tryExecuteAndNotify(this.#host, DocumentResource.getDocumentByIdDomains({ id }));
 	}
 
-	async setDomains(id: string, data: DomainsPresentationModelBaseModel) {
+	/**
+	 * Updates the Document Domains for the given Document id
+	 * @param {string} id
+	 * @param {DomainsPresentationModelBaseModel} data
+	 * @memberof UmbDocumentTypeServerDataSource
+	 */
+	async updateDomains(id: string, data: DomainsPresentationModelBaseModel) {
 		if (!id) throw new Error('Id is missing');
 		return tryExecuteAndNotify(this.#host, DocumentResource.putDocumentByIdDomains({ id, requestBody: data }));
 	}

From 95181473aa6db0c275e806aacf8c690449751249 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Mon, 22 Jan 2024 14:05:24 +0100
Subject: [PATCH 09/31] actual popover

---
 .../culture-and-hostnames-modal.element.ts      | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
index 1a1eb7f6ca..7cf0844ad5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
@@ -1,8 +1,8 @@
 import { UmbDocumentRepository } from '../../repository/document.repository.js';
-import { html, customElement, state, css, repeat } from '@umbraco-cms/backoffice/external/lit';
+import { html, customElement, state, css, repeat, query } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
-import { UUIInputEvent, UUISelectEvent } from '@umbraco-cms/backoffice/external/uui';
+import { UUIInputEvent, UUIPopoverContainerElement, UUISelectEvent } from '@umbraco-cms/backoffice/external/uui';
 import { UmbLanguageRepository } from '@umbraco-cms/backoffice/language';
 import { DomainPresentationModel, LanguageResponseModel } from '@umbraco-cms/backoffice/backend-api';
 import { UmbCultureAndHostnamesModalData, UmbCultureAndHostnamesModalValue } from '@umbraco-cms/backoffice/document';
@@ -24,6 +24,9 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 	@state()
 	private _domains: Array<DomainPresentationModel> = [];
 
+	@query('#more-options')
+	private _moreOptions?: UUIPopoverContainerElement;
+
 	#handleCancel() {
 		this.modalContext?.reject();
 	}
@@ -76,6 +79,7 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 	#addDomain(currentDomain?: boolean) {
 		const defaultModel = this.#languageModel.find((model) => model.isDefault);
 		if (currentDomain) {
+			this._moreOptions?.hidePopover();
 			this._domains = [...this._domains, { isoCode: defaultModel?.isoCode ?? '', domainName: window.location.host }];
 		} else {
 			this._domains = [...this._domains, { isoCode: defaultModel?.isoCode ?? '', domainName: '' }];
@@ -177,10 +181,15 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 				label=${this.localize.term('buttons_select')}
 				look="placeholder"
 				compact
-				@click=${() => this.#addDomain(true)}>
+				popovertarget="more-options">
 				<uui-icon name="icon-navigation-down"></uui-icon>
 			</uui-button>
-		</uui-button-group>`;
+			<uui-popover-container id="more-options" placement="bottom-end">
+				<umb-popover-layout>
+					<uui-button label="add current domain" @click=${() => this.#addDomain(true)}> Add current domain </uui-button>
+				</umb-popover-layout>
+			</uui-popover-container>
+		</uui-button-group> `;
 	}
 
 	static styles = [

From 5a9623daa18c6b644e1aa2472d9bf4c5dcf413a2 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Mon, 22 Jan 2024 14:07:26 +0100
Subject: [PATCH 10/31] localize option

---
 .../culture-and-hostnames-modal.element.ts                    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
index 7cf0844ad5..38253f009e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
@@ -186,7 +186,9 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 			</uui-button>
 			<uui-popover-container id="more-options" placement="bottom-end">
 				<umb-popover-layout>
-					<uui-button label="add current domain" @click=${() => this.#addDomain(true)}> Add current domain </uui-button>
+					<uui-button label=${this.localize.term('assignDomain_addCurrent')} @click=${() => this.#addDomain(true)}>
+						<umb-localize key="assignDomain_addCurrent"> Add current domain </umb-localize>
+					</uui-button>
 				</umb-popover-layout>
 			</uui-popover-container>
 		</uui-button-group> `;

From 3dc1cf3df69adc58cb090861dc892840914b564f Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Mon, 22 Jan 2024 15:39:44 +0100
Subject: [PATCH 11/31] popover

---
 .../culture-and-hostnames-modal.element.ts                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
index 38253f009e..999525a267 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
@@ -25,7 +25,7 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 	private _domains: Array<DomainPresentationModel> = [];
 
 	@query('#more-options')
-	private _moreOptions?: UUIPopoverContainerElement;
+	popoverContainerElement?: UUIPopoverContainerElement;
 
 	#handleCancel() {
 		this.modalContext?.reject();
@@ -79,7 +79,7 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 	#addDomain(currentDomain?: boolean) {
 		const defaultModel = this.#languageModel.find((model) => model.isDefault);
 		if (currentDomain) {
-			this._moreOptions?.hidePopover();
+			this.popoverContainerElement?.hidePopover();
 			this._domains = [...this._domains, { isoCode: defaultModel?.isoCode ?? '', domainName: window.location.host }];
 		} else {
 			this._domains = [...this._domains, { isoCode: defaultModel?.isoCode ?? '', domainName: '' }];

From f68d97eb2a59424e101b33e2a412d254059d3049 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Mon, 22 Jan 2024 15:46:15 +0100
Subject: [PATCH 12/31] ts ignore

---
 .../culture-and-hostnames-modal.element.ts                     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
index 999525a267..4c47752351 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
@@ -79,6 +79,9 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 	#addDomain(currentDomain?: boolean) {
 		const defaultModel = this.#languageModel.find((model) => model.isDefault);
 		if (currentDomain) {
+			// TODO: This ignorer is just needed for JSON SCHEMA TO WORK, As its not updated with latest TS jet.
+			// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+			// @ts-ignore
 			this.popoverContainerElement?.hidePopover();
 			this._domains = [...this._domains, { isoCode: defaultModel?.isoCode ?? '', domainName: window.location.host }];
 		} else {

From b7429db155044767df59b31df86411d4198a7fb6 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Wed, 24 Jan 2024 10:35:07 +0100
Subject: [PATCH 13/31] remove double manifest

---
 .../documents/entity-actions/manifests.ts         | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts
index 6f99c11fad..21a090ec10 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts
@@ -71,21 +71,6 @@ const entityActions: Array<ManifestTypes> = [
 			entityTypes: [UMB_DOCUMENT_ROOT_ENTITY_TYPE, UMB_DOCUMENT_ENTITY_TYPE],
 		},
 	},
-	/*
-	{
-		type: 'entityAction',
-		alias: 'Umb.EntityAction.Document.CultureAndHostnames',
-		name: 'Culture And Hostnames Document Entity Action',
-		weight: 400,
-		api: UmbDocumentCultureAndHostnamesEntityAction,
-		meta: {
-			icon: 'icon-home',
-			label: 'Culture And Hostnames (TBD)',
-			repositoryAlias: UMB_DOCUMENT_REPOSITORY_ALIAS,
-			entityTypes: [UMB_DOCUMENT_ENTITY_TYPE],
-		},
-	},
-	*/
 	{
 		type: 'entityAction',
 		alias: 'Umb.EntityAction.Document.PublicAccess',

From 850e0036ccbb926b5f9766d0250fd0c1ff340deb Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Wed, 24 Jan 2024 10:43:22 +0100
Subject: [PATCH 14/31] dont submit if error

---
 .../culture-and-hostnames-modal.element.ts                 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
index 4c47752351..6b0bec3b54 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
@@ -30,9 +30,10 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 	#handleCancel() {
 		this.modalContext?.reject();
 	}
-	#handleSave() {
-		// TODO validation before submitting
-		this.#documentRepository.saveCultureAndHostnames(this.#unique!, this.value);
+
+	async #handleSave() {
+		const { error } = await this.#documentRepository.saveCultureAndHostnames(this.#unique!, this.value);
+		if (error) return;
 		this.modalContext?.submit();
 	}
 

From 6989ba8a02a83bb07ceaf757bbf7fecde2fb63e5 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Wed, 24 Jan 2024 11:07:46 +0100
Subject: [PATCH 15/31] combobox test

---
 .../culture-and-hostnames-modal.element.ts      | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
index 6b0bec3b54..7711fcfa2c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
@@ -117,11 +117,18 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 			<umb-body-layout headline=${this.localize.term('actions_assigndomain')}>
 				<uui-box headline=${this.localize.term('assignDomain_setLanguage')}>
 					<uui-label for="select">${this.localize.term('assignDomain_language')}</uui-label>
-					<uui-select
+					<uui-combobox
 						id="select"
 						label=${this.localize.term('assignDomain_language')}
-						@change=${this.#onChangeLanguage}
-						.options=${this._options}></uui-select>
+						.value=${this._options.find((option) => option.selected)?.value as string}
+						@change=${this.#onChangeLanguage}>
+						<uui-combobox-list>
+							${this._options.map(
+								(option) =>
+									html`<uui-combobox-list-option .value=${option.value}> ${option.name} </uui-combobox-list-option>`,
+							)}
+						</uui-combobox-list>
+					</uui-combobox>
 				</uui-box>
 				<uui-box headline=${this.localize.term('assignDomain_setDomains')}>
 					<umb-localize key="assignDomain_domainHelpWithVariants">
@@ -223,6 +230,10 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 				grid-template-columns: 1fr 1fr auto;
 				background-color: var(--uui-interface-surface-alt);
 			}
+
+			uui-combobox {
+				display: block;
+			}
 		`,
 	];
 }

From b989415ecb1b451906c3e5e8ddf43846a0f133f0 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Wed, 24 Jan 2024 13:16:22 +0100
Subject: [PATCH 16/31] move to own folder with own repository

---
 .../documents/culture-and-hostnames/index.ts  |  2 +
 .../manifests.ts                              |  5 +-
 .../culture-and-hostnames-modal.element.ts    | 58 ++++++++++++-------
 .../culture-and-hostnames-modal.token.ts      |  2 +-
 .../modal}/index.ts                           |  0
 .../culture-and-hostnames.repository.ts       | 49 ++++++++++++++++
 .../culture-and-hostnames.server.data.ts      | 43 ++++++++++++++
 .../culture-and-hostnames/repository/index.ts |  2 +
 .../repository/manifests.ts                   | 13 +++++
 .../src/packages/documents/documents/index.ts |  2 +-
 .../packages/documents/documents/manifests.ts |  4 +-
 .../documents/documents/modals/index.ts       |  1 -
 .../repository/document.repository.ts         | 24 --------
 .../sources/document.server.data.ts           | 22 -------
 14 files changed, 154 insertions(+), 73 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/index.ts
 rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{modals => culture-and-hostnames}/manifests.ts (52%)
 rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{modals/culture-and-hostnames => culture-and-hostnames/modal}/culture-and-hostnames-modal.element.ts (89%)
 rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{modals/culture-and-hostnames => culture-and-hostnames/modal}/culture-and-hostnames-modal.token.ts (96%)
 rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{modals/culture-and-hostnames => culture-and-hostnames/modal}/index.ts (100%)
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/index.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/manifests.ts
 delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/index.ts

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/index.ts
new file mode 100644
index 0000000000..e130217e61
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/index.ts
@@ -0,0 +1,2 @@
+export * from './modal/index.js';
+export * from './repository/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/manifests.ts
similarity index 52%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/manifests.ts
index 746c4d8a5b..11673b9e78 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/manifests.ts
@@ -1,3 +1,4 @@
+import { manifests as repositoryManifests } from './repository/manifests.js';
 import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
 
 const modals: Array<ManifestModal> = [
@@ -5,8 +6,8 @@ const modals: Array<ManifestModal> = [
 		type: 'modal',
 		alias: 'Umb.Modal.CultureAndHostnames',
 		name: 'Culture And Hostnames Modal',
-		js: () => import('./culture-and-hostnames/culture-and-hostnames-modal.element.js'),
+		js: () => import('./modal/culture-and-hostnames-modal.element.js'),
 	},
 ];
 
-export const manifests = [...modals];
+export const manifests = [...modals, ...repositoryManifests];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
similarity index 89%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
index 7711fcfa2c..6c984f2bb3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
@@ -1,18 +1,21 @@
-import { UmbDocumentRepository } from '../../repository/document.repository.js';
 import { html, customElement, state, css, repeat, query } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import { UUIInputEvent, UUIPopoverContainerElement, UUISelectEvent } from '@umbraco-cms/backoffice/external/uui';
 import { UmbLanguageRepository } from '@umbraco-cms/backoffice/language';
 import { DomainPresentationModel, LanguageResponseModel } from '@umbraco-cms/backoffice/backend-api';
-import { UmbCultureAndHostnamesModalData, UmbCultureAndHostnamesModalValue } from '@umbraco-cms/backoffice/document';
+import {
+	UmbCultureAndHostnamesModalData,
+	UmbCultureAndHostnamesModalValue,
+	UmbDocumentCultureAndHostnamesRepository,
+} from '@umbraco-cms/backoffice/document';
 
 @customElement('umb-culture-and-hostnames-modal')
 export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 	UmbCultureAndHostnamesModalData,
 	UmbCultureAndHostnamesModalValue
 > {
-	#documentRepository = new UmbDocumentRepository(this);
+	#documentRepository = new UmbDocumentCultureAndHostnamesRepository(this);
 	#languageRepository = new UmbLanguageRepository(this);
 
 	#unique?: string | null;
@@ -27,15 +30,7 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 	@query('#more-options')
 	popoverContainerElement?: UUIPopoverContainerElement;
 
-	#handleCancel() {
-		this.modalContext?.reject();
-	}
-
-	async #handleSave() {
-		const { error } = await this.#documentRepository.saveCultureAndHostnames(this.#unique!, this.value);
-		if (error) return;
-		this.modalContext?.submit();
-	}
+	// Init
 
 	firstUpdated() {
 		this.#unique = this.data?.unique;
@@ -44,7 +39,7 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 
 	async #getDomains() {
 		if (!this.#unique) return;
-		const { data } = await this.#documentRepository.getCultureAndHostnames(this.#unique);
+		const { data } = await this.#documentRepository.readCultureAndHostnames(this.#unique);
 
 		if (!data) return;
 		this._domains = data.domains.map((domain) => ({ isoCode: domain.isoCode, domainName: domain.domainName }));
@@ -68,6 +63,20 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 		this._options = options;
 	}
 
+	// Modal
+
+	async #handleSave() {
+		const { error } = await this.#documentRepository.updateCultureAndHostnames(this.#unique!, this.value);
+		if (error) return;
+		this.modalContext?.submit();
+	}
+
+	#handleCancel() {
+		this.modalContext?.reject();
+	}
+
+	// Events
+
 	#onChangeLanguage(e: UUISelectEvent) {
 		const documentIsoCode = e.target.value as string;
 		if (documentIsoCode === 'inherit') {
@@ -112,6 +121,8 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 		this.value = { ...this.value, domains: this._domains };
 	}
 
+	// Render
+
 	render() {
 		return html`
 			<umb-body-layout headline=${this.localize.term('actions_assigndomain')}>
@@ -164,19 +175,27 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 					value: model.isoCode,
 					selected: domain.isoCode ? domain.isoCode === model.isoCode : model.isDefault,
 				}));
-				return html`<uui-button-group class="domain">
+				return html`<div class="domain">
 					<uui-input
 						label=${this.localize.term('assignDomain_domain')}
 						value=${domain.domainName}
 						@change=${(e: UUIInputEvent) => this.#changeDomainName(e, index)}></uui-input>
-					<uui-select
+					<uui-combobox
+						.value=${options.find((option) => option.selected)?.value as string}
 						label=${this.localize.term('assignDomain_language')}
-						.options=${options}
-						@change=${(e: UUISelectEvent) => this.#changeIsoCode(e, index)}></uui-select>
-					<uui-button look="outline" color="danger" label=${this.localize.term('assignDomain_remove')} compact>
+						@change=${(e: UUISelectEvent) => this.#changeIsoCode(e, index)}>
+						<uui-combobox-list>
+							${options.map(
+								(option) =>
+									html`<uui-combobox-list-option .value=${option.value}> ${option.name} </uui-combobox-list-option>`,
+							)}
+						</uui-combobox-list>
+					</uui-combobox>
+
+					<uui-button look="outline" color="danger" label=${this.localize.term('assignDomain_remove')}>
 						<uui-icon name="icon-trash" @click=${() => this.#remove(index)}></uui-icon>
 					</uui-button>
-				</uui-button-group>`;
+				</div> `;
 			},
 		)}`;
 	}
@@ -191,7 +210,6 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 				id="dropdown"
 				label=${this.localize.term('buttons_select')}
 				look="placeholder"
-				compact
 				popovertarget="more-options">
 				<uui-icon name="icon-navigation-down"></uui-icon>
 			</uui-button>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts
similarity index 96%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.token.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts
index 7b8611d82d..052fe2c4b2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/culture-and-hostnames-modal.token.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts
@@ -16,6 +16,6 @@ export const UMB_CULTURE_AND_HOSTNAMES_MODAL = new UmbModalToken<
 >('Umb.Modal.CultureAndHostnames', {
 	modal: {
 		type: 'sidebar',
-		size: 'small',
+		size: 'medium',
 	},
 });
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/culture-and-hostnames/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
new file mode 100644
index 0000000000..2a955a6c31
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
@@ -0,0 +1,49 @@
+import { UmbDocumentCultureAndHostnamesServerDataSource } from './culture-and-hostnames.server.data.js';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import { UmbBaseController } from '@umbraco-cms/backoffice/class-api';
+import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
+import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
+
+export class UmbDocumentCultureAndHostnamesRepository extends UmbBaseController implements UmbApi {
+	#init!: Promise<unknown>;
+
+	#detailDataSource: UmbDocumentCultureAndHostnamesServerDataSource;
+
+	#notificationContext?: UmbNotificationContext;
+
+	constructor(host: UmbControllerHost) {
+		super(host);
+
+		this.#detailDataSource = new UmbDocumentCultureAndHostnamesServerDataSource(this);
+
+		this.#init = Promise.all([
+			this.consumeContext(UMB_NOTIFICATION_CONTEXT_TOKEN, (instance) => {
+				this.#notificationContext = instance;
+			}).asPromise(),
+		]);
+	}
+
+	async readCultureAndHostnames(id: string) {
+		if (!id) throw new Error('Id is missing');
+		await this.#init;
+
+		const { data, error } = await this.#detailDataSource.read(id);
+		if (!error) {
+			return { data };
+		}
+		return { error };
+	}
+
+	async updateCultureAndHostnames(id: string, data: any) {
+		if (!id) throw new Error('Id is missing');
+		if (!data) throw new Error('Data is missing');
+		await this.#init;
+
+		const { error } = await this.#detailDataSource.update(id, data);
+		if (!error) {
+			const notification = { data: { message: `Cultures and hostnames saved` } };
+			this.#notificationContext?.peek('positive', notification);
+		}
+		return { error };
+	}
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts
new file mode 100644
index 0000000000..1a6fae85da
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts
@@ -0,0 +1,43 @@
+import { DocumentResource, DomainsPresentationModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
+
+/**
+ * A data source for the Document Culture and Hostnames that fetches data from the server
+ * @export
+ * @class UmbDocumentCultureAndHostnamesServerDataSource
+ * @implements {RepositoryDetailDataSource}
+ */
+export class UmbDocumentCultureAndHostnamesServerDataSource {
+	#host: UmbControllerHost;
+
+	/**
+	 * Creates an instance of UmbDocumentCultureAndHostnamesServerDataSource.
+	 * @param {UmbControllerHost} host
+	 * @memberof UmbDocumentCultureAndHostnamesServerDataSource
+	 */
+	constructor(host: UmbControllerHost) {
+		this.#host = host;
+	}
+
+	/**
+	 * Fetches the Culture and Hostnames for the given Document id
+	 * @param {string} id
+	 * @memberof UmbDocumentCultureAndHostnamesServerDataSource
+	 */
+	async read(id: string) {
+		if (!id) throw new Error('Id is missing');
+		return tryExecuteAndNotify(this.#host, DocumentResource.getDocumentByIdDomains({ id }));
+	}
+
+	/**
+	 * Updates Culture and Hostnames for the given Document id
+	 * @param {string} id
+	 * @param {DomainsPresentationModelBaseModel} data
+	 * @memberof UmbDocumentCultureAndHostnamesServerDataSource
+	 */
+	async update(id: string, data: DomainsPresentationModelBaseModel) {
+		if (!id) throw new Error('Id is missing');
+		return tryExecuteAndNotify(this.#host, DocumentResource.putDocumentByIdDomains({ id, requestBody: data }));
+	}
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/index.ts
new file mode 100644
index 0000000000..76199887dd
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/index.ts
@@ -0,0 +1,2 @@
+export { UmbDocumentCultureAndHostnamesRepository } from './culture-and-hostnames.repository.js';
+export { UMB_DOCUMENT_CULTURE_AND_HOSTNAMES_REPOSITORY_ALIAS } from './manifests.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/manifests.ts
new file mode 100644
index 0000000000..603ca30ed7
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/manifests.ts
@@ -0,0 +1,13 @@
+import { UmbDocumentCultureAndHostnamesRepository } from '../repository/index.js';
+import type { ManifestRepository } from '@umbraco-cms/backoffice/extension-registry';
+
+export const UMB_DOCUMENT_CULTURE_AND_HOSTNAMES_REPOSITORY_ALIAS = 'Umb.Repository.Document.CultureAndHostnames';
+
+const repository: ManifestRepository = {
+	type: 'repository',
+	alias: UMB_DOCUMENT_CULTURE_AND_HOSTNAMES_REPOSITORY_ALIAS,
+	name: 'Document Culture And Hostnames Repository',
+	api: UmbDocumentCultureAndHostnamesRepository,
+};
+
+export const manifests = [repository];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts
index 572fb2c61e..1afab25c2e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts
@@ -7,7 +7,7 @@ export * from './recycle-bin/index.js';
 export * from './user-permissions/index.js';
 export * from './components/index.js';
 export * from './entity.js';
-export * from './modals/index.js';
+export * from './culture-and-hostnames/index.js';
 
 export { UMB_DOCUMENT_TREE_ALIAS } from './tree/index.js';
 export { UMB_CONTENT_MENU_ALIAS } from './menu.manifests.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts
index dbd160f8a9..82edf90e04 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts
@@ -9,7 +9,7 @@ import { manifests as propertyEditorManifests } from './property-editors/manifes
 import { manifests as userPermissionManifests } from './user-permissions/manifests.js';
 import { manifests as recycleBinManifests } from './recycle-bin/manifests.js';
 import { manifests as trackedReferenceManifests } from './tracked-reference/manifests.js';
-import { manifests as modalManifests } from './modals/manifests.js';
+import { manifests as cultureAndHostnamesManifests } from './culture-and-hostnames/manifests.js';
 
 export const manifests = [
 	...collectionManifests,
@@ -23,5 +23,5 @@ export const manifests = [
 	...userPermissionManifests,
 	...recycleBinManifests,
 	...trackedReferenceManifests,
-	...modalManifests,
+	...cultureAndHostnamesManifests,
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/index.ts
deleted file mode 100644
index a25927e33b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './culture-and-hostnames/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.repository.ts
index 7ff6f5cbed..6e76c296c6 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.repository.ts
@@ -267,30 +267,6 @@ export class UmbDocumentRepository extends UmbBaseController implements UmbApi {
 		alert('sort');
 	}
 
-	async getCultureAndHostnames(id: string) {
-		if (!id) throw new Error('Id is missing');
-		await this.#init;
-
-		const { data, error } = await this.#detailDataSource.getDomains(id);
-		if (!error) {
-			return { data };
-		}
-		return { error };
-	}
-
-	async saveCultureAndHostnames(id: string, data: any) {
-		if (!id) throw new Error('Id is missing');
-		if (!data) throw new Error('Data is missing');
-		await this.#init;
-
-		const { error } = await this.#detailDataSource.updateDomains(id, data);
-		if (!error) {
-			const notification = { data: { message: `Cultures and hostnames saved` } };
-			this.#notificationContext?.peek('positive', notification);
-		}
-		return { error };
-	}
-
 	async setPermissions() {
 		alert('set permissions');
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/sources/document.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/sources/document.server.data.ts
index cfdb69abd4..805240d798 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/sources/document.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/sources/document.server.data.ts
@@ -8,7 +8,6 @@ import {
 	UpdateDocumentRequestModel,
 	PublishDocumentRequestModel,
 	UnpublishDocumentRequestModel,
-	DomainsPresentationModelBaseModel,
 } from '@umbraco-cms/backoffice/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
@@ -192,25 +191,4 @@ export class UmbDocumentServerDataSource
 		// TODO: Notice, here we need to implement pagination.
 		return tryExecuteAndNotify(this.#host, DocumentResource.getDocumentAllowedDocumentTypes({ parentId: hackId }));
 	}
-
-	/**
-	 * Fetches the Document Domains from the given Document id
-	 * @param {string} id
-	 * @memberof UmbDocumentTypeServerDataSource
-	 */
-	async getDomains(id: string) {
-		if (!id) throw new Error('Id is missing');
-		return tryExecuteAndNotify(this.#host, DocumentResource.getDocumentByIdDomains({ id }));
-	}
-
-	/**
-	 * Updates the Document Domains for the given Document id
-	 * @param {string} id
-	 * @param {DomainsPresentationModelBaseModel} data
-	 * @memberof UmbDocumentTypeServerDataSource
-	 */
-	async updateDomains(id: string, data: DomainsPresentationModelBaseModel) {
-		if (!id) throw new Error('Id is missing');
-		return tryExecuteAndNotify(this.#host, DocumentResource.putDocumentByIdDomains({ id, requestBody: data }));
-	}
 }

From 09e99cdb005486b4b9c7f337c010d7574f9ae994 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Wed, 24 Jan 2024 14:32:22 +0100
Subject: [PATCH 17/31] restructure

---
 .../culture-and-hostnames-modal.element.ts    | 198 ++++++++----------
 .../culture-and-hostnames.repository.ts       |  11 +-
 2 files changed, 97 insertions(+), 112 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
index 6c984f2bb3..7b231d0f7b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
@@ -22,7 +22,7 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 	#languageModel: Array<LanguageResponseModel> = [];
 
 	@state()
-	private _options: Array<Option> = [];
+	private _defaultIsoCode?: string | null;
 
 	@state()
 	private _domains: Array<DomainPresentationModel> = [];
@@ -34,38 +34,29 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 
 	firstUpdated() {
 		this.#unique = this.data?.unique;
-		this.#getDomains();
+		this.#readDomains();
+		this.#requestLanguages();
 	}
 
-	async #getDomains() {
+	async #readDomains() {
 		if (!this.#unique) return;
 		const { data } = await this.#documentRepository.readCultureAndHostnames(this.#unique);
 
 		if (!data) return;
-		this._domains = data.domains.map((domain) => ({ isoCode: domain.isoCode, domainName: domain.domainName }));
-
-		this.value = { defaultIsoCode: data.defaultIsoCode, domains: this._domains };
-		this.#getLanguages(data.defaultIsoCode);
+		this._defaultIsoCode = data.defaultIsoCode;
+		this._domains = data.domains;
 	}
 
-	async #getLanguages(defaultIsoCode?: string | null) {
+	async #requestLanguages() {
 		const { data } = await this.#languageRepository.requestLanguages();
 		if (!data) return;
-
 		this.#languageModel = data.items;
-
-		const options = data.items.map((item) => ({
-			name: item.name,
-			selected: item.isoCode === defaultIsoCode,
-			value: item.isoCode,
-		}));
-		options.unshift({ value: 'inherit', name: 'Inherit', selected: defaultIsoCode ? false : true });
-		this._options = options;
 	}
 
 	// Modal
 
 	async #handleSave() {
+		this.value = { defaultIsoCode: this._defaultIsoCode, domains: this._domains };
 		const { error } = await this.#documentRepository.updateCultureAndHostnames(this.#unique!, this.value);
 		if (error) return;
 		this.modalContext?.submit();
@@ -78,17 +69,31 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 	// Events
 
 	#onChangeLanguage(e: UUISelectEvent) {
-		const documentIsoCode = e.target.value as string;
-		if (documentIsoCode === 'inherit') {
-			this.value = { ...this.value, defaultIsoCode: undefined };
+		const defaultIsoCode = e.target.value as string;
+		if (defaultIsoCode === 'inherit') {
+			this._defaultIsoCode = null;
 		} else {
-			this.value = { ...this.value, defaultIsoCode: e.target.value as string };
+			this._defaultIsoCode = defaultIsoCode;
 		}
 	}
 
-	#addDomain(currentDomain?: boolean) {
+	#onChangeDomainLanguage(e: UUISelectEvent, index: number) {
+		const isoCode = e.target.value as string;
+		this._domains = this._domains.map((domain, i) => (index === i ? { ...domain, isoCode } : domain));
+	}
+
+	#onChangeDomainHostname(e: UUIInputEvent, index: number) {
+		const domainName = e.target.value as string;
+		this._domains = this._domains.map((domain, i) => (index === i ? { ...domain, domainName } : domain));
+	}
+
+	#onRemoveDomain(index: number) {
+		this._domains = this._domains.filter((d, i) => index !== i);
+	}
+
+	#onAddDomain(useCurrentDomain?: boolean) {
 		const defaultModel = this.#languageModel.find((model) => model.isDefault);
-		if (currentDomain) {
+		if (useCurrentDomain) {
 			// TODO: This ignorer is just needed for JSON SCHEMA TO WORK, As its not updated with latest TS jet.
 			// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 			// @ts-ignore
@@ -97,58 +102,14 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 		} else {
 			this._domains = [...this._domains, { isoCode: defaultModel?.isoCode ?? '', domainName: '' }];
 		}
-
-		this.value = { ...this.value, domains: this._domains };
 	}
 
-	#remove(index: number) {
-		this._domains = this._domains.filter((d, i) => index !== i);
-
-		this.value = { ...this.value, domains: this._domains };
-	}
-
-	#changeDomainName(e: UUIInputEvent, index: number) {
-		const domainName = e.target.value as string;
-		this._domains = this._domains.map((domain, i) => (index === i ? { ...domain, domainName: domainName } : domain));
-
-		this.value = { ...this.value, domains: this._domains };
-	}
-
-	#changeIsoCode(e: UUISelectEvent, index: number) {
-		const isoCode = e.target.value as string;
-		this._domains = this._domains.map((domain, i) => (index === i ? { ...domain, isoCode: isoCode } : domain));
-
-		this.value = { ...this.value, domains: this._domains };
-	}
-
-	// Render
+	// Renders
 
 	render() {
 		return html`
 			<umb-body-layout headline=${this.localize.term('actions_assigndomain')}>
-				<uui-box headline=${this.localize.term('assignDomain_setLanguage')}>
-					<uui-label for="select">${this.localize.term('assignDomain_language')}</uui-label>
-					<uui-combobox
-						id="select"
-						label=${this.localize.term('assignDomain_language')}
-						.value=${this._options.find((option) => option.selected)?.value as string}
-						@change=${this.#onChangeLanguage}>
-						<uui-combobox-list>
-							${this._options.map(
-								(option) =>
-									html`<uui-combobox-list-option .value=${option.value}> ${option.name} </uui-combobox-list-option>`,
-							)}
-						</uui-combobox-list>
-					</uui-combobox>
-				</uui-box>
-				<uui-box headline=${this.localize.term('assignDomain_setDomains')}>
-					<umb-localize key="assignDomain_domainHelpWithVariants">
-						Valid domain names are: "example.com", "www.example.com", "example.com:8080", or
-						"https://www.example.com/".<br />Furthermore also one-level paths in domains are supported, eg.
-						"example.com/en" or "/en".
-					</umb-localize>
-					${this.#renderDomains()} ${this.#renderAddNewDomainButton()}
-				</uui-box>
+				${this.#renderCultureSection()} ${this.#renderDomainSection()}
 				<uui-button
 					slot="actions"
 					id="cancel"
@@ -165,38 +126,68 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 		`;
 	}
 
+	#renderCultureSection() {
+		return html`<uui-box headline=${this.localize.term('assignDomain_setLanguage')}>
+			<uui-label for="select">${this.localize.term('assignDomain_language')}</uui-label>
+			<uui-combobox
+				id="select"
+				label=${this.localize.term('assignDomain_language')}
+				.value=${(this._defaultIsoCode as string) ?? 'inherit'}
+				@change=${this.#onChangeLanguage}>
+				<uui-combobox-list>
+					<uui-combobox-list-option .value=${'inherit'}>
+						${this.localize.term('assignDomain_inherit')}
+					</uui-combobox-list-option>
+					${this.#renderLanguageModelOptions()}
+				</uui-combobox-list>
+			</uui-combobox>
+		</uui-box>`;
+	}
+
+	#renderDomainSection() {
+		return html`<uui-box headline=${this.localize.term('assignDomain_setDomains')}>
+			<umb-localize key="assignDomain_domainHelpWithVariants">
+				Valid domain names are: "example.com", "www.example.com", "example.com:8080", or "https://www.example.com/".<br />Furthermore
+				also one-level paths in domains are supported, eg. "example.com/en" or "/en".
+			</umb-localize>
+			${this.#renderDomains()} ${this.#renderAddNewDomainButton()}
+		</uui-box>`;
+	}
+
 	#renderDomains() {
-		return html` ${repeat(
-			this._domains,
-			(domain) => domain,
-			(domain, index) => {
-				const options = this.#languageModel.map((model) => ({
-					name: model.name,
-					value: model.isoCode,
-					selected: domain.isoCode ? domain.isoCode === model.isoCode : model.isDefault,
-				}));
-				return html`<div class="domain">
+		if (!this._domains?.length) return;
+		return html`<div id="domains">
+			${repeat(
+				this._domains,
+				(domain) => domain.isoCode,
+				(domain, index) => html`
 					<uui-input
 						label=${this.localize.term('assignDomain_domain')}
-						value=${domain.domainName}
-						@change=${(e: UUIInputEvent) => this.#changeDomainName(e, index)}></uui-input>
+						.value=${domain.domainName}
+						@change=${(e: UUIInputEvent) => this.#onChangeDomainHostname(e, index)}></uui-input>
 					<uui-combobox
-						.value=${options.find((option) => option.selected)?.value as string}
+						.value=${domain.isoCode as string}
 						label=${this.localize.term('assignDomain_language')}
-						@change=${(e: UUISelectEvent) => this.#changeIsoCode(e, index)}>
-						<uui-combobox-list>
-							${options.map(
-								(option) =>
-									html`<uui-combobox-list-option .value=${option.value}> ${option.name} </uui-combobox-list-option>`,
-							)}
-						</uui-combobox-list>
+						@change=${(e: UUISelectEvent) => this.#onChangeDomainLanguage(e, index)}>
+						<uui-combobox-list> ${this.#renderLanguageModelOptions()} </uui-combobox-list>
 					</uui-combobox>
-
-					<uui-button look="outline" color="danger" label=${this.localize.term('assignDomain_remove')}>
-						<uui-icon name="icon-trash" @click=${() => this.#remove(index)}></uui-icon>
+					<uui-button
+						look="outline"
+						color="danger"
+						label=${this.localize.term('assignDomain_remove')}
+						@change=${() => this.#onRemoveDomain(index)}>
+						<uui-icon name="icon-trash"></uui-icon>
 					</uui-button>
-				</div> `;
-			},
+				`,
+			)}
+		</div>`;
+	}
+
+	#renderLanguageModelOptions() {
+		return html`${repeat(
+			this.#languageModel,
+			(model) => model.isoCode,
+			(model) => html`<uui-combobox-list-option .value=${model.isoCode}>${model.name}</uui-combobox-list-option>`,
 		)}`;
 	}
 
@@ -205,7 +196,7 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 			<uui-button
 				label=${this.localize.term('assignDomain_addNew')}
 				look="placeholder"
-				@click=${() => this.#addDomain()}></uui-button>
+				@click=${() => this.#onAddDomain()}></uui-button>
 			<uui-button
 				id="dropdown"
 				label=${this.localize.term('buttons_select')}
@@ -215,7 +206,7 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 			</uui-button>
 			<uui-popover-container id="more-options" placement="bottom-end">
 				<umb-popover-layout>
-					<uui-button label=${this.localize.term('assignDomain_addCurrent')} @click=${() => this.#addDomain(true)}>
+					<uui-button label=${this.localize.term('assignDomain_addCurrent')} @click=${() => this.#onAddDomain(true)}>
 						<umb-localize key="assignDomain_addCurrent"> Add current domain </umb-localize>
 					</uui-button>
 				</umb-popover-layout>
@@ -238,19 +229,12 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 				flex-grow: 0;
 			}
 
-			uui-select {
-				display: grid;
-			}
-
-			.domain {
-				display: grid;
+			#domains {
+				margin-top: var(--uui-size-layout-1);
 				margin-bottom: var(--uui-size-2);
+				display: grid;
 				grid-template-columns: 1fr 1fr auto;
-				background-color: var(--uui-interface-surface-alt);
-			}
-
-			uui-combobox {
-				display: block;
+				grid-gap: var(--uui-size-1);
 			}
 		`,
 	];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
index 2a955a6c31..be0959b385 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
@@ -3,18 +3,19 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbBaseController } from '@umbraco-cms/backoffice/class-api';
 import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
 import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
+import { DomainsPresentationModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
 
 export class UmbDocumentCultureAndHostnamesRepository extends UmbBaseController implements UmbApi {
 	#init!: Promise<unknown>;
 
-	#detailDataSource: UmbDocumentCultureAndHostnamesServerDataSource;
+	#dataSource: UmbDocumentCultureAndHostnamesServerDataSource;
 
 	#notificationContext?: UmbNotificationContext;
 
 	constructor(host: UmbControllerHost) {
 		super(host);
 
-		this.#detailDataSource = new UmbDocumentCultureAndHostnamesServerDataSource(this);
+		this.#dataSource = new UmbDocumentCultureAndHostnamesServerDataSource(this);
 
 		this.#init = Promise.all([
 			this.consumeContext(UMB_NOTIFICATION_CONTEXT_TOKEN, (instance) => {
@@ -27,19 +28,19 @@ export class UmbDocumentCultureAndHostnamesRepository extends UmbBaseController
 		if (!id) throw new Error('Id is missing');
 		await this.#init;
 
-		const { data, error } = await this.#detailDataSource.read(id);
+		const { data, error } = await this.#dataSource.read(id);
 		if (!error) {
 			return { data };
 		}
 		return { error };
 	}
 
-	async updateCultureAndHostnames(id: string, data: any) {
+	async updateCultureAndHostnames(id: string, data: DomainsPresentationModelBaseModel) {
 		if (!id) throw new Error('Id is missing');
 		if (!data) throw new Error('Data is missing');
 		await this.#init;
 
-		const { error } = await this.#detailDataSource.update(id, data);
+		const { error } = await this.#dataSource.update(id, data);
 		if (!error) {
 			const notification = { data: { message: `Cultures and hostnames saved` } };
 			this.#notificationContext?.peek('positive', notification);

From 1ddda35b1c5dcabb83667f8801299b565c845fdc Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:04:49 +0100
Subject: [PATCH 18/31] rename token

---
 .../repository/culture-and-hostnames.repository.ts          | 6 +++---
 .../culture-and-hostnames/culture-and-hostnames.action.ts   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
index be0959b385..04bf7b6b4c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
@@ -1,7 +1,7 @@
 import { UmbDocumentCultureAndHostnamesServerDataSource } from './culture-and-hostnames.server.data.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbBaseController } from '@umbraco-cms/backoffice/class-api';
-import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
+import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
 import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 import { DomainsPresentationModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
 
@@ -18,8 +18,8 @@ export class UmbDocumentCultureAndHostnamesRepository extends UmbBaseController
 		this.#dataSource = new UmbDocumentCultureAndHostnamesServerDataSource(this);
 
 		this.#init = Promise.all([
-			this.consumeContext(UMB_NOTIFICATION_CONTEXT_TOKEN, (instance) => {
-				this.#notificationContext = instance;
+			this.consumeContext(UMB_NOTIFICATION_CONTEXT, (instance) => {
+				this.#notificationContext = instance as UmbNotificationContext;
 			}).asPromise(),
 		]);
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
index 9521403d4a..8fd3b2bbbf 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
@@ -1,7 +1,7 @@
 import { UmbDocumentRepository } from '../../repository/document.repository.js';
 import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
-import { UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
+import { UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
 import { UMB_CULTURE_AND_HOSTNAMES_MODAL } from '@umbraco-cms/backoffice/document';
 
 export class UmbDocumentCultureAndHostnamesEntityAction extends UmbEntityActionBase<UmbDocumentRepository> {
@@ -10,8 +10,8 @@ export class UmbDocumentCultureAndHostnamesEntityAction extends UmbEntityActionB
 	constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) {
 		super(host, repositoryAlias, unique);
 
-		this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
-			this.#modalContext = instance;
+		this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
+			this.#modalContext = instance as UmbModalManagerContext;
 		});
 	}
 

From 308c47b194539d0b989e2b2017c90d70c9b72826 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:26:06 +0100
Subject: [PATCH 19/31] move to folder, fix delete bug

---
 .../documents/culture-and-hostnames/manifests.ts    | 13 -------------
 .../culture-and-hostnames/index.ts                  |  0
 .../culture-and-hostnames/manifests.ts              | 13 +++++++++++--
 .../modal/culture-and-hostnames-modal.element.ts    | 11 ++++++++---
 .../modal/culture-and-hostnames-modal.token.ts      |  0
 .../culture-and-hostnames/modal/index.ts            |  0
 .../repository/culture-and-hostnames.repository.ts  |  0
 .../repository/culture-and-hostnames.server.data.ts |  0
 .../culture-and-hostnames/repository/index.ts       |  0
 .../culture-and-hostnames/repository/manifests.ts   |  0
 .../documents/documents/entity-actions/index.ts     |  1 +
 .../src/packages/documents/documents/index.ts       |  2 +-
 .../src/packages/documents/documents/manifests.ts   |  2 --
 13 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/manifests.ts
 rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{ => entity-actions}/culture-and-hostnames/index.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{ => entity-actions}/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts (97%)
 rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{ => entity-actions}/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{ => entity-actions}/culture-and-hostnames/modal/index.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{ => entity-actions}/culture-and-hostnames/repository/culture-and-hostnames.repository.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{ => entity-actions}/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{ => entity-actions}/culture-and-hostnames/repository/index.ts (100%)
 rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{ => entity-actions}/culture-and-hostnames/repository/manifests.ts (100%)
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/index.ts

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/manifests.ts
deleted file mode 100644
index 11673b9e78..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/manifests.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { manifests as repositoryManifests } from './repository/manifests.js';
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
-
-const modals: Array<ManifestModal> = [
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.CultureAndHostnames',
-		name: 'Culture And Hostnames Modal',
-		js: () => import('./modal/culture-and-hostnames-modal.element.js'),
-	},
-];
-
-export const manifests = [...modals, ...repositoryManifests];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts
index 06a93cac69..40c0dd6b4e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts
@@ -1,7 +1,7 @@
 import { UMB_DOCUMENT_REPOSITORY_ALIAS } from '../../repository/manifests.js';
 import { UMB_DOCUMENT_ENTITY_TYPE } from '../../entity.js';
 import { UmbDocumentCultureAndHostnamesEntityAction } from './culture-and-hostnames.action.js';
-import { ManifestEntityAction } from '@umbraco-cms/backoffice/extension-registry';
+import { ManifestEntityAction, ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
 
 const entityActions: Array<ManifestEntityAction> = [
 	{
@@ -19,4 +19,13 @@ const entityActions: Array<ManifestEntityAction> = [
 	},
 ];
 
-export const manifests = [...entityActions];
+const manifestModals: Array<ManifestModal> = [
+	{
+		type: 'modal',
+		alias: 'Umb.Modal.CultureAndHostnames',
+		name: 'Culture And Hostnames Modal',
+		js: () => import('./modal/culture-and-hostnames-modal.element.js'),
+	},
+];
+
+export const manifests = [...entityActions, ...manifestModals];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
similarity index 97%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
index 7b231d0f7b..c656517820 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
@@ -1,6 +1,11 @@
 import { html, customElement, state, css, repeat, query } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
+import {
+	UMB_CONFIRM_MODAL,
+	UMB_MODAL_MANAGER_CONTEXT,
+	UmbModalBaseElement,
+	UmbModalManagerContext,
+} from '@umbraco-cms/backoffice/modal';
 import { UUIInputEvent, UUIPopoverContainerElement, UUISelectEvent } from '@umbraco-cms/backoffice/external/uui';
 import { UmbLanguageRepository } from '@umbraco-cms/backoffice/language';
 import { DomainPresentationModel, LanguageResponseModel } from '@umbraco-cms/backoffice/backend-api';
@@ -87,7 +92,7 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 		this._domains = this._domains.map((domain, i) => (index === i ? { ...domain, domainName } : domain));
 	}
 
-	#onRemoveDomain(index: number) {
+	async #onRemoveDomain(index: number) {
 		this._domains = this._domains.filter((d, i) => index !== i);
 	}
 
@@ -175,7 +180,7 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 						look="outline"
 						color="danger"
 						label=${this.localize.term('assignDomain_remove')}
-						@change=${() => this.#onRemoveDomain(index)}>
+						@click=${() => this.#onRemoveDomain(index)}>
 						<uui-icon name="icon-trash"></uui-icon>
 					</uui-button>
 				`,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/modal/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/index.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/index.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/index.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/manifests.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/culture-and-hostnames/repository/manifests.ts
rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/manifests.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/index.ts
new file mode 100644
index 0000000000..a25927e33b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/index.ts
@@ -0,0 +1 @@
+export * from './culture-and-hostnames/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts
index 1afab25c2e..50f3d55158 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts
@@ -7,7 +7,7 @@ export * from './recycle-bin/index.js';
 export * from './user-permissions/index.js';
 export * from './components/index.js';
 export * from './entity.js';
-export * from './culture-and-hostnames/index.js';
+export * from './entity-actions/index.js';
 
 export { UMB_DOCUMENT_TREE_ALIAS } from './tree/index.js';
 export { UMB_CONTENT_MENU_ALIAS } from './menu.manifests.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts
index 82edf90e04..ba7ad261ff 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts
@@ -9,7 +9,6 @@ import { manifests as propertyEditorManifests } from './property-editors/manifes
 import { manifests as userPermissionManifests } from './user-permissions/manifests.js';
 import { manifests as recycleBinManifests } from './recycle-bin/manifests.js';
 import { manifests as trackedReferenceManifests } from './tracked-reference/manifests.js';
-import { manifests as cultureAndHostnamesManifests } from './culture-and-hostnames/manifests.js';
 
 export const manifests = [
 	...collectionManifests,
@@ -23,5 +22,4 @@ export const manifests = [
 	...userPermissionManifests,
 	...recycleBinManifests,
 	...trackedReferenceManifests,
-	...cultureAndHostnamesManifests,
 ];

From 58428ed4fd5b2b598f8906dad9d91cdea35c08f0 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 25 Jan 2024 12:47:00 +0100
Subject: [PATCH 20/31] update types

---
 .../culture-and-hostnames.action.ts               |  7 ++++---
 .../modal/culture-and-hostnames-modal.element.ts  | 15 +++++----------
 .../modal/culture-and-hostnames-modal.token.ts    |  2 +-
 .../culture-and-hostnames.repository.ts           |  7 ++++---
 .../culture-and-hostnames.server.data.ts          |  3 ++-
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
index 8fd3b2bbbf..b0f552e335 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
@@ -1,7 +1,8 @@
-import { UmbDocumentRepository } from '../../repository/document.repository.js';
+import type { UmbDocumentRepository } from '../../repository/document.repository.js';
 import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
-import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
-import { UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
+import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal';
 import { UMB_CULTURE_AND_HOSTNAMES_MODAL } from '@umbraco-cms/backoffice/document';
 
 export class UmbDocumentCultureAndHostnamesEntityAction extends UmbEntityActionBase<UmbDocumentRepository> {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
index c656517820..b0a34731d1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
@@ -1,19 +1,14 @@
 import { html, customElement, state, css, repeat, query } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import {
-	UMB_CONFIRM_MODAL,
-	UMB_MODAL_MANAGER_CONTEXT,
-	UmbModalBaseElement,
-	UmbModalManagerContext,
-} from '@umbraco-cms/backoffice/modal';
-import { UUIInputEvent, UUIPopoverContainerElement, UUISelectEvent } from '@umbraco-cms/backoffice/external/uui';
+import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import { UmbLanguageRepository } from '@umbraco-cms/backoffice/language';
-import { DomainPresentationModel, LanguageResponseModel } from '@umbraco-cms/backoffice/backend-api';
+import type { DomainPresentationModel, LanguageResponseModel } from '@umbraco-cms/backoffice/backend-api';
 import {
-	UmbCultureAndHostnamesModalData,
-	UmbCultureAndHostnamesModalValue,
 	UmbDocumentCultureAndHostnamesRepository,
+	type UmbCultureAndHostnamesModalData,
+	type UmbCultureAndHostnamesModalValue,
 } from '@umbraco-cms/backoffice/document';
+import type { UUIInputEvent, UUIPopoverContainerElement, UUISelectEvent } from '@umbraco-cms/backoffice/external/uui';
 
 @customElement('umb-culture-and-hostnames-modal')
 export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts
index 052fe2c4b2..b6c802805a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts
@@ -1,4 +1,4 @@
-import { DomainPresentationModel } from '@umbraco-cms/backoffice/backend-api';
+import type { DomainPresentationModel } from '@umbraco-cms/backoffice/backend-api';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbCultureAndHostnamesModalData {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
index 04bf7b6b4c..457111b7e4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
@@ -1,9 +1,10 @@
 import { UmbDocumentCultureAndHostnamesServerDataSource } from './culture-and-hostnames.server.data.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbBaseController } from '@umbraco-cms/backoffice/class-api';
-import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
-import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
-import { DomainsPresentationModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
+import type { UmbNotificationContext } from '@umbraco-cms/backoffice/notification';
+import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
+import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
+import type { DomainsPresentationModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
 
 export class UmbDocumentCultureAndHostnamesRepository extends UmbBaseController implements UmbApi {
 	#init!: Promise<unknown>;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts
index 1a6fae85da..53db77e2ee 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts
@@ -1,4 +1,5 @@
-import { DocumentResource, DomainsPresentationModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
+import { DocumentResource } from '@umbraco-cms/backoffice/backend-api';
+import type { DomainsPresentationModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
 

From 060009ae2064888b9cc880b6aae478f162fdbb2f Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 25 Jan 2024 12:50:28 +0100
Subject: [PATCH 21/31] type

---
 .../documents/entity-actions/culture-and-hostnames/manifests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts
index 40c0dd6b4e..d3824080ba 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts
@@ -1,7 +1,7 @@
 import { UMB_DOCUMENT_REPOSITORY_ALIAS } from '../../repository/manifests.js';
 import { UMB_DOCUMENT_ENTITY_TYPE } from '../../entity.js';
 import { UmbDocumentCultureAndHostnamesEntityAction } from './culture-and-hostnames.action.js';
-import { ManifestEntityAction, ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestEntityAction, ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
 
 const entityActions: Array<ManifestEntityAction> = [
 	{

From f8902045a9e311b912ee29284e953aefff2b19b4 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Tue, 30 Jan 2024 14:28:01 +0100
Subject: [PATCH 22/31] rename to unique

---
 .../culture-and-hostnames.repository.ts       | 12 +++++------
 .../culture-and-hostnames.server.data.ts      | 20 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
index 457111b7e4..9c488fd542 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
@@ -25,23 +25,23 @@ export class UmbDocumentCultureAndHostnamesRepository extends UmbBaseController
 		]);
 	}
 
-	async readCultureAndHostnames(id: string) {
-		if (!id) throw new Error('Id is missing');
+	async readCultureAndHostnames(unique: string) {
+		if (!unique) throw new Error('Unique is missing');
 		await this.#init;
 
-		const { data, error } = await this.#dataSource.read(id);
+		const { data, error } = await this.#dataSource.read(unique);
 		if (!error) {
 			return { data };
 		}
 		return { error };
 	}
 
-	async updateCultureAndHostnames(id: string, data: DomainsPresentationModelBaseModel) {
-		if (!id) throw new Error('Id is missing');
+	async updateCultureAndHostnames(unique: string, data: DomainsPresentationModelBaseModel) {
+		if (!unique) throw new Error('Unique is missing');
 		if (!data) throw new Error('Data is missing');
 		await this.#init;
 
-		const { error } = await this.#dataSource.update(id, data);
+		const { error } = await this.#dataSource.update(unique, data);
 		if (!error) {
 			const notification = { data: { message: `Cultures and hostnames saved` } };
 			this.#notificationContext?.peek('positive', notification);
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts
index 53db77e2ee..c3cd1dabe2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts
@@ -22,23 +22,23 @@ export class UmbDocumentCultureAndHostnamesServerDataSource {
 	}
 
 	/**
-	 * Fetches the Culture and Hostnames for the given Document id
-	 * @param {string} id
+	 * Fetches the Culture and Hostnames for the given Document unique
+	 * @param {string} unique
 	 * @memberof UmbDocumentCultureAndHostnamesServerDataSource
 	 */
-	async read(id: string) {
-		if (!id) throw new Error('Id is missing');
-		return tryExecuteAndNotify(this.#host, DocumentResource.getDocumentByIdDomains({ id }));
+	async read(unique: string) {
+		if (!unique) throw new Error('Unique is missing');
+		return tryExecuteAndNotify(this.#host, DocumentResource.getDocumentByIdDomains({ id: unique }));
 	}
 
 	/**
-	 * Updates Culture and Hostnames for the given Document id
-	 * @param {string} id
+	 * Updates Culture and Hostnames for the given Document unique
+	 * @param {string} unique
 	 * @param {DomainsPresentationModelBaseModel} data
 	 * @memberof UmbDocumentCultureAndHostnamesServerDataSource
 	 */
-	async update(id: string, data: DomainsPresentationModelBaseModel) {
-		if (!id) throw new Error('Id is missing');
-		return tryExecuteAndNotify(this.#host, DocumentResource.putDocumentByIdDomains({ id, requestBody: data }));
+	async update(unique: string, data: DomainsPresentationModelBaseModel) {
+		if (!unique) throw new Error('Unique is missing');
+		return tryExecuteAndNotify(this.#host, DocumentResource.putDocumentByIdDomains({ id: unique, requestBody: data }));
 	}
 }

From 3ba517a74b3441875a7ba539b8592efeb1894e26 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Wed, 31 Jan 2024 11:34:12 +0100
Subject: [PATCH 23/31] keep window open, fix language bug

---
 .../culture-and-hostnames-modal.element.ts    | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
index b0a34731d1..88b22c0c8d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
@@ -19,7 +19,9 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 	#languageRepository = new UmbLanguageRepository(this);
 
 	#unique?: string | null;
-	#languageModel: Array<LanguageResponseModel> = [];
+
+	@state()
+	private _languageModel: Array<LanguageResponseModel> = [];
 
 	@state()
 	private _defaultIsoCode?: string | null;
@@ -34,8 +36,8 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 
 	firstUpdated() {
 		this.#unique = this.data?.unique;
-		this.#readDomains();
 		this.#requestLanguages();
+		this.#readDomains();
 	}
 
 	async #readDomains() {
@@ -50,20 +52,18 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 	async #requestLanguages() {
 		const { data } = await this.#languageRepository.requestLanguages();
 		if (!data) return;
-		this.#languageModel = data.items;
+		this._languageModel = data.items;
 	}
 
 	// Modal
 
 	async #handleSave() {
 		this.value = { defaultIsoCode: this._defaultIsoCode, domains: this._domains };
-		const { error } = await this.#documentRepository.updateCultureAndHostnames(this.#unique!, this.value);
-		if (error) return;
-		this.modalContext?.submit();
+		await this.#documentRepository.updateCultureAndHostnames(this.#unique!, this.value);
 	}
 
-	#handleCancel() {
-		this.modalContext?.reject();
+	#handleClose() {
+		this.modalContext?.submit();
 	}
 
 	// Events
@@ -92,7 +92,7 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 	}
 
 	#onAddDomain(useCurrentDomain?: boolean) {
-		const defaultModel = this.#languageModel.find((model) => model.isDefault);
+		const defaultModel = this._languageModel.find((model) => model.isDefault);
 		if (useCurrentDomain) {
 			// TODO: This ignorer is just needed for JSON SCHEMA TO WORK, As its not updated with latest TS jet.
 			// eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -112,9 +112,9 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 				${this.#renderCultureSection()} ${this.#renderDomainSection()}
 				<uui-button
 					slot="actions"
-					id="cancel"
-					label=${this.localize.term('buttons_confirmActionCancel')}
-					@click="${this.#handleCancel}"></uui-button>
+					id="close"
+					label=${this.localize.term('general_close')}
+					@click="${this.#handleClose}"></uui-button>
 				<uui-button
 					slot="actions"
 					id="save"
@@ -185,7 +185,7 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 
 	#renderLanguageModelOptions() {
 		return html`${repeat(
-			this.#languageModel,
+			this._languageModel,
 			(model) => model.isoCode,
 			(model) => html`<uui-combobox-list-option .value=${model.isoCode}>${model.name}</uui-combobox-list-option>`,
 		)}`;

From c98592b94f32d216914fb26cdcb1850de479a104 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 1 Feb 2024 13:44:36 +0100
Subject: [PATCH 24/31] Update
 src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts

Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
---
 .../repository/culture-and-hostnames.repository.ts              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
index 9c488fd542..46da3ff9e8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
@@ -11,7 +11,7 @@ export class UmbDocumentCultureAndHostnamesRepository extends UmbBaseController
 
 	#dataSource: UmbDocumentCultureAndHostnamesServerDataSource;
 
-	#notificationContext?: UmbNotificationContext;
+	#notificationContext?: typeof UMB_NOTIFICATION_CONTEXT.TYPE;
 
 	constructor(host: UmbControllerHost) {
 		super(host);

From 31f1c00ef851e24a8b20ffce86e007d34ce7efa5 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 1 Feb 2024 13:44:50 +0100
Subject: [PATCH 25/31] Update
 src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts

Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
---
 .../repository/culture-and-hostnames.repository.ts              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
index 46da3ff9e8..c8c20938a2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
@@ -9,7 +9,7 @@ import type { DomainsPresentationModelBaseModel } from '@umbraco-cms/backoffice/
 export class UmbDocumentCultureAndHostnamesRepository extends UmbBaseController implements UmbApi {
 	#init!: Promise<unknown>;
 
-	#dataSource: UmbDocumentCultureAndHostnamesServerDataSource;
+	#dataSource = new UmbDocumentCultureAndHostnamesServerDataSource(this);
 
 	#notificationContext?: typeof UMB_NOTIFICATION_CONTEXT.TYPE;
 

From c3721eaa4d4f4d14081c9968dbd37e4f25a59015 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 1 Feb 2024 13:49:12 +0100
Subject: [PATCH 26/31] remove cast

---
 .../repository/culture-and-hostnames.repository.ts           | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
index c8c20938a2..fb5e061251 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
@@ -1,7 +1,6 @@
 import { UmbDocumentCultureAndHostnamesServerDataSource } from './culture-and-hostnames.server.data.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbBaseController } from '@umbraco-cms/backoffice/class-api';
-import type { UmbNotificationContext } from '@umbraco-cms/backoffice/notification';
 import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
 import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 import type { DomainsPresentationModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
@@ -16,11 +15,9 @@ export class UmbDocumentCultureAndHostnamesRepository extends UmbBaseController
 	constructor(host: UmbControllerHost) {
 		super(host);
 
-		this.#dataSource = new UmbDocumentCultureAndHostnamesServerDataSource(this);
-
 		this.#init = Promise.all([
 			this.consumeContext(UMB_NOTIFICATION_CONTEXT, (instance) => {
-				this.#notificationContext = instance as UmbNotificationContext;
+				this.#notificationContext = instance;
 			}).asPromise(),
 		]);
 	}

From a57c153195786022c9defaabec1909a8a459956c Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 1 Feb 2024 13:52:02 +0100
Subject: [PATCH 27/31] Update
 src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts

Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
---
 .../modal/culture-and-hostnames-modal.element.ts              | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
index 88b22c0c8d..343e6ff0a1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts
@@ -206,9 +206,7 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement<
 			</uui-button>
 			<uui-popover-container id="more-options" placement="bottom-end">
 				<umb-popover-layout>
-					<uui-button label=${this.localize.term('assignDomain_addCurrent')} @click=${() => this.#onAddDomain(true)}>
-						<umb-localize key="assignDomain_addCurrent"> Add current domain </umb-localize>
-					</uui-button>
+					<uui-button label=${this.localize.term('assignDomain_addCurrent')} @click=${() => this.#onAddDomain(true)}></uui-button>
 				</umb-popover-layout>
 			</uui-popover-container>
 		</uui-button-group> `;

From 0f6aaee7444be15ec9688b09dab7737b662bc109 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 1 Feb 2024 14:44:04 +0100
Subject: [PATCH 28/31] remove init

---
 .../repository/culture-and-hostnames.repository.ts     | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
index fb5e061251..d09cac09c0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
@@ -15,16 +15,13 @@ export class UmbDocumentCultureAndHostnamesRepository extends UmbBaseController
 	constructor(host: UmbControllerHost) {
 		super(host);
 
-		this.#init = Promise.all([
-			this.consumeContext(UMB_NOTIFICATION_CONTEXT, (instance) => {
-				this.#notificationContext = instance;
-			}).asPromise(),
-		]);
+		this.consumeContext(UMB_NOTIFICATION_CONTEXT, (instance) => {
+			this.#notificationContext = instance;
+		});
 	}
 
 	async readCultureAndHostnames(unique: string) {
 		if (!unique) throw new Error('Unique is missing');
-		await this.#init;
 
 		const { data, error } = await this.#dataSource.read(unique);
 		if (!error) {
@@ -36,7 +33,6 @@ export class UmbDocumentCultureAndHostnamesRepository extends UmbBaseController
 	async updateCultureAndHostnames(unique: string, data: DomainsPresentationModelBaseModel) {
 		if (!unique) throw new Error('Unique is missing');
 		if (!data) throw new Error('Data is missing');
-		await this.#init;
 
 		const { error } = await this.#dataSource.update(unique, data);
 		if (!error) {

From 28d5f9fd4032cd17f10c958ef8125e2958a6eabb Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Fri, 2 Feb 2024 09:50:43 +0100
Subject: [PATCH 29/31] Update
 src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts

Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
---
 .../culture-and-hostnames/culture-and-hostnames.action.ts      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
index 46f1723f95..2d90ce8bd2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
@@ -1,11 +1,10 @@
 import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
-import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal';
 import { UMB_CULTURE_AND_HOSTNAMES_MODAL, type UmbDocumentDetailRepository } from '@umbraco-cms/backoffice/document';
 
 export class UmbDocumentCultureAndHostnamesEntityAction extends UmbEntityActionBase<UmbDocumentDetailRepository> {
-	#modalContext?: UmbModalManagerContext;
+	#modalContext?: typeof UMB_MODAL_MANAGER_CONTEXT.TYPE;
 
 	constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string, entityType: string) {
 		super(host, repositoryAlias, unique, entityType);

From b39dc50894ba320976ccd4a0fd3dda52729f27af Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Fri, 2 Feb 2024 09:50:59 +0100
Subject: [PATCH 30/31] Update
 src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts

Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
---
 .../culture-and-hostnames/culture-and-hostnames.action.ts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
index 2d90ce8bd2..f22531fd36 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts
@@ -10,7 +10,7 @@ export class UmbDocumentCultureAndHostnamesEntityAction extends UmbEntityActionB
 		super(host, repositoryAlias, unique, entityType);
 
 		this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
-			this.#modalContext = instance as UmbModalManagerContext;
+			this.#modalContext = instance;
 		});
 	}
 

From 62b02439932eb6908cbe17b2e1070cbfc13e5fbe Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Fri, 2 Feb 2024 09:51:38 +0100
Subject: [PATCH 31/31] remove init

---
 .../repository/culture-and-hostnames.repository.ts              | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
index d09cac09c0..219c5a75f6 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts
@@ -6,8 +6,6 @@ import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 import type { DomainsPresentationModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
 
 export class UmbDocumentCultureAndHostnamesRepository extends UmbBaseController implements UmbApi {
-	#init!: Promise<unknown>;
-
 	#dataSource = new UmbDocumentCultureAndHostnamesServerDataSource(this);
 
 	#notificationContext?: typeof UMB_NOTIFICATION_CONTEXT.TYPE;