ADK changes

PiperOrigin-RevId: 827517900

Author: google-genai-bot

src/app/components/session-tab/session-tab.component.spec.ts

@@ -15,40 +15,47 @@
  * limitations under the License.
  */
 
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatDialog, MatDialogModule } from '@angular/material/dialog';
-import { SessionTabComponent } from './session-tab.component';
-import { SESSION_SERVICE, SessionService } from '../../core/services/interfaces/session';
-import { UI_STATE_SERVICE, UiStateService } from '../../core/services/interfaces/ui-state';
-import { MockUiStateService } from '../../core/services/testing/mock-ui-state.service';
-import { of } from 'rxjs';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {ComponentFixture, TestBed,} from '@angular/core/testing';
+import {MatDialog, MatDialogModule} from '@angular/material/dialog';
+import {NoopAnimationsModule} from '@angular/platform-browser/animations';
+// 1p-ONLY-IMPORTS: import {beforeEach, describe, it,}
+import {of} from 'rxjs';
+
+import {SESSION_SERVICE, SessionService,} from '../../core/services/interfaces/session';
+import {UI_STATE_SERVICE,} from '../../core/services/interfaces/ui-state';
+import {MockSessionService} from '../../core/services/testing/mock-session.service';
+import {MockUiStateService} from '../../core/services/testing/mock-ui-state.service';
+import {fakeAsync, initTestBed} from '../../testing/utils';
+
+import {SessionTabComponent} from './session-tab.component';
 
 describe('SessionTabComponent', () => {
   let component: SessionTabComponent;
   let fixture: ComponentFixture<SessionTabComponent>;
   let mockUiStateService: MockUiStateService;
+  let sessionService: MockSessionService;
 
   beforeEach(async () => {
-    const sessionService = jasmine.createSpyObj<SessionService>([
-      'listSessions',
-      'getSession',
-      'canEdit',
-    ]);
-    sessionService.listSessions.and.returnValue(of([]));
-    sessionService.getSession.and.returnValue(of({} as any));
-    sessionService.canEdit.and.returnValue(of(true));
+    sessionService = new MockSessionService();
     mockUiStateService = new MockUiStateService();
 
+    sessionService.listSessionsResponse.next([]);
+    sessionService.canEditResponse.next(true);
 
-    await TestBed.configureTestingModule({
-      imports: [MatDialogModule, SessionTabComponent, NoopAnimationsModule],
-      providers: [
-        { provide: MatDialog, useValue: jasmine.createSpyObj('MatDialog', ['open']) },
-        { provide: SESSION_SERVICE, useValue: sessionService },
-        { provide: UI_STATE_SERVICE, useValue: mockUiStateService },
-      ],
-    }).compileComponents();
+    initTestBed();  // required for 1p compatibility
+    await TestBed
+        .configureTestingModule({
+          imports: [MatDialogModule, SessionTabComponent, NoopAnimationsModule],
+          providers: [
+            {
+              provide: MatDialog,
+              useValue: jasmine.createSpyObj('MatDialog', ['open']),
+            },
+            {provide: SESSION_SERVICE, useValue: sessionService},
+            {provide: UI_STATE_SERVICE, useValue: mockUiStateService},
+          ],
+        })
+        .compileComponents();
 
     fixture = TestBed.createComponent(SessionTabComponent);
     component = fixture.componentInstance;
@@ -59,8 +66,63 @@ describe('SessionTabComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  it('should set session loading state when getting a session', () => {
-    component.getSession('session1');
-    expect(mockUiStateService.setIsSessionLoading).toHaveBeenCalledWith(true);
+  describe('when getting a session', () => {
+    beforeEach(() => {
+      spyOn(component.sessionSelected, 'emit');
+    });
+
+    it('should set session loading state to true', () => {
+      component.getSession('session1');
+      expect(mockUiStateService.setIsSessionLoading).toHaveBeenCalledWith(true);
+    });
+
+    describe('when getting a session is successful', () => {
+      beforeEach(() => {
+        sessionService.getSessionResponse.next({} as any);
+        component.getSession('session1');
+      });
+
+      it('emits sessionSelected', () => {
+        expect(component.sessionSelected.emit).toHaveBeenCalled();
+      });
+
+      it('sets session loading state to false', fakeAsync(() => {
+                    expect(mockUiStateService.setIsSessionLoading)
+                        .toHaveBeenCalledWith(
+                            false,
+                        );
+                  }));
+    });
+
+    describe('when getting a session throws error', () => {
+      beforeEach(() => {
+        sessionService.getSessionResponse.error(new Error('error'));
+        component.getSession('session1');
+      });
+
+      it('hides session loading state', fakeAsync(() => {
+                    expect(mockUiStateService.setIsSessionLoading)
+                        .toHaveBeenCalledWith(
+                            false,
+                        );
+                  }));
+
+      it(
+          'does not emit sessionSelected', fakeAsync(() => {
+            expect(component.sessionSelected.emit).not.toHaveBeenCalled();
+          }));
+
+      describe('on retry', () => {
+        beforeEach(() => {
+          sessionService.getSession.calls.reset();
+          sessionService.getSessionResponse.next({} as any);
+          component.getSession('session1');
+        });
+
+        it('fetches session again', () => {
+          expect(sessionService.getSession).toHaveBeenCalled();
+        });
+      });
+    });
   });
 });

src/app/components/session-tab/session-tab.component.ts

@@ -19,8 +19,8 @@ import {AsyncPipe, NgClass} from '@angular/common';
 import {ChangeDetectorRef, Component, EventEmitter, inject, Input, OnInit, Output, signal} from '@angular/core';
 import {MatChip} from '@angular/material/chips';
 import {MatProgressBar} from '@angular/material/progress-bar';
-import {Subject} from 'rxjs';
-import {debounceTime, map, switchMap, tap} from 'rxjs/operators';
+import {of, Subject} from 'rxjs';
+import {catchError, debounceTime, map, switchMap, tap} from 'rxjs/operators';
 
 import {Session} from '../../core/models/Session';
 import {SESSION_SERVICE} from '../../core/services/interfaces/session';
@@ -86,15 +86,17 @@ export class SessionTabComponent implements OnInit {
             tap(() => {
               this.uiStateService.setIsSessionLoading(true);
             }),
-            switchMap(
-                (sessionId) => this.sessionService.getSession(
-                    this.userId, this.appName, sessionId)),
+            switchMap((sessionId) => {
+              return this.sessionService
+                  .getSession(this.userId, this.appName, sessionId)
+                  .pipe(catchError(() => of(null)));
+            }),
             tap((res) => {
+              if (!res) return;
               const session = this.fromApiResultToSession(res);
               this.sessionSelected.emit(session);
               this.changeDetectorRef.markForCheck();
             }),
-            debounceTime(300),
             )
         .subscribe(
             (session) => {