Current User: Adds Current User workspace modal by NguyenThuyLan · Pull Request #22268 · umbraco/Umbraco-CMS

NguyenThuyLan · 2026-03-26T10:58:52Z

Prerequisites

I have added steps to test this contribution in the description below

If there's an existing issue for this PR then this fixes

Description

Adds a lightweight Edit Profile experience for the currently signed-in backoffice user, so non-admin users (who don't have access to the Users section) can manage their own avatar and change their UI language from the user menu.

Opening the Edit action from the current-user menu now:

Navigates to the full user workspace when the user has access to the Users section.
Opens a sidebar modal (umb-current-user-edit-profile-modal) otherwise, with two sections:
- Avatar – upload or remove the profile photo.
- Profile settings – change the UI language.

Save failures (avatar upload/delete, language update) surface a danger notification and the modal stays open so the user can retry. On successful avatar upload the current user is refreshed from the server so the store holds the real resized avatar URLs.

Management API endpoints

PUT /umbraco/management/api/v1/user/current/profile – update the current user's language preference (new).
DELETE /umbraco/management/api/v1/user/current/avatar – clear the current user's avatar (new).
POST /umbraco/management/api/v1/user/current/avatar – set the current user's avatar; now usable by any authenticated user for their own avatar.

Backend

New IUserService.UpdateProfileAsync(userKey, UserUpdateProfileModel) and IUserPresentationFactory.CreateUpdateProfileModelAsync(...), both with default interface implementations (to be removed in V19).
Integration tests in UserServiceCrudTests.Update cover the happy path, language-only update (other fields unchanged), and ISO-code validation.

How to test

Log in as a non-admin backoffice user.
Click the user avatar/name in the top bar.
Click Edit – the Edit Profile modal should open with Avatar and Profile settings sections.
Change the UI language and save – verify the change is persisted.
Upload and remove an avatar – verify both actions work and that a notification is shown on success and failure.
Log in as an admin user – the Edit button should open the full user editor instead of the modal.

…7/feature/current-user-workspace

AndyButland

Thanks for this @NguyenThuyLan - it's looking good. I haven't had time to review closely or test yet, but I found a few things to consider with the back-end code. Could you look at those please, and then I'll take it for a spin tomorrow and provide feedback from testing.

AndyButland

A few additional points and findings from testing.

We should have an update to the OpenApi.json file as part of the PR. You can get this following the link in the Swagger document and saving it to the solution, replacing the exiting file.

The avatar function doesn't seem to be working quite correctly:

After upload, the visual display in the circle doesn't update (instead I see the initial slide up out of view, but no display of the uploaded image). I have to save and re-render the dialog to see it.
There seems to be an update immediately after uploading the photo. Maybe we can't avoid that easily, but ideally it would only update when I hit the "Save" button. In other words, the "Change photo" and "Remove photo" should hold the changes within the dialog only, and only persist when the dialog is closed, otherwise the previous information should be retained.

Co-authored-by: Andy Butland <abutland73@gmail.com>

…erRequestModel.cs Co-authored-by: Andy Butland <abutland73@gmail.com>

…iceCrudTests.Update.cs Co-authored-by: Andy Butland <abutland73@gmail.com>

Co-authored-by: Andy Butland <abutland73@gmail.com>

…entication check from controllers

…7/feature/current-user-workspace

NguyenThuyLan · 2026-03-31T10:29:52Z

Thanks @AndyButland , I updated OpenApi.json, fixed the issue when uploading avatar, and made sure we update avatar only after clicking the Save button

Align validation for user profile update with update user service method. Controller tidy-up of dependencies.

AndyButland

Works very nicely @NguyenThuyLan - I've tested it out locally and can update my avatar and language, with both or neither updates being made as expected now, depending on whether I save or close the dialog.

I just pushed a small update to:

Align the validation of the language with what we do for a full user update.
Completely remove the concept of the "current" user from the user service (by renaming methods and models).

From a BE and testing side, this is all ✅. The FE all looks good to me too - but maybe @nielslyngsoe you'd like a look over before this is merged.

Maybe @nhudinh0309 you too could have a look at this and see what you think about adding acceptance tests for the functionality?

nhudinh0309 · 2026-04-02T08:00:57Z

@AndyButland: I noticed that on the user page, changing the avatar is also applied immediately.
Do you think we should create a separate task to make this behavior consistent across both places? It might be a bit confusing if one flow requires saving while the other doesn't.

AndyButland · 2026-04-02T08:07:06Z

It's a good point - though I suspect we'll run into the same issue @NguyenThuyLan found when working on her other task around managing users from the user group, that there's currently no way to hook into the workspace save. So I don't think it's feasible at the moment.

Given it's a quite different user role for someone managing users and a general editor updating their avatar, I don't think the different behaviour will be too confusing. And likely within project, these will likely be managed either by the individuals, or by the user management, and not both.

But @nielslyngsoe - maybe you can consider this case along with the general case you've mentioned here: #22215 (comment)

…om/umbraco/Umbraco-CMS into v17/feature/current-user-workspace

nielslyngsoe

As mentioned in the comment. This should be implemented like a Workspace, in the same way as other Workspaces.

Refactored the "Edit" (profile) button logic, to handle the check whether the user has access to the Users section.

as no longer used.

- Show danger notification when avatar upload/delete or profile update fails - Refresh current user after avatar upload so the store holds server URLs, not a leaking local blob - Element save() methods now return boolean; modal keeps itself open when a save fails and no longer double-submits

# Conflicts: # src/Umbraco.Web.UI.Client/src/assets/lang/en.ts # src/Umbraco.Web.UI.Client/src/packages/core/backend-api/sdk.gen.ts

leekelleher

Tested out, works as described.

Replaces Umb.Modal.CurrentUserEditProfile with a workspace registered against entityType 'current-user'. The UmbSubmittableWorkspaceContextBase subclass owns the editable user model and pending avatar state; submit() coordinates uploadAvatar / deleteAvatar / updateProfile and throws on failure so the workspace stays open, relying on the repository's existing danger notifications. The current-user "Edit" action now opens UMB_WORKSPACE_MODAL (sidebar, small) instead of the bespoke modal. Avatar and settings children become presentational views wired to the workspace context.

- Await initial load promise in submit() to prevent a race where the save action fires before the first requestCurrentUser() resolves. - Guard the avatar element's async observer setup against post-disconnect attachment. - Document the split between #data (editable persisted state) and #pendingAvatar (transient UI state) in the workspace context. - Remove stray JSDoc whitespace in current-user.server.data-source.ts.

The modal has now been implemented as a (non-routable) workspace.

LanThuyNguyen added 8 commits March 24, 2026 13:17

init current user workspace

bf74a82

Merge branch 'main' of https://github.com/umbraco/Umbraco-CMS into v1…

44cef0f

…7/feature/current-user-workspace

Merge branch 'main' of https://github.com/umbraco/Umbraco-CMS into v1…

ed961ee

…7/feature/current-user-workspace

adding current user workspace and their apis

e690615

Merge branch 'main' of https://github.com/umbraco/Umbraco-CMS into v1…

d0d9541

…7/feature/current-user-workspace

add new controllers

b14f852

Merge branch 'main' of https://github.com/umbraco/Umbraco-CMS into v1…

4bc18b5

…7/feature/current-user-workspace

add default implementation

225816f

AndyButland requested changes Mar 30, 2026

View reviewed changes

AndyButland reviewed Mar 31, 2026

View reviewed changes

NguyenThuyLan and others added 9 commits March 31, 2026 12:55

Update src/Umbraco.Core/Services/UserService.cs

ed8dae1

Co-authored-by: Andy Butland <abutland73@gmail.com>

Update src/Umbraco.Cms.Api.Management/ViewModels/User/UpdateCurrentUs…

5978c6d

…erRequestModel.cs Co-authored-by: Andy Butland <abutland73@gmail.com>

Update tests/Umbraco.Tests.Integration/Umbraco.Core/Services/UserServ…

e85054c

…iceCrudTests.Update.cs Co-authored-by: Andy Butland <abutland73@gmail.com>

Update src/Umbraco.Core/Models/CurrentUserUpdateModel.cs

1524945

Co-authored-by: Andy Butland <abutland73@gmail.com>

update openApi.json, remove userKey from model, remove redundant auth…

2dbf9cf

…entication check from controllers

Merge branch 'main' of https://github.com/umbraco/Umbraco-CMS into v1…

8f31319

…7/feature/current-user-workspace

update localize

ae454c0

allow blob: URLs in img-src CSP for avatar

d809d00

save image change later

d0634a3

Remove references to "current" user from service layer.

c650395

Align validation for user profile update with update user service method. Controller tidy-up of dependencies.

AndyButland approved these changes Mar 31, 2026

View reviewed changes

Add missing controller from last commit.

98d58a7

LanThuyNguyen added 3 commits April 14, 2026 09:49

resolve conflicts

434e4ea

Merge branch 'v17/feature/current-user-workspace' of https://github.c…

a8a8f66

…om/umbraco/Umbraco-CMS into v17/feature/current-user-workspace

resolve conflicts 2

9f6f224

nhudinh0309 mentioned this pull request Apr 14, 2026

E2E: QA Added acceptance tests for current user workspace #22457

Merged

nielslyngsoe reviewed Apr 14, 2026

View reviewed changes

Comment thread ...ages/user/current-user/modals/current-user-workspace/current-user-workspace-modal.element.ts Outdated

nielslyngsoe previously requested changes Apr 14, 2026

View reviewed changes

leekelleher added 4 commits April 22, 2026 10:23

Renamed/relocated "current-user-workspace" to "profile/edit"

7a9376a

Refactored the "Edit" (profile) button logic, to handle the check whether the user has access to the Users section.

Removed the "Section User No Permission" condition

7332af4

as no longer used.

UI tweaks + streamlining

1bd75d4

leekelleher changed the title ~~Current user: Add current user workspace modal~~ Current User: Adds Edit Profile modal Apr 22, 2026

leekelleher added type/feature release/17.4.0 labels Apr 22, 2026

Merge branch 'main' into v17/feature/current-user-workspace

c45d665

# Conflicts: # src/Umbraco.Web.UI.Client/src/assets/lang/en.ts # src/Umbraco.Web.UI.Client/src/packages/core/backend-api/sdk.gen.ts

leekelleher approved these changes Apr 22, 2026

View reviewed changes

nielslyngsoe reviewed Apr 22, 2026

View reviewed changes

Comment thread src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/edit/edit-profile.action.ts Outdated

Refactored to use asPromise()

b754b4f

nielslyngsoe reviewed Apr 22, 2026

View reviewed changes

Comment thread ...raco.Web.UI.Client/src/packages/user/current-user/profile/edit/edit-profile-modal.element.ts Outdated

leekelleher added 2 commits April 22, 2026 15:53

leekelleher removed the release/17.4.0 label Apr 24, 2026

leekelleher changed the title ~~Current User: Adds Edit Profile modal~~ Current User: Adds Current User workspace modal Apr 28, 2026

leekelleher added the release/17.5.0 label Apr 28, 2026

leekelleher merged commit 6bd3ede into main Apr 28, 2026
30 of 31 checks passed

leekelleher deleted the v17/feature/current-user-workspace branch April 28, 2026 10:18

This was referenced Jun 26, 2026

Bump the dotnet-deps group with 17 updates MiguelGuedelha/MiguelGuedelha.Umbraco.Templates#61

Merged

Bump the umbraco group with 1 update AndrewMcLachlan/ASM#400

Open

Uh oh!

Conversation

NguyenThuyLan commented Mar 26, 2026 • edited by leekelleher Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Prerequisites

Description

Uh oh!

AndyButland left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AndyButland left a comment

Choose a reason for hiding this comment

Uh oh!

NguyenThuyLan commented Mar 31, 2026

Uh oh!

AndyButland left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nhudinh0309 commented Apr 2, 2026

Uh oh!

AndyButland commented Apr 2, 2026

Uh oh!

Uh oh!

nielslyngsoe left a comment

Choose a reason for hiding this comment

Uh oh!

leekelleher left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

NguyenThuyLan commented Mar 26, 2026 •

edited by leekelleher

Loading

AndyButland left a comment •

edited

Loading