ADK changes

PiperOrigin-RevId: 832211459

Author: google-genai-bot

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

@@ -182,7 +182,8 @@ describe('ChatComponent', () => {
       events: of(new NavigationEnd(1, '', '')),
     });
     mockLocation = jasmine.createSpyObj('Location', ['replaceState']);
-    mockAgentBuilderService = jasmine.createSpyObj('AgentBuilderService', ['clear', 'setLoadedAgentData']);
+    mockAgentBuilderService = jasmine.createSpyObj(
+        'AgentBuilderService', ['clear', 'setLoadedAgentData']);
 
     mockActivatedRoute = {
       snapshot: {
@@ -496,10 +497,12 @@ describe('ChatComponent', () => {
           expect(component.traceData.length).toBe(0);
         });
 
-        it('should hide session list spinner', () => {
-          expect(mockUiStateService.setIsSessionListLoading)
-              .toHaveBeenCalledWith(false);
-        });
+        it(
+            'should not hide session list spinner because the session list is still being loaded',
+            () => {
+              expect(mockUiStateService.setIsSessionListLoading)
+                  .toHaveBeenCalledWith(true);
+            });
       });
 
       describe('when session is created with error', () => {
@@ -638,8 +641,7 @@ describe('ChatComponent', () => {
 
             describe('when canEdit throws an error', () => {
               beforeEach(() => {
-                mockSessionService.canEditResponse.error(
-                    new Error('error'));
+                mockSessionService.canEditResponse.error(new Error('error'));
                 mockEventService.getTraceResponse.next([]);
                 component['updateWithSelectedSession'](mockSession as any);
                 fixture.detectChanges();

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

@@ -67,14 +67,14 @@ import {getMediaTypeFromMimetype, MediaType} from '../artifact-tab/artifact-tab.
 import {BuilderTabsComponent} from '../builder-tabs/builder-tabs.component';
 import {CanvasComponent} from '../canvas/canvas.component';
 import {ChatPanelComponent} from '../chat-panel/chat-panel.component';
-import {ThemeToggle} from '../theme-toggle/theme-toggle';
 import {EditJsonDialogComponent} from '../edit-json-dialog/edit-json-dialog.component';
 import {EvalTabComponent} from '../eval-tab/eval-tab.component';
 import {PendingEventDialogComponent} from '../pending-event-dialog/pending-event-dialog.component';
 import {DeleteSessionDialogComponent, DeleteSessionDialogData,} from '../session-tab/delete-session-dialog/delete-session-dialog.component';
 import {SessionTabComponent} from '../session-tab/session-tab.component';
 import {SidePanelComponent} from '../side-panel/side-panel.component';
 import {SidePanelMessagesInjectionToken} from '../side-panel/side-panel.component.i18n';
+import {ThemeToggle} from '../theme-toggle/theme-toggle';
 import {TraceEventComponent} from '../trace-tab/trace-event/trace-event.component';
 import {ViewImageDialogComponent} from '../view-image-dialog/view-image-dialog.component';
 
@@ -433,8 +433,6 @@ export class ChatComponent implements OnInit, AfterViewInit, OnDestroy {
     this.sessionService.createSession(this.userId, this.appName)
         .subscribe(
             (res) => {
-              this.uiStateService.setIsSessionListLoading(false);
-
               this.currentSessionState = res.state;
               this.sessionId = res.id ?? '';
               this.sessionTab?.refreshSession();
@@ -523,8 +521,9 @@ export class ChatComponent implements OnInit, AfterViewInit, OnDestroy {
           this.updatedSessionState.set(null);
         }
         this.streamingTextMessage = null;
-        this.featureFlagService.isSessionReloadOnNewMessageEnabled().pipe(first()).subscribe(
-            (enabled) => {
+        this.featureFlagService.isSessionReloadOnNewMessageEnabled()
+            .pipe(first())
+            .subscribe((enabled) => {
               if (enabled) {
                 this.sessionTab?.reloadSession(this.sessionId);
               }

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

@@ -24,7 +24,7 @@
     </mat-form-field>
   </div>
   } @let isSessionListLoading = uiStateService.isSessionListLoading() | async; @if
-  (isSessionListLoading && sessionList.length === 0) {
+  (isSessionListLoading && !isLoadingMoreInProgress()) {
   <div class="loading-spinner-container">
     <mat-progress-bar mode="indeterminate"></mat-progress-bar>
   </div>

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

@@ -141,10 +141,35 @@ describe('SessionTabComponent', () => {
                             {
                               filter: 'abc',
                               pageToken: '',
-                              pageSize: component.SESSIONS_PAGE_LIMIT,
+                              pageSize: 100,
                             },
                         );
                   }));
+
+      describe('on refresh', () => {
+        beforeEach((fakeAsync(() => {
+          component.refreshSession();
+          tick(300);  // for debounceTime
+        })));
+
+        it('should reset session list', fakeAsync(() => {
+                      expect(component.sessionList).toEqual([]);
+                    }));
+
+        it('should reset page token and filter', fakeAsync(() => {
+                      expect(sessionService.listSessions)
+                          .toHaveBeenCalledWith(
+                              component.userId,
+                              component.appName,
+                              {
+                                filter: undefined,
+                                pageToken: '',
+                                pageSize: 100,
+                              },
+                          );
+                    }));
+      });
+
       describe('when list is loaded', () => {
         beforeEach(fakeAsync(() => {
           mockUiStateService.isSessionListLoadingResponse.next(false);
@@ -202,7 +227,7 @@ describe('SessionTabComponent', () => {
                             {
                               filter: undefined,
                               pageToken: 'nextPage',
-                              pageSize: component.SESSIONS_PAGE_LIMIT,
+                              pageSize: 100,
                             },
                         );
                   }));
@@ -345,4 +370,36 @@ describe('SessionTabComponent', () => {
       });
     });
   });
+
+  describe('on refresh', () => {
+    beforeEach(fakeAsync(() => {
+      mockFeatureFlagService.isSessionFilteringEnabledResponse.next(true);
+      sessionService.listSessionsResponse.next({
+        items: [{id: 'session1', lastUpdateTime: 1}],
+        nextPageToken: 'nextPage',
+      });
+      fixture = TestBed.createComponent(SessionTabComponent);
+      component = fixture.componentInstance;
+      fixture.detectChanges();
+      tick(500);  // for setTimeout in ngOnInit
+      expect(component.pageToken).toBe('nextPage');
+      expect(component.sessionList.length).toBe(1);
+      sessionService.listSessions.calls.reset();
+      component.refreshSession();
+      tick(300);  // for debounceTime
+    }));
+
+    it('should reset page token and session list', fakeAsync(() => {
+         expect(sessionService.listSessions)
+             .toHaveBeenCalledWith(
+                 component.userId,
+                 component.appName,
+                 {
+                   filter: undefined,
+                   pageToken: '',
+                   pageSize: 100,
+                 },
+             );
+       }));
+  });
 });

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

@@ -81,6 +81,8 @@ export class SessionTabComponent implements OnInit {
   isSessionFilteringEnabled =
       this.featureFlagService.isSessionFilteringEnabled();
 
+  isLoadingMoreInProgress = signal(false);
+
   constructor() {
     this.filterControl.valueChanges.pipe(debounceTime(300)).subscribe(() => {
       this.pageToken = '';
@@ -112,28 +114,34 @@ export class SessionTabComponent implements OnInit {
                   .pipe(catchError(() => of({items: [], nextPageToken: ''})));
             }),
             tap(({items, nextPageToken}) => {
-              this.sessionList = Array.from(
-                new Map(
-                  [...this.sessionList, ...items].map((session) => [
-                    session.id,
-                    session,
-                  ]),
-                ).values(),
-              ).sort(
-                (a: any, b: any) =>
-                  Number(b.lastUpdateTime) - Number(a.lastUpdateTime),
-              );
+              this.sessionList =
+                  Array
+                      .from(
+                          new Map(
+                              [...this.sessionList, ...items].map(
+                                  (session) =>
+                                      [session.id,
+                                       session,
+              ]),
+                              )
+                              .values(),
+                          )
+                      .sort(
+                          (a: any, b: any) => Number(b.lastUpdateTime) -
+                              Number(a.lastUpdateTime),
+                      );
               this.pageToken = nextPageToken ?? '';
               this.canLoadMoreSessions = !!nextPageToken;
               this.changeDetectorRef.markForCheck();
-            }),
-            debounceTime(300),
+            })
             )
         .subscribe(
             () => {
+              this.isLoadingMoreInProgress.set(false);
               this.uiStateService.setIsSessionListLoading(false);
             },
             () => {
+              this.isLoadingMoreInProgress.set(false);
               this.uiStateService.setIsSessionListLoading(false);
             },
         );
@@ -203,6 +211,7 @@ export class SessionTabComponent implements OnInit {
   }
 
   loadMoreSessions() {
+    this.isLoadingMoreInProgress.set(true);
     this.refreshSessionsSubject.next();
   }
 
@@ -229,15 +238,23 @@ export class SessionTabComponent implements OnInit {
   }
 
   refreshSession(session?: string) {
-    this.refreshSessionsSubject.next();
-    if (this.sessionList.length <= 1) {
-      return undefined;
-    } else {
+    let nextSession = null;
+
+    if (this.sessionList.length > 0) {
       let index = this.sessionList.findIndex((s) => s.id == session);
       if (index == this.sessionList.length - 1) {
         index = -1;
       }
-      return this.sessionList[index + 1];
+      nextSession = this.sessionList[index + 1];
     }
+
+    if (this.isSessionFilteringEnabled) {
+      this.filterControl.setValue('');
+    } else {
+      this.sessionList = [];
+      this.refreshSessionsSubject.next();
+    }
+
+    return nextSession;
   }
 }