From 406dff984f967480e3379de2be1c7b40bbd80741 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 27 Nov 2023 10:50:48 +0100 Subject: [PATCH] align names --- .../src/packages/core/store/events/index.ts | 4 ++-- .../packages/core/store/events/store-append.event.ts | 9 +++++++++ .../packages/core/store/events/store-create.event.ts | 9 --------- .../packages/core/store/events/store-delete.event.ts | 9 --------- .../packages/core/store/events/store-remove.event.ts | 9 +++++++++ .../src/packages/core/store/store-base.ts | 12 ++++++------ .../src/packages/core/store/store-connector.ts | 10 +++++----- 7 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/store/events/store-append.event.ts delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/store/events/store-create.event.ts delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/store/events/store-delete.event.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/store/events/store-remove.event.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/events/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/events/index.ts index cc72a42b77..773abffd97 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/store/events/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/events/index.ts @@ -1,4 +1,4 @@ -export * from './store-create.event.js'; +export * from './store-append.event.js'; export * from './store.event.js'; -export * from './store-delete.event.js'; +export * from './store-remove.event.js'; export * from './store-update.event.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/events/store-append.event.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/events/store-append.event.ts new file mode 100644 index 0000000000..e9fa3e50f1 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/events/store-append.event.ts @@ -0,0 +1,9 @@ +import { UmbStoreEvent } from './store.event.js'; + +export class UmbStoreAppendEvent extends UmbStoreEvent { + static readonly TYPE = 'append'; + + public constructor(uniques: Array) { + super(UmbStoreAppendEvent.TYPE, uniques); + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/events/store-create.event.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/events/store-create.event.ts deleted file mode 100644 index 1c8f616565..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/store/events/store-create.event.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { UmbStoreEvent } from './store.event.js'; - -export class UmbStoreCreateEvent extends UmbStoreEvent { - static readonly TYPE = 'create'; - - public constructor(uniques: Array) { - super(UmbStoreCreateEvent.TYPE, uniques); - } -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/events/store-delete.event.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/events/store-delete.event.ts deleted file mode 100644 index 855e237cac..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/store/events/store-delete.event.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { UmbStoreEvent } from './store.event.js'; - -export class UmbStoreDeleteEvent extends UmbStoreEvent { - static readonly TYPE = 'delete'; - - public constructor(uniques: Array) { - super(UmbStoreDeleteEvent.TYPE, uniques); - } -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/events/store-remove.event.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/events/store-remove.event.ts new file mode 100644 index 0000000000..0d83488692 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/events/store-remove.event.ts @@ -0,0 +1,9 @@ +import { UmbStoreEvent } from './store.event.js'; + +export class UmbStoreRemoveEvent extends UmbStoreEvent { + static readonly TYPE = 'remove'; + + public constructor(uniques: Array) { + super(UmbStoreRemoveEvent.TYPE, uniques); + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/store-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/store-base.ts index 825f41c086..8d46af757f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/store/store-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/store-base.ts @@ -1,7 +1,7 @@ import { UmbStore } from './store.interface.js'; -import { UmbStoreDeleteEvent } from './events/store-delete.event.js'; +import { UmbStoreRemoveEvent } from './events/store-remove.event.js'; import { UmbStoreUpdateEvent } from './events/store-update.event.js'; -import { UmbStoreCreateEvent } from './events/store-create.event.js'; +import { UmbStoreAppendEvent } from './events/store-append.event.js'; import { UmbContextProviderController } from '@umbraco-cms/backoffice/context-api'; import { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { type UmbApi } from '@umbraco-cms/backoffice/extension-api'; @@ -32,7 +32,7 @@ export class UmbStoreBase extends EventTarget implements Um append(item: StoreItemType) { this._data.append([item]); const unique = this._data.getUnique(item) as string; - this.dispatchEvent(new UmbStoreCreateEvent([unique])); + this.dispatchEvent(new UmbStoreAppendEvent([unique])); } /** @@ -43,7 +43,7 @@ export class UmbStoreBase extends EventTarget implements Um appendItems(items: Array) { this._data.append(items); const uniques = items.map((item) => this._data.getUnique(item)) as Array; - this.dispatchEvent(new UmbStoreCreateEvent(uniques)); + this.dispatchEvent(new UmbStoreAppendEvent(uniques)); } /** @@ -64,7 +64,7 @@ export class UmbStoreBase extends EventTarget implements Um */ removeItem(unique: string) { this._data.removeOne(unique); - this.dispatchEvent(new UmbStoreDeleteEvent([unique])); + this.dispatchEvent(new UmbStoreRemoveEvent([unique])); } /** @@ -74,7 +74,7 @@ export class UmbStoreBase extends EventTarget implements Um */ removeItems(uniques: Array) { this._data.remove(uniques); - this.dispatchEvent(new UmbStoreDeleteEvent(uniques)); + this.dispatchEvent(new UmbStoreRemoveEvent(uniques)); } /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/store-connector.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/store-connector.ts index 56d7fa7ae6..b2d9a85f04 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/store/store-connector.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/store-connector.ts @@ -1,5 +1,5 @@ import { UmbStoreBase } from './store-base.js'; -import { UmbStoreCreateEvent, UmbStoreDeleteEvent, UmbStoreUpdateEvent } from './events/index.js'; +import { UmbStoreAppendEvent, UmbStoreRemoveEvent, UmbStoreUpdateEvent } from './events/index.js'; import { UmbStore } from './store.interface.js'; import { UmbContextConsumerController, UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; @@ -35,12 +35,12 @@ export class UmbStoreConnector { #listenToConnectedStore = () => { if (!this.#connectedStore) return; - this.#connectedStore.addEventListener(UmbStoreCreateEvent.TYPE, this.#updateStoreItems as EventListener); + this.#connectedStore.addEventListener(UmbStoreAppendEvent.TYPE, this.#updateStoreItems as EventListener); this.#connectedStore.addEventListener(UmbStoreUpdateEvent.TYPE, this.#updateStoreItems as EventListener); - this.#connectedStore.addEventListener(UmbStoreDeleteEvent.TYPE, this.#removeStoreItems as EventListener); + this.#connectedStore.addEventListener(UmbStoreRemoveEvent.TYPE, this.#removeStoreItems as EventListener); }; - #updateStoreItems = (event: UmbStoreCreateEvent | UmbStoreUpdateEvent) => { + #updateStoreItems = (event: UmbStoreAppendEvent | UmbStoreUpdateEvent) => { event.uniques.forEach((unique) => { const storeHasItem = this.#store.getItems([unique]).length > 0; const connectedStoreItem = this.#connectedStore!.getItems([unique])[0]; @@ -54,7 +54,7 @@ export class UmbStoreConnector { }); }; - #removeStoreItems = (event: UmbStoreDeleteEvent) => { + #removeStoreItems = (event: UmbStoreRemoveEvent) => { this.#store.removeItems(event.uniques); }; }