testing new menu order

SUNET · Aug 30, 2024 · 6d2bd9d · 6d2bd9d
1 parent b04d069
commit 6d2bd9d
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 31 deletions.
diff --git a/src/components/Common/ExternalReturnHandler.tsx b/src/components/Common/ExternalReturnHandler.tsx
@@ -30,12 +30,12 @@ export function ExternalReturnHandler() {
       // the user should be returned to
       const actionToRoute: { [key: string]: string } = {
         verifyIdentity: "/profile/verify-identity/",
-        verifyCredential: "/profile/settings/advanced-settings/",
+        verifyCredential: "/profile/settings/personaldata/",
         changepwAuthn: "/profile/chpass",
         terminateAccountAuthn: "/",
-        addSecurityKeyAuthn: "/profile/settings/advanced-settings/",
-        removeSecurityKeyAuthn: "/profile/settings/advanced-settings/",
-        changeSecurityPreferencesAuthn: "/profile/settings/advanced-settings/",
+        addSecurityKeyAuthn: "/profile/settings/personaldata/",
+        removeSecurityKeyAuthn: "/profile/settings/personaldata/",
+        changeSecurityPreferencesAuthn: "/profile/settings/personaldata/",
         removeIdentity: "/profile/verify-identity/",
       };
       const _path = actionToRoute[status.frontend_action];

diff --git a/src/components/Common/HeaderNav.tsx b/src/components/Common/HeaderNav.tsx
@@ -90,25 +90,25 @@ export function HeaderNav(props: HeaderNavProps): JSX.Element {
           <NavLink
             onClick={() => setOpenMenu(false)}
             className={({ isActive }) => (isActive ? `${activeClassName} menu` : `menu`)}
-            to={identityPath}
+            to={settingsPath}
           >
-            <FormattedMessage defaultMessage="Identity" description="Dashboard nav tab name" />
+            <FormattedMessage defaultMessage="Account" description="Dashboard nav tab name" />
           </NavLink>
 
           <NavLink
             onClick={() => setOpenMenu(false)}
             className={({ isActive }) => (isActive ? `${activeClassName} menu` : `menu`)}
-            to={settingsPath}
+            to={identityPath}
           >
-            <FormattedMessage defaultMessage="Settings" description="Dashboard nav tab name" />
+            <FormattedMessage defaultMessage="Identity" description="Dashboard nav tab name" />
           </NavLink>
 
           <NavLink
             onClick={() => setOpenMenu(false)}
             className={({ isActive }) => (isActive ? `${activeClassName} menu` : `menu`)}
             to={advancedSettingsPath}
           >
-            <FormattedMessage defaultMessage="Advanced settings" description="Dashboard nav tab name" />
+            <FormattedMessage defaultMessage="Account Linking" description="Dashboard nav tab name" />
           </NavLink>
 
           <EduIDButton

diff --git a/src/components/Common/Settings.tsx b/src/components/Common/Settings.tsx
@@ -1,9 +1,10 @@
 import { faGear } from "@fortawesome/free-solid-svg-icons";
+import { Security } from "components/Common/Security";
+import { AccountId } from "components/Dashboard/AccountId";
 import ChangePasswordDisplay from "components/Dashboard/ChangePasswordDisplay";
 import { DashboardBreadcrumbs } from "components/Dashboard/DashboardBreadcrumbs";
 import DeleteAccount from "components/Dashboard/DeleteAccount";
 import Emails from "components/Dashboard/Emails";
-import PersonalDataParent from "components/Dashboard/PersonalDataParent";
 import Phones from "components/Dashboard/Phones";
 import React, { useEffect } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
@@ -14,37 +15,38 @@ export function Settings(): JSX.Element {
 
   useEffect(() => {
     document.title = intl.formatMessage({
-      id: "document title Settings",
-      defaultMessage: "Settings | eduID",
+      id: "document title Account",
+      defaultMessage: "Account | eduID",
     });
   }, []);
 
   const currentPage = intl.formatMessage({
-    id: "Settings",
-    defaultMessage: "Settings",
-    description: "Settings",
+    id: "Account",
+    defaultMessage: "Account",
+    description: "Account",
   });
 
   return (
     <React.Fragment>
       <DashboardBreadcrumbs pageIcon={faGear} currentPage={currentPage} />
       <section className="intro">
         <h1>
-          <FormattedMessage description="settings main title" defaultMessage="Manage your eduID settings" />
+          <FormattedMessage description="account main title" defaultMessage="Manage your account" />
         </h1>
         <div className="lead">
           <p>
             <FormattedMessage
-              description="settings lead title"
-              defaultMessage="Update your eduID account settings, change password or delete your eduID."
+              description="account lead title"
+              defaultMessage="Update your eduID account settings, change password, add a security key (2FA) or delete your eduID."
             />
           </p>
         </div>
       </section>
-      <PersonalDataParent />
+      <AccountId />
       <Emails />
-      <Phones />
       <ChangePasswordDisplay />
+      <Security />
+      <Phones />
       <DeleteAccount />
     </React.Fragment>
   );

diff --git a/src/components/Dashboard/AdvancedSettings.tsx b/src/components/Dashboard/AdvancedSettings.tsx
@@ -1,45 +1,46 @@
 import { faGears } from "@fortawesome/free-solid-svg-icons";
-import { Security } from "components/Common/Security";
 import { AccountLinking } from "components/Dashboard/AccountLinking";
 import LadokContainer from "components/Dashboard/Ladok";
 import React, { useEffect } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { DashboardBreadcrumbs } from "./DashboardBreadcrumbs";
 
-/* The Dashboard "Advanced Settings" tab */
+/* The Dashboard "Account Linking" tab */
 export function AdvancedSettings(): JSX.Element {
   const intl = useIntl();
 
   useEffect(() => {
     document.title = intl.formatMessage({
-      id: "document title Advanced Settings",
-      defaultMessage: "Advanced Settings | eduID",
+      id: "document title Account Linking",
+      defaultMessage: "Account Linking | eduID",
     });
   }, []);
 
   const currentPage = intl.formatMessage({
-    id: "Advanced settings",
-    defaultMessage: "Advanced settings",
-    description: "Advanced settings",
+    id: "Account Linking",
+    defaultMessage: "Account Linking",
+    description: "Account Linking",
   });
 
   return (
     <React.Fragment>
       <DashboardBreadcrumbs pageIcon={faGears} currentPage={currentPage} />
       <section className="intro">
         <h1>
-          <FormattedMessage description="advanced settings main title" defaultMessage="Enhance your eduID" />
+          <FormattedMessage
+            description="account linking main title"
+            defaultMessage="Connect your eduID other services"
+          />
         </h1>
         <div className="lead">
           <p>
             <FormattedMessage
-              description="advanced settings lead title"
-              defaultMessage="Increase the security of your eduID or connect it to other services."
+              description="account linking lead title"
+              defaultMessage="Connect your eduID to other services."
             />
           </p>
         </div>
       </section>
-      <Security />
       <AccountLinking />
       <LadokContainer />
     </React.Fragment>

diff --git a/src/components/Dashboard/VerifyIdentity.tsx b/src/components/Dashboard/VerifyIdentity.tsx
@@ -21,6 +21,7 @@ import AccordionItemTemplate from "../Common/AccordionItemTemplate";
 import { removeIdentity } from "apis/eduidSecurity";
 import EduIDButton from "components/Common/EduIDButton";
 import NinDisplay from "components/Common/NinDisplay";
+import PersonalDataParent from "components/Dashboard/PersonalDataParent";
 import { AuthenticateModal } from "./Authenticate";
 import BankID from "./BankID";
 import { DashboardBreadcrumbs } from "./DashboardBreadcrumbs";
@@ -84,6 +85,7 @@ function VerifyIdentityIntro(): JSX.Element {
      */
     return (
       <React.Fragment>
+        <PersonalDataParent />
         <section className="intro">
           <h1>
             <FormattedMessage