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 0fba78f8f9..40010d3257 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 @@ -3,12 +3,12 @@ import type { UmbCultureAndHostnamesModalData, UmbCultureAndHostnamesModalValue, } from './culture-and-hostnames-modal.token.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 type { UmbLanguageDetailModel } from '@umbraco-cms/backoffice/language'; +import { css, customElement, html, query, repeat, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbLanguageCollectionRepository } from '@umbraco-cms/backoffice/language'; +import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; +import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { DomainPresentationModel } from '@umbraco-cms/backoffice/external/backend-api'; +import type { UmbLanguageDetailModel } from '@umbraco-cms/backoffice/language'; import type { UUIInputEvent, UUIPopoverContainerElement, UUISelectEvent } from '@umbraco-cms/backoffice/external/uui'; @customElement('umb-culture-and-hostnames-modal') @@ -61,10 +61,11 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement< async #handleSave() { this.value = { defaultIsoCode: this._defaultIsoCode, domains: this._domains }; await this.#documentRepository.updateCultureAndHostnames(this.#unique!, this.value); + this.modalContext?.submit(); } - #handleClose() { - this.modalContext?.submit(); + #handleCancel() { + this.modalContext?.reject(); } // Events @@ -114,74 +115,81 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement< + label=${this.localize.term('general_cancel')} + @click=${this.#handleCancel}> + @click=${this.#handleSave}> `; } #renderCultureSection() { - return html` - ${this.localize.term('assignDomain_language')} - - - - ${this.localize.term('assignDomain_inherit')} - - ${this.#renderLanguageModelOptions()} - - - `; + return html` + + ${this.localize.term('assignDomain_language')} + + + + ${this.localize.term('assignDomain_inherit')} + + ${this.#renderLanguageModelOptions()} + + + + `; } #renderDomainSection() { - return html` - - Valid domain names are: "example.com", "www.example.com", "example.com:8080", or "https://www.example.com/".
Furthermore - also one-level paths in domains are supported, eg. "example.com/en" or "/en". -
- ${this.#renderDomains()} ${this.#renderAddNewDomainButton()} -
`; + return html` + + + Valid domain names are: "example.com", "www.example.com", "example.com:8080", or + "https://www.example.com/".
Furthermore also one-level paths in domains are supported, eg. + "example.com/en" or "/en". +
+ ${this.#renderDomains()} ${this.#renderAddNewDomainButton()} +
+ `; } #renderDomains() { if (!this._domains?.length) return; - return html`
- ${repeat( - this._domains, - (domain) => domain.isoCode, - (domain, index) => html` - this.#onChangeDomainHostname(e, index)}> - this.#onChangeDomainLanguage(e, index)}> - ${this.#renderLanguageModelOptions()} - - this.#onRemoveDomain(index)}> - - - `, - )} -
`; + return html` +
+ ${repeat( + this._domains, + (domain) => domain.isoCode, + (domain, index) => html` + this.#onChangeDomainHostname(e, index)}> + this.#onChangeDomainLanguage(e, index)}> + ${this.#renderLanguageModelOptions()} + + this.#onRemoveDomain(index)}> + + + `, + )} +
+ `; } #renderLanguageModelOptions() { @@ -193,26 +201,28 @@ export class UmbCultureAndHostnamesModalElement extends UmbModalBaseElement< } #renderAddNewDomainButton() { - return html` - this.#onAddDomain()}> - - - - - - this.#onAddDomain(true)}> - - - `; + return html` + + this.#onAddDomain()}> + + + + + + this.#onAddDomain(true)}> + + + + `; } static styles = [