Merge pull request #891 from umbraco/improvement/move-event-files

Improvement: move event files into core package
This commit is contained in:
Jacob Overgaard
2023-10-09 16:15:29 +02:00
committed by GitHub
35 changed files with 62 additions and 56 deletions

View File

@@ -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",

View File

@@ -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`<umb-entity-bulk-action
@executed=${this.#onActionExecuted}
.selection=${this._selection}
.manifest=${manifest}></umb-entity-bulk-action>`
.manifest=${manifest}></umb-entity-bulk-action>`,
)}
</div>
</div>

View File

@@ -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)

View File

@@ -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';

View File

@@ -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';

View File

@@ -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';

View File

@@ -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<UmbTemplateModa
async #saveTemplate() {
const { error } = await tryExecuteAndNotify(
this,
TemplateResource.putTemplateById({ id: this._id, requestBody: this._template })
TemplateResource.putTemplateById({ id: this._id, requestBody: this._template }),
);
if (!error) {
console.log(`template (${this._id}) saved successfully`);

View File

@@ -1,10 +1,10 @@
import { UmbSelectedEvent } from '@umbraco-cms/backoffice/event';
import type { UmbTreeElement } from '../../../tree/tree.element.js';
import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import { UmbTreePickerModalData, UmbPickerModalResult } from '@umbraco-cms/backoffice/modal';
import { UmbModalBaseElement } from '@umbraco-cms/internal/modal';
import { TreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api';
import { UmbSelectedEvent } from '@umbraco-cms/backoffice/events';
@customElement('umb-tree-picker-modal')
export class UmbTreePickerModalElement<TreeItemType extends TreeItemPresentationModel> extends UmbModalBaseElement<

View File

@@ -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<ItemType extends ItemResponseModelBaseModel> {
host: UmbControllerHostElement;

View File

@@ -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';
/**

View File

@@ -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<MultipleTextStringValueItem>;
@@ -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<UmbInputMultipleTextStringItemElement>;
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"></umb-input-multiple-text-string-item>`
required-message="Item ${index + 1} is missing a value"></umb-input-multiple-text-string-item>`,
)}
`;
}

View File

@@ -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';
/**

View File

@@ -1 +0,0 @@
export * from './repository.interface.js';

View File

@@ -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';

View File

@@ -1,5 +1,4 @@
export interface UmbRepository<EntityType = unknown> {
/**
* Get the type of the entity
*
@@ -8,5 +7,4 @@ export interface UmbRepository<EntityType = unknown> {
* @returns undefined
*/
readonly ENTITY_TYPE: EntityType;
}

View File

@@ -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<TreeItemType extends TreeItemPresentationModel> extends UmbBaseController {

View File

@@ -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')

View File

@@ -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';

View File

@@ -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')

View File

@@ -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')

View File

@@ -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';

View File

@@ -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 = <CodeEditorSearchOptions>{}
searchOptions: CodeEditorSearchOptions = <CodeEditorSearchOptions>{},
): UmbCodeEditorRange[] {
if (!this.#editor) throw new Error('Editor object not found');
const defaultOptions = {

View File

@@ -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 {
<uui-symbol-lock .open=${this.isOpen} ></uui-symbol-lock>
</uui-button>
<input placeholder="Enter alias..." .value=${this.value} ?disabled=${!this.isOpen} @input=${
this.#setValue
}></input>
this.#setValue
}></input>
`;
}

View File

@@ -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';

View File

@@ -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';

View File

@@ -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 {

View File

@@ -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"],

View File

@@ -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',