Merge branch 'main' into v14/feature/property-type-workspace

Author: nielslyngsoe

package-lock.json

@@ -142,7 +142,8 @@
 		"./src/packages/tags",
 		"./src/packages/templating",
 		"./src/packages/property-editors",
-		"./src/packages/media"
+		"./src/packages/media",
+		"./src/packages/user"
 	],
 	"scripts": {
 		"backoffice:test:e2e": "npx playwright test",

package.json

@@ -48,7 +48,7 @@ export class RouterSlot<D = any, P = any> extends HTMLElement implements IRouter
 	/**
 	 * Method to cancel navigation if changed.
 	 */
-	private _cancelNavigation ?:() => void;
+	private _cancelNavigation?: () => void;
 
 	/**
 	 * Listeners on the router.
@@ -208,7 +208,7 @@ export class RouterSlot<D = any, P = any> extends HTMLElement implements IRouter
 				if (this.isConnected) {
 					const newMatch = this.getRouteMatch();
 					// Check if this match matches the current match (aka. If the path has changed), if so we should navigate. [NL]
-					if(newMatch) {
+					if (newMatch) {
 						navigate = shouldNavigate(this.match, newMatch);
 					}
 				}
@@ -318,7 +318,6 @@ export class RouterSlot<D = any, P = any> extends HTMLElement implements IRouter
 	 * Returns true if a navigation was made to a new page.
 	 */
 	protected async renderPath(path: string | PathFragment): Promise<boolean> {
-
 		// Notice: Since this is never called from any other place than one higher in this file(when writing this...), we could just retrieve the path and find a match by using this.getRouteMatch() [NL]
 		// Find the corresponding route.
 		const match = matchRoutes(this._routes, path);
@@ -336,7 +335,6 @@ export class RouterSlot<D = any, P = any> extends HTMLElement implements IRouter
 			// Only change route if its a new route.
 			const navigate = shouldNavigate(this.match, match);
 			if (navigate) {
-
 				// If another navigation is still begin resolved in this very moment, then we need to cancel that so it does not end up overriding this new navigation.[NL]
 				this._cancelNavigation?.();
 				// Listen for another push state event. If another push state event happens
@@ -412,7 +410,7 @@ export class RouterSlot<D = any, P = any> extends HTMLElement implements IRouter
 					// We have some routes that share the same component instance, those should not be removed and re-appended [NL]
 					const isTheSameComponent = this.firstChild === page;
 
-					if(!isTheSameComponent) {
+					if (!isTheSameComponent) {
 						// Remove the old page by clearing the slot
 						this.clearChildren();
 					}
@@ -421,7 +419,7 @@ export class RouterSlot<D = any, P = any> extends HTMLElement implements IRouter
 					// We do this to ensure that we can find the match in the connectedCallback of the page.
 					this._routeMatch = match;
 
-					if(!isTheSameComponent) {
+					if (!isTheSameComponent) {
 						if (page) {
 							// Append the new page
 							this.appendChild(page);

src/external/router-slot/router-slot.ts

@@ -0,0 +1,4 @@
+import type UmbCurrentUserContext from './current-user.context.js';
+import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
+
+export const UMB_CURRENT_USER_CONTEXT = new UmbContextToken<UmbCurrentUserContext>('UmbCurrentUserContext');

src/packages/user/current-user/current-user.context.token.ts

@@ -1,6 +1,6 @@
 import type { UmbCurrentUserModel } from './types.js';
 import { UmbCurrentUserRepository } from './repository/index.js';
-import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
+import { UMB_CURRENT_USER_CONTEXT } from './current-user.context.token.js';
 import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { firstValueFrom } from '@umbraco-cms/backoffice/external/rxjs';
@@ -116,5 +116,3 @@ export class UmbCurrentUserContext extends UmbContextBase<UmbCurrentUserContext>
 }
 
 export default UmbCurrentUserContext;
-
-export const UMB_CURRENT_USER_CONTEXT = new UmbContextToken<UmbCurrentUserContext>('UmbCurrentUserContext');

src/packages/user/current-user/current-user.context.ts

@@ -16,3 +16,5 @@ export class UmbConfigureExternalLoginProvidersApi<ArgsMetaType = never>
 		await modalManagerContext.open(this, UMB_CURRENT_USER_EXTERNAL_LOGIN_MODAL).onSubmit();
 	}
 }
+
+export { UmbConfigureExternalLoginProvidersApi as api };

src/packages/user/current-user/external-login/configure-external-login-providers-action.ts

@@ -1,4 +1,3 @@
-import { UmbConfigureExternalLoginProvidersApi } from './configure-external-login-providers-action.js';
 import type { ManifestCurrentUserActionDefaultKind, ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
 
 export const modals: Array<ManifestModal> = [
@@ -17,7 +16,7 @@ export const userProfileApps: Array<ManifestCurrentUserActionDefaultKind> = [
 		alias: 'Umb.CurrentUser.App.ExternalLoginProviders',
 		name: 'External Login Providers Current User App',
 		weight: 700,
-		api: UmbConfigureExternalLoginProvidersApi,
+		api: () => import('./configure-external-login-providers-action.js'),
 		meta: {
 			label: '#defaultdialogs_externalLoginProviders',
 			icon: 'icon-lock',

src/packages/user/current-user/external-login/manifests.ts

@@ -1,5 +1,5 @@
 import type { UmbCurrentUserHistoryItem, UmbCurrentUserHistoryStore } from './current-user-history.store.js';
-import { UMB_CURRENT_USER_HISTORY_STORE_CONTEXT } from './current-user-history.store.js';
+import { UMB_CURRENT_USER_HISTORY_STORE_CONTEXT } from './current-user-history.store.token.js';
 import { html, customElement, state, map, ifDefined, css } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';

src/packages/user/current-user/history/current-user-history-user-profile-app.element.ts

@@ -0,0 +1,6 @@
+import type UmbCurrentUserHistoryStore from './current-user-history.store.js';
+import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
+
+export const UMB_CURRENT_USER_HISTORY_STORE_CONTEXT = new UmbContextToken<UmbCurrentUserHistoryStore>(
+	'UmbCurrentUserHistoryStore',
+);

src/packages/user/current-user/history/current-user-history.store.token.ts

@@ -1,4 +1,4 @@
-import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
+import { UMB_CURRENT_USER_HISTORY_STORE_CONTEXT } from './current-user-history.store.token.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbId } from '@umbraco-cms/backoffice/id';
 import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
@@ -61,9 +61,5 @@ export class UmbCurrentUserHistoryStore extends UmbStoreBase<UmbCurrentUserHisto
 	}
 }
 
-export const UMB_CURRENT_USER_HISTORY_STORE_CONTEXT = new UmbContextToken<UmbCurrentUserHistoryStore>(
-	'UmbCurrentUserHistoryStore',
-);
-
 // Default export for the globalContext manifest:
 export default UmbCurrentUserHistoryStore;