dotCMS/core#20270 The "Site or Folder" field dropdown randomly disapp…

…ears (#1691) * progress * progress * clean up * this change because waiting for change detection * cleanup
dotCMS · Jul 2, 2021 · 0b1077e · 0b1077e
1 parent b53547c
commit 0b1077e
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 21 deletions.
diff --git a/...pp/view/components/_common/dot-site-selector-field/dot-site-selector-field.component.html b/...pp/view/components/_common/dot-site-selector-field/dot-site-selector-field.component.html
@@ -4,4 +4,5 @@
     [archive]="archive"
     [system]="system"
     [live]="live"
+    [asField]="true"
 ></dot-site-selector>
diff --git a/...view/components/_common/dot-site-selector-field/dot-site-selector-field.component.spec.ts b/...view/components/_common/dot-site-selector-field/dot-site-selector-field.component.spec.ts
@@ -43,6 +43,8 @@ export class SiteSelectorComponent {
     live: boolean;
     @Input()
     system: boolean;
+    @Input()
+    asField: boolean;
 }
 
 describe('SiteSelectorFieldComponent', () => {
@@ -141,6 +143,7 @@ describe('SiteSelectorFieldComponent', () => {
         expect(siteSelector.componentInstance.archive).toBe(true);
         expect(siteSelector.componentInstance.system).toBe(false);
         expect(siteSelector.componentInstance.live).toBe(false);
+        expect(siteSelector.componentInstance.asField).toBe(true);
     });
 
     it('should not set current site when already hava a value', () => {

diff --git a/...cms-ui/src/app/view/components/_common/dot-site-selector/dot-site-selector.component.html b/...cms-ui/src/app/view/components/_common/dot-site-selector/dot-site-selector.component.html
@@ -1,5 +1,5 @@
 <dot-searchable-dropdown
-    *ngIf="paginationService.totalRecords > 1; else hostName"
+    *ngIf="moreThanOneSite || asField; else hostName"
     #searchableDropdown
     (change)="siteChange($event)"
     (filterChange)="handleFilterChange($event)"

diff --git a/...-ui/src/app/view/components/_common/dot-site-selector/dot-site-selector.component.spec.ts b/...-ui/src/app/view/components/_common/dot-site-selector/dot-site-selector.component.spec.ts
@@ -129,7 +129,7 @@ describe('SiteSelectorComponent', () => {
         const page = 1;
 
         paginatorService.totalRecords = 2;
-        spyOn(paginatorService, 'getWithOffset').and.returnValue(observableOf([]));
+        spyOn(paginatorService, 'getWithOffset').and.returnValue(observableOf(sites));
         spyOn<any>(siteService, 'switchSite$').and.returnValue(observableOf({}));
 
         fixture.detectChanges();
@@ -153,8 +153,7 @@ describe('SiteSelectorComponent', () => {
     it('should paginate when the filter change', () => {
         const filter = 'filter';
 
-        paginatorService.totalRecords = 2;
-        spyOn(paginatorService, 'getWithOffset').and.returnValue(observableOf([]));
+        spyOn(paginatorService, 'getWithOffset').and.returnValue(observableOf(sites));
         spyOn<any>(siteService, 'switchSite$').and.returnValue(observableOf({}));
 
         fixture.detectChanges();
@@ -173,7 +172,7 @@ describe('SiteSelectorComponent', () => {
     it('should pass class name to searchable dropdown', async () => {
         paginatorService.filter = 'filter';
         paginatorService.totalRecords = 2;
-        spyOn(paginatorService, 'getWithOffset').and.returnValue(observableOf([]));
+        spyOn(paginatorService, 'getWithOffset').and.returnValue(observableOf(sites));
 
         comp.cssClass = 'hello';
         fixture.detectChanges();
@@ -186,7 +185,7 @@ describe('SiteSelectorComponent', () => {
     it('should be assign to filter if empty', () => {
         paginatorService.filter = 'filter';
         paginatorService.totalRecords = 2;
-        spyOn(paginatorService, 'getWithOffset').and.returnValue(observableOf([]));
+        spyOn(paginatorService, 'getWithOffset').and.returnValue(observableOf(sites));
 
         fixture.detectChanges();
 
@@ -202,7 +201,7 @@ describe('SiteSelectorComponent', () => {
     it('should emit change event', () => {
         paginatorService.filter = 'filter';
         paginatorService.totalRecords = 2;
-        spyOn(paginatorService, 'getWithOffset').and.returnValue(observableOf([]));
+        spyOn(paginatorService, 'getWithOffset').and.returnValue(observableOf(sites));
         spyOn(comp, 'handleSitesRefresh');
         fixture.detectChanges();
         const searchableDropdownComponent: DebugElement = de.query(
@@ -282,4 +281,30 @@ describe('SiteSelectorComponent', () => {
             expect(paginatorService.getCurrentPage).toHaveBeenCalledTimes(1);
         }));
     });
+
+    it('should display as field', () => {
+        spyOn(paginatorService, 'getWithOffset').and.returnValue(observableOf(sites));
+        fixture.detectChanges();
+        const searchableDropdownComponent: DebugElement = de.query(
+            By.css('dot-searchable-dropdown')
+        );
+        expect(searchableDropdownComponent).not.toBeNull();
+    });
+
+    it('should display only one result as field', () => {
+        comp.asField = true;
+        spyOn(paginatorService, 'getWithOffset').and.returnValue(observableOf([sites[0]]));
+        fixture.detectChanges();
+        const searchableDropdownComponent: DebugElement = de.query(
+            By.css('dot-searchable-dropdown')
+        );
+        expect(searchableDropdownComponent).not.toBeNull();
+    });
+
+    it('should display as text if only one result', () => {
+        spyOn(paginatorService, 'getWithOffset').and.returnValue(observableOf([sites[0]]));
+        fixture.detectChanges();
+        const siteTitle: DebugElement = de.query(By.css('.site-selector__title'));
+        expect(siteTitle).not.toBeNull();
+    });
 });
diff --git a/...otcms-ui/src/app/view/components/_common/dot-site-selector/dot-site-selector.component.ts b/...otcms-ui/src/app/view/components/_common/dot-site-selector/dot-site-selector.component.ts
@@ -39,6 +39,7 @@ export class DotSiteSelectorComponent implements OnInit, OnChanges, OnDestroy {
     @Input() cssClass: string;
     @Input() width: string;
     @Input() pageSize = 10;
+    @Input() asField = false;
 
     @Output() change: EventEmitter<Site> = new EventEmitter();
     @Output() hide: EventEmitter<any> = new EventEmitter();
@@ -49,6 +50,7 @@ export class DotSiteSelectorComponent implements OnInit, OnChanges, OnDestroy {
     currentSiteSub$: Subject<Site> = new Subject();
 
     sitesCurrentPage: Site[];
+    moreThanOneSite = false;
 
     private destroy$: Subject<boolean> = new Subject<boolean>();
 
@@ -73,7 +75,6 @@ export class DotSiteSelectorComponent implements OnInit, OnChanges, OnDestroy {
         this.siteService.refreshSites$
             .pipe(takeUntil(this.destroy$))
             .subscribe((_site: Site) => this.handleSitesRefresh(_site));
-
         this.getSitesList();
         ['login-as', 'logout-as'].forEach((event: string) => {
             this.dotEventsService
@@ -85,7 +86,9 @@ export class DotSiteSelectorComponent implements OnInit, OnChanges, OnDestroy {
         });
 
         this.siteService.switchSite$.pipe(takeUntil(this.destroy$)).subscribe(() => {
-            this.updateCurrentSite(this.siteService.currentSite);
+            setTimeout(() => {
+                this.updateCurrentSite(this.siteService.currentSite);
+            }, 200);
         });
     }
 
@@ -171,13 +174,13 @@ export class DotSiteSelectorComponent implements OnInit, OnChanges, OnDestroy {
      * @memberof SiteSelectorComponent
      */
     getSitesList(filter = '', offset = 0): void {
-        Promise.resolve().then(() => this.setSelectedSite());
         this.paginationService.filter = filter;
         this.paginationService
             .getWithOffset(offset)
             .pipe(take(1))
             .subscribe((items: Site[]) => {
                 this.sitesCurrentPage = [...items];
+                this.moreThanOneSite = this.moreThanOneSite || items.length > 1;
             });
     }
 
@@ -226,15 +229,4 @@ export class DotSiteSelectorComponent implements OnInit, OnChanges, OnDestroy {
         this.sitesCurrentPage = [...items];
         this.updateCurrentSite(this.siteService.currentSite);
     }
-
-    private setSelectedSite(): void {
-        if (this.id && this.siteService.currentSite.identifier !== this.id) {
-            this.siteService
-                .getSiteById(this.id)
-                .pipe(take(1))
-                .subscribe((selectedSite) => this.updateCurrentSite(selectedSite));
-        } else {
-            this.updateCurrentSite(this.siteService.currentSite);
-        }
-    }
 }