Skip to content

Commit 3096efa

Browse files
migrate file tree source calls
1 parent 2d5a216 commit 3096efa

File tree

9 files changed

+11
-16
lines changed

9 files changed

+11
-16
lines changed

packages/web/src/app/[domain]/browse/[...path]/components/codePreviewPanel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { getRepoInfoByName } from "@/actions";
22
import { PathHeader } from "@/app/[domain]/components/pathHeader";
33
import { Separator } from "@/components/ui/separator";
4-
import { getFileSource } from "@/features/search/fileSourceApi";
54
import { cn, getCodeHostInfoForRepo, isServiceError } from "@/lib/utils";
65
import Image from "next/image";
76
import { PureCodePreviewPanel } from "./pureCodePreviewPanel";
7+
import { getFileSource } from "@/features/search/fileSourceApi";
88

99
interface CodePreviewPanelProps {
1010
path: string;

packages/web/src/app/[domain]/components/searchBar/useSuggestionsData.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export const useSuggestionsData = ({
5555
query: `file:${suggestionQuery}`,
5656
matches: 15,
5757
contextLines: 1,
58-
}, domain),
58+
}),
5959
select: (data): Suggestion[] => {
6060
if (isServiceError(data)) {
6161
return [];
@@ -75,7 +75,7 @@ export const useSuggestionsData = ({
7575
query: `sym:${suggestionQuery.length > 0 ? suggestionQuery : ".*"}`,
7676
matches: 15,
7777
contextLines: 1,
78-
}, domain),
78+
}),
7979
select: (data): Suggestion[] => {
8080
if (isServiceError(data)) {
8181
return [];

packages/web/src/app/[domain]/search/components/codePreviewPanel/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { CodePreview } from "./codePreview";
55
import { SearchResultFile } from "@/features/search/types";
66
import { SymbolIcon } from "@radix-ui/react-icons";
77
import { SetStateAction, Dispatch, useMemo } from "react";
8-
import { getFileSource } from "@/features/search/fileSourceApi";
98
import { unwrapServiceError } from "@/lib/utils";
9+
import { fetchFileSource } from "@/app/api/(client)/client";
1010

1111
interface CodePreviewPanelProps {
1212
previewedFile: SearchResultFile;
@@ -31,7 +31,7 @@ export const CodePreviewPanel = ({
3131
const { data: file, isLoading, isPending, isError } = useQuery({
3232
queryKey: ["source", previewedFile, branch],
3333
queryFn: () => unwrapServiceError(
34-
getFileSource({
34+
fetchFileSource({
3535
fileName: previewedFile.fileName.text,
3636
repository: previewedFile.repository,
3737
branch,

packages/web/src/app/[domain]/search/components/searchResultsPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export const SearchResultsPage = ({
6666
matches: maxMatchCount,
6767
contextLines: 3,
6868
whole: false,
69-
}, domain)), "client.search"),
69+
})), "client.search"),
7070
select: ({ data, durationMs }) => ({
7171
...data,
7272
totalClientSearchDurationMs: durationMs,

packages/web/src/app/api/(client)/client.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@ import {
1111
} from "@/features/search/types";
1212
import { FindRelatedSymbolsRequest, FindRelatedSymbolsResponse } from "@/features/codeNav/types";
1313

14-
export const search = async (body: SearchRequest, domain: string): Promise<SearchResponse | ServiceError> => {
14+
export const search = async (body: SearchRequest): Promise<SearchResponse | ServiceError> => {
1515
const result = await fetch("/api/search", {
1616
method: "POST",
1717
headers: {
1818
"Content-Type": "application/json",
19-
"X-Org-Domain": domain,
2019
},
2120
body: JSON.stringify(body),
2221
}).then(response => response.json());
@@ -28,12 +27,11 @@ export const search = async (body: SearchRequest, domain: string): Promise<Searc
2827
return result as SearchResponse | ServiceError;
2928
}
3029

31-
export const fetchFileSource = async (body: FileSourceRequest, domain: string): Promise<FileSourceResponse | ServiceError> => {
30+
export const fetchFileSource = async (body: FileSourceRequest): Promise<FileSourceResponse | ServiceError> => {
3231
const result = await fetch("/api/source", {
3332
method: "POST",
3433
headers: {
3534
"Content-Type": "application/json",
36-
"X-Org-Domain": domain,
3735
},
3836
body: JSON.stringify(body),
3937
}).then(response => response.json());

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,6 @@ const resolveFileSource = async ({ path, repo, revision }: FileSource) => {
251251
fileName: path,
252252
repository: repo,
253253
branch: revision,
254-
// @todo: handle multi-tenancy.
255254
});
256255

257256
if (isServiceError(fileSource)) {

packages/web/src/features/chat/components/chatBox/useSuggestionsData.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export const useSuggestionsData = ({
4141
query,
4242
matches: 10,
4343
contextLines: 1,
44-
}, domain))
44+
}))
4545
},
4646
select: (data): FileSuggestion[] => {
4747
return data.files.map((file) => {

packages/web/src/features/search/fileSourceApi.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
'use server';
2-
1+
import 'server-only';
32
import escapeStringRegexp from "escape-string-regexp";
43
import { fileNotFound, ServiceError, unexpectedError } from "../../lib/serviceError";
54
import { FileSourceRequest, FileSourceResponse } from "./types";

packages/web/src/features/search/searchApi.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
'use server';
2-
1+
import 'server-only';
32
import { sew } from "@/actions";
43
import { withOptionalAuthV2 } from "@/withAuthV2";
54
import { PrismaClient, Repo } from "@sourcebot/db";

0 commit comments

Comments
 (0)