diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 213a1916e3..6671c3e070 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -14,7 +14,6 @@ "./localization-api": "./dist-cms/libs/localization-api/index.js", "./observable-api": "./dist-cms/libs/observable-api/index.js", "./auth": "./dist-cms/shared/auth/index.js", - "./events": "./dist-cms/shared/umb-events/index.js", "./icon": "./dist-cms/shared/icon/index.js", "./models": "./dist-cms/shared/models/index.js", "./resources": "./dist-cms/shared/resources/index.js", @@ -46,6 +45,7 @@ "./tree": "./dist-cms/packages/core/tree/index.js", "./variant": "./dist-cms/packages/core/variant/index.js", "./workspace": "./dist-cms/packages/core/workspace/index.js", + "./events": "./dist-cms/packages/core/umb-events/index.js", "./repository": "./dist-cms/packages/core/repository/index.js", "./dictionary": "./dist-cms/packages/dictionary/dictionary/index.js", "./document": "./dist-cms/packages/documents/documents/index.js", diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-selection-actions.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-selection-actions.element.ts index ae694f4fe4..dd43060c0d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-selection-actions.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-selection-actions.element.ts @@ -1,10 +1,10 @@ +import { UmbExecutedEvent } from '@umbraco-cms/backoffice/event'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { map } from '@umbraco-cms/backoffice/external/rxjs'; import { UMB_COLLECTION_CONTEXT_TOKEN, UmbCollectionContext } from '@umbraco-cms/backoffice/collection'; import { ManifestEntityBulkAction, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import { UmbExecutedEvent } from '@umbraco-cms/backoffice/events'; @customElement('umb-collection-selection-actions') export class UmbCollectionSelectionActionsElement extends UmbLitElement { @@ -49,14 +49,22 @@ export class UmbCollectionSelectionActionsElement extends UmbLitElement { if (!this._collectionContext) return; // TODO: Make sure it only updates on length change. - this.observe(this._collectionContext.items, (mediaItems) => { - this._nodesLength = mediaItems.length; - }, 'observeItem'); + this.observe( + this._collectionContext.items, + (mediaItems) => { + this._nodesLength = mediaItems.length; + }, + 'observeItem', + ); - this.observe(this._collectionContext.selection, (selection) => { - this._selectionLength = selection.length; - this._selection = selection; - }, 'observeSelection'); + this.observe( + this._collectionContext.selection, + (selection) => { + this._selectionLength = selection.length; + this._selection = selection; + }, + 'observeSelection', + ); } private _renderSelectionCount() { @@ -69,12 +77,12 @@ export class UmbCollectionSelectionActionsElement extends UmbLitElement { umbExtensionsRegistry.extensionsOfType('entityBulkAction').pipe( map((extensions) => { return extensions.filter((extension) => extension.conditions.entityType === this.#entityType); - }) + }), ), (bulkActions) => { this._entityBulkActions = bulkActions; - } - , 'observeEntityBulkActions' + }, + 'observeEntityBulkActions', ); } @@ -103,7 +111,7 @@ export class UmbCollectionSelectionActionsElement extends UmbLitElement { html`` + .manifest=${manifest}>`, )} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-date/input-date.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-date/input-date.element.ts index 3df8c085a9..56fd3a4184 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-date/input-date.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-date/input-date.element.ts @@ -1,4 +1,4 @@ -import { UmbConfigRepository } from '../../repositories/config/config.repository.js'; +import { UmbConfigRepository } from '../../repository/config/config.repository.js'; import { css, html, ifDefined, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin, UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; @@ -98,7 +98,7 @@ export class UmbInputDateElement extends FormControlMixin(UmbLitElement) { if (this.type === 'time') { const newDate = new Date(`${new Date().toJSON().slice(0, 10)} ${d}`); const dateOffset = new Date( - newDate.setTime(newDate.getTime() + (utc ? this._offsetValue * -1 : this._offsetValue) * 60 * 1000) + newDate.setTime(newDate.getTime() + (utc ? this._offsetValue * -1 : this._offsetValue) * 60 * 1000), ); const time = dateOffset .toLocaleTimeString(undefined, { @@ -109,7 +109,7 @@ export class UmbInputDateElement extends FormControlMixin(UmbLitElement) { } else { const newDate = new Date(d.replace('Z', '')); const dateOffset = new Date( - newDate.setTime(newDate.getTime() + (utc ? this._offsetValue * -1 : this._offsetValue) * 60 * 1000) + newDate.setTime(newDate.getTime() + (utc ? this._offsetValue * -1 : this._offsetValue) * 60 * 1000), ); return this.type === 'datetime-local' ? this.#dateToString(dateOffset) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/culture/components/input-culture-select/input-culture-select.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/culture/components/input-culture-select/input-culture-select.element.ts index 4e04199eb3..3c9f545096 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/culture/components/input-culture-select/input-culture-select.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/culture/components/input-culture-select/input-culture-select.element.ts @@ -1,7 +1,7 @@ +import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import { UmbCultureRepository } from '../../repository/culture.repository.js'; import { html, repeat, ifDefined, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin, UUIComboboxElement, UUIComboboxEvent } from '@umbraco-cms/backoffice/external/uui'; -import { UmbChangeEvent } from '@umbraco-cms/backoffice/events'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { CultureReponseModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action.element.ts index d03f19fe2e..cd901e0044 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action.element.ts @@ -1,6 +1,6 @@ +import { UmbExecutedEvent } from '@umbraco-cms/backoffice/event'; import { html, nothing, ifDefined, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { UUIMenuItemEvent } from '@umbraco-cms/backoffice/external/uui'; -import { UmbExecutedEvent } from '@umbraco-cms/backoffice/events'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { ManifestEntityAction } from '@umbraco-cms/backoffice/extension-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action.element.ts index b83fd56941..95648818e4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action.element.ts @@ -1,6 +1,6 @@ +import { UmbExecutedEvent } from '@umbraco-cms/backoffice/event'; import { UmbEntityBulkAction } from './entity-bulk-action.js'; import { html, ifDefined, customElement, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbExecutedEvent } from '@umbraco-cms/backoffice/events'; import { ManifestEntityBulkAction } from '@umbraco-cms/backoffice/extension-registry'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; diff --git a/src/Umbraco.Web.UI.Client/src/shared/umb-events/change.event.ts b/src/Umbraco.Web.UI.Client/src/packages/core/event/change.event.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/shared/umb-events/change.event.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/event/change.event.ts diff --git a/src/Umbraco.Web.UI.Client/src/shared/umb-events/delete.event.ts b/src/Umbraco.Web.UI.Client/src/packages/core/event/delete.event.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/shared/umb-events/delete.event.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/event/delete.event.ts diff --git a/src/Umbraco.Web.UI.Client/src/shared/umb-events/executed.event.ts b/src/Umbraco.Web.UI.Client/src/packages/core/event/executed.event.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/shared/umb-events/executed.event.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/event/executed.event.ts diff --git a/src/Umbraco.Web.UI.Client/src/shared/umb-events/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/event/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/shared/umb-events/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/event/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/shared/umb-events/input.event.ts b/src/Umbraco.Web.UI.Client/src/packages/core/event/input.event.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/shared/umb-events/input.event.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/event/input.event.ts diff --git a/src/Umbraco.Web.UI.Client/src/shared/umb-events/selected.event.ts b/src/Umbraco.Web.UI.Client/src/packages/core/event/selected.event.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/shared/umb-events/selected.event.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/event/selected.event.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/template/template-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/template/template-modal.element.ts index 0020d86e6f..05435c7095 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/template/template-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/template/template-modal.element.ts @@ -1,8 +1,8 @@ +import { UmbInputEvent } from '@umbraco-cms/backoffice/event'; import type { UmbCodeEditorElement } from '@umbraco-cms/backoffice/code-editor'; import { css, html, ifDefined, customElement, query, state } from '@umbraco-cms/backoffice/external/lit'; import { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { UmbTemplateModalData, UmbTemplateModalResult } from '@umbraco-cms/backoffice/modal'; -import { UmbInputEvent } from '@umbraco-cms/backoffice/events'; import { TemplateResource, TemplateResponseModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbModalBaseElement } from '@umbraco-cms/internal/modal'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -41,7 +41,7 @@ export class UmbTemplateModalElement extends UmbModalBaseElement extends UmbModalBaseElement< diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts index a77b907fee..bb0eac8fad 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts @@ -1,3 +1,4 @@ +import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import { UmbItemRepository, UmbRepositoryItemsManager } from '@umbraco-cms/backoffice/repository'; import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import { @@ -9,7 +10,6 @@ import { } from '@umbraco-cms/backoffice/modal'; import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api'; import { ItemResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; -import { UmbChangeEvent } from '@umbraco-cms/backoffice/events'; export class UmbPickerInputContext { host: UmbControllerHostElement; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/input-multiple-text-string-item/input-multiple-text-string-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/input-multiple-text-string-item/input-multiple-text-string-item.element.ts index b56c82b7bb..48a69ec19b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/input-multiple-text-string-item/input-multiple-text-string-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/input-multiple-text-string-item/input-multiple-text-string-item.element.ts @@ -5,7 +5,7 @@ import { UMB_MODAL_MANAGER_CONTEXT_TOKEN, UMB_CONFIRM_MODAL, } from '@umbraco-cms/backoffice/modal'; -import { UmbChangeEvent, UmbInputEvent, UmbDeleteEvent } from '@umbraco-cms/backoffice/events'; +import { UmbChangeEvent, UmbInputEvent, UmbDeleteEvent } from '@umbraco-cms/backoffice/event'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/input-multiple-text-string/input-multiple-text-string.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/input-multiple-text-string/input-multiple-text-string.element.ts index cad33d5410..e099a27904 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/input-multiple-text-string/input-multiple-text-string.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/input-multiple-text-string/input-multiple-text-string.element.ts @@ -1,7 +1,7 @@ import UmbInputMultipleTextStringItemElement from '../input-multiple-text-string-item/input-multiple-text-string-item.element.js'; import { css, html, nothing, repeat, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbInputEvent, UmbChangeEvent, UmbDeleteEvent } from '@umbraco-cms/backoffice/events'; +import { UmbInputEvent, UmbChangeEvent, UmbDeleteEvent } from '@umbraco-cms/backoffice/event'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; export type MultipleTextStringValue = Array; @@ -86,12 +86,12 @@ export class UmbInputMultipleTextStringElement extends FormControlMixin(UmbLitEl this.addValidator( 'rangeUnderflow', () => this.minMessage, - () => !!this.min && this._items.length < this.min + () => !!this.min && this._items.length < this.min, ); this.addValidator( 'rangeOverflow', () => this.maxMessage, - () => !!this.max && this._items.length > this.max + () => !!this.max && this._items.length > this.max, ); } @@ -138,7 +138,7 @@ export class UmbInputMultipleTextStringElement extends FormControlMixin(UmbLitEl async #focusNewItem() { await this.updateComplete; const items = this.shadowRoot?.querySelectorAll( - 'umb-input-multiple-text-string-item' + 'umb-input-multiple-text-string-item', ) as NodeListOf; const newItem = items[items.length - 1]; newItem.focus(); @@ -173,7 +173,7 @@ export class UmbInputMultipleTextStringElement extends FormControlMixin(UmbLitEl ?disabled=${this.disabled} ?readonly=${this.readonly} required - required-message="Item ${index + 1} is missing a value">` + required-message="Item ${index + 1} is missing a value">`, )} `; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts index db71e5d040..db5a26480e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts @@ -1,3 +1,4 @@ +import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import { UmbPropertyValueChangeEvent } from '../../index.js'; import { UmbInputMultipleTextStringElement, @@ -6,7 +7,6 @@ import { import { html, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbChangeEvent } from '@umbraco-cms/backoffice/events'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repositories/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repositories/index.ts deleted file mode 100644 index a7d3719d54..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repositories/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './repository.interface.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repositories/config/config.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/config/config.repository.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/repositories/config/config.repository.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/repository/config/config.repository.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts index a11ca47da5..b63156a757 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts @@ -7,3 +7,4 @@ export * from './item-repository.interface.js'; export * from './move-repository.interface.js'; export * from './copy-repository.interface.js'; export * from './repository-items.manager.js'; +export * from './repository.interface.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repositories/repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository.interface.ts similarity index 99% rename from src/Umbraco.Web.UI.Client/src/packages/core/repositories/repository.interface.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/repository/repository.interface.ts index 1ea5957a38..9b2f588588 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repositories/repository.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository.interface.ts @@ -1,5 +1,4 @@ export interface UmbRepository { - /** * Get the type of the entity * @@ -8,5 +7,4 @@ export interface UmbRepository { * @returns undefined */ readonly ENTITY_TYPE: EntityType; - } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts index 1e9c5fe3a6..da70add6b9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts @@ -6,7 +6,7 @@ import { UmbBaseController, UmbControllerHostElement } from '@umbraco-cms/backof import { createExtensionClass } from '@umbraco-cms/backoffice/extension-api'; import { ProblemDetails, TreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbSelectionManagerBase } from '@umbraco-cms/backoffice/utils'; -import { UmbSelectedEvent } from '@umbraco-cms/backoffice/events'; +import { UmbSelectedEvent } from '@umbraco-cms/backoffice/event'; // TODO: update interface export interface UmbTreeContext extends UmbBaseController { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action-menu/workspace-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action-menu/workspace-action-menu.element.ts index 3f78226d8a..d4d7fd322c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action-menu/workspace-action-menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action-menu/workspace-action-menu.element.ts @@ -1,6 +1,6 @@ -import { UmbTextStyles } from "@umbraco-cms/backoffice/style"; +import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbExecutedEvent } from '@umbraco-cms/backoffice/events'; +import { UmbExecutedEvent } from '@umbraco-cms/backoffice/event'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; @customElement('umb-workspace-action-menu') diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/workspace-action.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/workspace-action.element.ts index 1b21bf25bc..0e64bb260e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/workspace-action.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-action/workspace-action.element.ts @@ -1,8 +1,8 @@ import { UmbWorkspaceAction } from './index.js'; -import { css, html, customElement, property, state, query } from '@umbraco-cms/backoffice/external/lit'; -import { UmbTextStyles } from "@umbraco-cms/backoffice/style"; -import type { UUIButtonElement, UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; -import { UmbExecutedEvent } from '@umbraco-cms/backoffice/events'; +import { css, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; +import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; +import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; +import { UmbExecutedEvent } from '@umbraco-cms/backoffice/event'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import type { ManifestWorkspaceAction } from '@umbraco-cms/backoffice/extension-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/table/column-layouts/document-table-actions-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/table/column-layouts/document-table-actions-column-layout.element.ts index 083ed5cb3e..fcf57577cc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/table/column-layouts/document-table-actions-column-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/table/column-layouts/document-table-actions-column-layout.element.ts @@ -9,7 +9,7 @@ import { state, } from '@umbraco-cms/backoffice/external/lit'; import type { UmbTableColumn, UmbTableItem } from '@umbraco-cms/backoffice/components'; -import { UmbExecutedEvent } from '@umbraco-cms/backoffice/events'; +import { UmbExecutedEvent } from '@umbraco-cms/backoffice/event'; // TODO: this could be done more generic, but for now we just need it for the document table @customElement('umb-document-table-actions-column-layout') diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-granular-permission/input-document-granular-permission.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-granular-permission/input-document-granular-permission.element.ts index 1ab33f7290..a157f93c73 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-granular-permission/input-document-granular-permission.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-granular-permission/input-document-granular-permission.element.ts @@ -9,7 +9,7 @@ import { import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import type { DocumentItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbDocumentRepository } from '@umbraco-cms/backoffice/document'; -import { UmbChangeEvent } from '@umbraco-cms/backoffice/events'; +import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import { UmbObserverController } from '@umbraco-cms/backoffice/observable-api'; @customElement('umb-input-document-granular-permission') diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/languages/workspace/language/views/details/language-details-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/languages/workspace/language/views/details/language-details-workspace-view.element.ts index 1b521cae1c..3faae4637a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/languages/workspace/language/views/details/language-details-workspace-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/languages/workspace/language/views/details/language-details-workspace-view.element.ts @@ -1,9 +1,9 @@ -import type { UmbInputCultureSelectElement } from '@umbraco-cms/backoffice/culture'; import { UMB_LANGUAGE_WORKSPACE_CONTEXT } from '../../language-workspace.context.js'; import type { UmbInputLanguagePickerElement } from '../../../../components/input-language-picker/input-language-picker.element.js'; +import type { UmbInputCultureSelectElement } from '@umbraco-cms/backoffice/culture'; import { UUIBooleanInputEvent, UUIToggleElement } from '@umbraco-cms/backoffice/external/uui'; import { css, html, nothing, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; -import { UmbChangeEvent } from '@umbraco-cms/backoffice/events'; +import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { LanguageResponseModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbWorkspaceEditorViewExtensionElement } from '@umbraco-cms/backoffice/extension-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/code-editor/code-editor.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/code-editor/code-editor.controller.ts index 9aeb5e2a10..3ce2e64817 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/code-editor/code-editor.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/code-editor/code-editor.controller.ts @@ -11,7 +11,7 @@ import { } from './code-editor.model.js'; import { themes } from './themes/index.js'; import { monaco } from '@umbraco-cms/backoffice/external/monaco-editor'; -import { UmbChangeEvent, UmbInputEvent } from '@umbraco-cms/backoffice/events'; +import { UmbChangeEvent, UmbInputEvent } from '@umbraco-cms/backoffice/event'; //TODO - consider firing change event on blur @@ -222,7 +222,7 @@ export class UmbCodeEditorController { if (selections?.length > 0) { this.#editor.executeEdits( null, - selections.map((selection) => ({ range: selection, text })) + selections.map((selection) => ({ range: selection, text })), ); } } @@ -236,7 +236,7 @@ export class UmbCodeEditorController { */ find( searchString: string, - searchOptions: CodeEditorSearchOptions = {} + searchOptions: CodeEditorSearchOptions = {}, ): UmbCodeEditorRange[] { if (!this.#editor) throw new Error('Editor object not found'); const defaultOptions = { diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/components/alias-input/alias-input.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/components/alias-input/alias-input.ts index 5d17a74e02..10a09a53ca 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/components/alias-input/alias-input.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/components/alias-input/alias-input.ts @@ -1,7 +1,7 @@ -import { UmbTextStyles } from "@umbraco-cms/backoffice/style"; +import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, customElement, html, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import { UmbChangeEvent } from '@umbraco-cms/backoffice/events'; +import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; @customElement('umb-template-alias-input') export class UmbTemplateAliasInputElement extends UmbLitElement { @@ -11,8 +11,8 @@ export class UmbTemplateAliasInputElement extends UmbLitElement { + this.#setValue + }> `; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/components/user-group-default-permission-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/components/user-group-default-permission-list.element.ts index 84d7880f9e..8b87699017 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/components/user-group-default-permission-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/components/user-group-default-permission-list.element.ts @@ -4,7 +4,7 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { UserGroupResponseModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { ManifestUserPermission, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbChangeEvent } from '@umbraco-cms/backoffice/events'; +import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import { type UmbUserPermissionSettingElement } from '@umbraco-cms/backoffice/users'; import { groupBy } from '@umbraco-cms/backoffice/external/lodash'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace-editor.element.ts index 7b7453b3b2..08243f8ad0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace-editor.element.ts @@ -8,7 +8,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbInputDocumentElement } from '@umbraco-cms/backoffice/document'; import { UmbInputSectionElement } from '@umbraco-cms/backoffice/components'; import { UmbUserInputElement } from '@umbraco-cms/backoffice/users'; -import { UmbChangeEvent } from '@umbraco-cms/backoffice/events'; +import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import { UmbInputMediaElement } from '@umbraco-cms/backoffice/media'; import './components/user-group-default-permission-list.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/components/user-permission-setting/user-permission-setting.element.ts b/src/Umbraco.Web.UI.Client/src/packages/users/users/components/user-permission-setting/user-permission-setting.element.ts index 2231e11f10..ba504104d0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/users/components/user-permission-setting/user-permission-setting.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/users/users/components/user-permission-setting/user-permission-setting.element.ts @@ -2,7 +2,7 @@ import { type UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui' import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbChangeEvent } from '@umbraco-cms/backoffice/events'; +import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; @customElement('umb-user-permission-setting') export class UmbUserPermissionSettingElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index 7c949e5c74..05b86aeebc 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -43,7 +43,7 @@ // SHARED "@umbraco-cms/backoffice/auth": ["src/shared/auth"], - "@umbraco-cms/backoffice/events": ["src/shared/umb-events"], + "@umbraco-cms/backoffice/event": ["src/packages/core/event"], "@umbraco-cms/backoffice/icon": ["src/shared/icon-registry"], "@umbraco-cms/backoffice/models": ["src/shared/models"], "@umbraco-cms/backoffice/repository": ["src/packages/core/repository"], diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs index c24e8c5ce9..f1230ade63 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -42,7 +42,6 @@ export default { '@umbraco-cms/backoffice/observable-api': './src/libs/observable-api/index.ts', '@umbraco-cms/backoffice/auth': './src/shared/auth/index.ts', - '@umbraco-cms/backoffice/events': './src/shared/umb-events/index.ts', '@umbraco-cms/backoffice/icon': './src/shared/icon-registry/index.ts', '@umbraco-cms/backoffice/models': './src/shared/models/index.ts', '@umbraco-cms/backoffice/resources': './src/shared/resources/index.ts', @@ -78,6 +77,7 @@ export default { '@umbraco-cms/backoffice/variant': './src/packages/core/variant/index.ts', '@umbraco-cms/backoffice/workspace': './src/packages/core/workspace/index.ts', '@umbraco-cms/backoffice/culture': './src/packages/core/culture/index.ts', + '@umbraco-cms/backoffice/event': './src/packages/core/event/index.ts', '@umbraco-cms/backoffice/repository': './src/packages/core/repository/index.ts', '@umbraco-cms/backoffice/dictionary': './src/packages/dictionary/dictionary/index.ts',