Skip to content

Commit d978e6b

Browse files
remove search scope selector constraint
1 parent 8c65eea commit d978e6b

File tree

6 files changed

+5
-61
lines changed

6 files changed

+5
-61
lines changed

packages/web/src/app/[domain]/askgh/[owner]/[repo]/components/landingPage.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ export const LandingPage = ({
7777
languageModels={languageModels}
7878
selectedSearchScopes={selectedSearchScopes}
7979
searchContexts={[]}
80-
onContextSelectorOpenChanged={setIsContextSelectorOpen}
8180
isDisabled={isChatBoxDisabled}
8281
/>
8382
<Separator />

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ export const LandingPageChatBox = ({
4242
languageModels={languageModels}
4343
selectedSearchScopes={selectedSearchScopes}
4444
searchContexts={searchContexts}
45-
onContextSelectorOpenChanged={setIsContextSelectorOpen}
4645
isDisabled={isChatBoxDisabled}
4746
/>
4847
<Separator />

packages/web/src/features/chat/agent.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,9 @@ import {
1515
import { randomUUID } from "crypto";
1616
import _dedent from "dedent";
1717
import { ANSWER_TAG, FILE_REFERENCE_PREFIX } from "./constants";
18-
import { findSymbolReferencesDefinition } from "@/features/tools/findSymbolReferences";
19-
import { findSymbolDefinitionsDefinition } from "@/features/tools/findSymbolDefinitions";
20-
import { readFileDefinition } from "@/features/tools/readFile";
21-
import { grepDefinition } from "@/features/tools/grep";
2218
import { Source } from "./types";
2319
import { addLineNumbers, fileReferenceToString } from "./utils";
2420
import { createTools } from "./tools";
25-
import { globDefinition, listTreeDefinition } from "../tools";
2621

2722
const dedent = _dedent.withOptions({ alignValues: true });
2823

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

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { CustomEditor, LanguageModelInfo, MentionElement, RenderElementPropsFor,
77
import { insertMention, slateContentToString } from "@/features/chat/utils";
88
import { cn, IS_MAC } from "@/lib/utils";
99
import { computePosition, flip, offset, shift, VirtualElement } from "@floating-ui/react";
10-
import { ArrowUp, Loader2, StopCircleIcon, TriangleAlertIcon } from "lucide-react";
10+
import { ArrowUp, Loader2, StopCircleIcon } from "lucide-react";
1111
import { Fragment, KeyboardEvent, memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
1212
import { useHotkeys } from "react-hotkeys-hook";
1313
import { Descendant, insertText } from "slate";
@@ -32,7 +32,6 @@ interface ChatBoxProps {
3232
languageModels: LanguageModelInfo[];
3333
selectedSearchScopes: SearchScope[];
3434
searchContexts: SearchContextQuery[];
35-
onContextSelectorOpenChanged: (isOpen: boolean) => void;
3635
}
3736

3837
const ChatBoxComponent = ({
@@ -46,7 +45,6 @@ const ChatBoxComponent = ({
4645
languageModels,
4746
selectedSearchScopes,
4847
searchContexts,
49-
onContextSelectorOpenChanged,
5048
}: ChatBoxProps) => {
5149
const suggestionsBoxRef = useRef<HTMLDivElement>(null);
5250
const [index, setIndex] = useState(0);
@@ -106,7 +104,7 @@ const ChatBoxComponent = ({
106104

107105
const { isSubmitDisabled, isSubmitDisabledReason } = useMemo((): {
108106
isSubmitDisabled: true,
109-
isSubmitDisabledReason: "empty" | "redirecting" | "generating" | "no-repos-selected" | "no-language-model-selected"
107+
isSubmitDisabledReason: "empty" | "redirecting" | "generating" | "no-language-model-selected"
110108
} | {
111109
isSubmitDisabled: false,
112110
isSubmitDisabledReason: undefined,
@@ -132,13 +130,6 @@ const ChatBoxComponent = ({
132130
}
133131
}
134132

135-
if (selectedSearchScopes.length === 0) {
136-
return {
137-
isSubmitDisabled: true,
138-
isSubmitDisabledReason: "no-repos-selected",
139-
}
140-
}
141-
142133
if (selectedLanguageModel === undefined) {
143134

144135
return {
@@ -152,24 +143,10 @@ const ChatBoxComponent = ({
152143
isSubmitDisabledReason: undefined,
153144
}
154145

155-
}, [
156-
editor.children,
157-
isRedirecting,
158-
isGenerating,
159-
selectedSearchScopes.length,
160-
selectedLanguageModel,
161-
])
146+
}, [editor.children, isRedirecting, isGenerating, selectedLanguageModel])
162147

163148
const onSubmit = useCallback(() => {
164149
if (isSubmitDisabled) {
165-
if (isSubmitDisabledReason === "no-repos-selected") {
166-
toast({
167-
description: "⚠️ You must select at least one search scope",
168-
variant: "destructive",
169-
});
170-
onContextSelectorOpenChanged(true);
171-
}
172-
173150
if (isSubmitDisabledReason === "no-language-model-selected") {
174151
toast({
175152
description: "⚠️ You must select a language model",
@@ -181,7 +158,7 @@ const ChatBoxComponent = ({
181158
}
182159

183160
_onSubmit(editor.children, editor);
184-
}, [_onSubmit, editor, isSubmitDisabled, isSubmitDisabledReason, toast, onContextSelectorOpenChanged]);
161+
}, [_onSubmit, editor, isSubmitDisabled, isSubmitDisabledReason, toast]);
185162

186163
const onInsertSuggestion = useCallback((suggestion: Suggestion) => {
187164
switch (suggestion.type) {
@@ -351,14 +328,6 @@ const ChatBoxComponent = ({
351328
</Button>
352329
</div>
353330
</TooltipTrigger>
354-
{(isSubmitDisabled && isSubmitDisabledReason === "no-repos-selected") && (
355-
<TooltipContent>
356-
<div className="flex flex-row items-center">
357-
<TriangleAlertIcon className="h-4 w-4 text-warning mr-1" />
358-
<span className="text-destructive">You must select at least one search scope</span>
359-
</div>
360-
</TooltipContent>
361-
)}
362331
</Tooltip>
363332
)}
364333
</div>

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

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,6 @@ export const SearchScopeSelector = forwardRef<
103103
})
104104
}, [onSelectedSearchScopesChange]);
105105

106-
const handleSelectAll = useCallback(() => {
107-
onSelectedSearchScopesChange(allSearchScopeItems);
108-
requestAnimationFrame(() => {
109-
if (scrollContainerRef.current) {
110-
scrollContainerRef.current.scrollTop = 0;
111-
}
112-
});
113-
}, [onSelectedSearchScopesChange, allSearchScopeItems]);
114-
115106
const handleTogglePopover = useCallback(() => {
116107
onOpenChanged(!isOpen);
117108
}, [onOpenChanged, isOpen]);
@@ -241,7 +232,7 @@ export const SearchScopeSelector = forwardRef<
241232
className={cn("text-sm text-muted-foreground mx-1 font-medium")}
242233
>
243234
{
244-
selectedSearchScopes.length === 0 ? `Search scopes` :
235+
selectedSearchScopes.length === 0 ? `All repos` :
245236
selectedSearchScopes.length === 1 ? selectedSearchScopes[0].name :
246237
`${selectedSearchScopes.length} selected`
247238
}
@@ -279,14 +270,6 @@ export const SearchScopeSelector = forwardRef<
279270
</div>
280271
) : (
281272
<div className="p-1">
282-
{!searchQuery && (
283-
<div
284-
onClick={handleSelectAll}
285-
className="flex items-center px-2 py-1.5 text-sm text-muted-foreground hover:text-foreground cursor-pointer transition-colors rounded-sm hover:bg-accent"
286-
>
287-
<span className="text-xs">Select all</span>
288-
</div>
289-
)}
290273
<div
291274
style={{
292275
height: `${virtualizer.getTotalSize()}px`,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,6 @@ export const ChatThread = ({
462462
languageModels={languageModels}
463463
selectedSearchScopes={selectedSearchScopes}
464464
searchContexts={searchContexts}
465-
onContextSelectorOpenChanged={setIsContextSelectorOpen}
466465
isDisabled={languageModels.length === 0}
467466
/>
468467
<div className="w-full flex flex-row items-center bg-accent rounded-b-md px-2">

0 commit comments

Comments
 (0)