diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-blueprints/document-blueprint.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-blueprints/document-blueprint.store.ts index 9eaca6f39e..e6a70b770f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-blueprints/document-blueprint.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-blueprints/document-blueprint.store.ts @@ -2,7 +2,7 @@ import { map, Observable } from 'rxjs'; import { UmbNodeStoreBase } from '../../../core/stores/store'; import type { DocumentBlueprintDetails, DocumentDetails } from '@umbraco-cms/models'; import { DocumentBlueprintTreeItem } from '@umbraco-cms/backend-api'; -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; export type UmbDocumentStoreItemType = DocumentBlueprintDetails | DocumentBlueprintTreeItem; @@ -41,4 +41,4 @@ export class UmbDocumentBlueprintStore extends UmbNodeStoreBase(STORE_ALIAS); +export const UMB_DOCUMENT_BLULEPRINT_STORE_CONTEXT_ALIAS = new UmbContextToken(STORE_ALIAS); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/document-type.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/document-type.store.ts index cedf8a450a..799caaf7de 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/document-type.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/document-type.store.ts @@ -3,7 +3,7 @@ import { UmbDataStoreBase } from '../../../core/stores/store'; import { DocumentTypeResource, DocumentTypeTreeItem } from '@umbraco-cms/backend-api'; import type { DocumentTypeDetails } from '@umbraco-cms/models'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; export const isDocumentTypeDetails = ( documentType: DocumentTypeDetails | DocumentTypeTreeItem @@ -86,4 +86,4 @@ export class UmbDocumentTypeStore extends UmbDataStoreBase(STORE_ALIAS); +export const UMB_DOCUMENT_TYPE_STORE_CONTEXT_ALIAS = new UmbContextToken(STORE_ALIAS); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/document.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/document.store.ts index 64c894e41f..d2da3302e1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/document.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/document.store.ts @@ -3,7 +3,7 @@ import { UmbNodeStoreBase } from '../../../core/stores/store'; import type { DocumentDetails } from '@umbraco-cms/models'; import { DocumentResource, DocumentTreeItem, FolderTreeItem } from '@umbraco-cms/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; export const isDocumentDetails = (document: DocumentDetails | DocumentTreeItem): document is DocumentDetails => { return (document as DocumentDetails).data !== undefined; @@ -131,4 +131,4 @@ export class UmbDocumentStore extends UmbNodeStoreBase } } -export const UMB_DOCUMENT_STORE_CONTEXT_ALIAS = new UmbContextAlias(STORE_ALIAS); +export const UMB_DOCUMENT_STORE_CONTEXT_ALIAS = new UmbContextToken(STORE_ALIAS); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/media-type.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/media-type.store.ts index f2f623d45a..119c4ecaf1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/media-type.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/media-type.store.ts @@ -3,7 +3,7 @@ import { UmbNodeStoreBase } from '../../../core/stores/store'; import { MediaTypeResource, FolderTreeItem } from '@umbraco-cms/backend-api'; import type { MediaTypeDetails } from '@umbraco-cms/models'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; export type UmbMediaTypeStoreItemType = MediaTypeDetails | FolderTreeItem; @@ -90,4 +90,4 @@ export class UmbMediaTypeStore extends UmbNodeStoreBase(STORE_ALIAS); +export const UMB_MEDIA_TYPE_STORE_CONTEXT_ALIAS = new UmbContextToken(STORE_ALIAS); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/media.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/media.store.ts index de8289ecf3..2d6b4184b7 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/media.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/media.store.ts @@ -3,7 +3,7 @@ import { UmbDataStoreBase } from '../../../core/stores/store'; import type { MediaDetails } from '@umbraco-cms/models'; import { ContentTreeItem, MediaResource } from '@umbraco-cms/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; const isMediaDetails = (media: UmbMediaStoreItemType): media is MediaDetails => { return (media as MediaDetails).data !== undefined; @@ -112,4 +112,4 @@ export class UmbMediaStore extends UmbDataStoreBase { } } -export const UMB_MEDIA_STORE_CONTEXT_ALIAS = new UmbContextAlias(STORE_ALIAS); +export const UMB_MEDIA_STORE_CONTEXT_ALIAS = new UmbContextToken(STORE_ALIAS); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/member-group.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/member-group.store.ts index f24285a9f5..0a4987f678 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/member-group.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/member-group.store.ts @@ -3,7 +3,7 @@ import { UmbNodeStoreBase } from '../../../core/stores/store'; import { EntityTreeItem, MemberGroupResource } from '@umbraco-cms/backend-api'; import type { MemberGroupDetails } from '@umbraco-cms/models'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; export type UmbMemberGroupStoreItemType = MemberGroupDetails | EntityTreeItem; @@ -37,4 +37,4 @@ export class UmbMemberGroupStore extends UmbNodeStoreBase(STORE_ALIAS); +export const UMB_MEMBER_GROUP_STORE_CONTEXT_ALIAS = new UmbContextToken(STORE_ALIAS); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/member-type.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/member-type.store.ts index 339c58628f..3b38560627 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/member-type.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/member-type.store.ts @@ -3,7 +3,7 @@ import { UmbDataStoreBase } from '../../../core/stores/store'; import { MemberTypeResource, EntityTreeItem } from '@umbraco-cms/backend-api'; import type { MemberTypeDetails } from '@umbraco-cms/models'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; export type UmbMemberTypeStoreItemType = MemberTypeDetails | EntityTreeItem; @@ -37,4 +37,4 @@ export class UmbMemberTypeStore extends UmbDataStoreBase(STORE_ALIAS); +export const UMB_MEMBER_TYPE_STORE_CONTEXT_ALIAS = new UmbContextToken(STORE_ALIAS); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/data-type.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/data-type.store.ts index 73e886c775..80e67d132e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/data-type.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/data-type.store.ts @@ -3,7 +3,7 @@ import { UmbDataStoreBase } from '../../../core/stores/store'; import type { DataTypeDetails } from '@umbraco-cms/models'; import { DataTypeResource, FolderTreeItem } from '@umbraco-cms/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; const isDataTypeDetails = (dataType: DataTypeDetails | FolderTreeItem): dataType is DataTypeDetails => { return (dataType as DataTypeDetails).data !== undefined; @@ -126,4 +126,4 @@ export class UmbDataTypeStore extends UmbDataStoreBase } } -export const UMB_DATA_TYPE_STORE_CONTEXT_ALIAS = new UmbContextAlias(STORE_ALIAS); +export const UMB_DATA_TYPE_STORE_CONTEXT_ALIAS = new UmbContextToken(STORE_ALIAS); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection.context.ts index a84ce349f9..ad20d2a2a0 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection.context.ts @@ -1,7 +1,7 @@ import { ContentTreeItem } from '@umbraco-cms/backend-api'; import { UmbTreeDataStore } from '@umbraco-cms/stores/store'; import { UmbControllerHostInterface } from '@umbraco-cms/controller'; -import { UmbContextAlias, UmbContextConsumerController } from '@umbraco-cms/context-api'; +import { UmbContextToken, UmbContextConsumerController } from '@umbraco-cms/context-api'; import { UniqueBehaviorSubject, UmbObserverController } from '@umbraco-cms/observable-api'; export class UmbCollectionContext< DataType extends ContentTreeItem, @@ -111,6 +111,6 @@ export class UmbCollectionContext< } } -export const UMB_COLLECTION_CONTEXT_ALIAS = new UmbContextAlias>( +export const UMB_COLLECTION_CONTEXT_ALIAS = new UmbContextToken>( UmbCollectionContext.name ); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section.context.ts index ab2a382154..dee9d4c896 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section.context.ts @@ -1,7 +1,7 @@ import { BehaviorSubject } from 'rxjs'; import type { Entity, ManifestSection, ManifestSectionView, ManifestTree } from '@umbraco-cms/models'; import { UniqueBehaviorSubject } from '@umbraco-cms/observable-api'; -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; export class UmbSectionContext { #manifest; @@ -45,4 +45,4 @@ export class UmbSectionContext { } } -export const UMB_SECTION_CONTEXT_ALIAS = new UmbContextAlias(UmbSectionContext.name); +export const UMB_SECTION_CONTEXT_ALIAS = new UmbContextToken(UmbSectionContext.name); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section.store.ts index 800030f4e3..463caef58c 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section.store.ts @@ -1,6 +1,6 @@ import { Observable, ReplaySubject } from 'rxjs'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; // TODO: maybe this should be named something else than store? export class UmbSectionStore { @@ -22,4 +22,4 @@ export class UmbSectionStore { } } -export const UMB_SECTION_STORE_CONTEXT_ALIAS = new UmbContextAlias(UmbSectionStore.name); +export const UMB_SECTION_STORE_CONTEXT_ALIAS = new UmbContextToken(UmbSectionStore.name); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu-page.service.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu-page.service.ts index 4f799de30c..73835d8104 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu-page.service.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu-page.service.ts @@ -5,7 +5,7 @@ import UmbTreeItemActionElement, { ActionPageEntity } from '../action/tree-item- import { UmbTreeContextMenuService } from './tree-context-menu.service'; import { UmbLitElement } from '@umbraco-cms/element'; import { UniqueBehaviorSubject } from '@umbraco-cms/observable-api'; -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; // TODO: Refactor this, its not a service and the data should be handled by a context api. @customElement('umb-tree-context-menu-page-service') @@ -66,7 +66,7 @@ export class UmbTreeContextMenuPageService extends UmbLitElement { } } -export const UMB_TREE_CONTEXT_MENU_PAGE_SERVICE_CONTEXT_ALIAS = new UmbContextAlias( +export const UMB_TREE_CONTEXT_MENU_PAGE_SERVICE_CONTEXT_ALIAS = new UmbContextToken( UmbTreeContextMenuService.name ); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu.service.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu.service.ts index aaed6a96aa..919ea6ae92 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu.service.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu.service.ts @@ -3,7 +3,7 @@ import { css, html, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { ActionPageEntity } from '../action/tree-item-action.element'; import { UmbLitElement } from '@umbraco-cms/element'; -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; @customElement('umb-tree-context-menu-service') export class UmbTreeContextMenuService extends UmbLitElement { @@ -93,7 +93,7 @@ export class UmbTreeContextMenuService extends UmbLitElement { } } -export const UMB_TREE_CONTEXT_MENU_SERVICE_CONTEXT_ALIAS = new UmbContextAlias( +export const UMB_TREE_CONTEXT_MENU_SERVICE_CONTEXT_ALIAS = new UmbContextToken( UmbTreeContextMenuService.name ); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/dictionary.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/dictionary.store.ts index dae11fae8f..ddc60ff7c1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/dictionary.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/dictionary.store.ts @@ -2,7 +2,7 @@ import { map, Observable } from 'rxjs'; import { UmbDataStoreBase } from '../../../core/stores/store'; import { DictionaryResource, EntityTreeItem } from '@umbraco-cms/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; export const STORE_ALIAS = 'umbDictionaryStore'; @@ -52,4 +52,4 @@ export class UmbDictionaryStore extends UmbDataStoreBase { } } -export const UMB_DICTIONARY_STORE_CONTEXT_ALIAS = new UmbContextAlias(STORE_ALIAS); +export const UMB_DICTIONARY_STORE_CONTEXT_ALIAS = new UmbContextToken(STORE_ALIAS); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/current-user-history.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/current-user-history.store.ts index e2558a5eba..a80bf1a1ff 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/current-user-history.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/current-user-history.store.ts @@ -1,4 +1,4 @@ -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; import { createObservablePart, UniqueBehaviorSubject } from '@umbraco-cms/observable-api'; export type UmbModelType = 'dialog' | 'sidebar'; @@ -50,6 +50,6 @@ export class UmbCurrentUserHistoryStore { } } -export const UMB_CURRENT_USER_HISTORY_STORE_CONTEXT_ALIAS = new UmbContextAlias( +export const UMB_CURRENT_USER_HISTORY_STORE_CONTEXT_ALIAS = new UmbContextToken( UmbCurrentUserHistoryStore.name ); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/current-user.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/current-user.store.ts index 269678f302..0e8df46239 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/current-user.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/current-user.store.ts @@ -2,7 +2,7 @@ import { BehaviorSubject, Observable } from 'rxjs'; import { umbUsersData } from '../../../core/mocks/data/users.data'; import type { UserDetails } from '@umbraco-cms/models'; import { umbracoPath } from '@umbraco-cms/utils'; -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; export class UmbCurrentUserStore { private _currentUser = new BehaviorSubject(umbUsersData.getAll()[0]); //TODO: Temp solution to set the first user as the current logged in user @@ -28,4 +28,4 @@ export class UmbCurrentUserStore { } } -export const UMB_CURRENT_USER_STORE_CONTEXT_ALIAS = new UmbContextAlias(UmbCurrentUserStore.name); +export const UMB_CURRENT_USER_STORE_CONTEXT_ALIAS = new UmbContextToken(UmbCurrentUserStore.name); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/user-group.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/user-group.store.ts index d8da4ff25c..4b8ba00b8e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/user-group.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/user-group.store.ts @@ -1,7 +1,7 @@ import { map, Observable } from 'rxjs'; import { UmbDataStoreBase } from '../../../core/stores/store'; import type { UserGroupDetails, UserGroupEntity } from '@umbraco-cms/models'; -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; // TODO: get rid of this type addition & { ... }: export type UmbUserGroupStoreItemType = UserGroupDetails & { users?: Array }; @@ -87,4 +87,4 @@ export class UmbUserGroupStore extends UmbDataStoreBase(STORE_ALIAS); +export const UMB_USER_GROUP_STORE_CONTEXT_ALIAS = new UmbContextToken(STORE_ALIAS); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/user.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/user.store.ts index b49119aa7a..4a842c5c95 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/user.store.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/user.store.ts @@ -2,7 +2,7 @@ import { map, Observable } from 'rxjs'; import { UmbDataStoreBase } from '../../../core/stores/store'; import type { UserDetails } from '@umbraco-cms/models'; import { UniqueBehaviorSubject } from '@umbraco-cms/observable-api'; -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; export type UmbUserStoreItemType = UserDetails; @@ -280,4 +280,4 @@ export class UmbUserStore extends UmbDataStoreBase { // } } -export const UMB_USER_STORE_CONTEXT_ALIAS = new UmbContextAlias(STORE_ALIAS); +export const UMB_USER_STORE_CONTEXT_ALIAS = new UmbContextToken(STORE_ALIAS); diff --git a/src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-consumer.controller.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-consumer.controller.ts index c0d5cc5e7d..dfc117c809 100644 --- a/src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-consumer.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-consumer.controller.ts @@ -1,4 +1,4 @@ -import { UmbContextAlias } from '../context-alias'; +import { UmbContextToken } from '../context-token'; import { UmbContextConsumer } from './context-consumer'; import { UmbContextCallback } from './context-request.event'; @@ -14,7 +14,7 @@ export class UmbContextConsumerController constructor( host: UmbControllerHostInterface, - contextAlias: string | UmbContextAlias, + contextAlias: string | UmbContextToken, callback: UmbContextCallback ) { super(host, contextAlias, callback); diff --git a/src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-consumer.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-consumer.ts index 2c0ba68cc6..ab627326ad 100644 --- a/src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-consumer.ts +++ b/src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-consumer.ts @@ -1,4 +1,4 @@ -import { UmbContextAlias } from '../context-alias'; +import { UmbContextToken } from '../context-token'; import { isUmbContextProvideEventType, umbContextProvideEventType } from '../provide/context-provide.event'; import { UmbContextRequestEventImplementation, UmbContextCallback } from './context-request.event'; @@ -26,7 +26,7 @@ export class UmbContextConsumer, + _contextAlias: string | UmbContextToken, private _callback: UmbContextCallback ) { this._contextAlias = _contextAlias.toString(); diff --git a/src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-request.event.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-request.event.ts index 4dfc6d1127..9d8fa86dec 100644 --- a/src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-request.event.ts +++ b/src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-request.event.ts @@ -1,4 +1,4 @@ -import { UmbContextAlias } from '../context-alias'; +import { UmbContextToken } from '../context-token'; export const umbContextRequestEventType = 'umb:context-request'; @@ -9,7 +9,7 @@ export type UmbContextCallback = (instance: T) => void; * @interface UmbContextRequestEvent */ export interface UmbContextRequestEvent extends Event { - readonly contextAlias: string | UmbContextAlias; + readonly contextAlias: string | UmbContextToken; readonly callback: UmbContextCallback; } @@ -21,7 +21,7 @@ export interface UmbContextRequestEvent extends Event { */ export class UmbContextRequestEventImplementation extends Event implements UmbContextRequestEvent { public constructor( - public readonly contextAlias: string | UmbContextAlias, + public readonly contextAlias: string | UmbContextToken, public readonly callback: UmbContextCallback ) { super(umbContextRequestEventType, { bubbles: true, composed: true, cancelable: true }); diff --git a/src/Umbraco.Web.UI.Client/src/core/context-api/context-alias.test.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/context-token.test.ts similarity index 92% rename from src/Umbraco.Web.UI.Client/src/core/context-api/context-alias.test.ts rename to src/Umbraco.Web.UI.Client/src/core/context-api/context-token.test.ts index 81b2f4623a..66531d06f0 100644 --- a/src/Umbraco.Web.UI.Client/src/core/context-api/context-alias.test.ts +++ b/src/Umbraco.Web.UI.Client/src/core/context-api/context-token.test.ts @@ -1,6 +1,6 @@ import { expect } from '@open-wc/testing'; import { UmbContextConsumer } from './consume/context-consumer'; -import { UmbContextAlias } from './context-alias'; +import { UmbContextToken } from './context-token'; import { UmbContextProvider } from './provide/context-provider'; const testContextAlias = 'my-test-context'; @@ -10,7 +10,7 @@ class MyClass { } describe('ContextAlias', () => { - const contextAlias = new UmbContextAlias(testContextAlias); + const contextAlias = new UmbContextToken(testContextAlias); const typedProvider = new UmbContextProvider(document.body, contextAlias, new MyClass()); typedProvider.hostConnected(); diff --git a/src/Umbraco.Web.UI.Client/src/core/context-api/context-alias.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/context-token.ts similarity index 80% rename from src/Umbraco.Web.UI.Client/src/core/context-api/context-alias.ts rename to src/Umbraco.Web.UI.Client/src/core/context-api/context-token.ts index a26741648b..a1d7c0b2a5 100644 --- a/src/Umbraco.Web.UI.Client/src/core/context-api/context-alias.ts +++ b/src/Umbraco.Web.UI.Client/src/core/context-api/context-token.ts @@ -1,4 +1,4 @@ -export class UmbContextAlias { +export class UmbContextToken { /** * @param alias Unique identifier for the token, * @param _desc Description for the token, @@ -10,8 +10,8 @@ export class UmbContextAlias { /** * @internal */ - get multi(): UmbContextAlias> { - return this as UmbContextAlias>; + get multi(): UmbContextToken> { + return this as UmbContextToken>; } /** diff --git a/src/Umbraco.Web.UI.Client/src/core/context-api/index.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/index.ts index fa0e18d989..67aaa8edcf 100644 --- a/src/Umbraco.Web.UI.Client/src/core/context-api/index.ts +++ b/src/Umbraco.Web.UI.Client/src/core/context-api/index.ts @@ -4,4 +4,4 @@ export * from './consume/context-request.event'; export * from './provide/context-provider.controller'; export * from './provide/context-provider'; export * from './provide/context-provide.event'; -export * from './context-alias'; +export * from './context-token'; diff --git a/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provide.event.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provide.event.ts index 3b3da50808..37b88cea24 100644 --- a/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provide.event.ts +++ b/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provide.event.ts @@ -1,4 +1,4 @@ -import { UmbContextAlias } from '../context-alias'; +import { UmbContextToken } from '../context-token'; export const umbContextProvideEventType = 'umb:context-provide'; @@ -7,7 +7,7 @@ export const umbContextProvideEventType = 'umb:context-provide'; * @interface UmbContextProvideEvent */ export interface UmbContextProvideEvent extends Event { - readonly contextAlias: string | UmbContextAlias; + readonly contextAlias: string | UmbContextToken; } /** @@ -17,7 +17,7 @@ export interface UmbContextProvideEvent extends Event { * @implements {UmbContextProvideEvent} */ export class UmbContextProvideEventImplementation extends Event implements UmbContextProvideEvent { - public constructor(public readonly contextAlias: string | UmbContextAlias) { + public constructor(public readonly contextAlias: string | UmbContextToken) { super(umbContextProvideEventType, { bubbles: true, composed: true }); } } diff --git a/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.controller.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.controller.ts index dbddce98ba..88bebc98d2 100644 --- a/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.controller.ts @@ -1,4 +1,4 @@ -import { UmbContextAlias } from '../context-alias'; +import { UmbContextToken } from '../context-token'; import { UmbContextProvider } from './context-provider'; import type { UmbControllerHostInterface, UmbControllerInterface } from '@umbraco-cms/controller'; @@ -10,7 +10,7 @@ export class UmbContextProviderController return this._contextAlias.toString(); } - constructor(host: UmbControllerHostInterface, contextAlias: string | UmbContextAlias, instance: T) { + constructor(host: UmbControllerHostInterface, contextAlias: string | UmbContextToken, instance: T) { super(host, contextAlias, instance); // TODO: What if this API is already provided with this alias? maybe handle this in the controller: diff --git a/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.test.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.test.ts index 6a633b7931..3a3a716eb7 100644 --- a/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.test.ts +++ b/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.test.ts @@ -1,7 +1,7 @@ import { expect } from '@open-wc/testing'; import { UmbContextConsumer } from '../consume/context-consumer'; import { UmbContextRequestEventImplementation } from '../consume/context-request.event'; -import { UmbContextAlias } from '../context-alias'; +import { UmbContextToken } from '../context-token'; import { UmbContextProvider } from './context-provider'; class MyClass { diff --git a/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.ts index 1b64bb2c85..f883c75c6a 100644 --- a/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.ts +++ b/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.ts @@ -1,5 +1,5 @@ import { umbContextRequestEventType, isUmbContextRequestEvent } from '../consume/context-request.event'; -import { UmbContextAlias } from '../context-alias'; +import { UmbContextToken } from '../context-token'; import { UmbContextProvideEventImplementation } from './context-provide.event'; /** @@ -19,7 +19,7 @@ export class UmbContextProvider { * @param {*} instance * @memberof UmbContextProvider */ - constructor(host: HostType, contextAlias: string | UmbContextAlias, instance: unknown) { + constructor(host: HostType, contextAlias: string | UmbContextToken, instance: unknown) { this.host = host; this._contextAlias = contextAlias.toString(); this.#instance = instance; diff --git a/src/Umbraco.Web.UI.Client/src/core/element/element.mixin.ts b/src/Umbraco.Web.UI.Client/src/core/element/element.mixin.ts index 99bd7471fc..eb855a226e 100644 --- a/src/Umbraco.Web.UI.Client/src/core/element/element.mixin.ts +++ b/src/Umbraco.Web.UI.Client/src/core/element/element.mixin.ts @@ -4,7 +4,7 @@ import type { HTMLElementConstructor } from '../models'; import { UmbControllerHostInterface, UmbControllerHostMixin } from '@umbraco-cms/controller'; import { - UmbContextAlias, + UmbContextToken, UmbContextCallback, UmbContextConsumerController, UmbContextProviderController, @@ -18,9 +18,9 @@ interface ResolvedContexts { export declare class UmbElementMixinInterface extends UmbControllerHostInterface { observe(source: Observable, callback: (_value: T) => void, unique?: string): UmbObserverController; - provideContext(alias: string | UmbContextAlias, instance: R): UmbContextProviderController; + provideContext(alias: string | UmbContextToken, instance: R): UmbContextProviderController; consumeContext( - alias: string | UmbContextAlias, + alias: string | UmbContextToken, callback: UmbContextCallback ): UmbContextConsumerController; consumeAllContexts(contextAliases: string[], callback: (_instances: ResolvedContexts) => void): void; @@ -46,7 +46,7 @@ export const UmbElementMixin = (superClass: T) * @return {UmbContextProviderController} Reference to a Context Provider Controller instance * @memberof UmbElementMixin */ - provideContext(alias: string | UmbContextAlias, instance: R): UmbContextProviderController { + provideContext(alias: string | UmbContextToken, instance: R): UmbContextProviderController { return new UmbContextProviderController(this, alias, instance); } @@ -58,7 +58,7 @@ export const UmbElementMixin = (superClass: T) * @memberof UmbElementMixin */ consumeContext( - alias: string | UmbContextAlias, + alias: string | UmbContextToken, callback: UmbContextCallback ): UmbContextConsumerController { return new UmbContextConsumerController(this, alias, callback); diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/modal.service.ts b/src/Umbraco.Web.UI.Client/src/core/modal/modal.service.ts index d974541fb3..b528cd9c05 100644 --- a/src/Umbraco.Web.UI.Client/src/core/modal/modal.service.ts +++ b/src/Umbraco.Web.UI.Client/src/core/modal/modal.service.ts @@ -15,7 +15,7 @@ import type { UmbModalConfirmData } from './layouts/confirm/modal-layout-confirm import type { UmbModalContentPickerData } from './layouts/content-picker/modal-layout-content-picker.element'; import type { UmbModalPropertyEditorUIPickerData } from './layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element'; import { UmbModalHandler } from './modal-handler'; -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; export type UmbModalType = 'dialog' | 'sidebar'; @@ -133,4 +133,4 @@ export class UmbModalService { } } -export const UMB_MODAL_SERVICE_CONTEXT_ALIAS = new UmbContextAlias(UmbModalService.name); +export const UMB_MODAL_SERVICE_CONTEXT_ALIAS = new UmbContextToken(UmbModalService.name); diff --git a/src/Umbraco.Web.UI.Client/src/core/notification/notification.service.ts b/src/Umbraco.Web.UI.Client/src/core/notification/notification.service.ts index 97686ccf7a..4a21e1a76f 100644 --- a/src/Umbraco.Web.UI.Client/src/core/notification/notification.service.ts +++ b/src/Umbraco.Web.UI.Client/src/core/notification/notification.service.ts @@ -1,6 +1,6 @@ import { BehaviorSubject } from 'rxjs'; import { UmbNotificationHandler } from '.'; -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; export type UmbNotificationData = any; @@ -86,6 +86,6 @@ export class UmbNotificationService { } } -export const UMB_NOTIFICATION_SERVICE_CONTEXT_ALIAS = new UmbContextAlias( +export const UMB_NOTIFICATION_SERVICE_CONTEXT_ALIAS = new UmbContextToken( UmbNotificationService.name ); diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts b/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts index 6c5a8a9f7f..b9564773d7 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts @@ -1,7 +1,7 @@ import { BehaviorSubject, Observable, ReplaySubject } from 'rxjs'; import { Install, InstallResource, InstallSettings, ProblemDetails, TelemetryLevel } from '@umbraco-cms/backend-api'; import { tryExecute } from '@umbraco-cms/resources'; -import { UmbContextAlias } from '@umbraco-cms/context-api'; +import { UmbContextToken } from '@umbraco-cms/context-api'; /** * Context API for the installer @@ -123,4 +123,4 @@ export class UmbInstallerContext { } } -export const UMB_INSTALLER_CONTEXT_ALIAS = new UmbContextAlias(UmbInstallerContext.name); +export const UMB_INSTALLER_CONTEXT_ALIAS = new UmbContextToken(UmbInstallerContext.name);