@umbraco-cms/backoffice 14.0.0-rc3 → 14.0.0-rc4

package/dist-cms/packages/user/current-user/external-login/modals/external-login-modal.element.js

@@ -0,0 +1,200 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { UmbCurrentUserRepository } from '../../repository/index.js';
+import { css, customElement, html, nothing, property, repeat, state, when } from '../../../../../external/lit/index.js';
+import { UmbLitElement } from '../../../../core/lit-element/index.js';
+import { umbConfirmModal } from '../../../../core/modal/index.js';
+import { UmbTextStyles } from '../../../../core/style/index.js';
+import { umbExtensionsRegistry } from '../../../../core/extension-registry/index.js';
+import { mergeObservables } from '../../../../../libs/observable-api/index.js';
+import { UMB_AUTH_CONTEXT } from '../../../../core/auth/index.js';
+import { UMB_NOTIFICATION_CONTEXT } from '../../../../core/notification/index.js';
+let UmbCurrentUserExternalLoginModalElement = class UmbCurrentUserExternalLoginModalElement extends UmbLitElement {
+    #currentUserRepository;
+    #notificationContext;
+    constructor() {
+        super();
+        this._items = [];
+        this.#currentUserRepository = new UmbCurrentUserRepository(this);
+        this.#loadProviders();
+        this.consumeContext(UMB_NOTIFICATION_CONTEXT, (context) => {
+            this.#notificationContext = context;
+        });
+    }
+    async #loadProviders() {
+        const serverLoginProviders$ = (await this.#currentUserRepository.requestExternalLoginProviders()).asObservable();
+        const manifestLoginProviders$ = umbExtensionsRegistry.byTypeAndFilter('authProvider', (ext) => !!ext.meta?.linking?.allowManualLinking);
+        // Merge the server and manifest providers to get the final list of providers
+        const externalLoginProviders$ = mergeObservables([serverLoginProviders$, manifestLoginProviders$], ([serverLoginProviders, manifestLoginProviders]) => {
+            const providers = manifestLoginProviders.map((manifestLoginProvider) => {
+                const serverLoginProvider = serverLoginProviders.find((serverLoginProvider) => serverLoginProvider.providerSchemeName === manifestLoginProvider.forProviderName);
+                return {
+                    existsOnServer: !!serverLoginProvider,
+                    hasManualLinkingEnabled: serverLoginProvider?.hasManualLinkingEnabled ?? false,
+                    isLinkedOnUser: serverLoginProvider?.isLinkedOnUser ?? false,
+                    providerKey: serverLoginProvider?.providerKey ?? '',
+                    providerSchemeName: manifestLoginProvider.forProviderName,
+                    icon: manifestLoginProvider.meta?.defaultView?.icon,
+                    displayName: manifestLoginProvider.meta?.label ?? manifestLoginProvider.forProviderName ?? manifestLoginProvider.name,
+                };
+            });
+            return providers;
+        });
+        this.observe(externalLoginProviders$, (providers) => {
+            this._items = providers;
+        }, '_externalLoginProviders');
+    }
+    #close() {
+        this.modalContext?.submit();
+    }
+    render() {
+        return html `
+			<umb-body-layout headline="${this.localize.term('defaultdialogs_externalLoginProviders')}">
+				<div id="main">
+					${repeat(this._items, (item) => item.providerSchemeName, (item) => this.#renderProvider(item))}
+				</div>
+				<div slot="actions">
+					<uui-button @click=${this.#close} look="secondary" .label=${this.localize.term('general_close')}></uui-button>
+				</div>
+			</umb-body-layout>
+		`;
+    }
+    /**
+     * Render a provider with a toggle to enable/disable it
+     */
+    #renderProvider(item) {
+        return html `
+			<uui-box>
+				<div class="header" slot="header">
+					<uui-icon class="header-icon" name=${item.icon ?? 'icon-cloud'}></uui-icon>
+					${this.localize.string(item.displayName)}
+				</div>
+				${when(item.existsOnServer, () => nothing, () => html `<div style="position:relative" slot="header-actions">
+							<uui-badge
+								style="cursor:default"
+								title="Warning: This provider is not configured on the server"
+								color="danger"
+								look="primary">
+								!
+							</uui-badge>
+						</div>`)}
+				${when(item.isLinkedOnUser, () => html `
+						<p style="margin-top:0">
+							<umb-localize key="defaultdialogs_linkedToService">Your account is linked to this service</umb-localize>
+						</p>
+						<uui-button
+							type="button"
+							look="secondary"
+							color="danger"
+							.label=${this.localize.term('defaultdialogs_unLinkYour', this.localize.string(item.displayName))}
+							@click=${() => this.#onProviderDisable(item)}>
+							<umb-localize key="defaultdialogs_unLinkYour" .args=${[this.localize.string(item.displayName)]}>
+								Unlink your ${this.localize.string(item.displayName)} account
+							</umb-localize>
+							<uui-icon name="icon-window-popout"></uui-icon>
+						</uui-button>
+					`, () => html `
+						<uui-button
+							type="button"
+							look="secondary"
+							color="success"
+							.label=${this.localize.term('defaultdialogs_linkYour', item.displayName)}
+							?disabled=${!item.existsOnServer || !item.hasManualLinkingEnabled}
+							@click=${() => this.#onProviderEnable(item)}>
+							<umb-localize key="defaultdialogs_linkYour" .args=${[this.localize.string(item.displayName)]}>
+								Link your ${this.localize.string(item.displayName)} account
+							</umb-localize>
+							<uui-icon name="icon-window-popout"></uui-icon>
+						</uui-button>
+					`)}
+			</uui-box>
+		`;
+    }
+    async #onProviderEnable(item) {
+        const providerDisplayName = this.localize.string(item.displayName);
+        try {
+            await umbConfirmModal(this, {
+                headline: this.localize.term('defaultdialogs_linkYour', providerDisplayName),
+                content: this.localize.term('defaultdialogs_linkYourConfirm', providerDisplayName),
+                confirmLabel: this.localize.term('general_continue'),
+                color: 'positive',
+            });
+            const authContext = await this.getContext(UMB_AUTH_CONTEXT);
+            await authContext.linkLogin(item.providerSchemeName);
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                this.#notificationContext?.peek('danger', {
+                    data: {
+                        headline: this.localize.term('defaultdialogs_linkYour', providerDisplayName),
+                        message: error.message,
+                    },
+                });
+            }
+        }
+    }
+    async #onProviderDisable(item) {
+        if (!item.providerKey) {
+            throw new Error('Provider key is missing');
+        }
+        const providerDisplayName = this.localize.string(item.displayName);
+        try {
+            await umbConfirmModal(this, {
+                headline: this.localize.term('defaultdialogs_unLinkYour', providerDisplayName),
+                content: this.localize.term('defaultdialogs_unLinkYourConfirm', providerDisplayName),
+                confirmLabel: this.localize.term('general_continue'),
+                color: 'danger',
+            });
+            const authContext = await this.getContext(UMB_AUTH_CONTEXT);
+            await authContext.unlinkLogin(item.providerSchemeName, item.providerKey);
+        }
+        catch (error) {
+            let message = this.localize.term('errors_receivedErrorFromServer');
+            if (error instanceof Error) {
+                message = error.message;
+            }
+            else if (typeof error === 'object' && error.title) {
+                message = error.title ?? message;
+            }
+            console.error('[External Login] Error unlinking provider: ', error);
+            this.#notificationContext?.peek('danger', {
+                data: {
+                    headline: this.localize.term('defaultdialogs_unLinkYour', providerDisplayName),
+                    message,
+                },
+            });
+        }
+    }
+    static { this.styles = [
+        UmbTextStyles,
+        css `
+			uui-box {
+				margin-bottom: var(--uui-size-space-3);
+			}
+
+			.header {
+				display: flex;
+				align-items: center;
+			}
+
+			.header-icon {
+				margin-right: var(--uui-size-space-4);
+			}
+		`,
+    ]; }
+};
+__decorate([
+    property({ attribute: false })
+], UmbCurrentUserExternalLoginModalElement.prototype, "modalContext", void 0);
+__decorate([
+    state()
+], UmbCurrentUserExternalLoginModalElement.prototype, "_items", void 0);
+UmbCurrentUserExternalLoginModalElement = __decorate([
+    customElement('umb-current-user-external-login-modal')
+], UmbCurrentUserExternalLoginModalElement);
+export { UmbCurrentUserExternalLoginModalElement };
+export default UmbCurrentUserExternalLoginModalElement;

package/dist-cms/packages/user/current-user/external-login/modals/external-login-modal.token.d.ts

@@ -0,0 +1,4 @@
+import { UmbModalToken } from '../../../../core/modal/index.js';
+export declare const UMB_CURRENT_USER_EXTERNAL_LOGIN_MODAL: UmbModalToken<{
+    [key: string]: any;
+}, unknown>;

package/dist-cms/packages/user/current-user/external-login/modals/external-login-modal.token.js

@@ -0,0 +1,7 @@
+import { UmbModalToken } from '../../../../core/modal/index.js';
+export const UMB_CURRENT_USER_EXTERNAL_LOGIN_MODAL = new UmbModalToken('Umb.Modal.CurrentUserExternalLogin', {
+    modal: {
+        type: 'sidebar',
+        size: 'small',
+    },
+});

package/dist-cms/packages/user/current-user/manifests.js

@@ -1,6 +1,7 @@
 import { manifest as actionDefaultKindManifest } from './action/default.kind.js';
 import { manifests as modalManifests } from './modals/manifests.js';
 import { manifests as historyManifests } from './history/manifests.js';
+import { manifests as externalLoginProviderManifests } from './external-login/manifests.js';
 import { manifests as mfaLoginProviderManifests } from './mfa-login/manifests.js';
 import { manifests as profileManifests } from './profile/manifests.js';
 import { manifests as themeManifests } from './theme/manifests.js';
@@ -29,6 +30,7 @@ export const manifests = [
     actionDefaultKindManifest,
     ...headerApps,
     ...historyManifests,
+    ...externalLoginProviderManifests,
     ...mfaLoginProviderManifests,
     ...modalManifests,
     ...profileManifests,

package/dist-cms/packages/user/current-user/modals/current-user-mfa/current-user-mfa-modal.element.d.ts

@@ -3,6 +3,7 @@ import { UmbLitElement } from '../../../../core/lit-element/index.js';
 import { type UmbModalContext } from '../../../../core/modal/index.js';
 type UmbMfaLoginProviderOption = UmbCurrentUserMfaProviderModel & {
     displayName: string;
+    existsOnServer: boolean;
 };
 export declare class UmbCurrentUserMfaModalElement extends UmbLitElement {
     #private;

package/dist-cms/packages/user/current-user/modals/current-user-mfa/current-user-mfa-modal.element.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { UMB_CURRENT_USER_MFA_ENABLE_PROVIDER_MODAL } from '../current-user-mfa-enable-provider/current-user-mfa-enable-provider-modal.token.js';
 import { UmbCurrentUserRepository } from '../../repository/index.js';
 import { UMB_CURRENT_USER_MFA_DISABLE_PROVIDER_MODAL } from '../current-user-mfa-disable-provider/current-user-mfa-disable-provider-modal.token.js';
-import { css, customElement, html, property, repeat, state, when } from '../../../../../external/lit/index.js';
+import { css, customElement, html, nothing, property, repeat, state, when } from '../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
 import { UMB_MODAL_MANAGER_CONTEXT } from '../../../../core/modal/index.js';
 import { UmbTextStyles } from '../../../../core/style/index.js';
@@ -29,6 +29,7 @@ let UmbCurrentUserMfaModalElement = class UmbCurrentUserMfaModalElement extends
             return manifestLoginProviders.map((manifestLoginProvider) => {
                 const serverLoginProvider = serverLoginProviders.find((serverLoginProvider) => serverLoginProvider.providerName === manifestLoginProvider.forProviderName);
                 return {
+                    existsOnServer: !!serverLoginProvider,
                     isEnabledOnUser: serverLoginProvider?.isEnabledOnUser ?? false,
                     providerName: serverLoginProvider?.providerName ?? manifestLoginProvider.forProviderName,
                     displayName: manifestLoginProvider.meta?.label ?? serverLoginProvider?.providerName ?? manifestLoginProvider.name,
@@ -62,6 +63,15 @@ let UmbCurrentUserMfaModalElement = class UmbCurrentUserMfaModalElement extends
     #renderProvider(item) {
         return html `
 			<uui-box headline=${item.displayName}>
+				${when(item.existsOnServer, () => nothing, () => html `<div style="position:relative" slot="header-actions">
+							<uui-badge
+								style="cursor:default"
+								title="Warning: This provider is not configured on the server"
+								color="danger"
+								look="primary">
+								!
+							</uui-badge>
+						</div>`)}
 				${when(item.isEnabledOnUser, () => html `
 						<p style="margin-top:0">
 							<umb-localize key="user_2faProviderIsEnabled">This two-factor provider is enabled</umb-localize>
@@ -76,6 +86,7 @@ let UmbCurrentUserMfaModalElement = class UmbCurrentUserMfaModalElement extends
 						<uui-button
 							type="button"
 							look="secondary"
+							?disabled=${!item.existsOnServer}
 							.label=${this.localize.term('actions_enable')}
 							@click=${() => this.#onProviderEnable(item)}></uui-button>
 					`)}

package/dist-cms/packages/user/current-user/repository/current-user.repository.d.ts

@@ -19,6 +19,15 @@ export declare class UmbCurrentUserRepository extends UmbRepositoryBase {
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
         asObservable: () => import("rxjs").Observable<import("../types.js").UmbCurrentUserModel | undefined>;
     }>;
+    /**
+     * Request the current user's external login providers
+     * @memberof UmbCurrentUserRepository
+     */
+    requestExternalLoginProviders(): Promise<{
+        data: import("../../../../external/backend-api/index.js").UserExternalLoginProviderModel[] | undefined;
+        error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
+        asObservable: () => import("rxjs").Observable<import("../../../../external/backend-api/index.js").UserExternalLoginProviderModel[]>;
+    }>;
     /**
      * Request the current user's available MFA login providers
      * @memberof UmbCurrentUserRepository

package/dist-cms/packages/user/current-user/repository/current-user.repository.js

@@ -32,6 +32,18 @@ export class UmbCurrentUserRepository extends UmbRepositoryBase {
         }
         return { data, error, asObservable: () => this.#currentUserStore.data };
     }
+    /**
+     * Request the current user's external login providers
+     * @memberof UmbCurrentUserRepository
+     */
+    async requestExternalLoginProviders() {
+        await this.#init;
+        const { data, error } = await this.#currentUserSource.getExternalLoginProviders();
+        if (data) {
+            this.#currentUserStore?.setExternalLoginProviders(data);
+        }
+        return { data, error, asObservable: () => this.#currentUserStore.externalLoginProviders };
+    }
     /**
      * Request the current user's available MFA login providers
      * @memberof UmbCurrentUserRepository

package/dist-cms/packages/user/current-user/repository/current-user.server.data-source.d.ts

@@ -25,6 +25,11 @@ export declare class UmbCurrentUserServerDataSource {
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
         data?: undefined;
     }>;
+    /**
+     * Get the current user's external login providers
+     * @memberof UmbCurrentUserServerDataSource
+     */
+    getExternalLoginProviders(): Promise<import("../../../core/repository/data-source-response.interface.js").UmbDataSourceResponse<import("../../../../external/backend-api/index.js").UserExternalLoginProviderModel[]>>;
     /**
      * Get the current user's available MFA login providers
      * @memberof UmbCurrentUserServerDataSource

package/dist-cms/packages/user/current-user/repository/current-user.server.data-source.js

@@ -24,25 +24,43 @@ export class UmbCurrentUserServerDataSource {
         const { data, error } = await tryExecuteAndNotify(this.#host, UserService.getUserCurrent());
         if (data) {
             const user = {
-                unique: data.id,
+                allowedSections: data.allowedSections,
+                avatarUrls: data.avatarUrls,
+                documentStartNodeUniques: data.documentStartNodeIds.map((node) => {
+                    return {
+                        unique: node.id,
+                    };
+                }),
                 email: data.email,
-                userName: data.userName,
-                name: data.name,
+                fallbackPermissions: data.fallbackPermissions,
+                hasAccessToAllLanguages: data.hasAccessToAllLanguages,
+                hasAccessToSensitiveData: data.hasAccessToSensitiveData,
+                hasDocumentRootAccess: data.hasDocumentRootAccess,
+                hasMediaRootAccess: data.hasMediaRootAccess,
+                isAdmin: data.isAdmin,
                 languageIsoCode: data.languageIsoCode || 'en-us', // TODO: make global variable
-                documentStartNodeUniques: data.documentStartNodeIds,
-                mediaStartNodeUniques: data.mediaStartNodeIds,
-                avatarUrls: data.avatarUrls,
                 languages: data.languages,
-                hasAccessToAllLanguages: data.hasAccessToAllLanguages,
-                fallbackPermissions: data.fallbackPermissions,
+                mediaStartNodeUniques: data.mediaStartNodeIds.map((node) => {
+                    return {
+                        unique: node.id,
+                    };
+                }),
+                name: data.name,
                 permissions: data.permissions,
-                allowedSections: data.allowedSections,
-                isAdmin: data.isAdmin,
+                unique: data.id,
+                userName: data.userName,
             };
             return { data: user };
         }
         return { error };
     }
+    /**
+     * Get the current user's external login providers
+     * @memberof UmbCurrentUserServerDataSource
+     */
+    async getExternalLoginProviders() {
+        return tryExecuteAndNotify(this.#host, UserService.getUserCurrentLoginProviders());
+    }
     /**
      * Get the current user's available MFA login providers
      * @memberof UmbCurrentUserServerDataSource

package/dist-cms/packages/user/current-user/repository/current-user.store.d.ts

@@ -1,4 +1,4 @@
-import type { UmbCurrentUserMfaProviderModel, UmbCurrentUserModel } from '../types.js';
+import type { UmbCurrentUserExternalLoginProviderModel, UmbCurrentUserMfaProviderModel, UmbCurrentUserModel } from '../types.js';
 import { UmbContextBase } from '../../../../libs/class-api/index.js';
 import { UmbContextToken } from '../../../../libs/context-api/index.js';
 import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
@@ -6,6 +6,7 @@ export declare class UmbCurrentUserStore extends UmbContextBase<UmbCurrentUserSt
     #private;
     readonly data: import("rxjs/internal/Observable").Observable<UmbCurrentUserModel | undefined>;
     readonly mfaProviders: import("rxjs/internal/Observable").Observable<import("../../../../external/backend-api/index.js").UserTwoFactorProviderModel[]>;
+    readonly externalLoginProviders: import("rxjs/internal/Observable").Observable<import("../../../../external/backend-api/index.js").UserExternalLoginProviderModel[]>;
     constructor(host: UmbControllerHost);
     /**
      * Get the current user
@@ -33,5 +34,7 @@ export declare class UmbCurrentUserStore extends UmbContextBase<UmbCurrentUserSt
     clear(): void;
     setMfaProviders(data: Array<UmbCurrentUserMfaProviderModel>): void;
     updateMfaProvider(data: Partial<UmbCurrentUserMfaProviderModel>): void;
+    setExternalLoginProviders(data: Array<UmbCurrentUserExternalLoginProviderModel>): void;
+    updateExternalLoginProvider(data: Partial<UmbCurrentUserExternalLoginProviderModel>): void;
 }
 export declare const UMB_CURRENT_USER_STORE_CONTEXT: UmbContextToken<UmbCurrentUserStore, UmbCurrentUserStore>;

package/dist-cms/packages/user/current-user/repository/current-user.store.js

@@ -5,12 +5,15 @@ import { UmbArrayState, UmbObjectState } from '../../../../libs/observable-api/i
 export class UmbCurrentUserStore extends UmbContextBase {
     #data;
     #mfaProviders;
+    #externalLoginProviders;
     constructor(host) {
         super(host, UMB_CURRENT_USER_STORE_CONTEXT);
         this.#data = new UmbObjectState(undefined);
         this.data = this.#data.asObservable();
         this.#mfaProviders = new UmbArrayState([], (e) => e.providerName);
         this.mfaProviders = this.#mfaProviders.asObservable();
+        this.#externalLoginProviders = new UmbArrayState([], (e) => e.providerSchemeName);
+        this.externalLoginProviders = this.#externalLoginProviders.asObservable();
         this.#onUserDetailStoreUpdate = (users) => {
             const currentUser = this.get();
             if (!currentUser)
@@ -73,5 +76,11 @@ export class UmbCurrentUserStore extends UmbContextBase {
     updateMfaProvider(data) {
         this.#mfaProviders.updateOne(data.providerName, data);
     }
+    setExternalLoginProviders(data) {
+        this.#externalLoginProviders.setValue(data);
+    }
+    updateExternalLoginProvider(data) {
+        this.#externalLoginProviders.updateOne(data.providerSchemeName, data);
+    }
 }
 export const UMB_CURRENT_USER_STORE_CONTEXT = new UmbContextToken('UmbCurrentUserStore');

package/dist-cms/packages/user/current-user/theme/current-user-theme-user-profile-app.element.js

@@ -34,12 +34,8 @@ let UmbCurrentUserThemeUserProfileAppElement = class UmbCurrentUserThemeUserProf
         if (!this._themes.length)
             return nothing;
         return html `
-			<uui-box headline="Select theme">
-				<uui-select
-					label="Select theme"
-					.options=${this._themes}
-					.value=${this._themeAlias}
-					@change=${this.#onThemeChange}></uui-select>
+			<uui-box headline="Theme (Experimental)">
+				<uui-select label="Select theme" .options=${this._themes} @change=${this.#onThemeChange}></uui-select>
 			</uui-box>
 		`;
     }

package/dist-cms/packages/user/current-user/types.d.ts

@@ -1,20 +1,25 @@
-import type { ApiError, CancelError, DocumentPermissionPresentationModel, UnknownTypePermissionPresentationModel, UserTwoFactorProviderModel } from '../../../external/backend-api/index.js';
+import type { ApiError, CancelError, DocumentPermissionPresentationModel, UnknownTypePermissionPresentationModel, UserExternalLoginProviderModel, UserTwoFactorProviderModel } from '../../../external/backend-api/index.js';
+import type { UmbReferenceByUnique } from '../../core/models/index.js';
 export interface UmbCurrentUserModel {
-    unique: string;
+    allowedSections: Array<string>;
+    avatarUrls: Array<string>;
+    documentStartNodeUniques: Array<UmbReferenceByUnique>;
     email: string;
-    userName: string;
-    name: string;
+    fallbackPermissions: Array<string>;
+    hasAccessToAllLanguages: boolean;
+    hasAccessToSensitiveData: boolean;
+    hasDocumentRootAccess: boolean;
+    hasMediaRootAccess: boolean;
+    isAdmin: boolean;
     languageIsoCode: string;
-    documentStartNodeUniques: Array<string>;
-    mediaStartNodeUniques: Array<string>;
-    avatarUrls: Array<string>;
     languages: Array<string>;
-    hasAccessToAllLanguages: boolean;
-    allowedSections: Array<string>;
-    fallbackPermissions: Array<string>;
+    mediaStartNodeUniques: Array<UmbReferenceByUnique>;
+    name: string;
     permissions: Array<DocumentPermissionPresentationModel | UnknownTypePermissionPresentationModel>;
-    isAdmin: boolean;
+    unique: string;
+    userName: string;
 }
+export type UmbCurrentUserExternalLoginProviderModel = UserExternalLoginProviderModel;
 export type UmbCurrentUserMfaProviderModel = UserTwoFactorProviderModel;
 export type UmbMfaProviderConfigurationCallback = Promise<{
     error?: ApiError | CancelError;

package/dist-cms/packages/user/user/collection/action/create-user.collection-action.d.ts

@@ -1,4 +1,4 @@
-import { UmbCollectionActionBase } from '../../../../core/collection/index.js';
-export declare class UmbCreateUserCollectionAction extends UmbCollectionActionBase {
+import { UmbControllerBase } from '../../../../../libs/class-api/index.js';
+export declare class UmbCreateUserCollectionAction extends UmbControllerBase {
     execute(): Promise<void>;
 }

package/dist-cms/packages/user/user/collection/action/create-user.collection-action.js

@@ -1,10 +1,29 @@
 import { UMB_CREATE_USER_MODAL } from '../../modals/create/create-user-modal.token.js';
-import { UmbCollectionActionBase } from '../../../../core/collection/index.js';
+import { UMB_ACTION_EVENT_CONTEXT } from '../../../../core/action/index.js';
+import { UmbControllerBase } from '../../../../../libs/class-api/index.js';
+import { UMB_ENTITY_CONTEXT } from '../../../../core/entity/index.js';
+import { UmbRequestReloadChildrenOfEntityEvent } from '../../../../core/entity-action/index.js';
 import { UMB_MODAL_MANAGER_CONTEXT } from '../../../../core/modal/index.js';
-export class UmbCreateUserCollectionAction extends UmbCollectionActionBase {
+export class UmbCreateUserCollectionAction extends UmbControllerBase {
     async execute() {
         const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
+        const entityContext = await this.getContext(UMB_ENTITY_CONTEXT);
+        const unique = entityContext.getUnique();
+        const entityType = entityContext.getEntityType();
+        if (unique === undefined)
+            throw new Error('Missing unique');
+        if (!entityType)
+            throw new Error('Missing entityType');
         const modalContext = modalManager.open(this, UMB_CREATE_USER_MODAL);
-        await modalContext?.onSubmit();
+        modalContext?.onSubmit().catch(async () => {
+            // modal is closed after creation instead of navigating to the new user.
+            // We therefore need to reload the children of the entity
+            const eventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
+            const event = new UmbRequestReloadChildrenOfEntityEvent({
+                entityType,
+                unique,
+            });
+            eventContext.dispatchEvent(event);
+        });
     }
 }

package/dist-cms/packages/user/user/collection/action/manifests.js

@@ -8,7 +8,7 @@ export const createManifest = {
     api: UmbCreateUserCollectionAction,
     weight: 200,
     meta: {
-        label: 'Create',
+        label: '#general_create',
     },
     conditions: [
         {

package/dist-cms/packages/user/user/collection/repository/user-collection.server.data-source.js

@@ -41,11 +41,23 @@ export class UmbUserCollectionServerDataSource {
                     email: item.email,
                     userName: item.userName,
                     name: item.name,
-                    userGroupUniques: item.userGroupIds,
+                    userGroupUniques: item.userGroupIds.map((reference) => {
+                        return {
+                            unique: reference.id,
+                        };
+                    }),
                     unique: item.id,
                     languageIsoCode: item.languageIsoCode || null,
-                    documentStartNodeUniques: item.documentStartNodeIds,
-                    mediaStartNodeUniques: item.mediaStartNodeIds,
+                    documentStartNodeUniques: item.documentStartNodeIds.map((node) => {
+                        return {
+                            unique: node.id,
+                        };
+                    }),
+                    mediaStartNodeUniques: item.mediaStartNodeIds.map((node) => {
+                        return {
+                            unique: node.id,
+                        };
+                    }),
                     hasDocumentRootAccess: item.hasDocumentRootAccess,
                     hasMediaRootAccess: item.hasMediaRootAccess,
                     avatarUrls: item.avatarUrls,

package/dist-cms/packages/user/user/collection/types.d.ts

@@ -1,13 +1,11 @@
 import type { UmbUserOrderByType, UmbUserStateFilterType } from './utils/index.js';
+import type { UmbCollectionFilterModel } from '../../../core/collection/index.js';
 import type { UmbDirectionType } from '../../../core/utils/index.js';
-export interface UmbUserCollectionFilterModel {
-    skip?: number;
-    take?: number;
+export interface UmbUserCollectionFilterModel extends UmbCollectionFilterModel {
     orderBy?: UmbUserOrderByType;
     orderDirection?: UmbDirectionType;
     userGroupIds?: string[];
     userStates?: UmbUserStateFilterType[];
-    filter?: string;
 }
 export interface UmbUserOrderByOption {
     unique: string;

package/dist-cms/packages/user/user/collection/user-collection-header.element.js

@@ -5,9 +5,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UmbUserStateFilter } from './utils/index.js';
+import { UMB_USER_COLLECTION_CONTEXT } from './user-collection.context-token.js';
 import { css, html, customElement, state, repeat, ifDefined } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../core/lit-element/index.js';
-import { UMB_COLLECTION_CONTEXT } from '../../../core/collection/index.js';
 import { UmbUserGroupCollectionRepository } from '../../user-group/index.js';
 import { observeMultiple } from '../../../../libs/observable-api/index.js';
 let UmbUserCollectionHeaderElement = class UmbUserCollectionHeaderElement extends UmbLitElement {
@@ -24,7 +24,7 @@ let UmbUserCollectionHeaderElement = class UmbUserCollectionHeaderElement extend
         this._orderByOptions = [];
         this.#inputTimerAmount = 500;
         this.#userGroupCollectionRepository = new UmbUserGroupCollectionRepository(this);
-        this.consumeContext(UMB_COLLECTION_CONTEXT, (instance) => {
+        this.consumeContext(UMB_USER_COLLECTION_CONTEXT, (instance) => {
             this.#collectionContext = instance;
             this.#observeOrderByOptions();
         });

package/dist-cms/packages/user/user/collection/user-collection.context-token.d.ts

@@ -0,0 +1,3 @@
+import type { UmbUserCollectionContext } from './user-collection.context.js';
+import { UmbContextToken } from '../../../../libs/context-api/index.js';
+export declare const UMB_USER_COLLECTION_CONTEXT: UmbContextToken<UmbUserCollectionContext, UmbUserCollectionContext>;

package/dist-cms/packages/user/user/collection/user-collection.context-token.js

@@ -0,0 +1,2 @@
+import { UmbContextToken } from '../../../../libs/context-api/index.js';
+export const UMB_USER_COLLECTION_CONTEXT = new UmbContextToken('UmbCollectionContext');

package/dist-cms/packages/user/user/collection/user-collection.context.d.ts

@@ -40,4 +40,4 @@ export declare class UmbUserCollectionContext extends UmbDefaultCollectionContex
      */
     setOrderDirectionFilter(orderDirection: UmbDirectionType): void;
 }
-export default UmbUserCollectionContext;
+export { UmbUserCollectionContext as api };

package/dist-cms/packages/user/user/collection/user-collection.context.js

@@ -104,4 +104,4 @@ export class UmbUserCollectionContext extends UmbDefaultCollectionContext {
         this.setFilter({ orderDirection });
     }
 }
-export default UmbUserCollectionContext;
+export { UmbUserCollectionContext as api };