Skip to content

Commit 94b72cd

Browse files
google-genai-botcopybara-github
authored andcommitted
ADK changes
PiperOrigin-RevId: 813414139
1 parent 8cd5de0 commit 94b72cd

18 files changed

+685
-118
lines changed

src/app/components/chat/chat.component.html

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,11 @@
3434
>
3535
}
3636
<mat-drawer class="side-drawer" #sideDrawer mode="side" appResizableDrawer>
37-
@if (isApplicationSelectorEnabledObs | async) {
38-
<div class="app-select-container">
39-
<mat-select
40-
class="app-select"
41-
(selectionChange)="onAppSelection($event)"
42-
[placeholder]="isLoadingApps() ? 'Loading...' : 'Select an agent'"
43-
[formControl]="selectedAppControl"
44-
>
45-
@if (apps$ | async; as availableApps) {
46-
@for (appName of availableApps; track appName) {
47-
<mat-option class="app-name-option" [value]="appName">{{ appName }}</mat-option>
48-
}
49-
}
50-
@if (selectedAppControl.value && isLoadingApps()) {
51-
<mat-option class="app-name-option" [value]="selectedAppControl.value">{{ selectedAppControl.value }}</mat-option>
52-
}
53-
</mat-select>
54-
</div>
55-
}
5637
<app-side-panel
38+
[isApplicationSelectorEnabledObs]="isApplicationSelectorEnabledObs"
39+
[apps$]="apps$"
40+
[isLoadingApps]="isLoadingApps"
41+
[selectedAppControl]="selectedAppControl"
5742
[showSidePanel]="showSidePanel"
5843
[appName]="appName"
5944
[userId]="userId"
@@ -80,6 +65,7 @@
8065
(page)="handlePageEvent($event)"
8166
(closeSelectedEvent)="closeSelectedEvent()"
8267
(openImageDialog)="openViewImageDialog($event)"
68+
(appSelectionChange)="onAppSelection($event)"
8369
>
8470
</app-side-panel>
8571
</mat-drawer>

src/app/components/chat/chat.component.scss

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,6 @@ button {
257257
margin-right: 20px;
258258
}
259259

260-
.app-select {
261-
width: 100%;
262-
}
263-
264260
.empty-state-container {
265261
color: #eee;
266262
height: 100%;
@@ -350,30 +346,6 @@ button {
350346
font-size: 14px;
351347
}
352348

353-
.app-select-container {
354-
width: 35%;
355-
margin-top: 12px;
356-
background-color: #212123;
357-
margin-left: 10px;
358-
height: 30px;
359-
display: flex;
360-
justify-content: space-between;
361-
padding-left: 20px;
362-
padding-right: 20px;
363-
border-radius: 10px;
364-
padding-top: 5px;
365-
}
366-
367-
.app-select-container {
368-
@include mat.select-overrides(
369-
(
370-
placeholder-text-color: #8ab4f8,
371-
enabled-trigger-text-color: #8ab4f8,
372-
enabled-arrow-color: #8ab4f8,
373-
)
374-
);
375-
}
376-
377349
.adk-checkbox {
378350
position: fixed;
379351
bottom: 0;
@@ -470,12 +442,3 @@ button {
470442
::ng-deep .mat-drawer {
471443
border-right: 1px solid #444746 !important;
472444
}
473-
474-
.app-name-option,
475-
.app-select {
476-
color: #9aa0a6;
477-
font-family: 'Google Sans Mono', monospace;
478-
font-style: normal;
479-
font-weight: 400;
480-
padding-left: unset;
481-
}

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,17 @@
1515
* limitations under the License.
1616
*/
1717

18+
1819
import {Location} from '@angular/common';
1920
import {HttpErrorResponse} from '@angular/common/http';
20-
import {ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
21+
import {Component} from '@angular/core';
22+
import {ComponentFixture, TestBed} from '@angular/core/testing';
2123
import {MatDialog, MatDialogModule} from '@angular/material/dialog';
2224
import {MatSnackBar} from '@angular/material/snack-bar';
2325
import {By} from '@angular/platform-browser';
2426
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
2527
import {ActivatedRoute, NavigationEnd, Router} from '@angular/router';
28+
2629
import {BehaviorSubject, NEVER, of, Subject, throwError} from 'rxjs';
2730

2831
import {EvalCase} from '../../core/models/Eval';
@@ -37,7 +40,6 @@ import {GRAPH_SERVICE, GraphService} from '../../core/services/graph.service';
3740
import {SAFE_VALUES_SERVICE} from '../../core/services/interfaces/safevalues';
3841
import {STRING_TO_COLOR_SERVICE} from '../../core/services/interfaces/string-to-color';
3942
import {SESSION_SERVICE, SessionService,} from '../../core/services/session.service';
40-
import {StringToColorServiceImpl} from '../../core/services/string-to-color.service';
4143
import {MockAgentService} from '../../core/services/testing/mock-agent.service';
4244
import {MockArtifactService} from '../../core/services/testing/mock-artifact.service';
4345
import {MockAudioService} from '../../core/services/testing/mock-audio.service';
@@ -55,11 +57,10 @@ import {MockWebSocketService} from '../../core/services/testing/mock-websocket.s
5557
import {TRACE_SERVICE, TraceService} from '../../core/services/trace.service';
5658
import {VIDEO_SERVICE, VideoService} from '../../core/services/video.service';
5759
import {WEBSOCKET_SERVICE, WebSocketService,} from '../../core/services/websocket.service';
58-
import {Component} from '@angular/core';
59-
import {MARKDOWN_COMPONENT} from '../markdown/markdown.component.interface';
60-
import {MarkdownComponent} from '../markdown/markdown.component';
61-
60+
import {fakeAsync, tick} from '../../testing/utils';
6261
import {ChatPanelComponent} from '../chat-panel/chat-panel.component';
62+
import {MARKDOWN_COMPONENT} from '../markdown/markdown.component.interface';
63+
import {MockMarkdownComponent} from '../markdown/testing/mock-markdown.component';
6364
import {SidePanelComponent} from '../side-panel/side-panel.component';
6465

6566
import {ChatComponent} from './chat.component';
@@ -136,6 +137,8 @@ describe('ChatComponent', () => {
136137
mockStringToColorService = new MockStringToColorService();
137138
mockSafeValuesService = new MockSafeValuesService();
138139

140+
mockStringToColorService.stc.and.returnValue('#8c8526ff');
141+
139142
mockSessionService.createSessionResponse.next(
140143
{id: SESSION_1_ID, state: {}});
141144
mockTraceService.selectedTraceRow$.next(undefined);
@@ -196,15 +199,18 @@ describe('ChatComponent', () => {
196199
{provide: TRACE_SERVICE, useValue: mockTraceService},
197200
{provide: AGENT_SERVICE, useValue: mockAgentService},
198201
{provide: FEATURE_FLAG_SERVICE, useValue: mockFeatureFlagService},
199-
{provide: STRING_TO_COLOR_SERVICE, useClass: StringToColorServiceImpl},
202+
{
203+
provide: STRING_TO_COLOR_SERVICE,
204+
useValue: mockStringToColorService,
205+
},
200206
{provide: GRAPH_SERVICE, useValue: graphService},
201207
{provide: SAFE_VALUES_SERVICE, useValue: mockSafeValuesService},
202208
{provide: MatDialog, useValue: mockDialog},
203209
{provide: MatSnackBar, useValue: mockSnackBar},
204210
{provide: Router, useValue: mockRouter},
205211
{provide: ActivatedRoute, useValue: mockActivatedRoute},
206212
{provide: Location, useValue: mockLocation},
207-
{provide: MARKDOWN_COMPONENT, useValue: MarkdownComponent},
213+
{provide: MARKDOWN_COMPONENT, useValue: MockMarkdownComponent},
208214
],
209215
})
210216
.compileComponents();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
@if (isTraceView()) {
2525
<p>Trace</p>
2626
}
27-
@if (traceData()) {
27+
@if (traceData().length > 0) {
2828
<mat-button-toggle-group name="fontStyle" aria-label="Font Style" style="scale: 0.8" [(ngModel)]="view">
2929
<mat-button-toggle value="events">Events</mat-button-toggle>
3030
<mat-button-toggle value="trace">Trace</mat-button-toggle>

0 commit comments

Comments
 (0)