#31919 include in 24.12.27 LTS

Author: erickgonzalez

core-web/libs/portlets/edit-ema/portlet/src/lib/dot-ema-shell/components/edit-ema-navigation-bar/edit-ema-navigation-bar.component.html

@@ -20,11 +20,18 @@
 
         <a
             [routerLink]="item.isDisabled ? null : item.href"
+            [queryParams]="$params()"
             [ngClass]="{ 'edit-ema-nav-bar__item--disabled': item.isDisabled }"
             [pTooltip]="item.tooltip | dm"
             class="edit-ema-nav-bar__item"
             data-testId="nav-bar-item"
             routerLinkActive="edit-ema-nav-bar__item--active"
+            [routerLinkActiveOptions]="{
+                queryParams: 'ignored',
+                matrixParams: 'ignored',
+                paths: 'exact',
+                fragment: 'ignored'
+            }"
             queryParamsHandling="merge"
             tooltipPosition="left"
             rel="noopener">

core-web/libs/portlets/edit-ema/portlet/src/lib/dot-ema-shell/components/edit-ema-navigation-bar/edit-ema-navigation-bar.component.ts

@@ -45,6 +45,8 @@ export class EditEmaNavigationBarComponent {
 
     $editorProps = this.uveStore.$editorProps;
 
+    $params = this.uveStore.pageParams;
+
     /**
      * Handle the click event on the item
      *

dotCMS/hotfix_tracking.md

@@ -40,3 +40,4 @@ This maintenance release includes the following code fixes:
 34. https://github.com/dotCMS/core/pull/32057
 35. https://github.com/dotCMS/core/issues/31933 : The "Select All Content" option is intermittently not appearing for some users across different devices and browsers #31933
 36. https://github.com/dotCMS/core/issues/31994 : SAML: skip RequestedAuthenticationContext #31994
+37. https://github.com/dotCMS/core/issues/31919 : UVE: Incorrect Language Layout Loaded When Editing Multilingual Pages #31919