Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvement: move event files into core package #891

Merged
merged 6 commits into from
Oct 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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.selection, (selection) => {
this._selectionLength = selection.length;
this._selection = selection;
}, 'observeSelection');
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',
);
}

private _renderSelectionCount() {
Expand All @@ -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',
);
}

Expand Down Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/packages/core/components/input-date/input-date.element.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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, {
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/packages/core/entity-action/entity-action.element.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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`);
Expand Down
Original file line number Diff line number Diff line change
@@ -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<
Expand Down
2 changes: 1 addition & 1 deletion src/packages/core/picker-input/picker-input.context.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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>;
Expand Down Expand Up @@ -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,
);
}

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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>`,
)}
`;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
import { UmbPropertyValueChangeEvent } from '../../index.js';
import {
UmbInputMultipleTextStringElement,
Expand All @@ -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';

/**
Expand Down
1 change: 0 additions & 1 deletion src/packages/core/repositories/index.ts

This file was deleted.

1 change: 1 addition & 0 deletions src/packages/core/repository/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
export interface UmbRepository<EntityType = unknown> {

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

}
2 changes: 1 addition & 1 deletion src/packages/core/tree/tree.context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
6 changes: 3 additions & 3 deletions src/packages/templating/code-editor/code-editor.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 })),
);
}
}
Expand All @@ -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 = {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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>

`;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading
Loading