From 08b9cd144fb8b70aff8538d6869c52fde3b40d94 Mon Sep 17 00:00:00 2001
From: Dharan <14145706+dhrn@users.noreply.github.com>
Date: Thu, 28 Oct 2021 18:52:17 +0530
Subject: [PATCH] [AAE-6150]  User info disappears in every click (#7328)

* [AAE-6150] userinfo remove debounce for every reload

* [ci:force] force e2e
---
 .../components/user-info.component.spec.ts         |  4 ++--
 .../userinfo/components/user-info.component.ts     | 14 +++++++-------
 .../widgets/dropdown/dropdown-cloud.widget.ts      |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/core/userinfo/components/user-info.component.spec.ts b/lib/core/userinfo/components/user-info.component.spec.ts
index 5ed0446c01..35e6d86e1d 100644
--- a/lib/core/userinfo/components/user-info.component.spec.ts
+++ b/lib/core/userinfo/components/user-info.component.spec.ts
@@ -27,7 +27,7 @@ import { IdentityUserService } from '../../services/identity-user.service';
 import { BpmUserModel } from '../../models/bpm-user.model';
 import { EcmUserModel } from '../../models/ecm-user.model';
 import { UserInfoComponent } from './user-info.component';
-import { of, timer } from 'rxjs';
+import { of } from 'rxjs';
 import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
@@ -88,7 +88,7 @@ describe('User info component', () => {
 
     async function whenFixtureReady() {
         fixture.detectChanges();
-        await timer(500).toPromise();
+        await fixture.whenStable();
         fixture.detectChanges();
     }
 
diff --git a/lib/core/userinfo/components/user-info.component.ts b/lib/core/userinfo/components/user-info.component.ts
index bb750783f7..a0d70c477b 100644
--- a/lib/core/userinfo/components/user-info.component.ts
+++ b/lib/core/userinfo/components/user-info.component.ts
@@ -25,7 +25,7 @@ import { EcmUserService } from '../../services/ecm-user.service';
 import { IdentityUserService } from '../../services/identity-user.service';
 import { of, Observable, Subject } from 'rxjs';
 import { MatMenuTrigger, MenuPositionX, MenuPositionY } from '@angular/material/menu';
-import { debounceTime, startWith, takeUntil } from 'rxjs/operators';
+import { filter, takeUntil } from 'rxjs/operators';
 
 @Component({
     selector: 'adf-userinfo',
@@ -75,15 +75,15 @@ export class UserInfoComponent implements OnInit, OnDestroy {
                 private bpmUserService: BpmUserService,
                 private identityUserService: IdentityUserService,
                 private authService: AuthenticationService) {
+        this.authService.onLogin
+            .pipe(
+                filter(() => this.authService.isKerberosEnabled()),
+                takeUntil(this.destroy$)
+            ).subscribe(() => this.getUserInfo());
     }
 
     ngOnInit() {
-       this.authService.onLogin
-           .pipe(
-               startWith(this.authService.isLoggedIn()),
-               debounceTime(500),
-               takeUntil(this.destroy$)
-           ).subscribe(() => this.getUserInfo());
+        this.getUserInfo();
     }
 
     ngOnDestroy(): void {
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.ts b/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.ts
index 2db44c04f2..3cfaf5e746 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.ts
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.ts
@@ -94,7 +94,7 @@ export class DropdownCloudWidgetComponent extends WidgetComponent implements OnI
         }
 
         if (typeof opt1 === 'object' && typeof opt2 === 'object') {
-            return  opt1.id === opt2.id && opt1.name === opt2.name;
+            return  opt1.id === opt2.id || opt1.name === opt2.name;
         }
 
         return opt1 === opt2;