ADK changes

PiperOrigin-RevId: 858932116

Author: reniowood

src/app/components/chat/chat.component.spec.ts

@@ -23,7 +23,7 @@ import {MatDialog, MatDialogModule} from '@angular/material/dialog';
 import {MatSnackBar} from '@angular/material/snack-bar';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {ActivatedRoute, NavigationEnd, Params, Router, UrlTree} from '@angular/router';
+import {ActivatedRoute, NavigationEnd, Router, UrlTree} from '@angular/router';
 // 1p-ONLY-IMPORTS: import {beforeEach, describe, expect, it}
 import {BehaviorSubject, NEVER, of, ReplaySubject, Subject, throwError} from 'rxjs';
 
@@ -190,12 +190,11 @@ describe('ChatComponent', () => {
     mockAgentBuilderService = jasmine.createSpyObj(
         'AgentBuilderService', ['clear', 'setLoadedAgentData']);
 
-    const queryParamsSubject = new BehaviorSubject<Params>({});
     mockActivatedRoute = {
       snapshot: {
         queryParams: {},
       } as any,
-      queryParams: queryParamsSubject,
+      queryParams: of({}),
     };
 
     const appName = new BehaviorSubject<string>(TEST_APP_1_NAME);
@@ -321,9 +320,9 @@ describe('ChatComponent', () => {
         mockAgentService.listAppsResponse.next(
             [TEST_APP_1_NAME, TEST_APP_2_NAME]);
 
-        const params = {[APP_QUERY_PARAM]: INVALID_APP_NAME};
-        mockActivatedRoute.snapshot!.queryParams = params;
-        (mockActivatedRoute.queryParams as Subject<Params>).next(params);
+        mockActivatedRoute.snapshot!.queryParams = {
+          [APP_QUERY_PARAM]: INVALID_APP_NAME,
+        };
         mockAgentService.listAppsResponse.next([TEST_APP_1_NAME]);
         fixture = TestBed.createComponent(ChatComponent);
         component = fixture.componentInstance;
@@ -402,11 +401,9 @@ describe('ChatComponent', () => {
         mockAgentService.listAppsResponse.next(
             [TEST_APP_1_NAME, TEST_APP_2_NAME]);
 
-        const params = {
+        mockActivatedRoute.snapshot!.queryParams = {
           [APP_QUERY_PARAM]: TEST_APP_2_NAME,
         };
-        mockActivatedRoute.snapshot!.queryParams = params;
-        (mockActivatedRoute.queryParams as Subject<Params>).next(params);
         component.ngOnInit();
       });
       it('should create new session on init', () => {
@@ -423,12 +420,10 @@ describe('ChatComponent', () => {
       beforeEach(() => {
         mockAgentService.listAppsResponse.next([TEST_APP_1_NAME]);
         mockFeatureFlagService.isSessionUrlEnabledResponse.next(true);
-        const params = {
+        mockActivatedRoute.snapshot!.queryParams = {
           [APP_QUERY_PARAM]: TEST_APP_1_NAME,
           [SESSION_QUERY_PARAM]: SESSION_2_ID,
         };
-        mockActivatedRoute.snapshot!.queryParams = params;
-        (mockActivatedRoute.queryParams as Subject<Params>).next(params);
         mockSessionService.getSessionResponse.next(
             {id: SESSION_2_ID, state: {}, events: []});
       });
@@ -476,12 +471,10 @@ describe('ChatComponent', () => {
 
     describe('when session in URL is not found', () => {
       beforeEach(async () => {
-        const params = {
+        mockActivatedRoute.snapshot!.queryParams = {
           [APP_QUERY_PARAM]: TEST_APP_1_NAME,
           [SESSION_QUERY_PARAM]: SESSION_2_ID,
         };
-        mockActivatedRoute.snapshot!.queryParams = params;
-        (mockActivatedRoute.queryParams as Subject<Params>).next(params);
         mockSessionService.getSession.and.callFake(
             (userId: string, app: string, sessionId: string) => {
               if (sessionId === SESSION_2_ID) {

src/app/components/chat/chat.component.ts

@@ -265,7 +265,6 @@ export class ChatComponent implements OnInit, AfterViewInit, OnDestroy {
           this.router.navigate([], {
             relativeTo: this.activatedRoute,
             queryParams: {app: app[0]},
-            replaceUrl: true,
           });
         }
       }),
@@ -1658,7 +1657,10 @@ export class ChatComponent implements OnInit, AfterViewInit, OnDestroy {
 
   private syncSelectedAppFromUrl() {
     combineLatest([
-      this.activatedRoute.queryParams,
+      this.router.events.pipe(
+          filter((e) => e instanceof NavigationEnd),
+          map(() => this.activatedRoute.snapshot.queryParams),
+          ),
       this.apps$
     ]).subscribe(([params, apps]) => {
       if (apps && apps.length) {