PD-3681 rework page titles (#2687)

* PD-3681 rework page titles

* PD-3681 fix page title order

---------

Co-authored-by: andrej romanov <50377758+auumgn@users.noreply.github.com>
Co-authored-by: Angel Montenegro <a.montenegro@orcid.org>

Author: aromanovv

src/app/constants.ts

@@ -101,6 +101,7 @@ export const ApplicationRoutes = {
   register: 'register',
   thirdPartySignIn: 'third-party-signin-completed',
   account: 'account',
+  deactivate: 'account/deactivate',
   trustedParties: 'trusted-parties',
   resetPasswordEmail: 'reset-password-email',
   selfService: 'self-service',
@@ -125,6 +126,7 @@ export const ApplicationRoutesLabels = {
   [ApplicationRoutes.register]: $localize`:@@share.register:Register - ORCID`,
   [ApplicationRoutes.thirdPartySignIn]: $localize`:@@share.signin:Sign in - ORCID`,
   [ApplicationRoutes.account]: $localize`:@@share.account:Account settings - ORCID`,
+  [ApplicationRoutes.deactivate]: $localize`:@@share.deactivateAccount:Deactivate account - ORCID`,
   [ApplicationRoutes.trustedParties]: $localize`:@@share.trustedParties:Trusted parties - ORCID `,
   [ApplicationRoutes.resetPasswordEmail]: $localize`:@@share.resetPasswordEmail:Reset password - ORCID`,
   [ApplicationRoutes.selfService]: $localize`:@@share.selfService:Self Service - ORCID`,

src/app/core/title-service/title.service.ts

@@ -35,19 +35,19 @@ export class TitleService {
           `${dynamicTitle} ${ApplicationDynamicRoutesLabels.orcidPageTitle}`
         )
       } else {
-        Object.keys(ApplicationRoutesLabels).forEach((route) => {
-          if (event.url.startsWith('/' + route)) {
-            // MY ORCID
-            if (dynamicTitle) {
-              this.setTitle(
-                `${dynamicTitle} ${ApplicationDynamicRoutesLabels.orcidMyPageTitle}`
-              )
-            } else {
-              // OTHER PAGES
-              this.setTitle(ApplicationRoutesLabels[route])
-            }
-          }
-        })
+        const route = Object.keys(ApplicationRoutesLabels).find(
+          (route) => event.url?.split('?')[0] == '/' + route
+        )
+        // MY ORCID
+        if (dynamicTitle) {
+          this.setTitle(
+            `${dynamicTitle} ${ApplicationDynamicRoutesLabels.orcidMyPageTitle}`
+          )
+        }
+        if (route !== null && route !== undefined) {
+          // OTHER PAGES
+          this.setTitle(ApplicationRoutesLabels[route])
+        }
       }
     })
   }

src/locale/properties/shared/shared.en.properties

@@ -617,6 +617,7 @@ share.account=Account settings - ORCID
 share.trustedParties=Trusted parties - ORCID
 share.resetPasswordEmail=Reset password - ORCID
 share.selfService=Self Service - ORCID
+share.deactivateAccount=Deactivate account - ORCID
 share.orcidTitle=- ORCID
 share.myOrcidTitle=- My ORCID
 share.developerTools=Developer tools - ORCID