From 4d4ab87bb662ad0b0cb0cd5032baaf429b907869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 11 Jul 2022 14:35:30 +0200
Subject: [PATCH] Page: Update profile page components to use new navId
 (#51664)

---
 .betterer.results                             |  2 +-
 pkg/api/index.go                              |  6 +++---
 .../NavBar/navBarItem-translations.ts         |  4 ++--
 .../core/components/PageNew/SectionNav.tsx    |  6 +++++-
 .../notifications/NotificationsPage.tsx       | 21 +++----------------
 .../profile/ChangePasswordPage.test.tsx       | 18 ----------------
 .../features/profile/ChangePasswordPage.tsx   | 11 +++-------
 .../profile/UserProfileEditPage.test.tsx      | 18 ----------------
 .../features/profile/UserProfileEditPage.tsx  | 10 ++-------
 public/app/features/profile/routes.tsx        |  6 ++++++
 10 files changed, 25 insertions(+), 77 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index c93e559c2a7..a623348052f 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -10436,4 +10436,4 @@ exports[`no undocumented stories`] = {
       [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
     ]
   }`
-};
+};
\ No newline at end of file
diff --git a/pkg/api/index.go b/pkg/api/index.go
index 9ab27c752c5..de644dabb94 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -36,17 +36,17 @@ func (hs *HTTPServer) getProfileNode(c *models.ReqContext) *dtos.NavLink {
 
 	children := []*dtos.NavLink{
 		{
-			Text: "Preferences", Id: "profile-settings", Url: hs.Cfg.AppSubURL + "/profile", Icon: "sliders-v-alt",
+			Text: "Preferences", Id: "profile/settings", Url: hs.Cfg.AppSubURL + "/profile", Icon: "sliders-v-alt",
 		},
 	}
 
 	children = append(children, &dtos.NavLink{
-		Text: "Notification history", Id: "notifications", Url: hs.Cfg.AppSubURL + "/notifications", Icon: "bell",
+		Text: "Notification history", Id: "profile/notifications", Url: hs.Cfg.AppSubURL + "profile/notifications", Icon: "bell",
 	})
 
 	if setting.AddChangePasswordLink() {
 		children = append(children, &dtos.NavLink{
-			Text: "Change password", Id: "change-password", Url: hs.Cfg.AppSubURL + "/profile/password",
+			Text: "Change password", Id: "profile/password", Url: hs.Cfg.AppSubURL + "/profile/password",
 			Icon: "lock",
 		})
 	}
diff --git a/public/app/core/components/NavBar/navBarItem-translations.ts b/public/app/core/components/NavBar/navBarItem-translations.ts
index 3d3ab5f31e4..7f517bf3f47 100644
--- a/public/app/core/components/NavBar/navBarItem-translations.ts
+++ b/public/app/core/components/NavBar/navBarItem-translations.ts
@@ -54,8 +54,8 @@ const TRANSLATED_MENU_ITEMS: Record<string, MessageDescriptor> = {
 
   help: defineMessage({ id: 'nav.help', message: 'Help' }),
 
-  'profile-settings': defineMessage({ id: 'nav.profile-settings', message: 'Preferences' }),
-  'change-password': defineMessage({ id: 'nav.change-password', message: 'Change password' }),
+  'profile-settings': defineMessage({ id: 'nav.profile/settings', message: 'Preferences' }),
+  'change-password': defineMessage({ id: 'nav.profile/password', message: 'Change password' }),
   'sign-out': defineMessage({ id: 'nav.sign-out', message: 'Sign out' }),
 };
 
diff --git a/public/app/core/components/PageNew/SectionNav.tsx b/public/app/core/components/PageNew/SectionNav.tsx
index 3570de4294f..0172722562d 100644
--- a/public/app/core/components/PageNew/SectionNav.tsx
+++ b/public/app/core/components/PageNew/SectionNav.tsx
@@ -19,7 +19,7 @@ export function SectionNav(props: Props) {
     <nav className={styles.nav}>
       <h2 className={styles.sectionName}>
         {main.icon && <Icon name={main.icon as IconName} size="lg" />}
-        {main.img && <img className="page-header__img" src={main.img} alt={`logo of ${main.text}`} />}
+        {main.img && <img className={styles.sectionImg} src={main.img} alt={`logo of ${main.text}`} />}
         {props.model.main.text}
       </h2>
       <div className={styles.items}>
@@ -75,6 +75,7 @@ const getStyles = (theme: GrafanaTheme2) => {
     }),
     sectionName: css({
       display: 'flex',
+      alignItems: 'center',
       gap: theme.spacing(1),
       padding: theme.spacing(0.5, 0, 3, 0.25),
       fontSize: theme.typography.h4.fontSize,
@@ -83,6 +84,9 @@ const getStyles = (theme: GrafanaTheme2) => {
     items: css({
       // paddingLeft: '9px',
     }),
+    sectionImg: css({
+      height: 48,
+    }),
     subSection: css({
       padding: theme.spacing(3, 0, 1, 1),
       fontWeight: 500,
diff --git a/public/app/features/notifications/NotificationsPage.tsx b/public/app/features/notifications/NotificationsPage.tsx
index 22c64301384..ee3ace6faed 100644
--- a/public/app/features/notifications/NotificationsPage.tsx
+++ b/public/app/features/notifications/NotificationsPage.tsx
@@ -1,27 +1,12 @@
 import React from 'react';
-import { connect, ConnectedProps } from 'react-redux';
 
 import { Page } from 'app/core/components/Page/Page';
 
-import { GrafanaRouteComponentProps } from '../../core/navigation/types';
-import { getNavModel } from '../../core/selectors/navModel';
-import { StoreState } from '../../types';
-
 import { StoredNotifications } from './StoredNotifications';
 
-const mapStateToProps = (state: StoreState) => ({
-  navModel: getNavModel(state.navIndex, 'notifications'),
-});
-
-const connector = connect(mapStateToProps, undefined);
-
-interface OwnProps extends GrafanaRouteComponentProps {}
-
-type Props = OwnProps & ConnectedProps<typeof connector>;
-
-export const NotificationsPage = ({ navModel }: Props) => {
+export const NotificationsPage = () => {
   return (
-    <Page navModel={navModel}>
+    <Page navId="profile/notifications">
       <Page.Contents>
         <StoredNotifications />
       </Page.Contents>
@@ -29,4 +14,4 @@ export const NotificationsPage = ({ navModel }: Props) => {
   );
 };
 
-export default connect(mapStateToProps)(NotificationsPage);
+export default NotificationsPage;
diff --git a/public/app/features/profile/ChangePasswordPage.test.tsx b/public/app/features/profile/ChangePasswordPage.test.tsx
index 2c6e15e39d9..4506dfdc361 100644
--- a/public/app/features/profile/ChangePasswordPage.test.tsx
+++ b/public/app/features/profile/ChangePasswordPage.test.tsx
@@ -4,7 +4,6 @@ import React from 'react';
 
 import config from 'app/core/config';
 
-import { getNavModel } from '../../core/selectors/navModel';
 import { backendSrv } from '../../core/services/backend_srv';
 
 import { Props, ChangePasswordPage } from './ChangePasswordPage';
@@ -22,23 +21,6 @@ const defaultProps: Props = {
     orgId: 0,
     authLabels: ['github'],
   },
-  navModel: getNavModel(
-    {
-      'profile-settings': {
-        icon: 'sliders-v-alt',
-        id: 'profile-settings',
-        parentItem: {
-          id: 'profile',
-          text: 'Test User',
-          img: '/avatar/46d229b033af06a191ff2267bca9ae56',
-          url: '/profile',
-        },
-        text: 'Preferences',
-        url: '/profile',
-      },
-    },
-    'profile-settings'
-  ),
   loadUser: jest.fn(),
   changePassword: jest.fn(),
 };
diff --git a/public/app/features/profile/ChangePasswordPage.tsx b/public/app/features/profile/ChangePasswordPage.tsx
index b375c512e9d..f6900e56e82 100644
--- a/public/app/features/profile/ChangePasswordPage.tsx
+++ b/public/app/features/profile/ChangePasswordPage.tsx
@@ -2,23 +2,18 @@ import React from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 import { useMount } from 'react-use';
 
-import { NavModel } from '@grafana/data';
 import { Page } from 'app/core/components/Page/Page';
-import { getNavModel } from 'app/core/selectors/navModel';
 import { StoreState } from 'app/types';
 
 import { ChangePasswordForm } from './ChangePasswordForm';
 import { changePassword, loadUser } from './state/actions';
 
-export interface OwnProps {
-  navModel: NavModel;
-}
+export interface OwnProps {}
 
 function mapStateToProps(state: StoreState) {
   const userState = state.user;
   const { isUpdating, user } = userState;
   return {
-    navModel: getNavModel(state.navIndex, `change-password`),
     isUpdating,
     user,
   };
@@ -33,11 +28,11 @@ const connector = connect(mapStateToProps, mapDispatchToProps);
 
 export type Props = OwnProps & ConnectedProps<typeof connector>;
 
-export function ChangePasswordPage({ navModel, loadUser, isUpdating, user, changePassword }: Props) {
+export function ChangePasswordPage({ loadUser, isUpdating, user, changePassword }: Props) {
   useMount(() => loadUser());
 
   return (
-    <Page navModel={navModel}>
+    <Page navId="profile/password">
       <Page.Contents isLoading={!Boolean(user)}>
         {user ? (
           <>
diff --git a/public/app/features/profile/UserProfileEditPage.test.tsx b/public/app/features/profile/UserProfileEditPage.test.tsx
index 905c9d4f77c..d2f1ed7613a 100644
--- a/public/app/features/profile/UserProfileEditPage.test.tsx
+++ b/public/app/features/profile/UserProfileEditPage.test.tsx
@@ -7,7 +7,6 @@ import { OrgRole } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 
 import TestProvider from '../../../test/helpers/TestProvider';
-import { getNavModel } from '../../core/selectors/navModel';
 import { backendSrv } from '../../core/services/backend_srv';
 import { TeamPermissionLevel } from '../../types';
 
@@ -66,23 +65,6 @@ const defaultProps: Props = {
       seenAt: new Date().toUTCString(),
     },
   ],
-  navModel: getNavModel(
-    {
-      'profile-settings': {
-        icon: 'sliders-v-alt',
-        id: 'profile-settings',
-        parentItem: {
-          id: 'profile',
-          text: 'Test User',
-          img: '/avatar/46d229b033af06a191ff2267bca9ae56',
-          url: '/profile',
-        },
-        text: 'Preferences',
-        url: '/profile',
-      },
-    },
-    'profile-settings'
-  ),
   initUserProfilePage: jest.fn().mockResolvedValue(undefined),
   revokeUserSession: jest.fn().mockResolvedValue(undefined),
   changeUserOrg: jest.fn().mockResolvedValue(undefined),
diff --git a/public/app/features/profile/UserProfileEditPage.tsx b/public/app/features/profile/UserProfileEditPage.tsx
index 446829834ad..967dc8afa2c 100644
--- a/public/app/features/profile/UserProfileEditPage.tsx
+++ b/public/app/features/profile/UserProfileEditPage.tsx
@@ -2,11 +2,9 @@ import React from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 import { useMount } from 'react-use';
 
-import { NavModel } from '@grafana/data';
 import { VerticalGroup } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import SharedPreferences from 'app/core/components/SharedPreferences/SharedPreferences';
-import { getNavModel } from 'app/core/selectors/navModel';
 import { StoreState } from 'app/types';
 
 import UserOrganizations from './UserOrganizations';
@@ -15,15 +13,12 @@ import UserSessions from './UserSessions';
 import { UserTeams } from './UserTeams';
 import { changeUserOrg, initUserProfilePage, revokeUserSession, updateUserProfile } from './state/actions';
 
-export interface OwnProps {
-  navModel: NavModel;
-}
+export interface OwnProps {}
 
 function mapStateToProps(state: StoreState) {
   const userState = state.user;
   const { user, teams, orgs, sessions, teamsAreLoading, orgsAreLoading, sessionsAreLoading, isUpdating } = userState;
   return {
-    navModel: getNavModel(state.navIndex, 'profile-settings'),
     orgsAreLoading,
     sessionsAreLoading,
     teamsAreLoading,
@@ -47,7 +42,6 @@ const connector = connect(mapStateToProps, mapDispatchToProps);
 export type Props = OwnProps & ConnectedProps<typeof connector>;
 
 export function UserProfileEditPage({
-  navModel,
   orgsAreLoading,
   sessionsAreLoading,
   teamsAreLoading,
@@ -64,7 +58,7 @@ export function UserProfileEditPage({
   useMount(() => initUserProfilePage());
 
   return (
-    <Page navModel={navModel}>
+    <Page navId="profile/settings">
       <Page.Contents isLoading={!user}>
         <VerticalGroup spacing="md">
           <UserProfileEditForm updateProfile={updateUserProfile} isSavingUser={isUpdating} user={user} />
diff --git a/public/app/features/profile/routes.tsx b/public/app/features/profile/routes.tsx
index c7939989eb7..a473b05050c 100644
--- a/public/app/features/profile/routes.tsx
+++ b/public/app/features/profile/routes.tsx
@@ -23,6 +23,12 @@ const profileRoutes: RouteDescriptor[] = [
       () => import(/* webpackChunkName: "SelectOrgPage" */ 'app/features/org/SelectOrgPage')
     ),
   },
+  {
+    path: '/profile/notifications',
+    component: SafeDynamicImport(
+      () => import(/* webpackChunkName: "NotificationsPage"*/ 'app/features/notifications/NotificationsPage')
+    ),
+  },
 ];
 
 export function getProfileRoutes(cfg = config): RouteDescriptor[] {