Skip to content

Commit cbc191e

Browse files
OrKoNDevtools-frontend LUCI CQ
authored andcommitted
[AI Assistance] Remove cancel context button
Fixed: 399359448 Change-Id: Icb20d7d4ed97a62f1f8cae917abb37a50689a998 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6304747 Reviewed-by: Nikolay Vitkov <[email protected]> Commit-Queue: Alex Rudenko <[email protected]>
1 parent d1ebd9e commit cbc191e

File tree

2 files changed

+9
-40
lines changed

2 files changed

+9
-40
lines changed

front_end/panels/ai_assistance/AiAssistancePanel.ts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,6 @@ export class AiAssistancePanel extends UI.Panel.Panel {
414414
#currentConversation?: Conversation;
415415
#conversations: Conversation[] = [];
416416

417-
#previousSameOriginContext?: ConversationContext<unknown>;
418417
#selectedFile: FileContext|null = null;
419418
#selectedElement: NodeContext|null = null;
420419
#selectedCallTree: CallTreeContext|null = null;
@@ -858,9 +857,6 @@ export class AiAssistancePanel extends UI.Panel.Panel {
858857
onCancelClick: this.#cancel.bind(this),
859858
onContextClick: this.#handleContextClick.bind(this),
860859
onNewConversation: this.#handleNewChatRequest.bind(this),
861-
onCancelCrossOriginChat: this.#blockedByCrossOrigin && this.#previousSameOriginContext ?
862-
this.#handleCrossOriginChatCancellation.bind(this) :
863-
undefined,
864860
onTakeScreenshot: isAiAssistanceMultimodalInputEnabled() ? this.#handleTakeScreenshot.bind(this) : undefined,
865861
onRemoveImageInput: isAiAssistanceMultimodalInputEnabled() ? this.#handleRemoveImageInput.bind(this) :
866862
undefined,
@@ -1147,13 +1143,6 @@ export class AiAssistancePanel extends UI.Panel.Panel {
11471143
UI.ARIAUtils.alert(i18nString(UIStrings.newChatCreated));
11481144
}
11491145

1150-
#handleCrossOriginChatCancellation(): void {
1151-
if (this.#previousSameOriginContext) {
1152-
this.#onContextSelectionChanged(this.#previousSameOriginContext);
1153-
this.requestUpdate();
1154-
}
1155-
}
1156-
11571146
async #handleTakeScreenshot(): Promise<void> {
11581147
const mainTarget = SDK.TargetManager.TargetManager.instance().primaryPageTarget();
11591148
if (!mainTarget) {
@@ -1198,9 +1187,6 @@ export class AiAssistancePanel extends UI.Panel.Panel {
11981187
return;
11991188
}
12001189
this.#blockedByCrossOrigin = !currentContext.isOriginAllowed(this.#currentAgent.origin);
1201-
if (!this.#blockedByCrossOrigin) {
1202-
this.#previousSameOriginContext = currentContext;
1203-
}
12041190
}
12051191

12061192
#getConversationContext(): ConversationContext<unknown>|null {

front_end/panels/ai_assistance/components/ChatView.ts

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ export interface Props {
264264
onCancelClick: () => void;
265265
onContextClick: () => void;
266266
onNewConversation: () => void;
267-
onCancelCrossOriginChat?: () => void;
268267
onTakeScreenshot?: () => void;
269268
onRemoveImageInput?: () => void;
270269
inspectElementToggled: boolean;
@@ -523,7 +522,6 @@ export class ChatView extends HTMLElement {
523522
onTextAreaKeyDown: this.#handleTextAreaKeyDown,
524523
onCancel: this.#handleCancel,
525524
onNewConversation: this.#props.onNewConversation,
526-
onCancelCrossOriginChat: this.#props.onCancelCrossOriginChat,
527525
onTakeScreenshot: this.#props.onTakeScreenshot,
528526
onRemoveImageInput: this.#props.onRemoveImageInput,
529527
})
@@ -1154,15 +1152,13 @@ function renderReadOnlySection({onNewConversation, agentType}: {
11541152
// clang-format on
11551153
}
11561154

1157-
function renderChatInputButtons(
1158-
{isLoading, blockedByCrossOrigin, isTextInputDisabled, onCancel, onNewConversation, onCancelCrossOriginChat}: {
1159-
isLoading: boolean,
1160-
blockedByCrossOrigin: boolean,
1161-
isTextInputDisabled: boolean,
1162-
onCancel: (ev: SubmitEvent) => void,
1163-
onNewConversation: () => void,
1164-
onCancelCrossOriginChat?: () => void,
1165-
}): Lit.TemplateResult {
1155+
function renderChatInputButtons({isLoading, blockedByCrossOrigin, isTextInputDisabled, onCancel, onNewConversation}: {
1156+
isLoading: boolean,
1157+
blockedByCrossOrigin: boolean,
1158+
isTextInputDisabled: boolean,
1159+
onCancel: (ev: SubmitEvent) => void,
1160+
onNewConversation: () => void,
1161+
}): Lit.TemplateResult {
11661162
if (isLoading) {
11671163
// clang-format off
11681164
return html`<devtools-button
@@ -1184,17 +1180,6 @@ function renderChatInputButtons(
11841180
if (blockedByCrossOrigin) {
11851181
// clang-format off
11861182
return html`
1187-
${blockedByCrossOrigin && Boolean(onCancelCrossOriginChat) ? html`<devtools-button
1188-
class="chat-cancel-context-button"
1189-
@click=${onCancelCrossOriginChat}
1190-
.data=${
1191-
{
1192-
variant: Buttons.Button.Variant.TEXT,
1193-
size: Buttons.Button.Size.REGULAR,
1194-
jslogContext: 'cancel-cross-origin-context-chat',
1195-
} as Buttons.Button.ButtonData
1196-
}
1197-
>${lockedString(UIStringsNotTranslate.cancelButtonTitle)}</devtools-button>` : Lit.nothing}
11981183
<devtools-button
11991184
class="chat-input-button"
12001185
aria-label=${lockedString(UIStringsNotTranslate.startNewChat)}
@@ -1307,7 +1292,6 @@ function renderChatInput({
13071292
onTextAreaKeyDown,
13081293
onCancel,
13091294
onNewConversation,
1310-
onCancelCrossOriginChat,
13111295
onTakeScreenshot,
13121296
onRemoveImageInput,
13131297
}: {
@@ -1327,7 +1311,6 @@ function renderChatInput({
13271311
onTextAreaKeyDown: (ev: KeyboardEvent) => void,
13281312
onCancel: (ev: SubmitEvent) => void,
13291313
onNewConversation: () => void,
1330-
onCancelCrossOriginChat?: () => void,
13311314
onTakeScreenshot?: () => void,
13321315
onRemoveImageInput?: () => void,
13331316
}): Lit.LitTemplate {
@@ -1381,11 +1364,11 @@ function renderChatInput({
13811364
${renderTakeScreenshotButton({
13821365
multimodalInputEnabled, blockedByCrossOrigin, isTextInputDisabled, onTakeScreenshot
13831366
})}
1384-
${renderChatInputButtons({ isLoading, blockedByCrossOrigin, isTextInputDisabled, onCancel, onNewConversation, onCancelCrossOriginChat })}
1367+
${renderChatInputButtons({ isLoading, blockedByCrossOrigin, isTextInputDisabled, onCancel, onNewConversation })}
13851368
</div>
13861369
</div>
13871370
</form>`;
1388-
// clang-format on
1371+
// clang-format on
13891372
}
13901373

13911374
function renderAidaUnavailableContents(

0 commit comments

Comments
 (0)