dotCMS/core#24172 Refresh Page portlet's data when site changed

core-web/apps/dotcms-ui/src/app/portlets/dot-pages/dot-pages.component.spec.ts

@@ -1,3 +1,5 @@
+import { Subject } from 'rxjs';
+
 import { Component, DebugElement, EventEmitter, Input, Output } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
@@ -11,6 +13,7 @@ import { DotMessageSeverity, DotMessageType } from '@components/dot-message-disp
 import { DotMessageDisplayService } from '@components/dot-message-display/services';
 import { DotRouterService } from '@dotcms/app/api/services/dot-router/dot-router.service';
 import { DotEventsService } from '@dotcms/data-access';
+import { mockSites, SiteService } from '@dotcms/dotcms-js';
 import { dotcmsContentletMock, MockDotRouterService } from '@dotcms/utils-testing';
 
 import { DotPageStore } from './dot-pages-store/dot-pages.store';
@@ -110,6 +113,8 @@ describe('DotPagesComponent', () => {
     let dotRouterService: DotRouterService;
     let dotMessageDisplayService: DotMessageDisplayService;
 
+    const switchSiteSubject = new Subject();
+
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [
@@ -122,7 +127,19 @@ describe('DotPagesComponent', () => {
             providers: [
                 DotEventsService,
                 { provide: DotMessageDisplayService, useClass: DotMessageDisplayServiceMock },
-                { provide: DotRouterService, useClass: MockDotRouterService }
+                { provide: DotRouterService, useClass: MockDotRouterService },
+                {
+                    provide: SiteService,
+                    useValue: {
+                        get currentSite() {
+                            return undefined;
+                        },
+
+                        get switchSite$() {
+                            return switchSiteSubject.asObservable();
+                        }
+                    }
+                }
             ]
         }).compileComponents();
     });
@@ -240,4 +257,10 @@ describe('DotPagesComponent', () => {
         });
         expect(store.getPages).toHaveBeenCalledWith({ offset: 0 });
     });
+
+    it('should reload portlet only when the site change', () => {
+        switchSiteSubject.next(mockSites[0]); // setting the site
+        switchSiteSubject.next(mockSites[1]); // switching the site
+        expect(store.getPages).toHaveBeenCalledWith({ offset: 0 });
+    });
 });

core-web/apps/dotcms-ui/src/app/portlets/dot-pages/dot-pages.component.ts

@@ -5,12 +5,13 @@ import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/co
 import { Menu } from 'primeng/menu';
 
 import { Observable } from 'rxjs/internal/Observable';
-import { filter, takeUntil } from 'rxjs/operators';
+import { filter, skip, takeUntil } from 'rxjs/operators';
 
 import { DotMessageSeverity, DotMessageType } from '@components/dot-message-display/model';
 import { DotMessageDisplayService } from '@components/dot-message-display/services';
 import { DotRouterService } from '@dotcms/app/api/services/dot-router/dot-router.service';
 import { DotEventsService } from '@dotcms/data-access';
+import { SiteService } from '@dotcms/dotcms-js';
 import { DotCMSContentlet } from '@dotcms/dotcms-models';
 
 import { DotPagesState, DotPageStore } from './dot-pages-store/dot-pages.store';
@@ -41,6 +42,7 @@ export class DotPagesComponent implements OnInit, OnDestroy {
         private dotRouterService: DotRouterService,
         private dotMessageDisplayService: DotMessageDisplayService,
         private dotEventsService: DotEventsService,
+        private dotSiteService: SiteService,
         private element: ElementRef
     ) {
         this.store.setInitialStateData(FAVORITE_PAGE_LIMIT);
@@ -115,6 +117,10 @@ export class DotPagesComponent implements OnInit, OnDestroy {
                     type: DotMessageType.SIMPLE_MESSAGE
                 });
             });
+
+        this.dotSiteService.switchSite$.pipe(takeUntil(this.destroy$), skip(1)).subscribe(() => {
+            this.store.getPages({ offset: 0 });
+        });
     }
 
     ngOnDestroy(): void {