@umbraco-cms/backoffice 15.0.0-rc2 → 15.0.0-rc4

package/dist-cms/packages/user/user/entity-actions/create/modal/index.js

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

package/dist-cms/packages/user/user/entity-actions/create/modal/manifests.js

@@ -1,8 +1,15 @@
+import { UMB_CREATE_USER_MODAL_ALIAS } from './constants.js';
 export const manifests = [
     {
         type: 'modal',
-        alias: 'Umb.Modal.User.CreateOptions',
-        name: 'User Create Options Modal',
-        element: () => import('./user-create-options-modal.element.js'),
+        alias: UMB_CREATE_USER_MODAL_ALIAS,
+        name: 'Create User Modal',
+        js: () => import('./create-user-modal.element.js'),
+    },
+    {
+        type: 'modal',
+        alias: 'Umb.Modal.User.CreateSuccess',
+        name: 'Create Success User Modal',
+        js: () => import('./create-user-success-modal.element.js'),
     },
 ];

package/dist-cms/packages/user/user/entity-actions/create/user-entity-create-option-action-base.d.ts

@@ -0,0 +1,11 @@
+import type { UmbUserKindType } from '../../utils/index.js';
+import type { UmbControllerHost } from '../../../../../libs/controller-api/index.js';
+import { UmbEntityCreateOptionActionBase, type MetaEntityCreateOptionAction, type UmbEntityCreateOptionActionArgs } from '../../../../core/entity-create-option-action/index.js';
+export interface UmbUserEntityCreateOptionActionBaseArgs extends UmbEntityCreateOptionActionArgs<MetaEntityCreateOptionAction> {
+    kind: UmbUserKindType;
+}
+export declare abstract class UmbUserEntityCreateOptionActionBase extends UmbEntityCreateOptionActionBase {
+    #private;
+    constructor(host: UmbControllerHost, args: UmbUserEntityCreateOptionActionBaseArgs);
+    execute(): Promise<void>;
+}

package/dist-cms/packages/user/user/entity-actions/create/user-entity-create-option-action-base.js

@@ -0,0 +1,40 @@
+import { UMB_CREATE_USER_MODAL } from './modal/create-user-modal.token.js';
+import { UMB_ACTION_EVENT_CONTEXT } from '../../../../core/action/index.js';
+import { UmbRequestReloadChildrenOfEntityEvent } from '../../../../core/entity-action/index.js';
+import { UmbEntityCreateOptionActionBase, } from '../../../../core/entity-create-option-action/index.js';
+import { UMB_MODAL_MANAGER_CONTEXT } from '../../../../core/modal/index.js';
+export class UmbUserEntityCreateOptionActionBase extends UmbEntityCreateOptionActionBase {
+    #kind;
+    constructor(host, args) {
+        super(host, args);
+        this.#kind = args.kind;
+    }
+    async execute() {
+        const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
+        const modalContext = modalManager.open(this, UMB_CREATE_USER_MODAL, {
+            data: {
+                user: {
+                    kind: this.#kind,
+                },
+            },
+        });
+        await modalContext
+            ?.onSubmit()
+            .then(() => {
+            this.#requestReloadChildrenOfEntity();
+        })
+            .catch(async () => {
+            // modal is closed after creation instead of navigating to the new user.
+            // We therefore need to reload the children of the entity
+            this.#requestReloadChildrenOfEntity();
+        });
+    }
+    async #requestReloadChildrenOfEntity() {
+        const eventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
+        const event = new UmbRequestReloadChildrenOfEntityEvent({
+            entityType: this.args.entityType,
+            unique: this.args.unique,
+        });
+        eventContext.dispatchEvent(event);
+    }
+}

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

@@ -1,17 +1,4 @@
-import { UMB_CREATE_USER_MODAL_ALIAS } from './create/constants.js';
 export const manifests = [
-    {
-        type: 'modal',
-        alias: UMB_CREATE_USER_MODAL_ALIAS,
-        name: 'Create User Modal',
-        js: () => import('./create/create-user-modal.element.js'),
-    },
-    {
-        type: 'modal',
-        alias: 'Umb.Modal.User.CreateSuccess',
-        name: 'Create Success User Modal',
-        js: () => import('./create/create-user-success-modal.element.js'),
-    },
     {
         type: 'modal',
         alias: 'Umb.Modal.User.Picker',

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

@@ -1,8 +1,12 @@
 import { UmbUserRepositoryBase } from '../user-repository-base.js';
+import { UmbUserItemRepository } from '../item/index.js';
 import { UmbDisableUserServerDataSource } from './disable-user.server.data-source.js';
+import { UmbLocalizationController } from '../../../../../libs/localization-api/index.js';
 import { UserStateModel } from '../../../../../external/backend-api/index.js';
 export class UmbDisableUserRepository extends UmbUserRepositoryBase {
     #disableSource;
+    #localize = new UmbLocalizationController(this);
+    #userItemRepository = new UmbUserItemRepository(this);
     constructor(host) {
         super(host);
         this.#disableSource = new UmbDisableUserServerDataSource(host);
@@ -13,10 +17,19 @@ export class UmbDisableUserRepository extends UmbUserRepositoryBase {
         await this.init;
         const { data, error } = await this.#disableSource.disable(ids);
         if (!error) {
+            const { data: items } = await this.#userItemRepository.requestItems(ids);
+            if (!items)
+                throw new Error('Could not load user item');
+            // TODO: get state from item when available
             ids.forEach((id) => {
                 this.detailStore?.updateItem(id, { state: UserStateModel.DISABLED });
             });
-            const notification = { data: { message: `User disabled` } };
+            let message = this.#localize.term('speechBubbles_disableUsersSuccess', items.length);
+            if (items.length === 1) {
+                const names = items?.map((item) => item.name).join(', ');
+                message = this.#localize.term('speechBubbles_disableUserSuccess', names);
+            }
+            const notification = { data: { message } };
             this.notificationContext?.peek('positive', notification);
         }
         return { data, error };

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

@@ -1,8 +1,12 @@
 import { UmbUserRepositoryBase } from '../user-repository-base.js';
+import { UmbUserItemRepository } from '../item/index.js';
 import { UmbEnableUserServerDataSource } from './enable-user.server.data-source.js';
+import { UmbLocalizationController } from '../../../../../libs/localization-api/index.js';
 import { UserStateModel } from '../../../../../external/backend-api/index.js';
 export class UmbEnableUserRepository extends UmbUserRepositoryBase {
     #enableSource;
+    #localize = new UmbLocalizationController(this);
+    #userItemRepository = new UmbUserItemRepository(this);
     constructor(host) {
         super(host);
         this.#enableSource = new UmbEnableUserServerDataSource(host);
@@ -13,10 +17,19 @@ export class UmbEnableUserRepository extends UmbUserRepositoryBase {
         await this.init;
         const { data, error } = await this.#enableSource.enable(ids);
         if (!error) {
+            const { data: items } = await this.#userItemRepository.requestItems(ids);
+            if (!items)
+                throw new Error('Could not load user item');
+            // TODO: get state from item when available
             ids.forEach((id) => {
                 this.detailStore?.updateItem(id, { state: UserStateModel.ACTIVE });
             });
-            const notification = { data: { message: `User disabled` } };
+            let message = this.#localize.term('speechBubbles_enableUsersSuccess', items.length);
+            if (items.length === 1) {
+                const names = items?.map((item) => item.name).join(', ');
+                message = this.#localize.term('speechBubbles_enableUserSuccess', names);
+            }
+            const notification = { data: { message } };
             this.notificationContext?.peek('positive', notification);
         }
         return { data, error };

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

@@ -2,6 +2,7 @@ import type { UmbUserEntityType } from './entity.js';
 import type { UmbUserKindType } from './utils/index.js';
 import type { UmbReferenceByUnique } from '../../core/models/index.js';
 import { type UserConfigurationResponseModel, UserStateModel, type UserTwoFactorProviderModel } from '../../../external/backend-api/index.js';
+export type * from './conditions/types.js';
 export type UmbUserStateEnum = UserStateModel;
 export declare const UmbUserStateEnum: typeof UserStateModel;
 export interface UmbUserDetailModel extends UmbUserStartNodesModel {

package/dist-cms/packages/user/user/workspace/user/components/user-workspace-avatar/user-workspace-avatar.element.d.ts

@@ -7,7 +7,7 @@ export declare class UmbUserAvatarElement extends UmbLitElement {
     private _selectElement;
     constructor();
     protected getFormElement(): HTMLInputElement;
-    render(): import("lit-html").TemplateResult<1> | typeof nothing;
+    render(): typeof nothing | import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
 }
 export default UmbUserAvatarElement;

package/dist-cms/packages/user/user/workspace/user/components/user-workspace-client-credentials/user-workspace-client-credentials.element.d.ts

@@ -7,7 +7,7 @@ export declare class UmbUserWorkspaceClientCredentialsElement extends UmbLitElem
     private _userKind?;
     private _clientCredentials;
     constructor();
-    render(): import("lit-html").TemplateResult<1> | typeof nothing;
+    render(): typeof nothing | import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
 }
 declare global {

package/dist-cms/packages/user/user/workspace/user/components/user-workspace-info/user-workspace-info.element.d.ts

@@ -5,7 +5,7 @@ export declare class UmbUserWorkspaceInfoElement extends UmbLitElement {
     private _userInfo;
     private _userDisplayState;
     constructor();
-    render(): import("lit-html").TemplateResult<1> | typeof nothing;
+    render(): typeof nothing | import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
 }
 export default UmbUserWorkspaceInfoElement;

package/dist-cms/packages/user/user-group/index.d.ts

@@ -1,6 +1,6 @@
 export * from './collection/index.js';
 export * from './components/index.js';
-export * from './repository/index.js';
-export * from './types.js';
 export * from './entity.js';
+export * from './repository/index.js';
+export type * from './types.js';
 export { UMB_USER_GROUP_PICKER_MODAL } from './modals/user-group-picker/index.js';

package/dist-cms/packages/user/user-group/index.js

@@ -1,6 +1,5 @@
 export * from './collection/index.js';
 export * from './components/index.js';
-export * from './repository/index.js';
-export * from './types.js';
 export * from './entity.js';
+export * from './repository/index.js';
 export { UMB_USER_GROUP_PICKER_MODAL } from './modals/user-group-picker/index.js';

package/dist-cms/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.d.ts

@@ -18,7 +18,7 @@ export declare class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
     private _mediaStartNode?;
     private _mediaRootAccess;
     constructor();
-    render(): import("lit-html").TemplateResult<1> | typeof nothing;
+    render(): typeof nothing | import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
 }
 export default UmbUserGroupWorkspaceEditorElement;

package/dist-cms/packages/user/user-group/workspace/user-group/user-group-workspace.context.js

@@ -27,8 +27,8 @@ export class UmbUserGroupWorkspaceContext extends UmbEntityDetailWorkspaceContex
             {
                 path: 'create',
                 component: UmbUserGroupWorkspaceEditorElement,
-                setup: () => {
-                    this.createScaffold({ parent: { entityType: UMB_USER_GROUP_ROOT_ENTITY_TYPE, unique: null } });
+                setup: async () => {
+                    await this.createScaffold({ parent: { entityType: UMB_USER_GROUP_ROOT_ENTITY_TYPE, unique: null } });
                     new UmbWorkspaceIsNewRedirectController(this, this, this.getHostElement().shadowRoot.querySelector('umb-router-slot'));
                 },
             },

package/dist-cms/packages/user/user-permission/index.d.ts

@@ -2,4 +2,4 @@ export * from './components/index.js';
 export * from './modals/index.js';
 export * from './user-granular-permission.extension.js';
 export * from './entity-user-permission.extension.js';
-export type { UmbUserPermissionModel } from './types.js';
+export type * from './types.js';

package/dist-cms/packages/webhook/collection/views/table/column-layouts/content-type/webhook-table-name-column-layout.element.d.ts

@@ -8,7 +8,7 @@ export declare class UmbWebhookTableContentTypeColumnLayoutElement extends UmbLi
     };
     private _contentTypes;
     connectedCallback(): void;
-    render(): import("lit-html").TemplateResult<1> | typeof nothing;
+    render(): typeof nothing | import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
 }
 declare global {

package/dist-cms/packages/webhook/collection/views/table/column-layouts/name/webhook-table-name-column-layout.element.d.ts

@@ -4,7 +4,7 @@ export declare class UmbWebhookTableNameColumnLayoutElement extends LitElement {
         unique: string;
         name: string;
     };
-    render(): import("lit-html").TemplateResult<1> | typeof nothing;
+    render(): typeof nothing | import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
 }
 declare global {

package/dist-cms/packages/webhook/index.d.ts

@@ -1,3 +1,4 @@
+export * from './repository/index.js';
 export * from './collection/index.js';
-export type * from './types.js';
 export * from './entity.js';
+export type * from './types.js';

package/dist-cms/packages/webhook/index.js

@@ -1,2 +1,3 @@
+export * from './repository/index.js';
 export * from './collection/index.js';
 export * from './entity.js';

package/dist-cms/packages/webhook/workspace/webhook/views/webhook-details-workspace-view.element.d.ts

@@ -11,7 +11,7 @@ export declare class UmbWebhookDetailsWorkspaceViewElement extends UmbLitElement
     _isNew?: boolean;
     contentType?: string;
     constructor();
-    render(): import("lit-html").TemplateResult<1> | typeof nothing;
+    render(): typeof nothing | import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
 }
 export default UmbWebhookDetailsWorkspaceViewElement;

package/dist-cms/packages/webhook/workspace/webhook/views/webhook-details-workspace-view.element.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { UMB_WEBHOOK_WORKSPACE_CONTEXT } from '../webhook-workspace.context-token.js';
 import { css, customElement, html, state, nothing } from '../../../../../external/lit/index.js';
-import { UmbLitElement } from '../../../../core/lit-element/index.js';
+import { UmbLitElement, umbFocus } from '../../../../core/lit-element/index.js';
 import { UmbTextStyles } from '../../../../core/style/index.js';
 import '../../../../core/culture/index.js';
 import '../../../components/input-webhook-headers.element.js';
@@ -88,9 +88,15 @@ let UmbWebhookDetailsWorkspaceViewElement = class UmbWebhookDetailsWorkspaceView
         return html `
 			<uui-box>
 				<umb-property-layout
+					mandatory
 					label=${this.localize.term('webhooks_url')}
 					description=${this.localize.term('webhooks_urlDescription')}>
-					<uui-input @input=${this.#onUrlChange} .value=${this._webhook.url} slot="editor"></uui-input>
+					<uui-input
+						@input=${this.#onUrlChange}
+						.value=${this._webhook.url}
+						slot="editor"
+						required="true"
+						${umbFocus()}></uui-input>
 				</umb-property-layout>
 				<umb-property-layout
 					label=${this.localize.term('webhooks_events')}

package/dist-cms/packages/webhook/workspace/webhook/webhook-workspace.context.js

@@ -14,7 +14,7 @@ export class UmbWebhookWorkspaceContext extends UmbEntityDetailWorkspaceContextB
                 path: 'create',
                 component: UmbWebhookWorkspaceEditorElement,
                 setup: async () => {
-                    this.createScaffold({ parent: { entityType: UMB_WEBHOOK_ROOT_ENTITY_TYPE, unique: null } });
+                    await this.createScaffold({ parent: { entityType: UMB_WEBHOOK_ROOT_ENTITY_TYPE, unique: null } });
                     new UmbWorkspaceIsNewRedirectController(this, this, this.getHostElement().shadowRoot.querySelector('umb-router-slot'));
                 },
             },