Skip to content

Commit e69ac0d

Browse files
Remove search scope constraint
1 parent 565d930 commit e69ac0d

File tree

4 files changed

+15
-71
lines changed

4 files changed

+15
-71
lines changed

packages/web/src/app/[domain]/chat/components/newChatPanel.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ export const NewChatPanel = ({
5151
languageModels={languageModels}
5252
selectedSearchScopes={selectedSearchScopes}
5353
searchContexts={searchContexts}
54-
onContextSelectorOpenChanged={setIsContextSelectorOpen}
5554
/>
5655
<div className="w-full flex flex-row items-center bg-accent rounded-b-md px-2">
5756
<ChatBoxToolbar

packages/web/src/app/[domain]/components/homepage/agenticSearch.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ export const AgenticSearch = ({
5858
languageModels={languageModels}
5959
selectedSearchScopes={selectedSearchScopes}
6060
searchContexts={searchContexts}
61-
onContextSelectorOpenChanged={setIsContextSelectorOpen}
6261
/>
6362
<Separator />
6463
<div className="relative">

packages/web/src/features/chat/components/chatBox/chatBox.tsx

Lines changed: 15 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import { Button } from "@/components/ui/button";
55
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
66
import { CustomEditor, LanguageModelInfo, MentionElement, RenderElementPropsFor, SearchScope } from "@/features/chat/types";
77
import { insertMention, slateContentToString } from "@/features/chat/utils";
8+
import { SearchContextQuery } from "@/lib/types";
89
import { cn, IS_MAC } from "@/lib/utils";
910
import { computePosition, flip, offset, shift, VirtualElement } from "@floating-ui/react";
10-
import { ArrowUp, Loader2, StopCircleIcon, TriangleAlertIcon } from "lucide-react";
11+
import { ArrowUp, Loader2, StopCircleIcon } from "lucide-react";
1112
import { Fragment, KeyboardEvent, useCallback, useEffect, useMemo, useRef, useState } from "react";
1213
import { useHotkeys } from "react-hotkeys-hook";
1314
import { Descendant, insertText } from "slate";
@@ -17,8 +18,6 @@ import { SuggestionBox } from "./suggestionsBox";
1718
import { Suggestion } from "./types";
1819
import { useSuggestionModeAndQuery } from "./useSuggestionModeAndQuery";
1920
import { useSuggestionsData } from "./useSuggestionsData";
20-
import { useToast } from "@/components/hooks/use-toast";
21-
import { SearchContextQuery } from "@/lib/types";
2221

2322
interface ChatBoxProps {
2423
onSubmit: (children: Descendant[], editor: CustomEditor) => void;
@@ -30,7 +29,6 @@ interface ChatBoxProps {
3029
languageModels: LanguageModelInfo[];
3130
selectedSearchScopes: SearchScope[];
3231
searchContexts: SearchContextQuery[];
33-
onContextSelectorOpenChanged: (isOpen: boolean) => void;
3432
}
3533

3634
export const ChatBox = ({
@@ -43,7 +41,6 @@ export const ChatBox = ({
4341
languageModels,
4442
selectedSearchScopes,
4543
searchContexts,
46-
onContextSelectorOpenChanged,
4744
}: ChatBoxProps) => {
4845
const suggestionsBoxRef = useRef<HTMLDivElement>(null);
4946
const [index, setIndex] = useState(0);
@@ -70,7 +67,6 @@ export const ChatBox = ({
7067
const { selectedLanguageModel } = useSelectedLanguageModel({
7168
initialLanguageModel: languageModels.length > 0 ? languageModels[0] : undefined,
7269
});
73-
const { toast } = useToast();
7470

7571
// Reset the index when the suggestion mode changes.
7672
useEffect(() => {
@@ -101,9 +97,9 @@ export const ChatBox = ({
10197
return <Leaf {...props} />
10298
}, []);
10399

104-
const { isSubmitDisabled, isSubmitDisabledReason } = useMemo((): {
100+
const { isSubmitDisabled } = useMemo((): {
105101
isSubmitDisabled: true,
106-
isSubmitDisabledReason: "empty" | "redirecting" | "generating" | "no-repos-selected" | "no-language-model-selected"
102+
isSubmitDisabledReason: "empty" | "redirecting" | "generating" | "no-language-model-selected"
107103
} | {
108104
isSubmitDisabled: false,
109105
isSubmitDisabledReason: undefined,
@@ -129,13 +125,6 @@ export const ChatBox = ({
129125
}
130126
}
131127

132-
if (selectedSearchScopes.length === 0) {
133-
return {
134-
isSubmitDisabled: true,
135-
isSubmitDisabledReason: "no-repos-selected",
136-
}
137-
}
138-
139128
if (selectedLanguageModel === undefined) {
140129

141130
return {
@@ -149,29 +138,11 @@ export const ChatBox = ({
149138
isSubmitDisabledReason: undefined,
150139
}
151140

152-
}, [
153-
editor.children,
154-
isRedirecting,
155-
isGenerating,
156-
selectedSearchScopes.length,
157-
selectedLanguageModel,
158-
])
141+
}, [editor.children, isRedirecting, isGenerating, selectedLanguageModel])
159142

160143
const onSubmit = useCallback(() => {
161-
if (isSubmitDisabled) {
162-
if (isSubmitDisabledReason === "no-repos-selected") {
163-
toast({
164-
description: "⚠️ You must select at least one search scope",
165-
variant: "destructive",
166-
});
167-
onContextSelectorOpenChanged(true);
168-
}
169-
170-
return;
171-
}
172-
173144
_onSubmit(editor.children, editor);
174-
}, [_onSubmit, editor, isSubmitDisabled, isSubmitDisabledReason, toast, onContextSelectorOpenChanged]);
145+
}, [_onSubmit, editor]);
175146

176147
const onInsertSuggestion = useCallback((suggestion: Suggestion) => {
177148
switch (suggestion.type) {
@@ -310,39 +281,15 @@ export const ChatBox = ({
310281
Stop
311282
</Button>
312283
) : (
313-
<Tooltip>
314-
<TooltipTrigger asChild>
315-
<div
316-
onClick={() => {
317-
// @hack: When submission is disabled, we still want to issue
318-
// a warning to the user as to why the submission is disabled.
319-
// onSubmit on the Button will not be called because of the
320-
// disabled prop, hence the call here.
321-
if (isSubmitDisabled) {
322-
onSubmit();
323-
}
324-
}}
325-
>
326-
<Button
327-
variant={isSubmitDisabled ? "outline" : "default"}
328-
size="sm"
329-
className="w-6 h-6"
330-
onClick={onSubmit}
331-
disabled={isSubmitDisabled}
332-
>
333-
<ArrowUp className="w-4 h-4" />
334-
</Button>
335-
</div>
336-
</TooltipTrigger>
337-
{(isSubmitDisabled && isSubmitDisabledReason === "no-repos-selected") && (
338-
<TooltipContent>
339-
<div className="flex flex-row items-center">
340-
<TriangleAlertIcon className="h-4 w-4 text-warning mr-1" />
341-
<span className="text-destructive">You must select at least one search scope</span>
342-
</div>
343-
</TooltipContent>
344-
)}
345-
</Tooltip>
284+
<Button
285+
variant={isSubmitDisabled ? "outline" : "default"}
286+
size="sm"
287+
className="w-6 h-6"
288+
onClick={onSubmit}
289+
disabled={isSubmitDisabled}
290+
>
291+
<ArrowUp className="w-4 h-4" />
292+
</Button>
346293
)}
347294
</div>
348295
{suggestionMode !== "none" && (

packages/web/src/features/chat/components/chatThread/chatThread.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@ export const ChatThread = ({
321321
languageModels={languageModels}
322322
selectedSearchScopes={selectedSearchScopes}
323323
searchContexts={searchContexts}
324-
onContextSelectorOpenChanged={setIsContextSelectorOpen}
325324
/>
326325
<div className="w-full flex flex-row items-center bg-accent rounded-b-md px-2">
327326
<ChatBoxToolbar

0 commit comments

Comments
 (0)