#25901 Unable to reuse content inside the variants (#26658)

* fix language change * make solutions consistent across environments
dotCMS · Nov 13, 2023 · d856431 · d856431
1 parent 2c13f3c
commit d856431
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/...web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/dot-edit-content.component.html b/...web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/dot-edit-content.component.html
@@ -99,9 +99,7 @@
             *ngIf="(isEnterpriseLicense$ | async) && isEditMode && allowedContent"
             [class.collapsed]="paletteCollapsed"
             [class.editMode]="isEditMode">
-            <dot-palette
-                [allowedContent]="allowedContent"
-                [languageId]="pageStateInternal.page?.languageId">
+            <dot-palette [allowedContent]="allowedContent" [languageId]="pageLanguageId">
             </dot-palette>
             <div
                 class="dot-edit-content__palette-visibility"

diff --git a/.../apps/dotcms-ui/src/app/portlets/dot-edit-page/content/dot-edit-content.component.spec.ts b/.../apps/dotcms-ui/src/app/portlets/dot-edit-page/content/dot-edit-content.component.spec.ts
@@ -333,7 +333,8 @@ describe('DotEditContentComponent', () => {
                                 mode: DotPageMode.PREVIEW
                             }
                         },
-                        data: of({})
+                        data: of({}),
+                        queryParams: of({ language_id: '1' })
                     }
                 },
                 { provide: DotMessageDisplayService, useClass: DotMessageDisplayServiceMock },

diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/dot-edit-content.component.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/dot-edit-content.component.ts
@@ -89,6 +89,7 @@ export class DotEditContentComponent implements OnInit, OnDestroy {
     featureFlagSeo = FeaturedFlags.FEATURE_FLAG_SEO_IMPROVEMENTS;
     seoOGTags: SeoMetaTags;
     seoOGTagsResults = null;
+    pageLanguageId: string;
 
     private readonly customEventsHandler;
     private destroy$: Subject<boolean> = new Subject<boolean>();
@@ -184,6 +185,7 @@ browse from the page internal links
         this.subscribeOverlayService();
         this.subscribeDraggedContentType();
         this.getExperimentResolverData();
+        this.subscribeToLanguageChange();
 
         /*This is needed when the user is in the edit mode in an experiment variant
         and navigate to another page with the page menu and want to go back with the
@@ -663,4 +665,14 @@ browse from the page internal links
             })
         );
     }
+
+    /**
+     * Subscribe to language change, because pageState.page.languageId is not being updated
+     * as should be between dev environments.
+     */
+    private subscribeToLanguageChange(): void {
+        this.route.queryParams.pipe(takeUntil(this.destroy$)).subscribe((params) => {
+            this.pageLanguageId = params['language_id'];
+        });
+    }
 }