Skip to content

Commit dab982e

Browse files
google-genai-botcopybara-github
google-genai-bot
authored and
copybara-github
committed
ADK changes
PiperOrigin-RevId: 832281602
1 parent 7a35812 commit dab982e

File tree

5 files changed

+88
-57
lines changed

5 files changed

+88
-57
lines changed

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

Lines changed: 77 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -35,69 +35,90 @@
3535
}
3636
<mat-drawer class="side-drawer" #sideDrawer mode="side" appResizableDrawer>
3737
@if (!isBuilderMode()) {
38-
<app-side-panel
39-
[isApplicationSelectorEnabledObs]="isApplicationSelectorEnabledObs"
40-
[apps$]="apps$"
41-
[isLoadingApps]="isLoadingApps"
42-
[selectedAppControl]="selectedAppControl"
43-
[showSidePanel]="showSidePanel"
44-
[appName]="appName"
45-
[userId]="userId"
46-
[sessionId]="sessionId"
47-
[traceData]="traceData"
48-
[eventData]="eventData"
49-
[currentSessionState]="currentSessionState"
50-
[artifacts]="artifacts"
51-
[selectedEvent]="selectedEvent"
52-
[selectedEventIndex]="selectedEventIndex"
53-
[renderedEventGraph]="renderedEventGraph"
54-
[rawSvgString]="rawSvgString"
55-
[llmRequest]="llmRequest"
56-
[llmResponse]="llmResponse"
57-
[disableBuilderIcon]="disableBuilderSwitch"
58-
(closePanel)="toggleSidePanel()"
59-
(tabChange)="handleTabChange($event)"
60-
(eventSelected)="selectEvent($event)"
61-
(sessionSelected)="updateWithSelectedSession($event)"
62-
(sessionReloaded)="updateWithSelectedSession($event)"
63-
(evalCaseSelected)="updateWithSelectedEvalCase($event)"
64-
(evalSetIdSelected)="updateSelectedEvalSetId($event)"
65-
(returnToSession)="handleReturnToSession($event)"
66-
(evalNotInstalled)="handleEvalNotInstalled($event)"
67-
(page)="handlePageEvent($event)"
68-
(closeSelectedEvent)="closeSelectedEvent()"
69-
(openImageDialog)="openViewImageDialog($event)"
70-
(appSelectionChange)="onAppSelection($event)"
71-
(openAddItemDialog)="openAddItemDialog()"
72-
(enterBuilderMode)="enterBuilderMode()"
73-
>
74-
</app-side-panel>
38+
<app-side-panel
39+
[isApplicationSelectorEnabledObs]="isApplicationSelectorEnabledObs"
40+
[apps$]="apps$"
41+
[isLoadingApps]="isLoadingApps"
42+
[selectedAppControl]="selectedAppControl"
43+
[showSidePanel]="showSidePanel"
44+
[appName]="appName"
45+
[userId]="userId"
46+
[sessionId]="sessionId"
47+
[traceData]="traceData"
48+
[eventData]="eventData"
49+
[currentSessionState]="currentSessionState"
50+
[artifacts]="artifacts"
51+
[selectedEvent]="selectedEvent"
52+
[selectedEventIndex]="selectedEventIndex"
53+
[renderedEventGraph]="renderedEventGraph"
54+
[rawSvgString]="rawSvgString"
55+
[llmRequest]="llmRequest"
56+
[llmResponse]="llmResponse"
57+
[disableBuilderIcon]="disableBuilderSwitch"
58+
(closePanel)="toggleSidePanel()"
59+
(tabChange)="handleTabChange($event)"
60+
(eventSelected)="selectEvent($event)"
61+
(sessionSelected)="updateWithSelectedSession($event)"
62+
(sessionReloaded)="updateWithSelectedSession($event)"
63+
(evalCaseSelected)="updateWithSelectedEvalCase($event)"
64+
(evalSetIdSelected)="updateSelectedEvalSetId($event)"
65+
(returnToSession)="handleReturnToSession($event)"
66+
(evalNotInstalled)="handleEvalNotInstalled($event)"
67+
(page)="handlePageEvent($event)"
68+
(closeSelectedEvent)="closeSelectedEvent()"
69+
(openImageDialog)="openViewImageDialog($event)"
70+
(appSelectionChange)="onAppSelection($event)"
71+
(openAddItemDialog)="openAddItemDialog()"
72+
(enterBuilderMode)="enterBuilderMode()"
73+
>
74+
</app-side-panel>
7575
} @else {
76-
<app-builder-tabs
77-
[appNameInput]="appName"
78-
(exitBuilderMode)="exitBuilderMode()"
79-
(closePanel)="toggleSidePanel()"
80-
></app-builder-tabs>
81-
<div class="resize-handler"></div>
76+
<app-builder-tabs
77+
[appNameInput]="appName"
78+
(exitBuilderMode)="exitBuilderMode()"
79+
(closePanel)="toggleSidePanel()"
80+
></app-builder-tabs>
81+
<div class="resize-handler"></div>
8282
}
83-
8483
</mat-drawer>
8584

8685
<!-- Builder Mode Layout - Canvas for Diagrams -->
8786
@if (isBuilderMode()) {
8887
<div class="builder-mode-container">
8988
<div class="builder-exit-button">
90-
<button mat-icon-button (click)="saveAgentBuilder()" class="builder-mode-action-button" matTooltip="Accept">
89+
<button
90+
mat-icon-button
91+
(click)="saveAgentBuilder()"
92+
class="builder-mode-action-button"
93+
matTooltip="Accept"
94+
>
9195
<mat-icon>check</mat-icon>
9296
</button>
93-
<button mat-icon-button (click)="exitBuilderMode()" class="builder-mode-action-button" matTooltip="Exit Builder Mode">
97+
<button
98+
mat-icon-button
99+
(click)="exitBuilderMode()"
100+
class="builder-mode-action-button"
101+
matTooltip="Exit Builder Mode"
102+
>
94103
<mat-icon>close</mat-icon>
95104
</button>
96-
<button mat-icon-button (click)="toggleBuilderAssistant()" class="builder-mode-action-button" matTooltip="Builder Assistant" [class.active]="showBuilderAssistant">
105+
<button
106+
mat-icon-button
107+
(click)="toggleBuilderAssistant()"
108+
class="builder-mode-action-button"
109+
matTooltip="Builder Assistant"
110+
[class.active]="showBuilderAssistant"
111+
>
97112
<mat-icon>assistant</mat-icon>
98113
</button>
99114
</div>
100-
<app-canvas [showSidePanel]="showSidePanel" [showBuilderAssistant]="showBuilderAssistant" [appNameInput]="appName" (toggleSidePanelRequest)="toggleSidePanel()" (builderAssistantCloseRequest)="toggleBuilderAssistant()"></app-canvas>
115+
<app-canvas
116+
[showSidePanel]="showSidePanel"
117+
[showBuilderAssistant]="showBuilderAssistant"
118+
[appNameInput]="appName"
119+
(toggleSidePanelRequest)="toggleSidePanel()"
120+
(builderAssistantCloseRequest)="toggleBuilderAssistant()"
121+
></app-canvas>
101122
</div>
102123
} @else {
103124
<!-- Test Mode Layout (existing chat interface) -->
@@ -162,16 +183,15 @@
162183
false) {
163184
<div class="toolbar-session-text">{{ i18n.sessionIdLabel }}</div>
164185
<div class="toolbar-session-id">{{ sessionId }}</div>
165-
<div class="toolbar-session-text" style="margin-left: 16px">
166-
{{ i18n.userIdLabel }}
167-
</div>
186+
@if (isUserIdOnToolbarEnabledObs | async) {
187+
<div class="toolbar-session-text" style="margin-left: 16px">{{ i18n.userIdLabel }}</div>
168188
<div class="toolbar-session-id">{{ userId }}</div>
169-
@if (!canEditSession()) {
170-
<div class="readonly-badge">
171-
<mat-icon>visibility</mat-icon>
172-
{{ i18n.readOnlyBadgeLabel }}
173-
</div>
174-
<div class="readonly-session-message">{{i18n.cannotEditSessionMessage}}</div>
189+
} @if (!canEditSession()) {
190+
<div class="readonly-badge">
191+
<mat-icon>visibility</mat-icon>
192+
{{ i18n.readOnlyBadgeLabel }}
193+
</div>
194+
<div class="readonly-session-message">{{i18n.cannotEditSessionMessage}}</div>
175195
} } @else {
176196
<div class="toolbar-session-text">{{ i18n.loadingSessionLabel }}</div>
177197
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,8 @@ export class ChatComponent implements OnInit, AfterViewInit, OnDestroy {
292292
toSignal(this.featureFlagService.isApplicationSelectorEnabled());
293293
readonly isDeleteSessionEnabledObs: Observable<boolean> =
294294
this.featureFlagService.isDeleteSessionEnabled();
295+
readonly isUserIdOnToolbarEnabledObs: Observable<boolean> =
296+
this.featureFlagService.isUserIdOnToolbarEnabled();
295297

296298
// Trace detail
297299
bottomPanelVisible = false;

‎src/app/core/services/feature-flag.service.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,8 @@ export class FeatureFlagService implements FeatureFlagServiceInterface {
114114
isSessionReloadOnNewMessageEnabled(): Observable<boolean> {
115115
return of(false);
116116
}
117+
118+
isUserIdOnToolbarEnabled(): Observable<boolean> {
119+
return of(true);
120+
}
117121
}

‎src/app/core/services/interfaces/feature-flag.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,5 @@ export declare abstract class FeatureFlagService {
4949
abstract isSessionsTabReorderingEnabled(): Observable<boolean>;
5050
abstract isSessionFilteringEnabled(): Observable<boolean>;
5151
abstract isSessionReloadOnNewMessageEnabled(): Observable<boolean>;
52+
abstract isUserIdOnToolbarEnabled(): Observable<boolean>;
5253
}

‎src/app/core/services/testing/mock-feature-flag.service.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,8 @@ export class MockFeatureFlagService implements FeatureFlagService {
9898
isSessionReloadOnNewMessageEnabled =
9999
jasmine.createSpy('isSessionReloadOnNewMessageEnabled')
100100
.and.returnValue(this.isSessionReloadOnNewMessageEnabledResponse);
101+
isUserIdOnToolbarEnabledResponse = new ReplaySubject<boolean>(1);
102+
isUserIdOnToolbarEnabled =
103+
jasmine.createSpy('isUserIdOnToolbarEnabled')
104+
.and.returnValue(this.isUserIdOnToolbarEnabledResponse);
101105
}

0 commit comments

Comments
 (0)