yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename context tokens, to align naming

Browse Source
This commit is contained in:
Niels Lyngsø
2024-01-24 09:52:36 +01:00
parent b78ee4bdab
commit 4ec086e14d
185 changed files with 418 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/.storybook/preview.js
View File

@@ -9,7 +9,7 @@ import { setCustomElements } from '@storybook/web-components';
import { startMockServiceWorker } from '../src/mocks';
import { UMB_MODAL_MANAGER_CONTEXT_TOKEN, UmbModalManagerContext } from '../src/packages/core/modal';
import { UMB_MODAL_MANAGER_CONTEXT, UmbModalManagerContext } from '../src/packages/core/modal';
import { UmbDataTypeTreeStore } from '../src/packages/core/data-type/tree/data-type-tree.store';
import { UmbDocumentStore } from '../src/packages/documents/documents/repository/document.store';
import { UmbDocumentTreeStore } from '../src/packages/documents/documents/tree/document-tree.store';
@@ -35,7 +35,7 @@ class UmbStoryBookElement extends UmbLitElement {
super();
this._umbIconRegistry.attach(this);
this._registerExtensions(documentManifests);
this.provideContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, new UmbModalManagerContext(this));
this.provideContext(UMB_MODAL_MANAGER_CONTEXT, new UmbModalManagerContext(this));
this._registerExtensions(localizationManifests);
umbLocalizationRegistry.loadLanguage('en-us'); // register default language

8
src/Umbraco.Web.UI.Client/README.md
View File

@@ -44,7 +44,7 @@ Then create a dashboard.js file the same folder.
```javascript
import { UmbElementMixin } from '@umbraco-cms/backoffice/element-api';
import { UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
const template = document.createElement('template');
template.innerHTML = `
@@ -75,7 +75,7 @@ export default class MyDashboardElement extends UmbElementMixin(HTMLElement) {
this.shadowRoot.getElementById('clickMe').addEventListener('click', this.onClick.bind(this));
this.consumeContext(UMB_NOTIFICATION_CONTEXT_TOKEN, (_instance) => {
this.consumeContext(UMB_NOTIFICATION_CONTEXT, (_instance) => {
this.#notificationContext = _instance;
});
}
@@ -109,7 +109,7 @@ Then go to the element located in `src/my-element.ts` and replace it with the fo
// src/my-element.ts
import { LitElement, html, customElement } from '@umbraco-cms/backoffice/external/lit';
import { UmbElementMixin } from '@umbraco-cms/backoffice/element-api';
import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
@customElement('my-element')
export default class MyElement extends UmbElementMixin(LitElement) {
@@ -117,7 +117,7 @@ export default class MyElement extends UmbElementMixin(LitElement) {
constructor() {
super();
this.consumeContext(UMB_NOTIFICATION_CONTEXT_TOKEN, (_instance) => {
this.consumeContext(UMB_NOTIFICATION_CONTEXT, (_instance) => {
this._notificationContext = _instance;
});
}

4
src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.context.ts
View File

@@ -17,7 +17,7 @@ export class UmbBackofficeContext extends UmbContextBase<UmbBackofficeContext> {
public readonly allowedSections = this.#allowedSections.asObservable();
constructor(host: UmbControllerHost) {
super(host, UMB_BACKOFFICE_CONTEXT_TOKEN);
super(host, UMB_BACKOFFICE_CONTEXT);
new UmbExtensionsManifestInitializer(this, umbExtensionsRegistry, 'section', null, (sections) => {
this.#allowedSections.setValue([...sections]);
});
@@ -28,4 +28,4 @@ export class UmbBackofficeContext extends UmbContextBase<UmbBackofficeContext> {
}
}
export const UMB_BACKOFFICE_CONTEXT_TOKEN = new UmbContextToken<UmbBackofficeContext>('UmbBackofficeContext');
export const UMB_BACKOFFICE_CONTEXT = new UmbContextToken<UmbBackofficeContext>('UmbBackofficeContext');

4
src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-sections.element.ts
View File

@@ -1,4 +1,4 @@
import { UMB_BACKOFFICE_CONTEXT_TOKEN } from '../backoffice.context.js';
import { UMB_BACKOFFICE_CONTEXT } from '../backoffice.context.js';
import type { UmbBackofficeContext } from '../backoffice.context.js';
import { css, CSSResultGroup, html, customElement, state, repeat } from '@umbraco-cms/backoffice/external/lit';
import type { ManifestSection } from '@umbraco-cms/backoffice/extension-registry';
@@ -18,7 +18,7 @@ export class UmbBackofficeHeaderSectionsElement extends UmbLitElement {
constructor() {
super();
this.consumeContext(UMB_BACKOFFICE_CONTEXT_TOKEN, (backofficeContext) => {
this.consumeContext(UMB_BACKOFFICE_CONTEXT, (backofficeContext) => {
this._backofficeContext = backofficeContext;
this._observeSections();
this._observeCurrentSection();

8
src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-main.element.ts
View File

@@ -1,6 +1,6 @@
import { UmbBackofficeContext, UMB_BACKOFFICE_CONTEXT_TOKEN } from '../backoffice.context.js';
import { UmbBackofficeContext, UMB_BACKOFFICE_CONTEXT } from '../backoffice.context.js';
import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
import { UmbSectionContext, UMB_SECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/section';
import { UmbSectionContext, UMB_SECTION_CONTEXT } from '@umbraco-cms/backoffice/section';
import type { UmbRoute, UmbRouterSlotChangeEvent } from '@umbraco-cms/backoffice/router';
import type { ManifestSection, UmbSectionElement } from '@umbraco-cms/backoffice/extension-registry';
import { UmbExtensionManifestInitializer, createExtensionElement } from '@umbraco-cms/backoffice/extension-api';
@@ -21,7 +21,7 @@ export class UmbBackofficeMainElement extends UmbLitElement {
constructor() {
super();
this.consumeContext(UMB_BACKOFFICE_CONTEXT_TOKEN, (_instance) => {
this.consumeContext(UMB_BACKOFFICE_CONTEXT, (_instance) => {
this._backofficeContext = _instance;
this._observeBackoffice();
});
@@ -88,7 +88,7 @@ export class UmbBackofficeMainElement extends UmbLitElement {
private _provideSectionContext(sectionManifest: ManifestSection) {
if (!this._sectionContext) {
this._sectionContext = new UmbSectionContext(sectionManifest);
this.provideContext(UMB_SECTION_CONTEXT_TOKEN, this._sectionContext);
this.provideContext(UMB_SECTION_CONTEXT, this._sectionContext);
} else {
this._sectionContext.setManifest(sectionManifest);
}

4
src/Umbraco.Web.UI.Client/src/apps/installer/consent/installer-consent.element.ts
View File

@@ -1,4 +1,4 @@
import { UmbInstallerContext, UMB_INSTALLER_CONTEXT_TOKEN } from '../installer.context.js';
import { UmbInstallerContext, UMB_INSTALLER_CONTEXT } from '../installer.context.js';
import { css, CSSResultGroup, html, customElement, state, unsafeHTML } from '@umbraco-cms/backoffice/external/lit';
import {
@@ -21,7 +21,7 @@ export class UmbInstallerConsentElement extends UmbLitElement {
constructor() {
super();
this.consumeContext(UMB_INSTALLER_CONTEXT_TOKEN, (installerContext) => {
this.consumeContext(UMB_INSTALLER_CONTEXT, (installerContext) => {
this._installerContext = installerContext;
this._observeInstallerSettings();
this._observeInstallerData();

4
src/Umbraco.Web.UI.Client/src/apps/installer/database/installer-database.element.ts
View File

@@ -1,4 +1,4 @@
import { UmbInstallerContext, UMB_INSTALLER_CONTEXT_TOKEN } from '../installer.context.js';
import { UmbInstallerContext, UMB_INSTALLER_CONTEXT } from '../installer.context.js';
import { UUIButtonElement } from '@umbraco-cms/backoffice/external/uui';
import {
css,
@@ -46,7 +46,7 @@ export class UmbInstallerDatabaseElement extends UmbLitElement {
constructor() {
super();
this.consumeContext(UMB_INSTALLER_CONTEXT_TOKEN, (installerContext) => {
this.consumeContext(UMB_INSTALLER_CONTEXT, (installerContext) => {
this._installerContext = installerContext;
this._observeInstallerSettings();
this._observeInstallerData();

4
src/Umbraco.Web.UI.Client/src/apps/installer/error/installer-error.element.ts
View File

@@ -1,4 +1,4 @@
import { UmbInstallerContext, UMB_INSTALLER_CONTEXT_TOKEN } from '../installer.context.js';
import { UmbInstallerContext, UMB_INSTALLER_CONTEXT } from '../installer.context.js';
import { css, CSSResultGroup, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit';
import { ProblemDetails } from '@umbraco-cms/backoffice/backend-api';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -13,7 +13,7 @@ export class UmbInstallerErrorElement extends UmbLitElement {
connectedCallback() {
super.connectedCallback();
this.consumeContext(UMB_INSTALLER_CONTEXT_TOKEN, (installerContext) => {
this.consumeContext(UMB_INSTALLER_CONTEXT, (installerContext) => {
this._installerContext = installerContext;
this._observeInstallStatus();
});

2
src/Umbraco.Web.UI.Client/src/apps/installer/installer.context.ts
View File

@@ -129,4 +129,4 @@ export class UmbInstallerContext {
}
}
export const UMB_INSTALLER_CONTEXT_TOKEN = new UmbContextToken<UmbInstallerContext>('UmbInstallerContext');
export const UMB_INSTALLER_CONTEXT = new UmbContextToken<UmbInstallerContext>('UmbInstallerContext');

4
src/Umbraco.Web.UI.Client/src/apps/installer/installer.element.ts
View File

@@ -1,4 +1,4 @@
import { UmbInstallerContext, UMB_INSTALLER_CONTEXT_TOKEN } from './installer.context.js';
import { UmbInstallerContext, UMB_INSTALLER_CONTEXT } from './installer.context.js';
import { css, CSSResultGroup, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -18,7 +18,7 @@ export class UmbInstallerElement extends UmbLitElement {
constructor() {
super();
this.provideContext(UMB_INSTALLER_CONTEXT_TOKEN, this._umbInstallerContext);
this.provideContext(UMB_INSTALLER_CONTEXT, this._umbInstallerContext);
}
connectedCallback(): void {

4
src/Umbraco.Web.UI.Client/src/apps/installer/user/installer-user.element.ts
View File

@@ -1,4 +1,4 @@
import { UmbInstallerContext, UMB_INSTALLER_CONTEXT_TOKEN } from '../installer.context.js';
import { UmbInstallerContext, UMB_INSTALLER_CONTEXT } from '../installer.context.js';
import { css, CSSResultGroup, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -12,7 +12,7 @@ export class UmbInstallerUserElement extends UmbLitElement {
constructor() {
super();
this.consumeContext(UMB_INSTALLER_CONTEXT_TOKEN, (installerContext) => {
this.consumeContext(UMB_INSTALLER_CONTEXT, (installerContext) => {
this._installerContext = installerContext;
this._observeInstallerData();
});

4
src/Umbraco.Web.UI.Client/src/packages/audit-log/repository/audit-log.repository.ts
View File

@@ -1,7 +1,7 @@
import { UmbAuditLogServerDataSource } from './audit-log.server.data.js';
import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
import { AuditTypeModel, DirectionModel } from '@umbraco-cms/backoffice/backend-api';
import { UmbBaseController } from '@umbraco-cms/backoffice/class-api';
@@ -14,7 +14,7 @@ export class UmbAuditLogRepository extends UmbBaseController {
super(host);
this.#dataSource = new UmbAuditLogServerDataSource(host);
this.#init = new UmbContextConsumerController(host, UMB_NOTIFICATION_CONTEXT_TOKEN, (instance) => {
this.#init = new UmbContextConsumerController(host, UMB_NOTIFICATION_CONTEXT, (instance) => {
this.#notificationService = instance;
}).asPromise();
}

4
src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-block/block-list-block.element.ts
View File

@@ -5,7 +5,7 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import { type UmbBlockLayoutBaseModel } from '@umbraco-cms/backoffice/block';
import '../ref-list-block/index.js';
import '../inline-list-block/index.js';
import { UMB_CONFIRM_MODAL, UMB_MODAL_MANAGER_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
import { UMB_CONFIRM_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
/**
* @element umb-property-editor-ui-block-list-block
@@ -55,7 +55,7 @@ export class UmbPropertyEditorUIBlockListBlockElement extends UmbLitElement impl
}
#requestDelete() {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, async (modalManager) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, async (modalManager) => {
const modalContext = modalManager.open(UMB_CONFIRM_MODAL, {
data: {
headline: `Delete ${this._label}`,

4
src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/block-type-card/block-type-card.element.ts
View File

@@ -4,7 +4,7 @@ import {
} from '@umbraco-cms/backoffice/document-type';
import { UmbDeleteEvent } from '@umbraco-cms/backoffice/event';
import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
import { UMB_CONFIRM_MODAL, UMB_MODAL_MANAGER_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
import { UMB_CONFIRM_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
import { UmbRepositoryItemsManager } from '@umbraco-cms/backoffice/repository';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -53,7 +53,7 @@ export class UmbBlockTypeCardElement extends UmbLitElement {
}
#onRequestDelete() {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, async (modalManager) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, async (modalManager) => {
const modalContext = modalManager.open(UMB_CONFIRM_MODAL, {
data: {
color: 'danger',

4
src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/input-block-type/input-block-type.element.ts
View File

@@ -1,7 +1,7 @@
import { UmbBlockTypeBaseModel } from '../../types.js';
import {
UMB_DOCUMENT_TYPE_PICKER_MODAL,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
UMB_WORKSPACE_MODAL,
UmbModalRouteRegistrationController,
} from '@umbraco-cms/backoffice/modal';
@@ -63,7 +63,7 @@ export class UmbInputBlockTypeElement<
}
create() {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, async (modalManager) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, async (modalManager) => {
if (modalManager) {
// TODO: Make as mode for the Picker Modal, so the click to select immediately submits the modal(And in that mode we do not want to see a Submit button).
const modalContext = modalManager.open(UMB_DOCUMENT_TYPE_PICKER_MODAL, {

4
src/Umbraco.Web.UI.Client/src/packages/block/block/modals/block-catalogue/block-catalogue-modal.element.ts
View File

@@ -7,7 +7,7 @@ import {
import { css, html, customElement, state, repeat, ifDefined, nothing } from '@umbraco-cms/backoffice/external/lit';
import { groupBy } from '@umbraco-cms/backoffice/external/lodash';
import {
UMB_MODAL_CONTEXT_TOKEN,
UMB_MODAL_CONTEXT,
UmbModalBaseElement,
UmbModalRouteRegistrationController,
} from '@umbraco-cms/backoffice/modal';
@@ -32,7 +32,7 @@ export class UmbBlockCatalogueModalElement extends UmbModalBaseElement<
constructor() {
super();
this.consumeContext(UMB_MODAL_CONTEXT_TOKEN, (modalContext) => {
this.consumeContext(UMB_MODAL_CONTEXT, (modalContext) => {
new UmbModalRouteRegistrationController(this, UMB_BLOCK_WORKSPACE_MODAL)
//.addAdditionalPath('block') // No need for additional path specification in this context as this is for sure the only workspace we want to open here.
.onSetup(() => {

6
src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.context.ts
View File

@@ -7,7 +7,7 @@ import { ManifestWorkspace } from '@umbraco-cms/backoffice/extension-registry';
import { UmbId } from '@umbraco-cms/backoffice/id';
import { UMB_BLOCK_MANAGER_CONTEXT, UmbBlockWorkspaceData } from '@umbraco-cms/backoffice/block';
import { buildUdi } from '@umbraco-cms/backoffice/utils';
import { UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
import { UMB_MODAL_CONTEXT } from '@umbraco-cms/backoffice/modal';
export class UmbBlockWorkspaceContext<
LayoutDataType extends UmbBlockLayoutBaseModel = UmbBlockLayoutBaseModel,
@@ -19,7 +19,7 @@ export class UmbBlockWorkspaceContext<
#blockManager?: typeof UMB_BLOCK_MANAGER_CONTEXT.TYPE;
#retrieveBlockManager;
#modalContext?: typeof UMB_MODAL_CONTEXT_TOKEN.TYPE;
#modalContext?: typeof UMB_MODAL_CONTEXT.TYPE;
#retrieveModalContext;
#editorConfigPromise?: Promise<unknown>;
@@ -49,7 +49,7 @@ export class UmbBlockWorkspaceContext<
this.#entityType = workspaceArgs.manifest.meta?.entityType;
this.workspaceAlias = workspaceArgs.manifest.alias;
this.#retrieveModalContext = this.consumeContext(UMB_MODAL_CONTEXT_TOKEN, (context) => {
this.#retrieveModalContext = this.consumeContext(UMB_MODAL_CONTEXT, (context) => {
this.#modalContext = context;
context.onSubmit().catch(this.#modalRejected);
}).asPromise();

4
src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-modal-container/backoffice-modal-container.element.ts
View File

@@ -2,7 +2,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import { css, CSSResultGroup, html, repeat, customElement, state } from '@umbraco-cms/backoffice/external/lit';
import {
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
UmbModalElement,
UmbModalContext,
} from '@umbraco-cms/backoffice/modal';
@@ -21,7 +21,7 @@ export class UmbBackofficeModalContainerElement extends UmbLitElement {
constructor() {
super();
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this._modalManager = instance;
this._observeModals();
});

4
src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-notification-container/backoffice-notification-container.element.ts
View File

@@ -3,7 +3,7 @@ import { css, CSSResultGroup, html, customElement, state, repeat, query } from '
import {
UmbNotificationHandler,
UmbNotificationContext,
UMB_NOTIFICATION_CONTEXT_TOKEN,
UMB_NOTIFICATION_CONTEXT,
} from '@umbraco-cms/backoffice/notification';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -20,7 +20,7 @@ export class UmbBackofficeNotificationContainerElement extends UmbLitElement {
constructor() {
super();
this.consumeContext(UMB_NOTIFICATION_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_NOTIFICATION_CONTEXT, (instance) => {
this._notificationContext = instance;
this._observeNotifications();
});

4
src/Umbraco.Web.UI.Client/src/packages/core/components/entity-actions-bundle/entity-actions-bundle.element.ts
View File

@@ -1,7 +1,7 @@
import { css, html, nothing, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import { map } from '@umbraco-cms/backoffice/external/rxjs';
import { UmbSectionSidebarContext, UMB_SECTION_SIDEBAR_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/section';
import { UmbSectionSidebarContext, UMB_SECTION_SIDEBAR_CONTEXT } from '@umbraco-cms/backoffice/section';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
@@ -35,7 +35,7 @@ export class UmbEntityActionsBundleElement extends UmbLitElement {
constructor() {
super();
this.consumeContext(UMB_SECTION_SIDEBAR_CONTEXT_TOKEN, (sectionContext) => {
this.consumeContext(UMB_SECTION_SIDEBAR_CONTEXT, (sectionContext) => {
this.#sectionSidebarContext = sectionContext;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/core/components/input-list-base/input-list-base.ts
View File

@@ -4,7 +4,7 @@ import {
UmbModalManagerContext,
UmbModalToken,
UmbModalType,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
UmbPickerModalValue,
} from '@umbraco-cms/backoffice/modal';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -29,7 +29,7 @@ export class UmbInputListBaseElement extends UmbLitElement {
constructor() {
super();
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this._modalContext = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/core/components/input-markdown-editor/input-markdown.element.ts
View File

@@ -9,7 +9,7 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import {
UMB_LINK_PICKER_MODAL,
UMB_MEDIA_TREE_PICKER_MODAL,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
UmbModalManagerContext,
} from '@umbraco-cms/backoffice/modal';
import { UMB_APP_CONTEXT } from '@umbraco-cms/backoffice/app';
@@ -47,7 +47,7 @@ export class UmbInputMarkdownElement extends FormControlMixin(UmbLitElement) {
constructor() {
super();
this.#loadCodeEditor();
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this._modalContext = instance;
});
this.consumeContext(UMB_APP_CONTEXT, (instance) => {

10
src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-color-picker-input/multiple-color-picker-item-input.element.ts
View File

@@ -5,11 +5,7 @@ import {
UUIInputElement,
UUIInputEvent,
} from '@umbraco-cms/backoffice/external/uui';
import {
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_CONFIRM_MODAL,
} from '@umbraco-cms/backoffice/modal';
import { UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT, UMB_CONFIRM_MODAL } from '@umbraco-cms/backoffice/modal';
import { UmbChangeEvent, UmbInputEvent, UmbDeleteEvent } from '@umbraco-cms/backoffice/event';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -53,7 +49,7 @@ export class UmbMultipleColorPickerItemInputElement extends FormControlMixin(Umb
constructor() {
super();
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this._modalContext = instance;
});
}
@@ -65,7 +61,7 @@ export class UmbMultipleColorPickerItemInputElement extends FormControlMixin(Umb
content: this.localize.term('content_nestedContentDeleteItem'),
color: 'danger',
confirmLabel: this.localize.term('actions_delete'),
}
},
});
modalContext?.onSubmit().then(() => {

8
src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-text-string-input/input-multiple-text-string-item.element.ts
View File

@@ -1,10 +1,6 @@
import { css, html, nothing, customElement, property, query } from '@umbraco-cms/backoffice/external/lit';
import { FormControlMixin, UUIInputElement, UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
import {
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_CONFIRM_MODAL,
} from '@umbraco-cms/backoffice/modal';
import { UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT, UMB_CONFIRM_MODAL } from '@umbraco-cms/backoffice/modal';
import { UmbChangeEvent, UmbInputEvent, UmbDeleteEvent } from '@umbraco-cms/backoffice/event';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -39,7 +35,7 @@ export class UmbInputMultipleTextStringItemElement extends FormControlMixin(UmbL
constructor() {
super();
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this._modalContext = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/copy/copy.action.ts
View File

@@ -3,7 +3,7 @@ import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import {
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
UMB_DATA_TYPE_PICKER_MODAL,
} from '@umbraco-cms/backoffice/modal';
@@ -14,7 +14,7 @@ export class UmbCopyDataTypeEntityAction extends UmbEntityActionBase<UmbCopyData
constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) {
super(host, repositoryAlias, unique);
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this.#modalManagerContext = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/create/create.action.ts
View File

@@ -2,7 +2,7 @@ import { UmbDataTypeDetailRepository } from '../../repository/detail/data-type-d
import { UMB_DATA_TYPE_CREATE_OPTIONS_MODAL } from './modal/index.js';
import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import { UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
import { UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
export class UmbCreateDataTypeEntityAction extends UmbEntityActionBase<UmbDataTypeDetailRepository> {
#modalManagerContext?: UmbModalManagerContext;
@@ -10,7 +10,7 @@ export class UmbCreateDataTypeEntityAction extends UmbEntityActionBase<UmbDataTy
constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) {
super(host, repositoryAlias, unique);
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this.#modalManagerContext = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/create/modal/data-type-create-options-modal.element.ts
View File

@@ -5,7 +5,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import {
type UmbModalManagerContext,
UmbModalBaseElement,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
} from '@umbraco-cms/backoffice/modal';
import { UMB_FOLDER_CREATE_MODAL } from '@umbraco-cms/backoffice/tree';
@@ -15,7 +15,7 @@ export class UmbDataTypeCreateOptionsModalElement extends UmbModalBaseElement<Um
constructor() {
super();
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this.#modalContext = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/core/data-type/entity-actions/move/move.action.ts
View File

@@ -3,7 +3,7 @@ import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import {
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
UMB_DATA_TYPE_PICKER_MODAL,
} from '@umbraco-cms/backoffice/modal';
@@ -14,7 +14,7 @@ export class UmbMoveDataTypeEntityAction extends UmbEntityActionBase<UmbMoveData
constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) {
super(host, repositoryAlias, unique);
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this.#modalManagerContext = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/copy/data-type-copy.repository.ts
View File

@@ -1,7 +1,7 @@
import { UMB_DATA_TYPE_TREE_STORE_CONTEXT, UmbDataTypeTreeStore } from '../../tree/data-type-tree.store.js';
import { UmbDataTypeDetailRepository } from '../detail/data-type-detail.repository.js';
import { UmbDataTypeCopyServerDataSource } from './data-type-copy.server.data-source.js';
import { UMB_NOTIFICATION_CONTEXT_TOKEN, UmbNotificationContext } from '@umbraco-cms/backoffice/notification';
import { UMB_NOTIFICATION_CONTEXT, UmbNotificationContext } from '@umbraco-cms/backoffice/notification';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UmbCopyDataSource, UmbCopyRepository, UmbRepositoryBase } from '@umbraco-cms/backoffice/repository';
@@ -22,7 +22,7 @@ export class UmbCopyDataTypeRepository extends UmbRepositoryBase implements UmbC
this.#treeStore = instance;
}).asPromise(),
this.consumeContext(UMB_NOTIFICATION_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_NOTIFICATION_CONTEXT, (instance) => {
this.#notificationContext = instance;
}).asPromise(),
]);

4
src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/move/data-type-move.repository.ts
View File

@@ -1,6 +1,6 @@
import { UMB_DATA_TYPE_TREE_STORE_CONTEXT, UmbDataTypeTreeStore } from '../../tree/data-type-tree.store.js';
import { UmbDataTypeMoveServerDataSource } from './data-type-move.server.data-source.js';
import { UMB_NOTIFICATION_CONTEXT_TOKEN, UmbNotificationContext } from '@umbraco-cms/backoffice/notification';
import { UMB_NOTIFICATION_CONTEXT, UmbNotificationContext } from '@umbraco-cms/backoffice/notification';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UmbMoveDataSource, UmbMoveRepository, UmbRepositoryBase } from '@umbraco-cms/backoffice/repository';
@@ -19,7 +19,7 @@ export class UmbMoveDataTypeRepository extends UmbRepositoryBase implements UmbM
this.#treeStore = instance;
}).asPromise(),
this.consumeContext(UMB_NOTIFICATION_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_NOTIFICATION_CONTEXT, (instance) => {
this.#notificationContext = instance;
}).asPromise(),
]);

4
src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/details/data-type-details-workspace-view.element.ts
View File

@@ -4,7 +4,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
import {
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
UMB_PROPERTY_EDITOR_UI_PICKER_MODAL,
} from '@umbraco-cms/backoffice/modal';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -33,7 +33,7 @@ export class UmbDataTypeDetailsWorkspaceViewEditElement extends UmbLitElement im
constructor() {
super();
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this._modalContext = instance;
});

4
src/Umbraco.Web.UI.Client/src/packages/core/debug/debug.element.ts
View File

@@ -19,7 +19,7 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import {
UmbModalManagerContext,
UMB_CONTEXT_DEBUGGER_MODAL,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
} from '@umbraco-cms/backoffice/modal';
@customElement('umb-debug')
@@ -40,7 +40,7 @@ export class UmbDebugElement extends UmbLitElement {
constructor() {
super();
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this._modalContext = instance;
});
}

8
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/delete/delete.action.ts
View File

@@ -1,11 +1,7 @@
import { UmbEntityActionBase } from '../../entity-action.js';
import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import {
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_CONFIRM_MODAL,
} from '@umbraco-cms/backoffice/modal';
import { UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT, UMB_CONFIRM_MODAL } from '@umbraco-cms/backoffice/modal';
import { UmbDetailRepository, UmbItemRepository } from '@umbraco-cms/backoffice/repository';
export class UmbDeleteEntityAction<
@@ -16,7 +12,7 @@ export class UmbDeleteEntityAction<
constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) {
super(host, repositoryAlias, unique);
new UmbContextConsumerController(this._host, UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
new UmbContextConsumerController(this._host, UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this.#modalManager = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/rename/rename-repository-base.ts
View File

@@ -1,5 +1,5 @@
import { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UMB_NOTIFICATION_CONTEXT_TOKEN, UmbNotificationContext } from '@umbraco-cms/backoffice/notification';
import { UMB_NOTIFICATION_CONTEXT, UmbNotificationContext } from '@umbraco-cms/backoffice/notification';
import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository';
import { UmbRenameDataSource, UmbRenameDataSourceConstructor } from '@umbraco-cms/backoffice/entity-action';
import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
@@ -24,7 +24,7 @@ export abstract class UmbRenameRepositoryBase<DetailModelType extends { unique:
this.#detailStore = instance;
}).asPromise(),
this.consumeContext(UMB_NOTIFICATION_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_NOTIFICATION_CONTEXT, (instance) => {
this.#notificationContext = instance;
}).asPromise(),
]);

4
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/rename/rename.action.ts
View File

@@ -2,7 +2,7 @@ import { UMB_RENAME_MODAL } from './modal/rename-modal.token.js';
import { type UmbRenameRepository } from './types.js';
import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import { UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
import { UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
export class UmbRenameEntityAction extends UmbEntityActionBase<UmbRenameRepository<{ unique: string }>> {
#modalManagerContext?: UmbModalManagerContext;
@@ -10,7 +10,7 @@ export class UmbRenameEntityAction extends UmbEntityActionBase<UmbRenameReposito
constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) {
super(host, repositoryAlias, unique);
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this.#modalManagerContext = instance;
});
}

8
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/trash/trash.action.ts
View File

@@ -1,11 +1,7 @@
import { UmbEntityActionBase } from '../../entity-action.js';
import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import {
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_CONFIRM_MODAL,
} from '@umbraco-cms/backoffice/modal';
import { UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT, UMB_CONFIRM_MODAL } from '@umbraco-cms/backoffice/modal';
import { UmbItemRepository } from '@umbraco-cms/backoffice/repository';
export class UmbTrashEntityAction<
@@ -16,7 +12,7 @@ export class UmbTrashEntityAction<
constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) {
super(host, repositoryAlias, unique);
new UmbContextConsumerController(this._host, UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
new UmbContextConsumerController(this._host, UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this.#modalContext = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/menu-alias.condition.ts
View File

@@ -1,4 +1,4 @@
import { UMB_MENU_CONTEXT_TOKEN } from '../../menu/menu.context.js';
import { UMB_MENU_CONTEXT } from '../../menu/menu.context.js';
import { UmbBaseController } from '@umbraco-cms/backoffice/class-api';
import {
ManifestCondition,
@@ -20,7 +20,7 @@ export class UmbMenuAliasCondition extends UmbBaseController implements UmbExten
super(args.host);
this.config = args.config;
this.#onChange = args.onChange;
this.consumeContext(UMB_MENU_CONTEXT_TOKEN, (context) => {
this.consumeContext(UMB_MENU_CONTEXT, (context) => {
this.observe(context.alias, (MenuAlias) => {
this.permitted = MenuAlias === this.config.match;
this.#onChange();

4
src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/section-alias.condition.ts
View File

@@ -5,7 +5,7 @@ import {
UmbConditionControllerArguments,
UmbExtensionCondition,
} from '@umbraco-cms/backoffice/extension-api';
import { UMB_SECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/section';
import { UMB_SECTION_CONTEXT } from '@umbraco-cms/backoffice/section';
export class UmbSectionAliasCondition extends UmbBaseController implements UmbExtensionCondition {
config: SectionAliasConditionConfig;
@@ -16,7 +16,7 @@ export class UmbSectionAliasCondition extends UmbBaseController implements UmbEx
super(args.host);
this.config = args.config;
this.#onChange = args.onChange;
this.consumeContext(UMB_SECTION_CONTEXT_TOKEN, (context) => {
this.consumeContext(UMB_SECTION_CONTEXT, (context) => {
this.observe(context.alias, (sectionAlias) => {
this.permitted = sectionAlias === this.config.match;
this.#onChange();

2
src/Umbraco.Web.UI.Client/src/packages/core/macro/macro.service.ts
View File

@@ -145,4 +145,4 @@ export class UmbMacroService {
}
}
export const UMB_MACRO_SERVICE_CONTEXT_TOKEN = new UmbContextToken<UmbMacroService>(UmbMacroService.name);
export const UMB_MACRO_SERVICE_CONTEXT = new UmbContextToken<UmbMacroService>(UmbMacroService.name);

4
src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-item-layout/menu-item-layout.element.ts
View File

@@ -1,6 +1,6 @@
import { html, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import { UmbSectionContext, UMB_SECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/section';
import { UmbSectionContext, UMB_SECTION_CONTEXT } from '@umbraco-cms/backoffice/section';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@customElement('umb-menu-item-layout')
@@ -25,7 +25,7 @@ export class UmbMenuItemLayoutElement extends UmbLitElement {
constructor() {
super();
this.consumeContext(UMB_SECTION_CONTEXT_TOKEN, (sectionContext) => {
this.consumeContext(UMB_SECTION_CONTEXT, (sectionContext) => {
this.#sectionContext = sectionContext;
this._observeSection();
});

2
src/Umbraco.Web.UI.Client/src/packages/core/menu/menu.context.ts
View File

@@ -12,4 +12,4 @@ export class UmbMenuContext {
}
}
export const UMB_MENU_CONTEXT_TOKEN = new UmbContextToken<UmbMenuContext>('UMB_MENU_CONTEXT_TOKEN');
export const UMB_MENU_CONTEXT = new UmbContextToken<UmbMenuContext>('UMB_MENU_CONTEXT');

2
src/Umbraco.Web.UI.Client/src/packages/core/menu/menu.element.ts
View File

@@ -12,7 +12,7 @@ export class UmbMenuElement extends UmbLitElement {
constructor() {
super();
//this.provideContext(UMB_MENU_CONTEXT_TOKEN, new UmbMenuContext());
//this.provideContext(UMB_MENU_CONTEXT, new UmbMenuContext());
}
render() {

4
src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-manager.context.ts
View File

@@ -20,7 +20,7 @@ export class UmbModalManagerContext extends UmbContextBase<UmbModalManagerContex
public readonly modals = this.#modals.asObservable();
constructor(host: UmbControllerHost) {
super(host, UMB_MODAL_MANAGER_CONTEXT_TOKEN);
super(host, UMB_MODAL_MANAGER_CONTEXT);
}
/**
@@ -68,6 +68,6 @@ export class UmbModalManagerContext extends UmbContextBase<UmbModalManagerContex
}
}
export const UMB_MODAL_MANAGER_CONTEXT_TOKEN = new UmbContextToken<UmbModalManagerContext, UmbModalManagerContext>(
export const UMB_MODAL_MANAGER_CONTEXT = new UmbContextToken<UmbModalManagerContext, UmbModalManagerContext>(
'UmbModalManagerContext',
);

6
src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-route-registration.controller.ts
View File

@@ -1,6 +1,6 @@
import { UmbModalRouteRegistration } from './modal-route-registration.js';
import { UmbModalToken } from './token/index.js';
import { UMB_ROUTE_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/router';
import { UMB_ROUTE_CONTEXT } from '@umbraco-cms/backoffice/router';
import type { UmbController, UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
@@ -15,7 +15,7 @@ export class UmbModalRouteRegistrationController<D extends object = object, R =
#additionalPath?: string;
#uniquePaths: Map<string, string | undefined> = new Map();
#routeContext?: typeof UMB_ROUTE_CONTEXT_TOKEN.TYPE;
#routeContext?: typeof UMB_ROUTE_CONTEXT.TYPE;
#modalRegistration?: UmbModalRouteRegistration;
public get controllerAlias() {
@@ -35,7 +35,7 @@ export class UmbModalRouteRegistrationController<D extends object = object, R =
super(alias, null);
this.#host = host;
this.#init = new UmbContextConsumerController(host, UMB_ROUTE_CONTEXT_TOKEN, (_routeContext) => {
this.#init = new UmbContextConsumerController(host, UMB_ROUTE_CONTEXT, (_routeContext) => {
this.#routeContext = _routeContext;
this.#registerModal();
}).asPromise();

2
src/Umbraco.Web.UI.Client/src/packages/core/modal/modal.context.ts
View File

@@ -131,4 +131,4 @@ export class UmbModalContext<ModalPreset extends object = object, ModalValue = a
}
}
export const UMB_MODAL_CONTEXT_TOKEN = new UmbContextToken<UmbModalContext>('UmbModalContext');
export const UMB_MODAL_CONTEXT = new UmbContextToken<UmbModalContext>('UmbModalContext');

6
src/Umbraco.Web.UI.Client/src/packages/core/modal/modal.element.ts
View File

@@ -1,4 +1,4 @@
import { UMB_MODAL_CONTEXT_TOKEN, UmbModalContext } from './modal.context.js';
import { UMB_MODAL_CONTEXT, UmbModalContext } from './modal.context.js';
import { ManifestModal, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import { CSSResultGroup, html, customElement } from '@umbraco-cms/backoffice/external/lit';
@@ -51,7 +51,7 @@ export class UmbModalElement extends UmbLitElement {
// Note for this hack (The if-sentence):
// We do not currently have a good enough control to ensure that the proxy is last, meaning if another context is provided at this element, it might respond after the proxy event has been dispatched.
// To avoid such this hack just prevents proxying the event if its a request for the Modal Context.
if (event.contextAlias !== UMB_MODAL_CONTEXT_TOKEN.contextAlias) {
if (event.contextAlias !== UMB_MODAL_CONTEXT.contextAlias) {
event.stopImmediatePropagation();
this.#modalContext.originTarget.dispatchEvent(event.clone());
}
@@ -86,7 +86,7 @@ export class UmbModalElement extends UmbLitElement {
this.element.appendChild(this.#modalRouterElement);
this.#observeModal(this.#modalContext.alias.toString());
const provider = new UmbContextProvider(this.element, UMB_MODAL_CONTEXT_TOKEN, this.#modalContext);
const provider = new UmbContextProvider(this.element, UMB_MODAL_CONTEXT, this.#modalContext);
provider.hostConnected();
}

4
src/Umbraco.Web.UI.Client/src/packages/core/notification/notification.context.ts
View File

@@ -34,7 +34,7 @@ export class UmbNotificationContext extends UmbContextBase<UmbNotificationContex
public readonly notifications = this._notifications.asObservable();
constructor(host: UmbControllerHost) {
super(host, UMB_NOTIFICATION_CONTEXT_TOKEN);
super(host, UMB_NOTIFICATION_CONTEXT);
}
/**
@@ -94,4 +94,4 @@ export class UmbNotificationContext extends UmbContextBase<UmbNotificationContex
}
}
export const UMB_NOTIFICATION_CONTEXT_TOKEN = new UmbContextToken<UmbNotificationContext>('UmbNotificationContext');
export const UMB_NOTIFICATION_CONTEXT = new UmbContextToken<UmbNotificationContext>('UmbNotificationContext');

4
src/Umbraco.Web.UI.Client/src/packages/core/notification/stories/story-notification-default-example.element.ts
View File

@@ -3,7 +3,7 @@ import {
UmbNotificationColor,
UmbNotificationOptions,
UmbNotificationContext,
UMB_NOTIFICATION_CONTEXT_TOKEN,
UMB_NOTIFICATION_CONTEXT,
} from '@umbraco-cms/backoffice/notification';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -14,7 +14,7 @@ export class UmbStoryNotificationDefaultExampleElement extends UmbLitElement {
connectedCallback(): void {
super.connectedCallback();
this.consumeContext(UMB_NOTIFICATION_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_NOTIFICATION_CONTEXT, (instance) => {
this._notificationContext = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts
View File

@@ -4,7 +4,7 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UmbBaseController } from '@umbraco-cms/backoffice/class-api';
import {
UMB_CONFIRM_MODAL,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
UmbModalManagerContext,
UmbModalToken,
UmbPickerModalData,
@@ -50,7 +50,7 @@ export class UmbPickerInputContext<ItemType extends { name: string }> extends Um
this.#init = Promise.all([
this.#itemManager.init,
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this.modalManager = instance;
}).asPromise(),
]);

8
src/Umbraco.Web.UI.Client/src/packages/core/property-action/common/copy/property-action-copy.element.ts
View File

@@ -3,9 +3,9 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/
import {
UmbNotificationDefaultData,
UmbNotificationContext,
UMB_NOTIFICATION_CONTEXT_TOKEN,
UMB_NOTIFICATION_CONTEXT,
} from '@umbraco-cms/backoffice/notification';
//import { UMB_WORKSPACE_PROPERTY_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/workspace';
//import { UMB_WORKSPACE_PROPERTY_CONTEXT } from '@umbraco-cms/backoffice/workspace';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@customElement('umb-property-action-copy')
@@ -18,12 +18,12 @@ export class UmbPropertyActionCopyElement extends UmbLitElement implements UmbPr
constructor() {
super();
//this.consumeContext(UMB_WORKSPACE_PROPERTY_CONTEXT_TOKEN, (property) => {
//this.consumeContext(UMB_WORKSPACE_PROPERTY_CONTEXT, (property) => {
//console.log('Got a reference to the editor element', property.getEditor());
// Be aware that the element might switch, so using the direct reference is not recommended, instead observe the .element Observable()
//});
this.consumeContext(UMB_NOTIFICATION_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_NOTIFICATION_CONTEXT, (instance) => {
this._notificationContext = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.element.ts
View File

@@ -4,7 +4,7 @@ import { UUIBooleanInputEvent, UUIInputEvent } from '@umbraco-cms/backoffice/ext
import { extractUmbColorVariable } from '@umbraco-cms/backoffice/resources';
import {
UMB_ICON_PICKER_MODAL,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
UmbModalManagerContext,
} from '@umbraco-cms/backoffice/modal';
import {
@@ -40,7 +40,7 @@ export class UmbPropertyEditorUICollectionViewLayoutConfigurationElement
constructor() {
super();
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this._modalContext = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/property-editor-ui-icon-picker.element.ts
View File

@@ -3,7 +3,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
import {
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
UMB_ICON_PICKER_MODAL,
} from '@umbraco-cms/backoffice/modal';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -48,7 +48,7 @@ export class UmbPropertyEditorUIIconPickerElement extends UmbLitElement implemen
constructor() {
super();
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this._modalContext = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/plugins/tiny-mce-code-editor.plugin.ts
View File

@@ -4,7 +4,7 @@ import {
UmbCodeEditorModalValue,
UMB_CODE_EDITOR_MODAL,
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
} from '@umbraco-cms/backoffice/modal';
export default class UmbTinyMceCodeEditorPlugin extends UmbTinyMcePluginBase {
@@ -13,7 +13,7 @@ export default class UmbTinyMceCodeEditorPlugin extends UmbTinyMcePluginBase {
constructor(args: TinyMcePluginArguments) {
super(args);
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (modalContext) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (modalContext) => {
this.#modalContext = modalContext;
});

4
src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/plugins/tiny-mce-embeddedmedia.plugin.ts
View File

@@ -4,7 +4,7 @@ import {
UmbEmbeddedMediaModalValue,
UMB_EMBEDDED_MEDIA_MODAL,
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
} from '@umbraco-cms/backoffice/modal';
export default class UmbTinyMceEmbeddedMediaPlugin extends UmbTinyMcePluginBase {
@@ -13,7 +13,7 @@ export default class UmbTinyMceEmbeddedMediaPlugin extends UmbTinyMcePluginBase
constructor(args: TinyMcePluginArguments) {
super(args);
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (modalContext) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (modalContext) => {
this.#modalContext = modalContext;
});

4
src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/plugins/tiny-mce-linkpicker.plugin.ts
View File

@@ -4,7 +4,7 @@ import {
UMB_LINK_PICKER_MODAL,
UmbLinkPickerLink,
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
} from '@umbraco-cms/backoffice/modal';
type AnchorElementAttributes = {
@@ -26,7 +26,7 @@ export default class UmbTinyMceLinkPickerPlugin extends UmbTinyMcePluginBase {
constructor(args: TinyMcePluginArguments) {
super(args);
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (modalContext) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (modalContext) => {
this.#modalContext = modalContext;
});

8
src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/plugins/tiny-mce-macropicker.plugin.ts
View File

@@ -1,10 +1,6 @@
import { MacroSyntaxData, UmbMacroService } from '@umbraco-cms/backoffice/macro';
import { TinyMcePluginArguments, UmbTinyMcePluginBase } from '@umbraco-cms/backoffice/components';
import {
UMB_CONFIRM_MODAL,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UmbModalManagerContext,
} from '@umbraco-cms/backoffice/modal';
import { UMB_CONFIRM_MODAL, UMB_MODAL_MANAGER_CONTEXT, UmbModalManagerContext } from '@umbraco-cms/backoffice/modal';
import type { AstNode } from '@umbraco-cms/backoffice/external/tinymce';
interface DialogData {
@@ -23,7 +19,7 @@ export default class UmbTinyMceMacroPickerPlugin extends UmbTinyMcePluginBase {
constructor(args: TinyMcePluginArguments) {
super(args);
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (modalContext) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (modalContext) => {
this.#modalContext = modalContext;
});

4
src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/plugins/tiny-mce-mediapicker.plugin.ts
View File

@@ -3,7 +3,7 @@ import { UmbMediaHelper } from '@umbraco-cms/backoffice/utils';
import {
UMB_MEDIA_TREE_PICKER_MODAL,
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
} from '@umbraco-cms/backoffice/modal';
import { UMB_CURRENT_USER_CONTEXT, UmbCurrentUser } from '@umbraco-cms/backoffice/current-user';
import { RawEditorOptions } from '@umbraco-cms/backoffice/external/tinymce';
@@ -40,7 +40,7 @@ export default class UmbTinyMceMediaPickerPlugin extends UmbTinyMcePluginBase {
this.#mediaHelper = new UmbMediaHelper();
this.#temporaryFileRepository = new UmbTemporaryFileRepository(args.host);
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (modalContext) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (modalContext) => {
this.#modalContext = modalContext;
});

4
src/Umbraco.Web.UI.Client/src/packages/core/repository/detail/detail-repository-base.ts
View File

@@ -2,7 +2,7 @@ import { UmbRepositoryBase } from '../repository-base.js';
import { UmbDetailDataSource, UmbDetailDataSourceConstructor } from './detail-data-source.interface.js';
import { UmbDetailRepository } from './detail-repository.interface.js';
import { type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UMB_NOTIFICATION_CONTEXT_TOKEN, UmbNotificationContext } from '@umbraco-cms/backoffice/notification';
import { UMB_NOTIFICATION_CONTEXT, UmbNotificationContext } from '@umbraco-cms/backoffice/notification';
import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
import { UmbDetailStore } from '@umbraco-cms/backoffice/store';
import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
@@ -33,7 +33,7 @@ export abstract class UmbDetailRepositoryBase<
this.#detailStore = instance;
}).asPromise(),
this.consumeContext(UMB_NOTIFICATION_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_NOTIFICATION_CONTEXT, (instance) => {
this.#notificationContext = instance;
}).asPromise(),
]);

4
src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-context-menu/section-sidebar-context-menu.element.ts
View File

@@ -1,4 +1,4 @@
import { UmbSectionSidebarContext, UMB_SECTION_SIDEBAR_CONTEXT_TOKEN } from '../section-sidebar/index.js';
import { UmbSectionSidebarContext, UMB_SECTION_SIDEBAR_CONTEXT } from '../section-sidebar/index.js';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -22,7 +22,7 @@ export class UmbSectionSidebarContextMenuElement extends UmbLitElement {
constructor() {
super();
this.consumeContext(UMB_SECTION_SIDEBAR_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_SECTION_SIDEBAR_CONTEXT, (instance) => {
this.#sectionSidebarContext = instance;
if (this.#sectionSidebarContext) {

4
src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar/section-sidebar.context.ts
View File

@@ -41,6 +41,4 @@ export class UmbSectionSidebarContext {
}
}
export const UMB_SECTION_SIDEBAR_CONTEXT_TOKEN = new UmbContextToken<UmbSectionSidebarContext>(
'UmbSectionSidebarContext',
);
export const UMB_SECTION_SIDEBAR_CONTEXT = new UmbContextToken<UmbSectionSidebarContext>('UmbSectionSidebarContext');

4
src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar/section-sidebar.element.ts
View File

@@ -1,4 +1,4 @@
import { UmbSectionSidebarContext, UMB_SECTION_SIDEBAR_CONTEXT_TOKEN } from './section-sidebar.context.js';
import { UmbSectionSidebarContext, UMB_SECTION_SIDEBAR_CONTEXT } from './section-sidebar.context.js';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -9,7 +9,7 @@ export class UmbSectionSidebarElement extends UmbLitElement {
constructor() {
super();
this.provideContext(UMB_SECTION_SIDEBAR_CONTEXT_TOKEN, this.#sectionSidebarContext);
this.provideContext(UMB_SECTION_SIDEBAR_CONTEXT, this.#sectionSidebarContext);
}
render() {

2
src/Umbraco.Web.UI.Client/src/packages/core/section/section.context.ts
View File

@@ -21,4 +21,4 @@ export class UmbSectionContext {
}
}
export const UMB_SECTION_CONTEXT_TOKEN = new UmbContextToken<UmbSectionContext>('UmbSectionContext');
export const UMB_SECTION_CONTEXT = new UmbContextToken<UmbSectionContext>('UmbSectionContext');

4
src/Umbraco.Web.UI.Client/src/packages/core/themes/theme.context.ts
View File

@@ -19,7 +19,7 @@ export class UmbThemeContext extends UmbBaseController {
constructor(host: UmbControllerHostElement) {
super(host);
this.provideContext(UMB_THEME_CONTEXT_TOKEN, this);
this.provideContext(UMB_THEME_CONTEXT, this);
const storedTheme = localStorage.getItem(LOCAL_STORAGE_KEY);
if (storedTheme) {
@@ -81,7 +81,7 @@ export class UmbThemeContext extends UmbBaseController {
}
}
export const UMB_THEME_CONTEXT_TOKEN = new UmbContextToken<UmbThemeContext>('umbThemeContext');
export const UMB_THEME_CONTEXT = new UmbContextToken<UmbThemeContext>('umbThemeContext');
// Default export to enable this as a globalContext extension js:
export default UmbThemeContext;

4
src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/create-folder/create-folder.action.ts
View File

@@ -1,7 +1,7 @@
import { UmbEntityActionBase } from '../../../../entity-action/entity-action.js';
import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import { type UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
import { type UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
import { type UmbFolderRepository, UMB_FOLDER_CREATE_MODAL } from '@umbraco-cms/backoffice/tree';
export class UmbCreateFolderEntityAction<T extends UmbFolderRepository> extends UmbEntityActionBase<T> {
@@ -10,7 +10,7 @@ export class UmbCreateFolderEntityAction<T extends UmbFolderRepository> extends
constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) {
super(host, repositoryAlias, unique);
new UmbContextConsumerController(this._host, UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
new UmbContextConsumerController(this._host, UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this.#modalContext = instance;
});
}

8
src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/delete-folder/delete-folder.action.ts
View File

@@ -1,11 +1,7 @@
import { UmbEntityActionBase } from '../../../../entity-action/entity-action.js';
import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import {
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_CONFIRM_MODAL,
} from '@umbraco-cms/backoffice/modal';
import { UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT, UMB_CONFIRM_MODAL } from '@umbraco-cms/backoffice/modal';
import { UmbFolderRepository } from '@umbraco-cms/backoffice/tree';
export class UmbDeleteFolderEntityAction<T extends UmbFolderRepository> extends UmbEntityActionBase<T> {
@@ -14,7 +10,7 @@ export class UmbDeleteFolderEntityAction<T extends UmbFolderRepository> extends
constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) {
super(host, repositoryAlias, unique);
new UmbContextConsumerController(this._host, UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
new UmbContextConsumerController(this._host, UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this.#modalContext = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/folder-update/folder-update.action.ts
View File

@@ -1,7 +1,7 @@
import { UmbEntityActionBase } from '../../../../entity-action/entity-action.js';
import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import { type UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
import { type UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
import { type UmbFolderRepository, UMB_FOLDER_UPDATE_MODAL } from '@umbraco-cms/backoffice/tree';
export class UmbFolderUpdateEntityAction<
@@ -12,7 +12,7 @@ export class UmbFolderUpdateEntityAction<
constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) {
super(host, repositoryAlias, unique);
new UmbContextConsumerController(this._host, UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
new UmbContextConsumerController(this._host, UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this.#modalContext = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/folder-repository-base.ts
View File

@@ -6,7 +6,7 @@ import { type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UmbTreeItemModelBase, UmbTreeStore } from '@umbraco-cms/backoffice/tree';
import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
import { UmbId } from '@umbraco-cms/backoffice/id';
import { UMB_NOTIFICATION_CONTEXT_TOKEN, UmbNotificationContext } from '@umbraco-cms/backoffice/notification';
import { UMB_NOTIFICATION_CONTEXT, UmbNotificationContext } from '@umbraco-cms/backoffice/notification';
export type UmbFolderToTreeItemMapper<FolderTreeItemType extends UmbTreeItemModelBase> = (
item: UmbFolderModel,
@@ -37,7 +37,7 @@ export abstract class UmbFolderRepositoryBase<FolderTreeItemType extends UmbTree
this._treeStore = instance;
}).asPromise(),
this.consumeContext(UMB_NOTIFICATION_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_NOTIFICATION_CONTEXT, (instance) => {
this.#notificationContext = instance;
}).asPromise(),
]);

10
src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.context.ts
View File

@@ -2,7 +2,7 @@ import { UmbTreeItemContext } from '../tree-item-default/tree-item.context.inter
import { UmbTreeContextBase } from '../tree.context.js';
import { UmbTreeItemModelBase } from '../types.js';
import { map } from '@umbraco-cms/backoffice/external/rxjs';
import { UMB_SECTION_CONTEXT_TOKEN, UMB_SECTION_SIDEBAR_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/section';
import { UMB_SECTION_CONTEXT, UMB_SECTION_SIDEBAR_CONTEXT } from '@umbraco-cms/backoffice/section';
import type { UmbSectionContext, UmbSectionSidebarContext } from '@umbraco-cms/backoffice/section';
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
import { UmbBooleanState, UmbDeepState, UmbStringState } from '@umbraco-cms/backoffice/observable-api';
@@ -58,7 +58,7 @@ export class UmbTreeItemContextBase<TreeItemType extends UmbTreeItemModelBase>
super(host);
this.#getUniqueFunction = getUniqueFunction;
this.#consumeContexts();
this.provideContext(UMB_TREE_ITEM_CONTEXT_TOKEN, this);
this.provideContext(UMB_TREE_ITEM_CONTEXT, this);
}
public setTreeItem(treeItem: TreeItemType | undefined) {
@@ -114,12 +114,12 @@ export class UmbTreeItemContextBase<TreeItemType extends UmbTreeItemModelBase>
}
#consumeContexts() {
this.consumeContext(UMB_SECTION_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_SECTION_CONTEXT, (instance) => {
this.#sectionContext = instance;
this.#observeSectionPath();
});
this.consumeContext(UMB_SECTION_SIDEBAR_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_SECTION_SIDEBAR_CONTEXT, (instance) => {
this.#sectionSidebarContext = instance;
});
@@ -212,4 +212,4 @@ export class UmbTreeItemContextBase<TreeItemType extends UmbTreeItemModelBase>
}
}
export const UMB_TREE_ITEM_CONTEXT_TOKEN = new UmbContextToken<UmbTreeItemContext<any>>('UmbTreeItemContext');
export const UMB_TREE_ITEM_CONTEXT = new UmbContextToken<UmbTreeItemContext<any>>('UmbTreeItemContext');

4
src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.element.ts
View File

@@ -1,6 +1,6 @@
import type { UmbTreeItemContext } from '../tree-item-default/index.js';
import { UmbTreeItemModelBase } from '../types.js';
import { UMB_TREE_ITEM_CONTEXT_TOKEN } from './tree-item-base.context.js';
import { UMB_TREE_ITEM_CONTEXT } from './tree-item-base.context.js';
import { css, html, nothing, customElement, state, ifDefined, repeat } from '@umbraco-cms/backoffice/external/lit';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -42,7 +42,7 @@ export class UmbTreeItemBaseElement extends UmbLitElement {
constructor() {
super();
this.consumeContext(UMB_TREE_ITEM_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_TREE_ITEM_CONTEXT, (instance) => {
this.#treeItemContext = instance;
if (!this.#treeItemContext) return;
// TODO: investigate if we can make an observe decorator

4
src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/editable-workspace-context-base.ts
View File

@@ -3,7 +3,7 @@ import { type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UmbBaseController } from '@umbraco-cms/backoffice/class-api';
import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api';
import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace';
import { UMB_MODAL_CONTEXT_TOKEN, UmbModalContext } from '@umbraco-cms/backoffice/modal';
import { UMB_MODAL_CONTEXT, UmbModalContext } from '@umbraco-cms/backoffice/modal';
export abstract class UmbEditableWorkspaceContextBase<WorkspaceData>
extends UmbBaseController
@@ -21,7 +21,7 @@ export abstract class UmbEditableWorkspaceContextBase<WorkspaceData>
super(host);
this.workspaceAlias = workspaceAlias;
this.provideContext(UMB_WORKSPACE_CONTEXT, this);
this.consumeContext(UMB_MODAL_CONTEXT_TOKEN, (context) => {
this.consumeContext(UMB_MODAL_CONTEXT, (context) => {
(this.modalContext as UmbModalContext) = context;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/entity-manager-controller.ts
View File

@@ -4,7 +4,7 @@ import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api
import {
UmbNotificationDefaultData,
UmbNotificationContext,
UMB_NOTIFICATION_CONTEXT_TOKEN,
UMB_NOTIFICATION_CONTEXT,
} from '@umbraco-cms/backoffice/notification';
import { UmbObjectState, UmbObserverController } from '@umbraco-cms/backoffice/observable-api';
import { UmbEntityDetailStore } from '@umbraco-cms/backoffice/store';
@@ -35,7 +35,7 @@ export class UmbEntityWorkspaceManager<
this._host = host;
this._entityType = entityType;
new UmbContextConsumerController(this._host, UMB_NOTIFICATION_CONTEXT_TOKEN, (_instance) => {
new UmbContextConsumerController(this._host, UMB_NOTIFICATION_CONTEXT, (_instance) => {
this._notificationContext = _instance;
});

2
src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/variant-workspace-context.token.ts
View File

@@ -2,7 +2,7 @@ import type { UmbWorkspaceContextInterface } from './workspace-context.interface
import type { UmbVariantableWorkspaceContextInterface } from './workspace-variantable-context.interface.js';
import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
export const UMB_VARIANT_WORKSPACE_CONTEXT_TOKEN = new UmbContextToken<
export const UMB_VARIANT_WORKSPACE_CONTEXT = new UmbContextToken<
UmbWorkspaceContextInterface,
UmbVariantableWorkspaceContextInterface
>(

4
src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-footer/workspace-footer.element.ts
View File

@@ -3,7 +3,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import { UMB_MODAL_CONTEXT_TOKEN, UmbModalContext } from '@umbraco-cms/backoffice/modal';
import { UMB_MODAL_CONTEXT, UmbModalContext } from '@umbraco-cms/backoffice/modal';
/**
* @element umb-workspace-footer
@@ -31,7 +31,7 @@ export class UmbWorkspaceFooterLayoutElement extends UmbLitElement {
this.consumeContext(UMB_SAVEABLE_WORKSPACE_CONTEXT, (context) => {
this._isNew = context.getIsNew();
});
this.consumeContext(UMB_MODAL_CONTEXT_TOKEN, (context) => {
this.consumeContext(UMB_MODAL_CONTEXT, (context) => {
this._modalContext = context;
});
}

6
src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-split-view/workspace-split-view.context.ts
View File

@@ -1,5 +1,5 @@
import { UmbPropertyDatasetContext } from '../../property/property-dataset/index.js';
import { UMB_VARIANT_WORKSPACE_CONTEXT_TOKEN } from '../index.js';
import { UMB_VARIANT_WORKSPACE_CONTEXT } from '../index.js';
import { UmbVariantId } from '@umbraco-cms/backoffice/variant';
import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
import { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
@@ -7,7 +7,7 @@ import { UmbBaseController } from '@umbraco-cms/backoffice/class-api';
import { UmbNumberState } from '@umbraco-cms/backoffice/observable-api';
export class UmbWorkspaceSplitViewContext extends UmbBaseController {
#workspaceContext?: typeof UMB_VARIANT_WORKSPACE_CONTEXT_TOKEN.TYPE;
#workspaceContext?: typeof UMB_VARIANT_WORKSPACE_CONTEXT.TYPE;
public getWorkspaceContext() {
return this.#workspaceContext;
}
@@ -23,7 +23,7 @@ export class UmbWorkspaceSplitViewContext extends UmbBaseController {
constructor(host: UmbControllerHost) {
super(host);
this.consumeContext(UMB_VARIANT_WORKSPACE_CONTEXT_TOKEN, (context) => {
this.consumeContext(UMB_VARIANT_WORKSPACE_CONTEXT, (context) => {
this.#workspaceContext = context;
this._observeVariant();
});

4
src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/entity-actions/export/export.action.ts
View File

@@ -4,7 +4,7 @@ import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import {
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
UMB_EXPORT_DICTIONARY_MODAL,
} from '@umbraco-cms/backoffice/modal';
@@ -16,7 +16,7 @@ export default class UmbExportDictionaryEntityAction extends UmbEntityActionBase
constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) {
super(host, repositoryAlias, unique);
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this.#modalContext = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/entity-actions/import/import.action.ts
View File

@@ -4,7 +4,7 @@ import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import {
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
UMB_IMPORT_DICTIONARY_MODAL,
} from '@umbraco-cms/backoffice/modal';
import { UMB_DICTIONARY_TREE_STORE_CONTEXT, UmbDictionaryTreeStore } from '@umbraco-cms/backoffice/dictionary';
@@ -18,7 +18,7 @@ export default class UmbImportDictionaryEntityAction extends UmbEntityActionBase
constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) {
super(host, repositoryAlias, unique);
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this.#modalContext = instance;
});
this.consumeContext(UMB_DICTIONARY_TREE_STORE_CONTEXT, (instance) => {

8
src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/dictionary.repository.ts
View File

@@ -1,5 +1,5 @@
import { type UmbDictionaryTreeStore, UMB_DICTIONARY_TREE_STORE_CONTEXT } from '../tree/index.js';
import { UmbDictionaryStore, UMB_DICTIONARY_STORE_CONTEXT_TOKEN } from './dictionary.store.js';
import { UmbDictionaryStore, UMB_DICTIONARY_STORE_CONTEXT } from './dictionary.store.js';
import { UmbDictionaryDetailServerDataSource } from './sources/dictionary-detail.server.data-source.js';
import { type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UmbBaseController } from '@umbraco-cms/backoffice/class-api';
@@ -7,7 +7,7 @@ import type {
CreateDictionaryItemRequestModel,
UpdateDictionaryItemRequestModel,
} from '@umbraco-cms/backoffice/backend-api';
import { type UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
import { type UmbNotificationContext, UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
import { UmbTemporaryFileRepository } from '@umbraco-cms/backoffice/temporary-file';
@@ -27,7 +27,7 @@ export class UmbDictionaryRepository extends UmbBaseController implements UmbApi
super(host);
this.#init = Promise.all([
this.consumeContext(UMB_DICTIONARY_STORE_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_DICTIONARY_STORE_CONTEXT, (instance) => {
this.#detailStore = instance;
}),
@@ -35,7 +35,7 @@ export class UmbDictionaryRepository extends UmbBaseController implements UmbApi
this.#treeStore = instance;
}),
this.consumeContext(UMB_NOTIFICATION_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_NOTIFICATION_CONTEXT, (instance) => {
this.#notificationContext = instance;
}),
]);

4
src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/dictionary.store.ts
View File

@@ -14,7 +14,7 @@ export class UmbDictionaryStore extends UmbStoreBase {
constructor(host: UmbControllerHostElement) {
super(
host,
UMB_DICTIONARY_STORE_CONTEXT_TOKEN.toString(),
UMB_DICTIONARY_STORE_CONTEXT.toString(),
new UmbArrayState<DictionaryItemResponseModel>([], (x) => x.id),
);
}
@@ -37,4 +37,4 @@ export class UmbDictionaryStore extends UmbStoreBase {
}
}
export const UMB_DICTIONARY_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbDictionaryStore>('UmbDictionaryStore');
export const UMB_DICTIONARY_STORE_CONTEXT = new UmbContextToken<UmbDictionaryStore>('UmbDictionaryStore');

8
src/Umbraco.Web.UI.Client/src/packages/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts
View File

@@ -1,10 +1,6 @@
import { UUIButtonState, UUIPaginationElement, UUIPaginationEvent } from '@umbraco-cms/backoffice/external/uui';
import { css, html, nothing, customElement, state, query, property } from '@umbraco-cms/backoffice/external/lit';
import {
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_CONFIRM_MODAL,
} from '@umbraco-cms/backoffice/modal';
import { UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT, UMB_CONFIRM_MODAL } from '@umbraco-cms/backoffice/modal';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import {
RedirectManagementResource,
@@ -47,7 +43,7 @@ export class UmbDashboardRedirectManagementElement extends UmbLitElement {
constructor() {
super();
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (_instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (_instance) => {
this._modalContext = _instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/document-blueprint.detail.store.ts
View File

@@ -14,7 +14,7 @@ export class UmbDocumentBlueprintStore extends UmbStoreBase {
constructor(host: UmbControllerHostElement) {
super(
host,
UMB_DOCUMENT_BLUEPRINT_STORE_CONTEXT_TOKEN.toString(),
UMB_DOCUMENT_BLUEPRINT_STORE_CONTEXT.toString(),
// TODO: use the right type:
new UmbArrayState<DocumentBlueprintDetails>([], (x) => x.id),
@@ -96,6 +96,6 @@ export class UmbDocumentBlueprintStore extends UmbStoreBase {
}
}
export const UMB_DOCUMENT_BLUEPRINT_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbDocumentBlueprintStore>(
export const UMB_DOCUMENT_BLUEPRINT_STORE_CONTEXT = new UmbContextToken<UmbDocumentBlueprintStore>(
'UmbDocumentBlueprintStore',
);

4
src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/document-blueprint.tree.store.ts
View File

@@ -2,7 +2,7 @@ import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
import { UmbEntityTreeStore } from '@umbraco-cms/backoffice/tree';
import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
export const UMB_DOCUMENT_BLUEPRINT_TREE_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbDocumentBlueprintTreeStore>(
export const UMB_DOCUMENT_BLUEPRINT_TREE_STORE_CONTEXT = new UmbContextToken<UmbDocumentBlueprintTreeStore>(
'UmbDocumentBlueprintTreeStore',
);
@@ -14,6 +14,6 @@ export const UMB_DOCUMENT_BLUEPRINT_TREE_STORE_CONTEXT_TOKEN = new UmbContextTok
*/
export class UmbDocumentBlueprintTreeStore extends UmbEntityTreeStore {
constructor(host: UmbControllerHostElement) {
super(host, UMB_DOCUMENT_BLUEPRINT_TREE_STORE_CONTEXT_TOKEN.toString());
super(host, UMB_DOCUMENT_BLUEPRINT_TREE_STORE_CONTEXT.toString());
}
}

4
src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/create.action.ts
View File

@@ -2,7 +2,7 @@ import { UmbDocumentTypeDetailRepository } from '../../repository/detail/documen
import { UMB_DOCUMENT_TYPE_CREATE_OPTIONS_MODAL } from './modal/index.js';
import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import { UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
import { UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
export class UmbCreateDataTypeEntityAction extends UmbEntityActionBase<UmbDocumentTypeDetailRepository> {
#modalManagerContext?: UmbModalManagerContext;
@@ -10,7 +10,7 @@ export class UmbCreateDataTypeEntityAction extends UmbEntityActionBase<UmbDocume
constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) {
super(host, repositoryAlias, unique);
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this.#modalManagerContext = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace-editor.element.ts
View File

@@ -4,7 +4,7 @@ import { css, html, customElement, state, ifDefined } from '@umbraco-cms/backoff
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import {
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
UMB_ICON_PICKER_MODAL,
} from '@umbraco-cms/backoffice/modal';
import { generateAlias } from '@umbraco-cms/backoffice/utils';
@@ -38,7 +38,7 @@ export class UmbDocumentTypeWorkspaceEditorElement extends UmbLitElement {
this.#observeDocumentType();
});
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this._modalContext = instance;
});
}

6
src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-property.element.ts
View File

@@ -4,7 +4,7 @@ import { css, html, customElement, property, state, ifDefined, nothing } from '@
import { PropertyTypeModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
import {
UMB_CONFIRM_MODAL,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
UMB_PROPERTY_SETTINGS_MODAL,
UMB_WORKSPACE_MODAL,
UmbConfirmModalData,
@@ -56,7 +56,7 @@ export class UmbDocumentTypeWorkspacePropertyElement extends UmbLitElement {
#dataTypeDetailRepository = new UmbDataTypeDetailRepository(this);
#modalRegistration;
private _modalManagerContext?: typeof UMB_MODAL_MANAGER_CONTEXT_TOKEN.TYPE;
private _modalManagerContext?: typeof UMB_MODAL_MANAGER_CONTEXT.TYPE;
@state()
protected _modalRoute?: string;
@@ -110,7 +110,7 @@ export class UmbDocumentTypeWorkspacePropertyElement extends UmbLitElement {
this._editDocumentTypePath = routeBuilder({});
});
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (context) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (context) => {
this._modalManagerContext = context;
});
}

6
src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit.element.ts
View File

@@ -13,7 +13,7 @@ import {
import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace';
import type { UmbRoute } from '@umbraco-cms/backoffice/router';
import { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry';
import { UMB_CONFIRM_MODAL, UMB_MODAL_MANAGER_CONTEXT_TOKEN, UmbConfirmModalData } from '@umbraco-cms/backoffice/modal';
import { UMB_CONFIRM_MODAL, UMB_MODAL_MANAGER_CONTEXT, UmbConfirmModalData } from '@umbraco-cms/backoffice/modal';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import { UmbSorterConfig, UmbSorterController } from '@umbraco-cms/backoffice/sorter';
@@ -88,7 +88,7 @@ export class UmbDocumentTypeWorkspaceViewEditElement extends UmbLitElement imple
private _tabsStructureHelper = new UmbContentTypeContainerStructureHelper<UmbDocumentTypeDetailModel>(this);
private _modalManagerContext?: typeof UMB_MODAL_MANAGER_CONTEXT_TOKEN.TYPE;
private _modalManagerContext?: typeof UMB_MODAL_MANAGER_CONTEXT.TYPE;
constructor() {
super();
@@ -116,7 +116,7 @@ export class UmbDocumentTypeWorkspaceViewEditElement extends UmbLitElement imple
this._observeRootGroups();
});
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (context) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (context) => {
this._modalManagerContext = context;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-granular-permission/input-document-granular-permission.element.ts
View File

@@ -2,7 +2,7 @@ import { css, html, customElement, property, state, PropertyValueMap } from '@um
import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui';
import {
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
UMB_CONFIRM_MODAL,
UMB_DOCUMENT_PICKER_MODAL,
} from '@umbraco-cms/backoffice/modal';
@@ -41,7 +41,7 @@ export class UmbInputDocumentGranularPermissionElement extends FormControlMixin(
constructor() {
super();
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => (this.#modalContext = instance));
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => (this.#modalContext = instance));
}
protected firstUpdated(_changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void {

4
src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts
View File

@@ -3,7 +3,7 @@ import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import {
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
UMB_CREATE_DOCUMENT_MODAL as UMB_CREATE_DOCUMENT_MODAL,
} from '@umbraco-cms/backoffice/modal';
@@ -13,7 +13,7 @@ export class UmbCreateDocumentEntityAction extends UmbEntityActionBase<UmbDocume
constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) {
super(host, repositoryAlias, unique);
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this.#modalContext = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions/permissions-modal.element.ts
View File

@@ -5,7 +5,7 @@ import { html, customElement, property, state, ifDefined, nothing } from '@umbra
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import {
UMB_ENTITY_USER_PERMISSION_MODAL,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
UMB_USER_GROUP_PICKER_MODAL,
UmbEntityUserPermissionSettingsModalData,
UmbEntityUserPermissionSettingsModalValue,
@@ -54,7 +54,7 @@ export class UmbPermissionsModalElement extends UmbLitElement {
constructor() {
super();
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this.#modalManagerContext = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions/permissions.action.ts
View File

@@ -2,7 +2,7 @@ import { type UmbDocumentRepository } from '../../repository/document.repository
import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import {
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UMB_MODAL_MANAGER_CONTEXT,
UmbModalManagerContext,
UMB_PERMISSIONS_MODAL,
} from '@umbraco-cms/backoffice/modal';
@@ -13,7 +13,7 @@ export class UmbDocumentPermissionsEntityAction extends UmbEntityActionBase<UmbD
constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) {
super(host, repositoryAlias, unique);
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this.#modalManagerContext = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document-item.store.ts
View File

@@ -18,8 +18,8 @@ export class UmbDocumentItemStore extends UmbEntityItemStore<DocumentItemRespons
* @memberof UmbDocumentItemStore
*/
constructor(host: UmbControllerHostElement) {
super(host, UMB_DOCUMENT_ITEM_STORE_CONTEXT_TOKEN.toString());
super(host, UMB_DOCUMENT_ITEM_STORE_CONTEXT.toString());
}
}
export const UMB_DOCUMENT_ITEM_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbDocumentItemStore>('UmbDocumentItemStore');
export const UMB_DOCUMENT_ITEM_STORE_CONTEXT = new UmbContextToken<UmbDocumentItemStore>('UmbDocumentItemStore');

12
src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.repository.ts
View File

@@ -1,12 +1,12 @@
import { UmbDocumentTreeStore, UMB_DOCUMENT_TREE_STORE_CONTEXT } from '../tree/document-tree.store.js';
import { UmbDocumentServerDataSource } from './sources/document.server.data.js';
import { UmbDocumentStore, UMB_DOCUMENT_STORE_CONTEXT_TOKEN } from './document.store.js';
import { UMB_DOCUMENT_ITEM_STORE_CONTEXT_TOKEN, type UmbDocumentItemStore } from './document-item.store.js';
import { UmbDocumentStore, UMB_DOCUMENT_STORE_CONTEXT } from './document.store.js';
import { UMB_DOCUMENT_ITEM_STORE_CONTEXT, type UmbDocumentItemStore } from './document-item.store.js';
import { UmbDocumentItemServerDataSource } from './sources/document-item.server.data.js';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UmbBaseController } from '@umbraco-cms/backoffice/class-api';
import { CreateDocumentRequestModel, UpdateDocumentRequestModel } from '@umbraco-cms/backoffice/backend-api';
import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
import { UmbApi } from '@umbraco-cms/backoffice/extension-api';
import { UmbVariantId } from '@umbraco-cms/backoffice/variant';
@@ -35,15 +35,15 @@ export class UmbDocumentRepository extends UmbBaseController implements UmbApi {
this.#treeStore = instance;
}).asPromise(),
this.consumeContext(UMB_DOCUMENT_STORE_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_DOCUMENT_STORE_CONTEXT, (instance) => {
this.#store = instance;
}).asPromise(),
this.consumeContext(UMB_DOCUMENT_ITEM_STORE_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_DOCUMENT_ITEM_STORE_CONTEXT, (instance) => {
this.#itemStore = instance;
}).asPromise(),
this.consumeContext(UMB_NOTIFICATION_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_NOTIFICATION_CONTEXT, (instance) => {
this.#notificationContext = instance;
}).asPromise(),
]);

4
src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/document.store.ts
View File

@@ -17,7 +17,7 @@ export class UmbDocumentStore extends UmbStoreBase {
* @memberof UmbDocumentDetailStore
*/
constructor(host: UmbControllerHostElement) {
super(host, UMB_DOCUMENT_STORE_CONTEXT_TOKEN.toString(), new UmbArrayState<DocumentResponseModel>([], (x) => x.id));
super(host, UMB_DOCUMENT_STORE_CONTEXT.toString(), new UmbArrayState<DocumentResponseModel>([], (x) => x.id));
}
/**
@@ -30,4 +30,4 @@ export class UmbDocumentStore extends UmbStoreBase {
}
}
export const UMB_DOCUMENT_STORE_CONTEXT_TOKEN = new UmbContextToken<UmbDocumentStore>('UmbDocumentStore');
export const UMB_DOCUMENT_STORE_CONTEXT = new UmbContextToken<UmbDocumentStore>('UmbDocumentStore');

7
src/Umbraco.Web.UI.Client/src/packages/health-check/dashboard-health-check.element.ts
View File

@@ -1,8 +1,5 @@
import { UmbDashboardHealthCheckGroupElement } from './views/health-check-group.element.js';
import {
UmbHealthCheckDashboardContext,
UMB_HEALTHCHECK_DASHBOARD_CONTEXT_TOKEN,
} from './health-check-dashboard.context.js';
import { UmbHealthCheckDashboardContext, UMB_HEALTHCHECK_DASHBOARD_CONTEXT } from './health-check-dashboard.context.js';
import { UmbHealthCheckContext } from './health-check.context.js';
import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
import { HealthCheckGroupResponseModel, HealthCheckResource } from '@umbraco-cms/backoffice/backend-api';
@@ -33,7 +30,7 @@ export class UmbDashboardHealthCheckElement extends UmbLitElement {
constructor() {
super();
this.provideContext(UMB_HEALTHCHECK_DASHBOARD_CONTEXT_TOKEN, this._healthCheckDashboardContext);
this.provideContext(UMB_HEALTHCHECK_DASHBOARD_CONTEXT, this._healthCheckDashboardContext);
this.observe(umbExtensionsRegistry.extensionsOfType('healthCheck'), (healthCheckManifests) => {
this._healthCheckDashboardContext.manifests = healthCheckManifests;

2
src/Umbraco.Web.UI.Client/src/packages/health-check/health-check-dashboard.context.ts
View File

@@ -34,6 +34,6 @@ export class UmbHealthCheckDashboardContext {
}
}
export const UMB_HEALTHCHECK_DASHBOARD_CONTEXT_TOKEN = new UmbContextToken<UmbHealthCheckDashboardContext>(
export const UMB_HEALTHCHECK_DASHBOARD_CONTEXT = new UmbContextToken<UmbHealthCheckDashboardContext>(
'UmbHealthCheckDashboardContext',
);

2
src/Umbraco.Web.UI.Client/src/packages/health-check/health-check.context.ts
View File

@@ -45,4 +45,4 @@ export class UmbHealthCheckContext {
}
}
export const UMB_HEALTHCHECK_CONTEXT_TOKEN = new UmbContextToken<UmbHealthCheckContext>('UmbHealthCheckContext');
export const UMB_HEALTHCHECK_CONTEXT = new UmbContextToken<UmbHealthCheckContext>('UmbHealthCheckContext');

4
src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-group-box-overview.element.ts
View File

@@ -1,6 +1,6 @@
import { UmbHealthCheckContext } from '../health-check.context.js';
import {
UMB_HEALTHCHECK_DASHBOARD_CONTEXT_TOKEN,
UMB_HEALTHCHECK_DASHBOARD_CONTEXT,
UmbHealthCheckDashboardContext,
} from '../health-check-dashboard.context.js';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
@@ -28,7 +28,7 @@ export class UmbHealthCheckGroupBoxOverviewElement extends UmbLitElement {
constructor() {
super();
this.consumeContext(UMB_HEALTHCHECK_DASHBOARD_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_HEALTHCHECK_DASHBOARD_CONTEXT, (instance) => {
this._healthCheckContext = instance;
if (!this._healthCheckContext || !this.manifest?.meta.label) return;
this._api = this._healthCheckContext?.apis.get(this.manifest?.meta.label);

4
src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-group.element.ts
View File

@@ -1,7 +1,7 @@
import { UmbHealthCheckContext } from '../health-check.context.js';
import {
UmbHealthCheckDashboardContext,
UMB_HEALTHCHECK_DASHBOARD_CONTEXT_TOKEN,
UMB_HEALTHCHECK_DASHBOARD_CONTEXT,
} from '../health-check-dashboard.context.js';
import { UUIButtonState } from '@umbraco-cms/backoffice/external/uui';
import { css, html, nothing, customElement, property, state, unsafeHTML } from '@umbraco-cms/backoffice/external/lit';
@@ -42,7 +42,7 @@ export class UmbDashboardHealthCheckGroupElement extends UmbLitElement {
constructor() {
super();
this.consumeContext(UMB_HEALTHCHECK_DASHBOARD_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_HEALTHCHECK_DASHBOARD_CONTEXT, (instance) => {
this._healthCheckContext = instance;
this._api = this._healthCheckContext?.apis.get(this.groupName);

4
src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-overview.element.ts
View File

@@ -1,6 +1,6 @@
import {
UmbHealthCheckDashboardContext,
UMB_HEALTHCHECK_DASHBOARD_CONTEXT_TOKEN,
UMB_HEALTHCHECK_DASHBOARD_CONTEXT,
} from '../health-check-dashboard.context.js';
import { UUIButtonState } from '@umbraco-cms/backoffice/external/uui';
import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
@@ -19,7 +19,7 @@ export class UmbDashboardHealthCheckOverviewElement extends UmbLitElement {
constructor() {
super();
this.consumeContext(UMB_HEALTHCHECK_DASHBOARD_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_HEALTHCHECK_DASHBOARD_CONTEXT, (instance) => {
this._healthCheckDashboardContext = instance;
});
}

4
src/Umbraco.Web.UI.Client/src/packages/log-viewer/components/log-viewer-date-range-selector.element.ts
View File

@@ -1,7 +1,7 @@
import {
LogViewerDateRange,
UmbLogViewerWorkspaceContext,
UMB_APP_LOG_VIEWER_CONTEXT_TOKEN,
UMB_APP_LOG_VIEWER_CONTEXT,
} from '../workspace/logviewer.context.js';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import { css, html, customElement, property, queryAll, state } from '@umbraco-cms/backoffice/external/lit';
@@ -27,7 +27,7 @@ export class UmbLogViewerDateRangeSelectorElement extends UmbLitElement {
constructor() {
super();
this.addEventListener('input', this.#setDates);
this.consumeContext(UMB_APP_LOG_VIEWER_CONTEXT_TOKEN, (instance) => {
this.consumeContext(UMB_APP_LOG_VIEWER_CONTEXT, (instance) => {
this.#logViewerContext = instance;
this.#observeStuff();
});

4
src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/log-viewer.repository.ts
View File

@@ -1,7 +1,7 @@
import { UmbLogMessagesServerDataSource, UmbLogSearchesServerDataSource } from './sources/log-viewer.server.data.js';
import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification';
import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
import { DirectionModel, LogLevelModel, SavedLogSearchPresenationBaseModel } from '@umbraco-cms/backoffice/backend-api';
// Move to documentation / JSdoc
@@ -20,7 +20,7 @@ export class UmbLogViewerRepository {
this.#searchDataSource = new UmbLogSearchesServerDataSource(this.#host);
this.#messagesDataSource = new UmbLogMessagesServerDataSource(this.#host);
this.#init = new UmbContextConsumerController(this.#host, UMB_NOTIFICATION_CONTEXT_TOKEN, (instance) => {
this.#init = new UmbContextConsumerController(this.#host, UMB_NOTIFICATION_CONTEXT, (instance) => {
this.#notificationService = instance;
}).asPromise();
}

Some files were not shown because too many files have changed in this diff Show More