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

suffix context token with CONTEXT

Browse Source
This commit is contained in:
Mads Rasmussen
2023-11-09 19:52:10 +01:00
parent 319274d09b
commit 20ca51703c
4 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,4 +19,4 @@ export class UmbAppContext {
}
}
export const UMB_APP = new UmbContextToken<UmbAppContext>('UMB_APP');
export const UMB_APP_CONTEXT = new UmbContextToken<UmbAppContext>('UMB_APP');

7
src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts
View File

@@ -1,5 +1,5 @@
import type { UmbAppErrorElement } from './app-error.element.js';
import { UMB_APP, UmbAppContext } from './app.context.js';
import { UMB_APP_CONTEXT, UmbAppContext } from './app.context.js';
import { umbLocalizationRegistry } from '@umbraco-cms/backoffice/localization';
import { UMB_AUTH_CONTEXT, UmbAuthContext } from '@umbraco-cms/backoffice/auth';
import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
@@ -113,7 +113,10 @@ export class UmbAppElement extends UmbLitElement {
this.provideContext(UMB_AUTH_CONTEXT, this.#authContext);
this.provideContext(UMB_APP, new UmbAppContext({ backofficePath: this.backofficePath, serverUrl: this.serverUrl }));
this.provideContext(
UMB_APP_CONTEXT,
new UmbAppContext({ backofficePath: this.backofficePath, serverUrl: this.serverUrl }),
);
// Try to initialise the auth flow and get the runtime status
try {

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

@@ -26,7 +26,7 @@ import { firstValueFrom } from '@umbraco-cms/backoffice/external/rxjs';
import { UmbMediaHelper } from '@umbraco-cms/backoffice/utils';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
import { UMB_APP } from '@umbraco-cms/backoffice/app';
import { UMB_APP_CONTEXT } from '@umbraco-cms/backoffice/app';
import { UmbStylesheetRepository } from '@umbraco-cms/backoffice/stylesheet';
// TODO => integrate macro picker, update stylesheet fetch when backend CLI exists (ref tinymce.service.js in existing backoffice)
@@ -56,7 +56,7 @@ export class UmbInputTinyMceElement extends FormControlMixin(UmbLitElement) {
constructor() {
super();
this.consumeContext(UMB_APP, (instance) => {
this.consumeContext(UMB_APP_CONTEXT, (instance) => {
this.#serverUrl = instance.getServerUrl();
});

16
src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user/current-user-modal.element.ts
View File

@@ -1,4 +1,4 @@
import { UMB_APP } from '@umbraco-cms/backoffice/app';
import { UMB_APP_CONTEXT } from '@umbraco-cms/backoffice/app';
import { UMB_AUTH_CONTEXT, type UmbLoggedInUser } from '@umbraco-cms/backoffice/auth';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import { css, CSSResultGroup, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
@@ -15,7 +15,7 @@ export class UmbCurrentUserModalElement extends UmbLitElement {
#authContext?: typeof UMB_AUTH_CONTEXT.TYPE;
#appContext?: typeof UMB_APP.TYPE;
#appContext?: typeof UMB_APP_CONTEXT.TYPE;
constructor() {
super();
@@ -25,7 +25,7 @@ export class UmbCurrentUserModalElement extends UmbLitElement {
this._observeCurrentUser();
});
this.consumeContext(UMB_APP, (instance) => {
this.consumeContext(UMB_APP_CONTEXT, (instance) => {
this.#appContext = instance;
});
}
@@ -33,9 +33,13 @@ export class UmbCurrentUserModalElement extends UmbLitElement {
private async _observeCurrentUser() {
if (!this.#authContext) return;
this.observe(this.#authContext.currentUser, (currentUser) => {
this._currentUser = currentUser;
}, 'umbCurrentUserObserver');
this.observe(
this.#authContext.currentUser,
(currentUser) => {
this._currentUser = currentUser;
},
'umbCurrentUserObserver',
);
}
private _close() {