Admin: New Admin User page (#20498)

* admin: user page to react WIP

* admin user page: basic view

* admin user page: refactor, extract orgs and permissions components

* admin user: change sessions actions styles

* admin user: add disable button

* user admin: add change grafana admin action

* user admin: able to change org role and remove org

* user admin: confirm force logout

* user admin: change org button style

* user admin: add confirm modals for critical actions

* user admin: lock down ldap user info

* user admin: align with latest design changes

* user admin: add LDAP sync

* admin user: confirm button

* user admin: add to org modal

* user admin: fix ConfirmButton story

* admin user: handle grafana admin change

* ConfirmButton: make styled component

* ConfirmButton: completely styled component

* User Admin: permissions section refactor

* admin user: refactor (orgs and sessions)

* ConfirmButton: able to set confirm variant

* admin user: inline org removal

* admin user: show ldap sync info only for ldap users

* admin user: edit profile

* ConfirmButton: some fixes after review

* Chore: fix storybook build

* admin user: rename handlers

* admin user: remove LdapUserPage import from routes

* Chore: fix ConfirmButton tests

* Chore: fix user api endpoint tests

* Chore: update failed test snapshots

* admin user: redux actions WIP

* admin user: use new ConfirmModal component for user profile

* admin user: use new ConfirmModal component for sessions

* admin user: use lockMessage

* ConfirmButton: use primary button as default

* admin user: fix ActionButton color

* UI: use Icon component for Modal

* UI: refactor ConfirmModal after Modal changes

* UI: add link button variant

* UI: able to use custom ConfirmButton

* Chore: fix type errors after ConfirmButton refactor

* Chore: revert Graph component changes (works with TS 3.7)

* Chore: use Forms.Button instead of ActionButton

* admin user: align items

* admin user: align add to org modal

* UI: organization picker component

* admin user: use org picker for AddToOrgModal

* admin user: org actions

* admin user: connect sessions actions

* admin user: updateUserPermissions action

* admin user: enable delete user action

* admin user: sync ldap user

* Chore: refactor, remove unused code

* Chore: refactor, move api calls to actions

* admin user: set user password action

* Chore: refactor, remove unused components

* admin user: set input focus on edit

* admin user: pass user into debug LDAP mapping

* UserAdminPage: Ux changes

* UserAdminPage: align buttons to the left

* UserAdminPage: align delete user button

* UserAdminPage: swap add to org modal buttons

* UserAdminPage: set password field to empty when editing

* UserAdminPage: fix tests

* Updated button border

* Chore: fix ConfirmButton after changes introduced in #21092

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>

pkg/api/user.go

@@ -36,6 +36,8 @@ func getUserUserProfile(userID int64) Response {
 		query.Result.IsExternal = true
 	}
 
+	query.Result.AvatarUrl = dtos.GetGravatarUrl(query.Result.Email)
+
 	return JSON(200, query.Result)
 }
 

pkg/api/user_test.go

@@ -1,10 +1,12 @@
 package api
 
 import (
+	"fmt"
 	"net/http"
 	"testing"
 	"time"
 
+	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/models"
@@ -48,9 +50,10 @@ func TestUserApiEndpoint(t *testing.T) {
 			})
 
 			sc.handlerFunc = GetUserByID
+			avatarUrl := dtos.GetGravatarUrl("daniel@grafana.com")
 			sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
 
-			expected := `
+			expected := fmt.Sprintf(`
 			{
 				"id": 1,
 				"email": "daniel@grafana.com",
@@ -64,10 +67,11 @@ func TestUserApiEndpoint(t *testing.T) {
 				"authLabels": [
 					"LDAP"
 				],
+				"avatarUrl": "%s",
 				"updatedAt": "2019-02-11T17:30:40Z",
 				"createdAt": "2019-02-11T17:30:40Z"
 			}
-			`
+			`, avatarUrl)
 
 			require.Equal(t, http.StatusOK, sc.resp.Code)
 			require.JSONEq(t, expected, sc.resp.Body.String())
@@ -109,6 +113,7 @@ func TestUserApiEndpoint(t *testing.T) {
 				"isDisabled": false,
 				"authLabels": null,
 				"isExternal": false,
+				"avatarUrl": "",
 				"updatedAt": "2019-02-11T17:30:40Z",
 				"createdAt": "2019-02-11T17:30:40Z"
 			}