From abaf5c8fba35d715bd01b017573e1e25e4b963b0 Mon Sep 17 00:00:00 2001
From: Florian Scholdei <florian.scholdei@cloudogu.com>
Date: Wed, 8 Jun 2022 11:00:03 +0200
Subject: [PATCH] Missing profile link in footer (#2057)

Currently there is a link to Theme with the name Profile in the footer. Another link should be added which is called Theme and points to Theme. In addition, Profile should now point to Information.
---
 gradle/changelog/add_profile_link.yaml        |  2 +
 .../src/__snapshots__/storyshots.test.ts.snap | 48 +++++++++++++++++--
 scm-ui/ui-components/src/layout/Footer.tsx    |  3 +-
 .../ui-webapp/public/locales/de/commons.json  |  9 ++--
 .../ui-webapp/public/locales/en/commons.json  |  3 +-
 5 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 gradle/changelog/add_profile_link.yaml

diff --git a/gradle/changelog/add_profile_link.yaml b/gradle/changelog/add_profile_link.yaml
new file mode 100644
index 0000000000..a2d1e5543c
--- /dev/null
+++ b/gradle/changelog/add_profile_link.yaml
@@ -0,0 +1,2 @@
+- type: fixed
+  description: Missing profile link in footer ([#2057](https://github.com/scm-manager/scm-manager/pull/2057))
diff --git a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
index 4a1068d8fd..b0c9df3905 100644
--- a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
+++ b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
@@ -1486,12 +1486,22 @@ exports[`Storyshots Footer Default 1`] = `
             <a
               className=""
               data-testid="footer-user-profile"
-              href="/me/settings/theme"
+              href="/me"
               onClick={[Function]}
             >
               footer.user.profile
             </a>
           </li>
+          <li>
+            <a
+              className=""
+              data-testid="footer-user-theme"
+              href="/me/settings/theme"
+              onClick={[Function]}
+            >
+              footer.user.theme
+            </a>
+          </li>
         </ul>
       </section>
       <section
@@ -1613,12 +1623,22 @@ exports[`Storyshots Footer Full 1`] = `
             <a
               className=""
               data-testid="footer-user-profile"
-              href="/me/settings/theme"
+              href="/me"
               onClick={[Function]}
             >
               footer.user.profile
             </a>
           </li>
+          <li>
+            <a
+              className=""
+              data-testid="footer-user-theme"
+              href="/me/settings/theme"
+              onClick={[Function]}
+            >
+              footer.user.theme
+            </a>
+          </li>
           <li>
             <a
               className=""
@@ -1779,12 +1799,22 @@ exports[`Storyshots Footer With Avatar 1`] = `
             <a
               className=""
               data-testid="footer-user-profile"
-              href="/me/settings/theme"
+              href="/me"
               onClick={[Function]}
             >
               footer.user.profile
             </a>
           </li>
+          <li>
+            <a
+              className=""
+              data-testid="footer-user-theme"
+              href="/me/settings/theme"
+              onClick={[Function]}
+            >
+              footer.user.theme
+            </a>
+          </li>
         </ul>
       </section>
       <section
@@ -1898,12 +1928,22 @@ exports[`Storyshots Footer With Plugin Links 1`] = `
             <a
               className=""
               data-testid="footer-user-profile"
-              href="/me/settings/theme"
+              href="/me"
               onClick={[Function]}
             >
               footer.user.profile
             </a>
           </li>
+          <li>
+            <a
+              className=""
+              data-testid="footer-user-theme"
+              href="/me/settings/theme"
+              onClick={[Function]}
+            >
+              footer.user.theme
+            </a>
+          </li>
           <li>
             <a
               className=""
diff --git a/scm-ui/ui-components/src/layout/Footer.tsx b/scm-ui/ui-components/src/layout/Footer.tsx
index 99764c82d2..0bba74ef7e 100644
--- a/scm-ui/ui-components/src/layout/Footer.tsx
+++ b/scm-ui/ui-components/src/layout/Footer.tsx
@@ -97,7 +97,8 @@ const Footer: FC<Props> = ({ me, version, links }) => {
         <div className="columns is-size-7">
           {me ? (
             <FooterSection title={meSectionTile}>
-              <NavLink to="/me/settings/theme" label={t("footer.user.profile")} testId="footer-user-profile" />
+              <NavLink to="/me" label={t("footer.user.profile")} testId="footer-user-profile" />
+              <NavLink to="/me/settings/theme" label={t("footer.user.theme")} testId="footer-user-theme" />
               {me?._links?.password && (
                 <NavLink to="/me/settings/password" label={t("profile.changePasswordNavLink")} />
               )}
diff --git a/scm-ui/ui-webapp/public/locales/de/commons.json b/scm-ui/ui-webapp/public/locales/de/commons.json
index de72e056be..ce926c7594 100644
--- a/scm-ui/ui-webapp/public/locales/de/commons.json
+++ b/scm-ui/ui-webapp/public/locales/de/commons.json
@@ -99,13 +99,13 @@
     "theme": {
       "nav": {
         "label": "Design",
-        "title": "Wähle dein Design"
+        "title": "Design wählen"
       },
-      "subtitle": "Wähle dein Design",
+      "subtitle": "Design wählen",
       "submit": "Anwenden",
       "light": {
         "displayName": "Hell",
-        "description": "„Hell“ is das Standard-Design des SCM-Managers"
+        "description": "„Hell“ ist das Standard-Design des SCM-Managers"
       },
       "highcontrast": {
         "displayName": "Hoher Kontrast",
@@ -135,7 +135,8 @@
   },
   "footer": {
     "user": {
-      "profile": "Profil"
+      "profile": "Profil",
+      "theme": "Design"
     },
     "information": {
       "title": "Information"
diff --git a/scm-ui/ui-webapp/public/locales/en/commons.json b/scm-ui/ui-webapp/public/locales/en/commons.json
index db964f10c7..eac53f6518 100644
--- a/scm-ui/ui-webapp/public/locales/en/commons.json
+++ b/scm-ui/ui-webapp/public/locales/en/commons.json
@@ -136,7 +136,8 @@
   },
   "footer": {
     "user": {
-      "profile": "Profile"
+      "profile": "Profile",
+      "theme": "Theme"
     },
     "information": {
       "title": "Information"