chore: Sourcebot REST api surface#290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendan-kellam merged 5 commits into from
May 3, 2025
Merged

chore: Sourcebot REST api surface #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d254e28
Api shim wip
brendan-kellam May 2, 2025
cfb523f
further wip
brendan-kellam May 3, 2025
9f87212
lint
brendan-kellam May 3, 2025
ae96bd5
nits
brendan-kellam May 3, 2025
177a182
feedback
brendan-kellam May 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/web/.eslintrc.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"next/core-web-vitals"
],
"rules": {
Expand Down
3 changes: 2 additions & 1 deletion packages/web/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
"lint": "cross-env SKIP_ENV_VALIDATION=1 next lint",
Comment thread
brendan-kellam marked this conversation as resolved.
"test": "vitest",
"dev:emails": "email dev --dir ./src/emails",
"stripe:listen": "stripe listen --forward-to http://localhost:3000/api/stripe"
Expand DownExpand Up@@ -146,6 +146,7 @@
"@types/react-dom": "^18",
"@typescript-eslint/eslint-plugin": "^8.3.0",
"@typescript-eslint/parser": "^8.3.0",
"cross-env": "^7.0.3",
"eslint": "^8",
"eslint-config-next": "14.2.6",
"eslint-plugin-react": "^7.35.0",
Expand Down
7 changes: 4 additions & 3 deletions packages/web/src/app/[domain]/browse/[...path]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { FileHeader } from "@/app/[domain]/components/fileHeader";
import { TopBar } from "@/app/[domain]/components/topBar";
import { Separator } from '@/components/ui/separator';
import { getFileSource, listRepositories } from '@/lib/server/searchService';
import { getFileSource } from '@/features/search/fileSourceApi';
import { listRepositories } from '@/features/search/listReposApi';
import { base64Decode, isServiceError } from "@/lib/utils";
import { CodePreview } from "./codePreview";
import { ErrorCode } from "@/lib/errorCodes";
Expand DownExpand Up@@ -57,7 +58,7 @@ export default async function BrowsePage({
if (isServiceError(reposResponse)) {
throw new ServiceErrorException(reposResponse);
}
const repo = reposResponse.List.Repos.find(r => r.Repository.Name === repoName);
const repo = reposResponse.repos.find(r => r.name === repoName);

if (pathType === 'tree') {
// @todo : proper tree handling
Expand All@@ -81,7 +82,7 @@ export default async function BrowsePage({
<div className="bg-accent py-1 px-2 flex flex-row">
<FileHeader
fileName={path}
repo={repo.Repository}
repo={repo}
branchDisplayName={revisionName}
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/components/fileHeader.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { Repository } from "@/lib/types";
import { Repository } from "@/features/search/types";
import { getRepoCodeHostInfo } from "@/lib/utils";
import { LaptopIcon } from "@radix-ui/react-icons";
import clsx from "clsx";
Expand Down
1 change: 1 addition & 0 deletions packages/web/src/app/[domain]/components/searchBar/searchSuggestionsBox.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ const SearchSuggestionsBox = forwardRef(({
searchHistorySuggestions,
languageSuggestions,
searchContextSuggestions,
refineModeSuggestions,
]);

// When the list of suggestions change, reset the highlight index
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/components/searchBar/useSuggestionModeAndQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@ export const useSuggestionModeAndQuery = ({
suggestionQuery: part,
suggestionMode: "refine",
}
}, [cursorPosition, isSuggestionsEnabled, query, isHistorySearchEnabled]);
}, [cursorPosition, isSuggestionsEnabled, query, isHistorySearchEnabled, suggestionModeMappings]);

// Debug logging for tracking mode transitions.
const [prevSuggestionMode, setPrevSuggestionMode] = useState<SuggestionMode>("none");
Expand Down
29 changes: 15 additions & 14 deletions packages/web/src/app/[domain]/components/searchBar/useSuggestionsData.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Suggestion, SuggestionMode } from "./searchSuggestionsBox";
import { getRepos, search } from "@/app/api/(client)/client";
import { getSearchContexts } from "@/actions";
import { useMemo } from "react";
import { Symbol } from "@/lib/types";
import { SearchSymbol } from "@/features/search/types";
import { languageMetadataMap } from "@/lib/languageMetadata";
import {
VscSymbolClass,
Expand DownExpand Up@@ -40,10 +40,9 @@ export const useSuggestionsData = ({
queryKey: ["repoSuggestions"],
queryFn: () => getRepos(domain),
select: (data): Suggestion[] => {
return data.List.Repos
.map(r => r.Repository)
return data.repos
.map(r => ({
value: r.Name
value: r.name,
}));
},
enabled: suggestionMode === "repo",
Expand All@@ -54,16 +53,17 @@ export const useSuggestionsData = ({
queryKey: ["fileSuggestions", suggestionQuery],
queryFn: () => search({
query: `file:${suggestionQuery}`,
maxMatchDisplayCount: 15,
matches: 15,
contextLines: 1,
}, domain),
select: (data): Suggestion[] => {
if (isServiceError(data)) {
return [];
}

return data.Result.Files?.map((file) => ({
value: file.FileName
})) ?? [];
return data.files.map((file) => ({
value: file.fileName.text,
}));
},
enabled: suggestionMode === "file"
});
Expand All@@ -73,22 +73,23 @@ export const useSuggestionsData = ({
queryKey: ["symbolSuggestions", suggestionQuery],
queryFn: () => search({
query: `sym:${suggestionQuery.length > 0 ? suggestionQuery : ".*"}`,
maxMatchDisplayCount: 15,
matches: 15,
contextLines: 1,
}, domain),
select: (data): Suggestion[] => {
if (isServiceError(data)) {
return [];
}

const symbols = data.Result.Files?.flatMap((file) => file.ChunkMatches).flatMap((chunk) => chunk.SymbolInfo ?? []);
const symbols = data.files.flatMap((file) => file.chunks).flatMap((chunk) => chunk.symbols ?? []);
if (!symbols) {
return [];
}

// De-duplicate on symbol name & kind.
const symbolMap = new Map<string, Symbol>(symbols.map((symbol: Symbol) => [`${symbol.Kind}.${symbol.Sym}`, symbol]));
const symbolMap = new Map<string, SearchSymbol>(symbols.map((symbol: SearchSymbol) => [`${symbol.kind}.${symbol.symbol}`, symbol]));
const suggestions = Array.from(symbolMap.values()).map((symbol) => ({
value: symbol.Sym,
value: symbol.symbol,
Icon: getSymbolIcon(symbol),
} satisfies Suggestion));

Expand DownExpand Up@@ -157,8 +158,8 @@ export const useSuggestionsData = ({
}
}

const getSymbolIcon = (symbol: Symbol) => {
switch (symbol.Kind) {
const getSymbolIcon = (symbol: SearchSymbol) => {
switch (symbol.kind) {
case "methodSpec":
case "method":
case "function":
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/app/[domain]/connections/[id]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import { isServiceError } from "@/lib/utils"
import { notFound } from "next/navigation"
import { OrgRole } from "@sourcebot/db"
import { CodeHostType } from "@/lib/utils"
import { BitbucketConnectionConfig } from "@sourcebot/schemas/v3/bitbucket.type"

interface ConnectionManagementPageProps {
params: {
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/connections/quickActions.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -403,7 +403,7 @@ export const bitbucketCloudQuickActions: QuickAction<BitbucketConnectionConfig>[
selectionText: "username",
description: (
<div className="flex flex-col">
<span>Username to use for authentication. This is only required if you're using an App Password (stored in <Code>token</Code>) for authentication.</span>
<span>Username to use for authentication. This is only required if you&apos;re using an App Password (stored in <Code>token</Code>) for authentication.</span>
</div>
)
},
Expand Down
6 changes: 3 additions & 3 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/codePreview.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,12 @@
import { EditorContextMenu } from "@/app/[domain]/components/editorContextMenu";
import { Button } from "@/components/ui/button";
import { ScrollArea } from "@/components/ui/scroll-area";
import { SearchResultChunk } from "@/features/search/types";
import { useCodeMirrorTheme } from "@/hooks/useCodeMirrorTheme";
import { useKeymapExtension } from "@/hooks/useKeymapExtension";
import { useSyntaxHighlightingExtension } from "@/hooks/useSyntaxHighlightingExtension";
import { gutterWidthExtension } from "@/lib/extensions/gutterWidthExtension";
import { highlightRanges, searchResultHighlightExtension } from "@/lib/extensions/searchResultHighlightExtension";
import { SearchResultFileMatch } from "@/lib/types";
import { search } from "@codemirror/search";
import { EditorView } from "@codemirror/view";
import { Cross1Icon, FileIcon } from "@radix-ui/react-icons";
Expand All@@ -22,7 +22,7 @@ export interface CodePreviewFile {
content: string;
filepath: string;
link?: string;
matches: SearchResultFileMatch[];
matches: SearchResultChunk[];
language: string;
revision: string;
}
Expand DownExpand Up@@ -84,7 +84,7 @@ export const CodePreview = ({
}

return file.matches.flatMap((match) => {
return match.Ranges;
return match.matchRanges;
})
}, [file]);

Expand Down
30 changes: 13 additions & 17 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,10 @@ import { fetchFileSource } from "@/app/api/(client)/client";
import { base64Decode } from "@/lib/utils";
import { useQuery } from "@tanstack/react-query";
import { CodePreview, CodePreviewFile } from "./codePreview";
import { SearchResultFile } from "@/lib/types";
import { SearchResultFile } from "@/features/search/types";
import { useDomain } from "@/hooks/useDomain";
import { SymbolIcon } from "@radix-ui/react-icons";

interface CodePreviewPanelProps {
fileMatch?: SearchResultFile;
onClose: () => void;
Expand All@@ -25,24 +26,24 @@ export const CodePreviewPanel = ({
const domain = useDomain();

const { data: file, isLoading } = useQuery({
queryKey: ["source", fileMatch?.FileName, fileMatch?.Repository, fileMatch?.Branches],
queryKey: ["source", fileMatch?.fileName, fileMatch?.repository, fileMatch?.branches],
queryFn: async (): Promise<CodePreviewFile | undefined> => {
if (!fileMatch) {
return undefined;
}

// If there are multiple branches pointing to the same revision of this file, it doesn't
// matter which branch we use here, so use the first one.
const branch = fileMatch.Branches && fileMatch.Branches.length > 0 ? fileMatch.Branches[0] : undefined;
const branch = fileMatch.branches && fileMatch.branches.length > 0 ? fileMatch.branches[0] : undefined;

return fetchFileSource({
fileName: fileMatch.FileName,
repository: fileMatch.Repository,
fileName: fileMatch.fileName.text,
repository: fileMatch.repository,
branch,
}, domain)
.then(({ source }) => {
const link = (() => {
const template = repoUrlTemplates[fileMatch.Repository];
const template = repoUrlTemplates[fileMatch.repository];

// This is a hacky parser for templates generated by
// the go text/template package. Example template:
Expand All@@ -55,7 +56,7 @@ export const CodePreviewPanel = ({
const url =
template.substring("{{URLJoinPath ".length,template.indexOf("}}"))
.replace(".Version", branch ?? "HEAD")
.replace(".Path", fileMatch.FileName)
.replace(".Path", fileMatch.fileName.text)
.split(" ")
.map((part) => {
// remove wrapping quotes
Expand All@@ -68,24 +69,19 @@ export const CodePreviewPanel = ({
const optionalQueryParams =
template.substring(template.indexOf("}}") + 2)
.replace("{{.Version}}", branch ?? "HEAD")
.replace("{{.Path}}", fileMatch.FileName);
.replace("{{.Path}}", fileMatch.fileName.text);

return url + optionalQueryParams;
})();

const decodedSource = base64Decode(source);

// Filter out filename matches
const filteredMatches = fileMatch.ChunkMatches.filter((match) => {
return !match.FileName;
});

return {
content: decodedSource,
filepath: fileMatch.FileName,
matches: filteredMatches,
filepath: fileMatch.fileName.text,
matches: fileMatch.chunks,
link: link,
language: fileMatch.Language,
language: fileMatch.language,
revision: branch ?? "HEAD",
};
});
Expand All@@ -103,7 +99,7 @@ export const CodePreviewPanel = ({
return (
<CodePreview
file={file}
repoName={fileMatch?.Repository}
repoName={fileMatch?.repository}
onClose={onClose}
selectedMatchIndex={selectedMatchIndex}
onSelectedMatchIndexChange={onSelectedMatchIndexChange}
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/app/[domain]/search/components/filterPanel/filter.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
import { useMemo, useState } from "react";
import { compareEntries, Entry } from "./entry";
import { Input } from "@/components/ui/input";
import { ScrollArea } from "@/components/ui/scroll-area";
import Fuse from "fuse.js";
import { cn } from "@/lib/utils"

Expand Down
22 changes: 11 additions & 11 deletions packages/web/src/app/[domain]/search/components/filterPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
'use client';

import { FileIcon } from "@/components/ui/fileIcon";
import { Repository, SearchResultFile } from "@/lib/types";
import { Repository, SearchResultFile } from "@/features/search/types";
import { cn, getRepoCodeHostInfo } from "@/lib/utils";
import { LaptopIcon } from "@radix-ui/react-icons";
import Image from "next/image";
import { useRouter, useSearchParams } from "next/navigation";
import { useEffect, useMemo } from "react";
import { useCallback, useEffect, useMemo } from "react";
import { Entry } from "./entry";
import { Filter } from "./filter";

Expand All@@ -28,15 +28,15 @@ export const FilterPanel = ({
const searchParams = useSearchParams();

// Helper to parse query params into sets
const getSelectedFromQuery = (param: string) => {
const getSelectedFromQuery = useCallback((param: string) => {
const value = searchParams.get(param);
return value ? new Set(value.split(',')) : new Set();
};
}, [searchParams]);

const repos = useMemo(() => {
const selectedRepos = getSelectedFromQuery(REPOS_QUERY_PARAM);
return aggregateMatches(
"Repository",
"repository",
matches,
(key) => {
const repo: Repository | undefined = repoMetadata[key];
Expand All@@ -60,12 +60,12 @@ export const FilterPanel = ({
};
}
)
}, [searchParams]);
}, [getSelectedFromQuery, matches, repoMetadata]);

const languages = useMemo(() => {
const selectedLanguages = getSelectedFromQuery(LANGUAGES_QUERY_PARAM);
return aggregateMatches(
"Language",
"language",
matches,
(key) => {
const Icon = (
Expand All@@ -81,7 +81,7 @@ export const FilterPanel = ({
} satisfies Entry;
}
);
}, [searchParams]);
}, [getSelectedFromQuery, matches]);

// Calls `onFilterChanged` with the filtered list of matches
// whenever the filter state changes.
Expand All@@ -91,8 +91,8 @@ export const FilterPanel = ({

const filteredMatches = matches.filter((match) =>
(
(selectedRepos.size === 0 ? true : selectedRepos.has(match.Repository)) &&
(selectedLanguages.size === 0 ? true : selectedLanguages.has(match.Language))
(selectedRepos.size === 0 ? true : selectedRepos.has(match.repository)) &&
(selectedLanguages.size === 0 ? true : selectedLanguages.has(match.language))
)
);
onFilterChanged(filteredMatches);
Expand DownExpand Up@@ -166,7 +166,7 @@ export const FilterPanel = ({
* }
*/
const aggregateMatches = (
propName: 'Repository' | 'Language',
propName: 'repository' | 'language',
matches: SearchResultFile[],
createEntry: (key: string) => Entry
) => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

chore: Sourcebot REST api surface#290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendan-kellam merged 5 commits into from
May 3, 2025
Merged

chore: Sourcebot REST api surface #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d254e28
Api shim wip
brendan-kellam May 2, 2025
cfb523f
further wip
brendan-kellam May 3, 2025
9f87212
lint
brendan-kellam May 3, 2025
ae96bd5
nits
brendan-kellam May 3, 2025
177a182
feedback
brendan-kellam May 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/web/.eslintrc.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"next/core-web-vitals"
],
"rules": {
Expand Down
3 changes: 2 additions & 1 deletion packages/web/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
"lint": "cross-env SKIP_ENV_VALIDATION=1 next lint",
Comment thread
brendan-kellam marked this conversation as resolved.
"test": "vitest",
"dev:emails": "email dev --dir ./src/emails",
"stripe:listen": "stripe listen --forward-to http://localhost:3000/api/stripe"
Expand DownExpand Up@@ -146,6 +146,7 @@
"@types/react-dom": "^18",
"@typescript-eslint/eslint-plugin": "^8.3.0",
"@typescript-eslint/parser": "^8.3.0",
"cross-env": "^7.0.3",
"eslint": "^8",
"eslint-config-next": "14.2.6",
"eslint-plugin-react": "^7.35.0",
Expand Down
7 changes: 4 additions & 3 deletions packages/web/src/app/[domain]/browse/[...path]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { FileHeader } from "@/app/[domain]/components/fileHeader";
import { TopBar } from "@/app/[domain]/components/topBar";
import { Separator } from '@/components/ui/separator';
import { getFileSource, listRepositories } from '@/lib/server/searchService';
import { getFileSource } from '@/features/search/fileSourceApi';
import { listRepositories } from '@/features/search/listReposApi';
import { base64Decode, isServiceError } from "@/lib/utils";
import { CodePreview } from "./codePreview";
import { ErrorCode } from "@/lib/errorCodes";
Expand DownExpand Up@@ -57,7 +58,7 @@ export default async function BrowsePage({
if (isServiceError(reposResponse)) {
throw new ServiceErrorException(reposResponse);
}
const repo = reposResponse.List.Repos.find(r => r.Repository.Name === repoName);
const repo = reposResponse.repos.find(r => r.name === repoName);

if (pathType === 'tree') {
// @todo : proper tree handling
Expand All@@ -81,7 +82,7 @@ export default async function BrowsePage({
<div className="bg-accent py-1 px-2 flex flex-row">
<FileHeader
fileName={path}
repo={repo.Repository}
repo={repo}
branchDisplayName={revisionName}
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/components/fileHeader.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { Repository } from "@/lib/types";
import { Repository } from "@/features/search/types";
import { getRepoCodeHostInfo } from "@/lib/utils";
import { LaptopIcon } from "@radix-ui/react-icons";
import clsx from "clsx";
Expand Down
1 change: 1 addition & 0 deletions packages/web/src/app/[domain]/components/searchBar/searchSuggestionsBox.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ const SearchSuggestionsBox = forwardRef(({
searchHistorySuggestions,
languageSuggestions,
searchContextSuggestions,
refineModeSuggestions,
]);

// When the list of suggestions change, reset the highlight index
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/components/searchBar/useSuggestionModeAndQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@ export const useSuggestionModeAndQuery = ({
suggestionQuery: part,
suggestionMode: "refine",
}
}, [cursorPosition, isSuggestionsEnabled, query, isHistorySearchEnabled]);
}, [cursorPosition, isSuggestionsEnabled, query, isHistorySearchEnabled, suggestionModeMappings]);

// Debug logging for tracking mode transitions.
const [prevSuggestionMode, setPrevSuggestionMode] = useState<SuggestionMode>("none");
Expand Down
29 changes: 15 additions & 14 deletions packages/web/src/app/[domain]/components/searchBar/useSuggestionsData.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Suggestion, SuggestionMode } from "./searchSuggestionsBox";
import { getRepos, search } from "@/app/api/(client)/client";
import { getSearchContexts } from "@/actions";
import { useMemo } from "react";
import { Symbol } from "@/lib/types";
import { SearchSymbol } from "@/features/search/types";
import { languageMetadataMap } from "@/lib/languageMetadata";
import {
VscSymbolClass,
Expand DownExpand Up@@ -40,10 +40,9 @@ export const useSuggestionsData = ({
queryKey: ["repoSuggestions"],
queryFn: () => getRepos(domain),
select: (data): Suggestion[] => {
return data.List.Repos
.map(r => r.Repository)
return data.repos
.map(r => ({
value: r.Name
value: r.name,
}));
},
enabled: suggestionMode === "repo",
Expand All@@ -54,16 +53,17 @@ export const useSuggestionsData = ({
queryKey: ["fileSuggestions", suggestionQuery],
queryFn: () => search({
query: `file:${suggestionQuery}`,
maxMatchDisplayCount: 15,
matches: 15,
contextLines: 1,
}, domain),
select: (data): Suggestion[] => {
if (isServiceError(data)) {
return [];
}

return data.Result.Files?.map((file) => ({
value: file.FileName
})) ?? [];
return data.files.map((file) => ({
value: file.fileName.text,
}));
},
enabled: suggestionMode === "file"
});
Expand All@@ -73,22 +73,23 @@ export const useSuggestionsData = ({
queryKey: ["symbolSuggestions", suggestionQuery],
queryFn: () => search({
query: `sym:${suggestionQuery.length > 0 ? suggestionQuery : ".*"}`,
maxMatchDisplayCount: 15,
matches: 15,
contextLines: 1,
}, domain),
select: (data): Suggestion[] => {
if (isServiceError(data)) {
return [];
}

const symbols = data.Result.Files?.flatMap((file) => file.ChunkMatches).flatMap((chunk) => chunk.SymbolInfo ?? []);
const symbols = data.files.flatMap((file) => file.chunks).flatMap((chunk) => chunk.symbols ?? []);
if (!symbols) {
return [];
}

// De-duplicate on symbol name & kind.
const symbolMap = new Map<string, Symbol>(symbols.map((symbol: Symbol) => [`${symbol.Kind}.${symbol.Sym}`, symbol]));
const symbolMap = new Map<string, SearchSymbol>(symbols.map((symbol: SearchSymbol) => [`${symbol.kind}.${symbol.symbol}`, symbol]));
const suggestions = Array.from(symbolMap.values()).map((symbol) => ({
value: symbol.Sym,
value: symbol.symbol,
Icon: getSymbolIcon(symbol),
} satisfies Suggestion));

Expand DownExpand Up@@ -157,8 +158,8 @@ export const useSuggestionsData = ({
}
}

const getSymbolIcon = (symbol: Symbol) => {
switch (symbol.Kind) {
const getSymbolIcon = (symbol: SearchSymbol) => {
switch (symbol.kind) {
case "methodSpec":
case "method":
case "function":
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/app/[domain]/connections/[id]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import { isServiceError } from "@/lib/utils"
import { notFound } from "next/navigation"
import { OrgRole } from "@sourcebot/db"
import { CodeHostType } from "@/lib/utils"
import { BitbucketConnectionConfig } from "@sourcebot/schemas/v3/bitbucket.type"

interface ConnectionManagementPageProps {
params: {
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/connections/quickActions.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -403,7 +403,7 @@ export const bitbucketCloudQuickActions: QuickAction<BitbucketConnectionConfig>[
selectionText: "username",
description: (
<div className="flex flex-col">
<span>Username to use for authentication. This is only required if you're using an App Password (stored in <Code>token</Code>) for authentication.</span>
<span>Username to use for authentication. This is only required if you&apos;re using an App Password (stored in <Code>token</Code>) for authentication.</span>
</div>
)
},
Expand Down
6 changes: 3 additions & 3 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/codePreview.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,12 @@
import { EditorContextMenu } from "@/app/[domain]/components/editorContextMenu";
import { Button } from "@/components/ui/button";
import { ScrollArea } from "@/components/ui/scroll-area";
import { SearchResultChunk } from "@/features/search/types";
import { useCodeMirrorTheme } from "@/hooks/useCodeMirrorTheme";
import { useKeymapExtension } from "@/hooks/useKeymapExtension";
import { useSyntaxHighlightingExtension } from "@/hooks/useSyntaxHighlightingExtension";
import { gutterWidthExtension } from "@/lib/extensions/gutterWidthExtension";
import { highlightRanges, searchResultHighlightExtension } from "@/lib/extensions/searchResultHighlightExtension";
import { SearchResultFileMatch } from "@/lib/types";
import { search } from "@codemirror/search";
import { EditorView } from "@codemirror/view";
import { Cross1Icon, FileIcon } from "@radix-ui/react-icons";
Expand All@@ -22,7 +22,7 @@ export interface CodePreviewFile {
content: string;
filepath: string;
link?: string;
matches: SearchResultFileMatch[];
matches: SearchResultChunk[];
language: string;
revision: string;
}
Expand DownExpand Up@@ -84,7 +84,7 @@ export const CodePreview = ({
}

return file.matches.flatMap((match) => {
return match.Ranges;
return match.matchRanges;
})
}, [file]);

Expand Down
30 changes: 13 additions & 17 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,10 @@ import { fetchFileSource } from "@/app/api/(client)/client";
import { base64Decode } from "@/lib/utils";
import { useQuery } from "@tanstack/react-query";
import { CodePreview, CodePreviewFile } from "./codePreview";
import { SearchResultFile } from "@/lib/types";
import { SearchResultFile } from "@/features/search/types";
import { useDomain } from "@/hooks/useDomain";
import { SymbolIcon } from "@radix-ui/react-icons";

interface CodePreviewPanelProps {
fileMatch?: SearchResultFile;
onClose: () => void;
Expand All@@ -25,24 +26,24 @@ export const CodePreviewPanel = ({
const domain = useDomain();

const { data: file, isLoading } = useQuery({
queryKey: ["source", fileMatch?.FileName, fileMatch?.Repository, fileMatch?.Branches],
queryKey: ["source", fileMatch?.fileName, fileMatch?.repository, fileMatch?.branches],
queryFn: async (): Promise<CodePreviewFile | undefined> => {
if (!fileMatch) {
return undefined;
}

// If there are multiple branches pointing to the same revision of this file, it doesn't
// matter which branch we use here, so use the first one.
const branch = fileMatch.Branches && fileMatch.Branches.length > 0 ? fileMatch.Branches[0] : undefined;
const branch = fileMatch.branches && fileMatch.branches.length > 0 ? fileMatch.branches[0] : undefined;

return fetchFileSource({
fileName: fileMatch.FileName,
repository: fileMatch.Repository,
fileName: fileMatch.fileName.text,
repository: fileMatch.repository,
branch,
}, domain)
.then(({ source }) => {
const link = (() => {
const template = repoUrlTemplates[fileMatch.Repository];
const template = repoUrlTemplates[fileMatch.repository];

// This is a hacky parser for templates generated by
// the go text/template package. Example template:
Expand All@@ -55,7 +56,7 @@ export const CodePreviewPanel = ({
const url =
template.substring("{{URLJoinPath ".length,template.indexOf("}}"))
.replace(".Version", branch ?? "HEAD")
.replace(".Path", fileMatch.FileName)
.replace(".Path", fileMatch.fileName.text)
.split(" ")
.map((part) => {
// remove wrapping quotes
Expand All@@ -68,24 +69,19 @@ export const CodePreviewPanel = ({
const optionalQueryParams =
template.substring(template.indexOf("}}") + 2)
.replace("{{.Version}}", branch ?? "HEAD")
.replace("{{.Path}}", fileMatch.FileName);
.replace("{{.Path}}", fileMatch.fileName.text);

return url + optionalQueryParams;
})();

const decodedSource = base64Decode(source);

// Filter out filename matches
const filteredMatches = fileMatch.ChunkMatches.filter((match) => {
return !match.FileName;
});

return {
content: decodedSource,
filepath: fileMatch.FileName,
matches: filteredMatches,
filepath: fileMatch.fileName.text,
matches: fileMatch.chunks,
link: link,
language: fileMatch.Language,
language: fileMatch.language,
revision: branch ?? "HEAD",
};
});
Expand All@@ -103,7 +99,7 @@ export const CodePreviewPanel = ({
return (
<CodePreview
file={file}
repoName={fileMatch?.Repository}
repoName={fileMatch?.repository}
onClose={onClose}
selectedMatchIndex={selectedMatchIndex}
onSelectedMatchIndexChange={onSelectedMatchIndexChange}
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/app/[domain]/search/components/filterPanel/filter.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
import { useMemo, useState } from "react";
import { compareEntries, Entry } from "./entry";
import { Input } from "@/components/ui/input";
import { ScrollArea } from "@/components/ui/scroll-area";
import Fuse from "fuse.js";
import { cn } from "@/lib/utils"

Expand Down
22 changes: 11 additions & 11 deletions packages/web/src/app/[domain]/search/components/filterPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
'use client';

import { FileIcon } from "@/components/ui/fileIcon";
import { Repository, SearchResultFile } from "@/lib/types";
import { Repository, SearchResultFile } from "@/features/search/types";
import { cn, getRepoCodeHostInfo } from "@/lib/utils";
import { LaptopIcon } from "@radix-ui/react-icons";
import Image from "next/image";
import { useRouter, useSearchParams } from "next/navigation";
import { useEffect, useMemo } from "react";
import { useCallback, useEffect, useMemo } from "react";
import { Entry } from "./entry";
import { Filter } from "./filter";

Expand All@@ -28,15 +28,15 @@ export const FilterPanel = ({
const searchParams = useSearchParams();

// Helper to parse query params into sets
const getSelectedFromQuery = (param: string) => {
const getSelectedFromQuery = useCallback((param: string) => {
const value = searchParams.get(param);
return value ? new Set(value.split(',')) : new Set();
};
}, [searchParams]);

const repos = useMemo(() => {
const selectedRepos = getSelectedFromQuery(REPOS_QUERY_PARAM);
return aggregateMatches(
"Repository",
"repository",
matches,
(key) => {
const repo: Repository | undefined = repoMetadata[key];
Expand All@@ -60,12 +60,12 @@ export const FilterPanel = ({
};
}
)
}, [searchParams]);
}, [getSelectedFromQuery, matches, repoMetadata]);

const languages = useMemo(() => {
const selectedLanguages = getSelectedFromQuery(LANGUAGES_QUERY_PARAM);
return aggregateMatches(
"Language",
"language",
matches,
(key) => {
const Icon = (
Expand All@@ -81,7 +81,7 @@ export const FilterPanel = ({
} satisfies Entry;
}
);
}, [searchParams]);
}, [getSelectedFromQuery, matches]);

// Calls `onFilterChanged` with the filtered list of matches
// whenever the filter state changes.
Expand All@@ -91,8 +91,8 @@ export const FilterPanel = ({

const filteredMatches = matches.filter((match) =>
(
(selectedRepos.size === 0 ? true : selectedRepos.has(match.Repository)) &&
(selectedLanguages.size === 0 ? true : selectedLanguages.has(match.Language))
(selectedRepos.size === 0 ? true : selectedRepos.has(match.repository)) &&
(selectedLanguages.size === 0 ? true : selectedLanguages.has(match.language))
)
);
onFilterChanged(filteredMatches);
Expand DownExpand Up@@ -166,7 +166,7 @@ export const FilterPanel = ({
* }
*/
const aggregateMatches = (
propName: 'Repository' | 'Language',
propName: 'repository' | 'language',
matches: SearchResultFile[],
createEntry: (key: string) => Entry
) => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

chore: Sourcebot REST api surface#290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendan-kellam merged 5 commits into from
May 3, 2025
Merged

chore: Sourcebot REST api surface #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d254e28
Api shim wip
brendan-kellam May 2, 2025
cfb523f
further wip
brendan-kellam May 3, 2025
9f87212
lint
brendan-kellam May 3, 2025
ae96bd5
nits
brendan-kellam May 3, 2025
177a182
feedback
brendan-kellam May 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/web/.eslintrc.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"next/core-web-vitals"
],
"rules": {
Expand Down
3 changes: 2 additions & 1 deletion packages/web/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
"lint": "cross-env SKIP_ENV_VALIDATION=1 next lint",
Comment thread
brendan-kellam marked this conversation as resolved.
"test": "vitest",
"dev:emails": "email dev --dir ./src/emails",
"stripe:listen": "stripe listen --forward-to http://localhost:3000/api/stripe"
Expand DownExpand Up@@ -146,6 +146,7 @@
"@types/react-dom": "^18",
"@typescript-eslint/eslint-plugin": "^8.3.0",
"@typescript-eslint/parser": "^8.3.0",
"cross-env": "^7.0.3",
"eslint": "^8",
"eslint-config-next": "14.2.6",
"eslint-plugin-react": "^7.35.0",
Expand Down
7 changes: 4 additions & 3 deletions packages/web/src/app/[domain]/browse/[...path]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { FileHeader } from "@/app/[domain]/components/fileHeader";
import { TopBar } from "@/app/[domain]/components/topBar";
import { Separator } from '@/components/ui/separator';
import { getFileSource, listRepositories } from '@/lib/server/searchService';
import { getFileSource } from '@/features/search/fileSourceApi';
import { listRepositories } from '@/features/search/listReposApi';
import { base64Decode, isServiceError } from "@/lib/utils";
import { CodePreview } from "./codePreview";
import { ErrorCode } from "@/lib/errorCodes";
Expand DownExpand Up@@ -57,7 +58,7 @@ export default async function BrowsePage({
if (isServiceError(reposResponse)) {
throw new ServiceErrorException(reposResponse);
}
const repo = reposResponse.List.Repos.find(r => r.Repository.Name === repoName);
const repo = reposResponse.repos.find(r => r.name === repoName);

if (pathType === 'tree') {
// @todo : proper tree handling
Expand All@@ -81,7 +82,7 @@ export default async function BrowsePage({
<div className="bg-accent py-1 px-2 flex flex-row">
<FileHeader
fileName={path}
repo={repo.Repository}
repo={repo}
branchDisplayName={revisionName}
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/components/fileHeader.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { Repository } from "@/lib/types";
import { Repository } from "@/features/search/types";
import { getRepoCodeHostInfo } from "@/lib/utils";
import { LaptopIcon } from "@radix-ui/react-icons";
import clsx from "clsx";
Expand Down
1 change: 1 addition & 0 deletions packages/web/src/app/[domain]/components/searchBar/searchSuggestionsBox.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ const SearchSuggestionsBox = forwardRef(({
searchHistorySuggestions,
languageSuggestions,
searchContextSuggestions,
refineModeSuggestions,
]);

// When the list of suggestions change, reset the highlight index
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/components/searchBar/useSuggestionModeAndQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@ export const useSuggestionModeAndQuery = ({
suggestionQuery: part,
suggestionMode: "refine",
}
}, [cursorPosition, isSuggestionsEnabled, query, isHistorySearchEnabled]);
}, [cursorPosition, isSuggestionsEnabled, query, isHistorySearchEnabled, suggestionModeMappings]);

// Debug logging for tracking mode transitions.
const [prevSuggestionMode, setPrevSuggestionMode] = useState<SuggestionMode>("none");
Expand Down
29 changes: 15 additions & 14 deletions packages/web/src/app/[domain]/components/searchBar/useSuggestionsData.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Suggestion, SuggestionMode } from "./searchSuggestionsBox";
import { getRepos, search } from "@/app/api/(client)/client";
import { getSearchContexts } from "@/actions";
import { useMemo } from "react";
import { Symbol } from "@/lib/types";
import { SearchSymbol } from "@/features/search/types";
import { languageMetadataMap } from "@/lib/languageMetadata";
import {
VscSymbolClass,
Expand DownExpand Up@@ -40,10 +40,9 @@ export const useSuggestionsData = ({
queryKey: ["repoSuggestions"],
queryFn: () => getRepos(domain),
select: (data): Suggestion[] => {
return data.List.Repos
.map(r => r.Repository)
return data.repos
.map(r => ({
value: r.Name
value: r.name,
}));
},
enabled: suggestionMode === "repo",
Expand All@@ -54,16 +53,17 @@ export const useSuggestionsData = ({
queryKey: ["fileSuggestions", suggestionQuery],
queryFn: () => search({
query: `file:${suggestionQuery}`,
maxMatchDisplayCount: 15,
matches: 15,
contextLines: 1,
}, domain),
select: (data): Suggestion[] => {
if (isServiceError(data)) {
return [];
}

return data.Result.Files?.map((file) => ({
value: file.FileName
})) ?? [];
return data.files.map((file) => ({
value: file.fileName.text,
}));
},
enabled: suggestionMode === "file"
});
Expand All@@ -73,22 +73,23 @@ export const useSuggestionsData = ({
queryKey: ["symbolSuggestions", suggestionQuery],
queryFn: () => search({
query: `sym:${suggestionQuery.length > 0 ? suggestionQuery : ".*"}`,
maxMatchDisplayCount: 15,
matches: 15,
contextLines: 1,
}, domain),
select: (data): Suggestion[] => {
if (isServiceError(data)) {
return [];
}

const symbols = data.Result.Files?.flatMap((file) => file.ChunkMatches).flatMap((chunk) => chunk.SymbolInfo ?? []);
const symbols = data.files.flatMap((file) => file.chunks).flatMap((chunk) => chunk.symbols ?? []);
if (!symbols) {
return [];
}

// De-duplicate on symbol name & kind.
const symbolMap = new Map<string, Symbol>(symbols.map((symbol: Symbol) => [`${symbol.Kind}.${symbol.Sym}`, symbol]));
const symbolMap = new Map<string, SearchSymbol>(symbols.map((symbol: SearchSymbol) => [`${symbol.kind}.${symbol.symbol}`, symbol]));
const suggestions = Array.from(symbolMap.values()).map((symbol) => ({
value: symbol.Sym,
value: symbol.symbol,
Icon: getSymbolIcon(symbol),
} satisfies Suggestion));

Expand DownExpand Up@@ -157,8 +158,8 @@ export const useSuggestionsData = ({
}
}

const getSymbolIcon = (symbol: Symbol) => {
switch (symbol.Kind) {
const getSymbolIcon = (symbol: SearchSymbol) => {
switch (symbol.kind) {
case "methodSpec":
case "method":
case "function":
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/app/[domain]/connections/[id]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import { isServiceError } from "@/lib/utils"
import { notFound } from "next/navigation"
import { OrgRole } from "@sourcebot/db"
import { CodeHostType } from "@/lib/utils"
import { BitbucketConnectionConfig } from "@sourcebot/schemas/v3/bitbucket.type"

interface ConnectionManagementPageProps {
params: {
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/connections/quickActions.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -403,7 +403,7 @@ export const bitbucketCloudQuickActions: QuickAction<BitbucketConnectionConfig>[
selectionText: "username",
description: (
<div className="flex flex-col">
<span>Username to use for authentication. This is only required if you're using an App Password (stored in <Code>token</Code>) for authentication.</span>
<span>Username to use for authentication. This is only required if you&apos;re using an App Password (stored in <Code>token</Code>) for authentication.</span>
</div>
)
},
Expand Down
6 changes: 3 additions & 3 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/codePreview.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,12 @@
import { EditorContextMenu } from "@/app/[domain]/components/editorContextMenu";
import { Button } from "@/components/ui/button";
import { ScrollArea } from "@/components/ui/scroll-area";
import { SearchResultChunk } from "@/features/search/types";
import { useCodeMirrorTheme } from "@/hooks/useCodeMirrorTheme";
import { useKeymapExtension } from "@/hooks/useKeymapExtension";
import { useSyntaxHighlightingExtension } from "@/hooks/useSyntaxHighlightingExtension";
import { gutterWidthExtension } from "@/lib/extensions/gutterWidthExtension";
import { highlightRanges, searchResultHighlightExtension } from "@/lib/extensions/searchResultHighlightExtension";
import { SearchResultFileMatch } from "@/lib/types";
import { search } from "@codemirror/search";
import { EditorView } from "@codemirror/view";
import { Cross1Icon, FileIcon } from "@radix-ui/react-icons";
Expand All@@ -22,7 +22,7 @@ export interface CodePreviewFile {
content: string;
filepath: string;
link?: string;
matches: SearchResultFileMatch[];
matches: SearchResultChunk[];
language: string;
revision: string;
}
Expand DownExpand Up@@ -84,7 +84,7 @@ export const CodePreview = ({
}

return file.matches.flatMap((match) => {
return match.Ranges;
return match.matchRanges;
})
}, [file]);

Expand Down
30 changes: 13 additions & 17 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,10 @@ import { fetchFileSource } from "@/app/api/(client)/client";
import { base64Decode } from "@/lib/utils";
import { useQuery } from "@tanstack/react-query";
import { CodePreview, CodePreviewFile } from "./codePreview";
import { SearchResultFile } from "@/lib/types";
import { SearchResultFile } from "@/features/search/types";
import { useDomain } from "@/hooks/useDomain";
import { SymbolIcon } from "@radix-ui/react-icons";

interface CodePreviewPanelProps {
fileMatch?: SearchResultFile;
onClose: () => void;
Expand All@@ -25,24 +26,24 @@ export const CodePreviewPanel = ({
const domain = useDomain();

const { data: file, isLoading } = useQuery({
queryKey: ["source", fileMatch?.FileName, fileMatch?.Repository, fileMatch?.Branches],
queryKey: ["source", fileMatch?.fileName, fileMatch?.repository, fileMatch?.branches],
queryFn: async (): Promise<CodePreviewFile | undefined> => {
if (!fileMatch) {
return undefined;
}

// If there are multiple branches pointing to the same revision of this file, it doesn't
// matter which branch we use here, so use the first one.
const branch = fileMatch.Branches && fileMatch.Branches.length > 0 ? fileMatch.Branches[0] : undefined;
const branch = fileMatch.branches && fileMatch.branches.length > 0 ? fileMatch.branches[0] : undefined;

return fetchFileSource({
fileName: fileMatch.FileName,
repository: fileMatch.Repository,
fileName: fileMatch.fileName.text,
repository: fileMatch.repository,
branch,
}, domain)
.then(({ source }) => {
const link = (() => {
const template = repoUrlTemplates[fileMatch.Repository];
const template = repoUrlTemplates[fileMatch.repository];

// This is a hacky parser for templates generated by
// the go text/template package. Example template:
Expand All@@ -55,7 +56,7 @@ export const CodePreviewPanel = ({
const url =
template.substring("{{URLJoinPath ".length,template.indexOf("}}"))
.replace(".Version", branch ?? "HEAD")
.replace(".Path", fileMatch.FileName)
.replace(".Path", fileMatch.fileName.text)
.split(" ")
.map((part) => {
// remove wrapping quotes
Expand All@@ -68,24 +69,19 @@ export const CodePreviewPanel = ({
const optionalQueryParams =
template.substring(template.indexOf("}}") + 2)
.replace("{{.Version}}", branch ?? "HEAD")
.replace("{{.Path}}", fileMatch.FileName);
.replace("{{.Path}}", fileMatch.fileName.text);

return url + optionalQueryParams;
})();

const decodedSource = base64Decode(source);

// Filter out filename matches
const filteredMatches = fileMatch.ChunkMatches.filter((match) => {
return !match.FileName;
});

return {
content: decodedSource,
filepath: fileMatch.FileName,
matches: filteredMatches,
filepath: fileMatch.fileName.text,
matches: fileMatch.chunks,
link: link,
language: fileMatch.Language,
language: fileMatch.language,
revision: branch ?? "HEAD",
};
});
Expand All@@ -103,7 +99,7 @@ export const CodePreviewPanel = ({
return (
<CodePreview
file={file}
repoName={fileMatch?.Repository}
repoName={fileMatch?.repository}
onClose={onClose}
selectedMatchIndex={selectedMatchIndex}
onSelectedMatchIndexChange={onSelectedMatchIndexChange}
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/app/[domain]/search/components/filterPanel/filter.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
import { useMemo, useState } from "react";
import { compareEntries, Entry } from "./entry";
import { Input } from "@/components/ui/input";
import { ScrollArea } from "@/components/ui/scroll-area";
import Fuse from "fuse.js";
import { cn } from "@/lib/utils"

Expand Down
22 changes: 11 additions & 11 deletions packages/web/src/app/[domain]/search/components/filterPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
'use client';

import { FileIcon } from "@/components/ui/fileIcon";
import { Repository, SearchResultFile } from "@/lib/types";
import { Repository, SearchResultFile } from "@/features/search/types";
import { cn, getRepoCodeHostInfo } from "@/lib/utils";
import { LaptopIcon } from "@radix-ui/react-icons";
import Image from "next/image";
import { useRouter, useSearchParams } from "next/navigation";
import { useEffect, useMemo } from "react";
import { useCallback, useEffect, useMemo } from "react";
import { Entry } from "./entry";
import { Filter } from "./filter";

Expand All@@ -28,15 +28,15 @@ export const FilterPanel = ({
const searchParams = useSearchParams();

// Helper to parse query params into sets
const getSelectedFromQuery = (param: string) => {
const getSelectedFromQuery = useCallback((param: string) => {
const value = searchParams.get(param);
return value ? new Set(value.split(',')) : new Set();
};
}, [searchParams]);

const repos = useMemo(() => {
const selectedRepos = getSelectedFromQuery(REPOS_QUERY_PARAM);
return aggregateMatches(
"Repository",
"repository",
matches,
(key) => {
const repo: Repository | undefined = repoMetadata[key];
Expand All@@ -60,12 +60,12 @@ export const FilterPanel = ({
};
}
)
}, [searchParams]);
}, [getSelectedFromQuery, matches, repoMetadata]);

const languages = useMemo(() => {
const selectedLanguages = getSelectedFromQuery(LANGUAGES_QUERY_PARAM);
return aggregateMatches(
"Language",
"language",
matches,
(key) => {
const Icon = (
Expand All@@ -81,7 +81,7 @@ export const FilterPanel = ({
} satisfies Entry;
}
);
}, [searchParams]);
}, [getSelectedFromQuery, matches]);

// Calls `onFilterChanged` with the filtered list of matches
// whenever the filter state changes.
Expand All@@ -91,8 +91,8 @@ export const FilterPanel = ({

const filteredMatches = matches.filter((match) =>
(
(selectedRepos.size === 0 ? true : selectedRepos.has(match.Repository)) &&
(selectedLanguages.size === 0 ? true : selectedLanguages.has(match.Language))
(selectedRepos.size === 0 ? true : selectedRepos.has(match.repository)) &&
(selectedLanguages.size === 0 ? true : selectedLanguages.has(match.language))
)
);
onFilterChanged(filteredMatches);
Expand DownExpand Up@@ -166,7 +166,7 @@ export const FilterPanel = ({
* }
*/
const aggregateMatches = (
propName: 'Repository' | 'Language',
propName: 'repository' | 'language',
matches: SearchResultFile[],
createEntry: (key: string) => Entry
) => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

chore: Sourcebot REST api surface#290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendan-kellam merged 5 commits into from
May 3, 2025
Merged

chore: Sourcebot REST api surface #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d254e28
Api shim wip
brendan-kellam May 2, 2025
cfb523f
further wip
brendan-kellam May 3, 2025
9f87212
lint
brendan-kellam May 3, 2025
ae96bd5
nits
brendan-kellam May 3, 2025
177a182
feedback
brendan-kellam May 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/web/.eslintrc.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"next/core-web-vitals"
],
"rules": {
Expand Down
3 changes: 2 additions & 1 deletion packages/web/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
"lint": "cross-env SKIP_ENV_VALIDATION=1 next lint",
Comment thread
brendan-kellam marked this conversation as resolved.
"test": "vitest",
"dev:emails": "email dev --dir ./src/emails",
"stripe:listen": "stripe listen --forward-to http://localhost:3000/api/stripe"
Expand DownExpand Up@@ -146,6 +146,7 @@
"@types/react-dom": "^18",
"@typescript-eslint/eslint-plugin": "^8.3.0",
"@typescript-eslint/parser": "^8.3.0",
"cross-env": "^7.0.3",
"eslint": "^8",
"eslint-config-next": "14.2.6",
"eslint-plugin-react": "^7.35.0",
Expand Down
7 changes: 4 additions & 3 deletions packages/web/src/app/[domain]/browse/[...path]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { FileHeader } from "@/app/[domain]/components/fileHeader";
import { TopBar } from "@/app/[domain]/components/topBar";
import { Separator } from '@/components/ui/separator';
import { getFileSource, listRepositories } from '@/lib/server/searchService';
import { getFileSource } from '@/features/search/fileSourceApi';
import { listRepositories } from '@/features/search/listReposApi';
import { base64Decode, isServiceError } from "@/lib/utils";
import { CodePreview } from "./codePreview";
import { ErrorCode } from "@/lib/errorCodes";
Expand DownExpand Up@@ -57,7 +58,7 @@ export default async function BrowsePage({
if (isServiceError(reposResponse)) {
throw new ServiceErrorException(reposResponse);
}
const repo = reposResponse.List.Repos.find(r => r.Repository.Name === repoName);
const repo = reposResponse.repos.find(r => r.name === repoName);

if (pathType === 'tree') {
// @todo : proper tree handling
Expand All@@ -81,7 +82,7 @@ export default async function BrowsePage({
<div className="bg-accent py-1 px-2 flex flex-row">
<FileHeader
fileName={path}
repo={repo.Repository}
repo={repo}
branchDisplayName={revisionName}
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/components/fileHeader.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { Repository } from "@/lib/types";
import { Repository } from "@/features/search/types";
import { getRepoCodeHostInfo } from "@/lib/utils";
import { LaptopIcon } from "@radix-ui/react-icons";
import clsx from "clsx";
Expand Down
1 change: 1 addition & 0 deletions packages/web/src/app/[domain]/components/searchBar/searchSuggestionsBox.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ const SearchSuggestionsBox = forwardRef(({
searchHistorySuggestions,
languageSuggestions,
searchContextSuggestions,
refineModeSuggestions,
]);

// When the list of suggestions change, reset the highlight index
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/components/searchBar/useSuggestionModeAndQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@ export const useSuggestionModeAndQuery = ({
suggestionQuery: part,
suggestionMode: "refine",
}
}, [cursorPosition, isSuggestionsEnabled, query, isHistorySearchEnabled]);
}, [cursorPosition, isSuggestionsEnabled, query, isHistorySearchEnabled, suggestionModeMappings]);

// Debug logging for tracking mode transitions.
const [prevSuggestionMode, setPrevSuggestionMode] = useState<SuggestionMode>("none");
Expand Down
29 changes: 15 additions & 14 deletions packages/web/src/app/[domain]/components/searchBar/useSuggestionsData.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Suggestion, SuggestionMode } from "./searchSuggestionsBox";
import { getRepos, search } from "@/app/api/(client)/client";
import { getSearchContexts } from "@/actions";
import { useMemo } from "react";
import { Symbol } from "@/lib/types";
import { SearchSymbol } from "@/features/search/types";
import { languageMetadataMap } from "@/lib/languageMetadata";
import {
VscSymbolClass,
Expand DownExpand Up@@ -40,10 +40,9 @@ export const useSuggestionsData = ({
queryKey: ["repoSuggestions"],
queryFn: () => getRepos(domain),
select: (data): Suggestion[] => {
return data.List.Repos
.map(r => r.Repository)
return data.repos
.map(r => ({
value: r.Name
value: r.name,
}));
},
enabled: suggestionMode === "repo",
Expand All@@ -54,16 +53,17 @@ export const useSuggestionsData = ({
queryKey: ["fileSuggestions", suggestionQuery],
queryFn: () => search({
query: `file:${suggestionQuery}`,
maxMatchDisplayCount: 15,
matches: 15,
contextLines: 1,
}, domain),
select: (data): Suggestion[] => {
if (isServiceError(data)) {
return [];
}

return data.Result.Files?.map((file) => ({
value: file.FileName
})) ?? [];
return data.files.map((file) => ({
value: file.fileName.text,
}));
},
enabled: suggestionMode === "file"
});
Expand All@@ -73,22 +73,23 @@ export const useSuggestionsData = ({
queryKey: ["symbolSuggestions", suggestionQuery],
queryFn: () => search({
query: `sym:${suggestionQuery.length > 0 ? suggestionQuery : ".*"}`,
maxMatchDisplayCount: 15,
matches: 15,
contextLines: 1,
}, domain),
select: (data): Suggestion[] => {
if (isServiceError(data)) {
return [];
}

const symbols = data.Result.Files?.flatMap((file) => file.ChunkMatches).flatMap((chunk) => chunk.SymbolInfo ?? []);
const symbols = data.files.flatMap((file) => file.chunks).flatMap((chunk) => chunk.symbols ?? []);
if (!symbols) {
return [];
}

// De-duplicate on symbol name & kind.
const symbolMap = new Map<string, Symbol>(symbols.map((symbol: Symbol) => [`${symbol.Kind}.${symbol.Sym}`, symbol]));
const symbolMap = new Map<string, SearchSymbol>(symbols.map((symbol: SearchSymbol) => [`${symbol.kind}.${symbol.symbol}`, symbol]));
const suggestions = Array.from(symbolMap.values()).map((symbol) => ({
value: symbol.Sym,
value: symbol.symbol,
Icon: getSymbolIcon(symbol),
} satisfies Suggestion));

Expand DownExpand Up@@ -157,8 +158,8 @@ export const useSuggestionsData = ({
}
}

const getSymbolIcon = (symbol: Symbol) => {
switch (symbol.Kind) {
const getSymbolIcon = (symbol: SearchSymbol) => {
switch (symbol.kind) {
case "methodSpec":
case "method":
case "function":
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/app/[domain]/connections/[id]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import { isServiceError } from "@/lib/utils"
import { notFound } from "next/navigation"
import { OrgRole } from "@sourcebot/db"
import { CodeHostType } from "@/lib/utils"
import { BitbucketConnectionConfig } from "@sourcebot/schemas/v3/bitbucket.type"

interface ConnectionManagementPageProps {
params: {
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/connections/quickActions.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -403,7 +403,7 @@ export const bitbucketCloudQuickActions: QuickAction<BitbucketConnectionConfig>[
selectionText: "username",
description: (
<div className="flex flex-col">
<span>Username to use for authentication. This is only required if you're using an App Password (stored in <Code>token</Code>) for authentication.</span>
<span>Username to use for authentication. This is only required if you&apos;re using an App Password (stored in <Code>token</Code>) for authentication.</span>
</div>
)
},
Expand Down
6 changes: 3 additions & 3 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/codePreview.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,12 @@
import { EditorContextMenu } from "@/app/[domain]/components/editorContextMenu";
import { Button } from "@/components/ui/button";
import { ScrollArea } from "@/components/ui/scroll-area";
import { SearchResultChunk } from "@/features/search/types";
import { useCodeMirrorTheme } from "@/hooks/useCodeMirrorTheme";
import { useKeymapExtension } from "@/hooks/useKeymapExtension";
import { useSyntaxHighlightingExtension } from "@/hooks/useSyntaxHighlightingExtension";
import { gutterWidthExtension } from "@/lib/extensions/gutterWidthExtension";
import { highlightRanges, searchResultHighlightExtension } from "@/lib/extensions/searchResultHighlightExtension";
import { SearchResultFileMatch } from "@/lib/types";
import { search } from "@codemirror/search";
import { EditorView } from "@codemirror/view";
import { Cross1Icon, FileIcon } from "@radix-ui/react-icons";
Expand All@@ -22,7 +22,7 @@ export interface CodePreviewFile {
content: string;
filepath: string;
link?: string;
matches: SearchResultFileMatch[];
matches: SearchResultChunk[];
language: string;
revision: string;
}
Expand DownExpand Up@@ -84,7 +84,7 @@ export const CodePreview = ({
}

return file.matches.flatMap((match) => {
return match.Ranges;
return match.matchRanges;
})
}, [file]);

Expand Down
30 changes: 13 additions & 17 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,10 @@ import { fetchFileSource } from "@/app/api/(client)/client";
import { base64Decode } from "@/lib/utils";
import { useQuery } from "@tanstack/react-query";
import { CodePreview, CodePreviewFile } from "./codePreview";
import { SearchResultFile } from "@/lib/types";
import { SearchResultFile } from "@/features/search/types";
import { useDomain } from "@/hooks/useDomain";
import { SymbolIcon } from "@radix-ui/react-icons";

interface CodePreviewPanelProps {
fileMatch?: SearchResultFile;
onClose: () => void;
Expand All@@ -25,24 +26,24 @@ export const CodePreviewPanel = ({
const domain = useDomain();

const { data: file, isLoading } = useQuery({
queryKey: ["source", fileMatch?.FileName, fileMatch?.Repository, fileMatch?.Branches],
queryKey: ["source", fileMatch?.fileName, fileMatch?.repository, fileMatch?.branches],
queryFn: async (): Promise<CodePreviewFile | undefined> => {
if (!fileMatch) {
return undefined;
}

// If there are multiple branches pointing to the same revision of this file, it doesn't
// matter which branch we use here, so use the first one.
const branch = fileMatch.Branches && fileMatch.Branches.length > 0 ? fileMatch.Branches[0] : undefined;
const branch = fileMatch.branches && fileMatch.branches.length > 0 ? fileMatch.branches[0] : undefined;

return fetchFileSource({
fileName: fileMatch.FileName,
repository: fileMatch.Repository,
fileName: fileMatch.fileName.text,
repository: fileMatch.repository,
branch,
}, domain)
.then(({ source }) => {
const link = (() => {
const template = repoUrlTemplates[fileMatch.Repository];
const template = repoUrlTemplates[fileMatch.repository];

// This is a hacky parser for templates generated by
// the go text/template package. Example template:
Expand All@@ -55,7 +56,7 @@ export const CodePreviewPanel = ({
const url =
template.substring("{{URLJoinPath ".length,template.indexOf("}}"))
.replace(".Version", branch ?? "HEAD")
.replace(".Path", fileMatch.FileName)
.replace(".Path", fileMatch.fileName.text)
.split(" ")
.map((part) => {
// remove wrapping quotes
Expand All@@ -68,24 +69,19 @@ export const CodePreviewPanel = ({
const optionalQueryParams =
template.substring(template.indexOf("}}") + 2)
.replace("{{.Version}}", branch ?? "HEAD")
.replace("{{.Path}}", fileMatch.FileName);
.replace("{{.Path}}", fileMatch.fileName.text);

return url + optionalQueryParams;
})();

const decodedSource = base64Decode(source);

// Filter out filename matches
const filteredMatches = fileMatch.ChunkMatches.filter((match) => {
return !match.FileName;
});

return {
content: decodedSource,
filepath: fileMatch.FileName,
matches: filteredMatches,
filepath: fileMatch.fileName.text,
matches: fileMatch.chunks,
link: link,
language: fileMatch.Language,
language: fileMatch.language,
revision: branch ?? "HEAD",
};
});
Expand All@@ -103,7 +99,7 @@ export const CodePreviewPanel = ({
return (
<CodePreview
file={file}
repoName={fileMatch?.Repository}
repoName={fileMatch?.repository}
onClose={onClose}
selectedMatchIndex={selectedMatchIndex}
onSelectedMatchIndexChange={onSelectedMatchIndexChange}
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/app/[domain]/search/components/filterPanel/filter.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
import { useMemo, useState } from "react";
import { compareEntries, Entry } from "./entry";
import { Input } from "@/components/ui/input";
import { ScrollArea } from "@/components/ui/scroll-area";
import Fuse from "fuse.js";
import { cn } from "@/lib/utils"

Expand Down
22 changes: 11 additions & 11 deletions packages/web/src/app/[domain]/search/components/filterPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
'use client';

import { FileIcon } from "@/components/ui/fileIcon";
import { Repository, SearchResultFile } from "@/lib/types";
import { Repository, SearchResultFile } from "@/features/search/types";
import { cn, getRepoCodeHostInfo } from "@/lib/utils";
import { LaptopIcon } from "@radix-ui/react-icons";
import Image from "next/image";
import { useRouter, useSearchParams } from "next/navigation";
import { useEffect, useMemo } from "react";
import { useCallback, useEffect, useMemo } from "react";
import { Entry } from "./entry";
import { Filter } from "./filter";

Expand All@@ -28,15 +28,15 @@ export const FilterPanel = ({
const searchParams = useSearchParams();

// Helper to parse query params into sets
const getSelectedFromQuery = (param: string) => {
const getSelectedFromQuery = useCallback((param: string) => {
const value = searchParams.get(param);
return value ? new Set(value.split(',')) : new Set();
};
}, [searchParams]);

const repos = useMemo(() => {
const selectedRepos = getSelectedFromQuery(REPOS_QUERY_PARAM);
return aggregateMatches(
"Repository",
"repository",
matches,
(key) => {
const repo: Repository | undefined = repoMetadata[key];
Expand All@@ -60,12 +60,12 @@ export const FilterPanel = ({
};
}
)
}, [searchParams]);
}, [getSelectedFromQuery, matches, repoMetadata]);

const languages = useMemo(() => {
const selectedLanguages = getSelectedFromQuery(LANGUAGES_QUERY_PARAM);
return aggregateMatches(
"Language",
"language",
matches,
(key) => {
const Icon = (
Expand All@@ -81,7 +81,7 @@ export const FilterPanel = ({
} satisfies Entry;
}
);
}, [searchParams]);
}, [getSelectedFromQuery, matches]);

// Calls `onFilterChanged` with the filtered list of matches
// whenever the filter state changes.
Expand All@@ -91,8 +91,8 @@ export const FilterPanel = ({

const filteredMatches = matches.filter((match) =>
(
(selectedRepos.size === 0 ? true : selectedRepos.has(match.Repository)) &&
(selectedLanguages.size === 0 ? true : selectedLanguages.has(match.Language))
(selectedRepos.size === 0 ? true : selectedRepos.has(match.repository)) &&
(selectedLanguages.size === 0 ? true : selectedLanguages.has(match.language))
)
);
onFilterChanged(filteredMatches);
Expand DownExpand Up@@ -166,7 +166,7 @@ export const FilterPanel = ({
* }
*/
const aggregateMatches = (
propName: 'Repository' | 'Language',
propName: 'repository' | 'language',
matches: SearchResultFile[],
createEntry: (key: string) => Entry
) => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

chore: Sourcebot REST api surface#290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendan-kellam merged 5 commits into from
May 3, 2025
Merged

chore: Sourcebot REST api surface #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d254e28
Api shim wip
brendan-kellam May 2, 2025
cfb523f
further wip
brendan-kellam May 3, 2025
9f87212
lint
brendan-kellam May 3, 2025
ae96bd5
nits
brendan-kellam May 3, 2025
177a182
feedback
brendan-kellam May 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/web/.eslintrc.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"next/core-web-vitals"
],
"rules": {
Expand Down
3 changes: 2 additions & 1 deletion packages/web/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
"lint": "cross-env SKIP_ENV_VALIDATION=1 next lint",
Comment thread
brendan-kellam marked this conversation as resolved.
"test": "vitest",
"dev:emails": "email dev --dir ./src/emails",
"stripe:listen": "stripe listen --forward-to http://localhost:3000/api/stripe"
Expand DownExpand Up@@ -146,6 +146,7 @@
"@types/react-dom": "^18",
"@typescript-eslint/eslint-plugin": "^8.3.0",
"@typescript-eslint/parser": "^8.3.0",
"cross-env": "^7.0.3",
"eslint": "^8",
"eslint-config-next": "14.2.6",
"eslint-plugin-react": "^7.35.0",
Expand Down
7 changes: 4 additions & 3 deletions packages/web/src/app/[domain]/browse/[...path]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { FileHeader } from "@/app/[domain]/components/fileHeader";
import { TopBar } from "@/app/[domain]/components/topBar";
import { Separator } from '@/components/ui/separator';
import { getFileSource, listRepositories } from '@/lib/server/searchService';
import { getFileSource } from '@/features/search/fileSourceApi';
import { listRepositories } from '@/features/search/listReposApi';
import { base64Decode, isServiceError } from "@/lib/utils";
import { CodePreview } from "./codePreview";
import { ErrorCode } from "@/lib/errorCodes";
Expand DownExpand Up@@ -57,7 +58,7 @@ export default async function BrowsePage({
if (isServiceError(reposResponse)) {
throw new ServiceErrorException(reposResponse);
}
const repo = reposResponse.List.Repos.find(r => r.Repository.Name === repoName);
const repo = reposResponse.repos.find(r => r.name === repoName);

if (pathType === 'tree') {
// @todo : proper tree handling
Expand All@@ -81,7 +82,7 @@ export default async function BrowsePage({
<div className="bg-accent py-1 px-2 flex flex-row">
<FileHeader
fileName={path}
repo={repo.Repository}
repo={repo}
branchDisplayName={revisionName}
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/components/fileHeader.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { Repository } from "@/lib/types";
import { Repository } from "@/features/search/types";
import { getRepoCodeHostInfo } from "@/lib/utils";
import { LaptopIcon } from "@radix-ui/react-icons";
import clsx from "clsx";
Expand Down
1 change: 1 addition & 0 deletions packages/web/src/app/[domain]/components/searchBar/searchSuggestionsBox.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ const SearchSuggestionsBox = forwardRef(({
searchHistorySuggestions,
languageSuggestions,
searchContextSuggestions,
refineModeSuggestions,
]);

// When the list of suggestions change, reset the highlight index
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/components/searchBar/useSuggestionModeAndQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@ export const useSuggestionModeAndQuery = ({
suggestionQuery: part,
suggestionMode: "refine",
}
}, [cursorPosition, isSuggestionsEnabled, query, isHistorySearchEnabled]);
}, [cursorPosition, isSuggestionsEnabled, query, isHistorySearchEnabled, suggestionModeMappings]);

// Debug logging for tracking mode transitions.
const [prevSuggestionMode, setPrevSuggestionMode] = useState<SuggestionMode>("none");
Expand Down
29 changes: 15 additions & 14 deletions packages/web/src/app/[domain]/components/searchBar/useSuggestionsData.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Suggestion, SuggestionMode } from "./searchSuggestionsBox";
import { getRepos, search } from "@/app/api/(client)/client";
import { getSearchContexts } from "@/actions";
import { useMemo } from "react";
import { Symbol } from "@/lib/types";
import { SearchSymbol } from "@/features/search/types";
import { languageMetadataMap } from "@/lib/languageMetadata";
import {
VscSymbolClass,
Expand DownExpand Up@@ -40,10 +40,9 @@ export const useSuggestionsData = ({
queryKey: ["repoSuggestions"],
queryFn: () => getRepos(domain),
select: (data): Suggestion[] => {
return data.List.Repos
.map(r => r.Repository)
return data.repos
.map(r => ({
value: r.Name
value: r.name,
}));
},
enabled: suggestionMode === "repo",
Expand All@@ -54,16 +53,17 @@ export const useSuggestionsData = ({
queryKey: ["fileSuggestions", suggestionQuery],
queryFn: () => search({
query: `file:${suggestionQuery}`,
maxMatchDisplayCount: 15,
matches: 15,
contextLines: 1,
}, domain),
select: (data): Suggestion[] => {
if (isServiceError(data)) {
return [];
}

return data.Result.Files?.map((file) => ({
value: file.FileName
})) ?? [];
return data.files.map((file) => ({
value: file.fileName.text,
}));
},
enabled: suggestionMode === "file"
});
Expand All@@ -73,22 +73,23 @@ export const useSuggestionsData = ({
queryKey: ["symbolSuggestions", suggestionQuery],
queryFn: () => search({
query: `sym:${suggestionQuery.length > 0 ? suggestionQuery : ".*"}`,
maxMatchDisplayCount: 15,
matches: 15,
contextLines: 1,
}, domain),
select: (data): Suggestion[] => {
if (isServiceError(data)) {
return [];
}

const symbols = data.Result.Files?.flatMap((file) => file.ChunkMatches).flatMap((chunk) => chunk.SymbolInfo ?? []);
const symbols = data.files.flatMap((file) => file.chunks).flatMap((chunk) => chunk.symbols ?? []);
if (!symbols) {
return [];
}

// De-duplicate on symbol name & kind.
const symbolMap = new Map<string, Symbol>(symbols.map((symbol: Symbol) => [`${symbol.Kind}.${symbol.Sym}`, symbol]));
const symbolMap = new Map<string, SearchSymbol>(symbols.map((symbol: SearchSymbol) => [`${symbol.kind}.${symbol.symbol}`, symbol]));
const suggestions = Array.from(symbolMap.values()).map((symbol) => ({
value: symbol.Sym,
value: symbol.symbol,
Icon: getSymbolIcon(symbol),
} satisfies Suggestion));

Expand DownExpand Up@@ -157,8 +158,8 @@ export const useSuggestionsData = ({
}
}

const getSymbolIcon = (symbol: Symbol) => {
switch (symbol.Kind) {
const getSymbolIcon = (symbol: SearchSymbol) => {
switch (symbol.kind) {
case "methodSpec":
case "method":
case "function":
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/app/[domain]/connections/[id]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import { isServiceError } from "@/lib/utils"
import { notFound } from "next/navigation"
import { OrgRole } from "@sourcebot/db"
import { CodeHostType } from "@/lib/utils"
import { BitbucketConnectionConfig } from "@sourcebot/schemas/v3/bitbucket.type"

interface ConnectionManagementPageProps {
params: {
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/connections/quickActions.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -403,7 +403,7 @@ export const bitbucketCloudQuickActions: QuickAction<BitbucketConnectionConfig>[
selectionText: "username",
description: (
<div className="flex flex-col">
<span>Username to use for authentication. This is only required if you're using an App Password (stored in <Code>token</Code>) for authentication.</span>
<span>Username to use for authentication. This is only required if you&apos;re using an App Password (stored in <Code>token</Code>) for authentication.</span>
</div>
)
},
Expand Down
6 changes: 3 additions & 3 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/codePreview.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,12 @@
import { EditorContextMenu } from "@/app/[domain]/components/editorContextMenu";
import { Button } from "@/components/ui/button";
import { ScrollArea } from "@/components/ui/scroll-area";
import { SearchResultChunk } from "@/features/search/types";
import { useCodeMirrorTheme } from "@/hooks/useCodeMirrorTheme";
import { useKeymapExtension } from "@/hooks/useKeymapExtension";
import { useSyntaxHighlightingExtension } from "@/hooks/useSyntaxHighlightingExtension";
import { gutterWidthExtension } from "@/lib/extensions/gutterWidthExtension";
import { highlightRanges, searchResultHighlightExtension } from "@/lib/extensions/searchResultHighlightExtension";
import { SearchResultFileMatch } from "@/lib/types";
import { search } from "@codemirror/search";
import { EditorView } from "@codemirror/view";
import { Cross1Icon, FileIcon } from "@radix-ui/react-icons";
Expand All@@ -22,7 +22,7 @@ export interface CodePreviewFile {
content: string;
filepath: string;
link?: string;
matches: SearchResultFileMatch[];
matches: SearchResultChunk[];
language: string;
revision: string;
}
Expand DownExpand Up@@ -84,7 +84,7 @@ export const CodePreview = ({
}

return file.matches.flatMap((match) => {
return match.Ranges;
return match.matchRanges;
})
}, [file]);

Expand Down
30 changes: 13 additions & 17 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,10 @@ import { fetchFileSource } from "@/app/api/(client)/client";
import { base64Decode } from "@/lib/utils";
import { useQuery } from "@tanstack/react-query";
import { CodePreview, CodePreviewFile } from "./codePreview";
import { SearchResultFile } from "@/lib/types";
import { SearchResultFile } from "@/features/search/types";
import { useDomain } from "@/hooks/useDomain";
import { SymbolIcon } from "@radix-ui/react-icons";

interface CodePreviewPanelProps {
fileMatch?: SearchResultFile;
onClose: () => void;
Expand All@@ -25,24 +26,24 @@ export const CodePreviewPanel = ({
const domain = useDomain();

const { data: file, isLoading } = useQuery({
queryKey: ["source", fileMatch?.FileName, fileMatch?.Repository, fileMatch?.Branches],
queryKey: ["source", fileMatch?.fileName, fileMatch?.repository, fileMatch?.branches],
queryFn: async (): Promise<CodePreviewFile | undefined> => {
if (!fileMatch) {
return undefined;
}

// If there are multiple branches pointing to the same revision of this file, it doesn't
// matter which branch we use here, so use the first one.
const branch = fileMatch.Branches && fileMatch.Branches.length > 0 ? fileMatch.Branches[0] : undefined;
const branch = fileMatch.branches && fileMatch.branches.length > 0 ? fileMatch.branches[0] : undefined;

return fetchFileSource({
fileName: fileMatch.FileName,
repository: fileMatch.Repository,
fileName: fileMatch.fileName.text,
repository: fileMatch.repository,
branch,
}, domain)
.then(({ source }) => {
const link = (() => {
const template = repoUrlTemplates[fileMatch.Repository];
const template = repoUrlTemplates[fileMatch.repository];

// This is a hacky parser for templates generated by
// the go text/template package. Example template:
Expand All@@ -55,7 +56,7 @@ export const CodePreviewPanel = ({
const url =
template.substring("{{URLJoinPath ".length,template.indexOf("}}"))
.replace(".Version", branch ?? "HEAD")
.replace(".Path", fileMatch.FileName)
.replace(".Path", fileMatch.fileName.text)
.split(" ")
.map((part) => {
// remove wrapping quotes
Expand All@@ -68,24 +69,19 @@ export const CodePreviewPanel = ({
const optionalQueryParams =
template.substring(template.indexOf("}}") + 2)
.replace("{{.Version}}", branch ?? "HEAD")
.replace("{{.Path}}", fileMatch.FileName);
.replace("{{.Path}}", fileMatch.fileName.text);

return url + optionalQueryParams;
})();

const decodedSource = base64Decode(source);

// Filter out filename matches
const filteredMatches = fileMatch.ChunkMatches.filter((match) => {
return !match.FileName;
});

return {
content: decodedSource,
filepath: fileMatch.FileName,
matches: filteredMatches,
filepath: fileMatch.fileName.text,
matches: fileMatch.chunks,
link: link,
language: fileMatch.Language,
language: fileMatch.language,
revision: branch ?? "HEAD",
};
});
Expand All@@ -103,7 +99,7 @@ export const CodePreviewPanel = ({
return (
<CodePreview
file={file}
repoName={fileMatch?.Repository}
repoName={fileMatch?.repository}
onClose={onClose}
selectedMatchIndex={selectedMatchIndex}
onSelectedMatchIndexChange={onSelectedMatchIndexChange}
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/app/[domain]/search/components/filterPanel/filter.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
import { useMemo, useState } from "react";
import { compareEntries, Entry } from "./entry";
import { Input } from "@/components/ui/input";
import { ScrollArea } from "@/components/ui/scroll-area";
import Fuse from "fuse.js";
import { cn } from "@/lib/utils"

Expand Down
22 changes: 11 additions & 11 deletions packages/web/src/app/[domain]/search/components/filterPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
'use client';

import { FileIcon } from "@/components/ui/fileIcon";
import { Repository, SearchResultFile } from "@/lib/types";
import { Repository, SearchResultFile } from "@/features/search/types";
import { cn, getRepoCodeHostInfo } from "@/lib/utils";
import { LaptopIcon } from "@radix-ui/react-icons";
import Image from "next/image";
import { useRouter, useSearchParams } from "next/navigation";
import { useEffect, useMemo } from "react";
import { useCallback, useEffect, useMemo } from "react";
import { Entry } from "./entry";
import { Filter } from "./filter";

Expand All@@ -28,15 +28,15 @@ export const FilterPanel = ({
const searchParams = useSearchParams();

// Helper to parse query params into sets
const getSelectedFromQuery = (param: string) => {
const getSelectedFromQuery = useCallback((param: string) => {
const value = searchParams.get(param);
return value ? new Set(value.split(',')) : new Set();
};
}, [searchParams]);

const repos = useMemo(() => {
const selectedRepos = getSelectedFromQuery(REPOS_QUERY_PARAM);
return aggregateMatches(
"Repository",
"repository",
matches,
(key) => {
const repo: Repository | undefined = repoMetadata[key];
Expand All@@ -60,12 +60,12 @@ export const FilterPanel = ({
};
}
)
}, [searchParams]);
}, [getSelectedFromQuery, matches, repoMetadata]);

const languages = useMemo(() => {
const selectedLanguages = getSelectedFromQuery(LANGUAGES_QUERY_PARAM);
return aggregateMatches(
"Language",
"language",
matches,
(key) => {
const Icon = (
Expand All@@ -81,7 +81,7 @@ export const FilterPanel = ({
} satisfies Entry;
}
);
}, [searchParams]);
}, [getSelectedFromQuery, matches]);

// Calls `onFilterChanged` with the filtered list of matches
// whenever the filter state changes.
Expand All@@ -91,8 +91,8 @@ export const FilterPanel = ({

const filteredMatches = matches.filter((match) =>
(
(selectedRepos.size === 0 ? true : selectedRepos.has(match.Repository)) &&
(selectedLanguages.size === 0 ? true : selectedLanguages.has(match.Language))
(selectedRepos.size === 0 ? true : selectedRepos.has(match.repository)) &&
(selectedLanguages.size === 0 ? true : selectedLanguages.has(match.language))
)
);
onFilterChanged(filteredMatches);
Expand DownExpand Up@@ -166,7 +166,7 @@ export const FilterPanel = ({
* }
*/
const aggregateMatches = (
propName: 'Repository' | 'Language',
propName: 'repository' | 'language',
matches: SearchResultFile[],
createEntry: (key: string) => Entry
) => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

chore: Sourcebot REST api surface#290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendan-kellam merged 5 commits into from
May 3, 2025
Merged

chore: Sourcebot REST api surface #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d254e28
Api shim wip
brendan-kellam May 2, 2025
cfb523f
further wip
brendan-kellam May 3, 2025
9f87212
lint
brendan-kellam May 3, 2025
ae96bd5
nits
brendan-kellam May 3, 2025
177a182
feedback
brendan-kellam May 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/web/.eslintrc.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"next/core-web-vitals"
],
"rules": {
Expand Down
3 changes: 2 additions & 1 deletion packages/web/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
"lint": "cross-env SKIP_ENV_VALIDATION=1 next lint",
Comment thread
brendan-kellam marked this conversation as resolved.
"test": "vitest",
"dev:emails": "email dev --dir ./src/emails",
"stripe:listen": "stripe listen --forward-to http://localhost:3000/api/stripe"
Expand DownExpand Up@@ -146,6 +146,7 @@
"@types/react-dom": "^18",
"@typescript-eslint/eslint-plugin": "^8.3.0",
"@typescript-eslint/parser": "^8.3.0",
"cross-env": "^7.0.3",
"eslint": "^8",
"eslint-config-next": "14.2.6",
"eslint-plugin-react": "^7.35.0",
Expand Down
7 changes: 4 additions & 3 deletions packages/web/src/app/[domain]/browse/[...path]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { FileHeader } from "@/app/[domain]/components/fileHeader";
import { TopBar } from "@/app/[domain]/components/topBar";
import { Separator } from '@/components/ui/separator';
import { getFileSource, listRepositories } from '@/lib/server/searchService';
import { getFileSource } from '@/features/search/fileSourceApi';
import { listRepositories } from '@/features/search/listReposApi';
import { base64Decode, isServiceError } from "@/lib/utils";
import { CodePreview } from "./codePreview";
import { ErrorCode } from "@/lib/errorCodes";
Expand DownExpand Up@@ -57,7 +58,7 @@ export default async function BrowsePage({
if (isServiceError(reposResponse)) {
throw new ServiceErrorException(reposResponse);
}
const repo = reposResponse.List.Repos.find(r => r.Repository.Name === repoName);
const repo = reposResponse.repos.find(r => r.name === repoName);

if (pathType === 'tree') {
// @todo : proper tree handling
Expand All@@ -81,7 +82,7 @@ export default async function BrowsePage({
<div className="bg-accent py-1 px-2 flex flex-row">
<FileHeader
fileName={path}
repo={repo.Repository}
repo={repo}
branchDisplayName={revisionName}
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/components/fileHeader.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { Repository } from "@/lib/types";
import { Repository } from "@/features/search/types";
import { getRepoCodeHostInfo } from "@/lib/utils";
import { LaptopIcon } from "@radix-ui/react-icons";
import clsx from "clsx";
Expand Down
1 change: 1 addition & 0 deletions packages/web/src/app/[domain]/components/searchBar/searchSuggestionsBox.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ const SearchSuggestionsBox = forwardRef(({
searchHistorySuggestions,
languageSuggestions,
searchContextSuggestions,
refineModeSuggestions,
]);

// When the list of suggestions change, reset the highlight index
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/components/searchBar/useSuggestionModeAndQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@ export const useSuggestionModeAndQuery = ({
suggestionQuery: part,
suggestionMode: "refine",
}
}, [cursorPosition, isSuggestionsEnabled, query, isHistorySearchEnabled]);
}, [cursorPosition, isSuggestionsEnabled, query, isHistorySearchEnabled, suggestionModeMappings]);

// Debug logging for tracking mode transitions.
const [prevSuggestionMode, setPrevSuggestionMode] = useState<SuggestionMode>("none");
Expand Down
29 changes: 15 additions & 14 deletions packages/web/src/app/[domain]/components/searchBar/useSuggestionsData.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Suggestion, SuggestionMode } from "./searchSuggestionsBox";
import { getRepos, search } from "@/app/api/(client)/client";
import { getSearchContexts } from "@/actions";
import { useMemo } from "react";
import { Symbol } from "@/lib/types";
import { SearchSymbol } from "@/features/search/types";
import { languageMetadataMap } from "@/lib/languageMetadata";
import {
VscSymbolClass,
Expand DownExpand Up@@ -40,10 +40,9 @@ export const useSuggestionsData = ({
queryKey: ["repoSuggestions"],
queryFn: () => getRepos(domain),
select: (data): Suggestion[] => {
return data.List.Repos
.map(r => r.Repository)
return data.repos
.map(r => ({
value: r.Name
value: r.name,
}));
},
enabled: suggestionMode === "repo",
Expand All@@ -54,16 +53,17 @@ export const useSuggestionsData = ({
queryKey: ["fileSuggestions", suggestionQuery],
queryFn: () => search({
query: `file:${suggestionQuery}`,
maxMatchDisplayCount: 15,
matches: 15,
contextLines: 1,
}, domain),
select: (data): Suggestion[] => {
if (isServiceError(data)) {
return [];
}

return data.Result.Files?.map((file) => ({
value: file.FileName
})) ?? [];
return data.files.map((file) => ({
value: file.fileName.text,
}));
},
enabled: suggestionMode === "file"
});
Expand All@@ -73,22 +73,23 @@ export const useSuggestionsData = ({
queryKey: ["symbolSuggestions", suggestionQuery],
queryFn: () => search({
query: `sym:${suggestionQuery.length > 0 ? suggestionQuery : ".*"}`,
maxMatchDisplayCount: 15,
matches: 15,
contextLines: 1,
}, domain),
select: (data): Suggestion[] => {
if (isServiceError(data)) {
return [];
}

const symbols = data.Result.Files?.flatMap((file) => file.ChunkMatches).flatMap((chunk) => chunk.SymbolInfo ?? []);
const symbols = data.files.flatMap((file) => file.chunks).flatMap((chunk) => chunk.symbols ?? []);
if (!symbols) {
return [];
}

// De-duplicate on symbol name & kind.
const symbolMap = new Map<string, Symbol>(symbols.map((symbol: Symbol) => [`${symbol.Kind}.${symbol.Sym}`, symbol]));
const symbolMap = new Map<string, SearchSymbol>(symbols.map((symbol: SearchSymbol) => [`${symbol.kind}.${symbol.symbol}`, symbol]));
const suggestions = Array.from(symbolMap.values()).map((symbol) => ({
value: symbol.Sym,
value: symbol.symbol,
Icon: getSymbolIcon(symbol),
} satisfies Suggestion));

Expand DownExpand Up@@ -157,8 +158,8 @@ export const useSuggestionsData = ({
}
}

const getSymbolIcon = (symbol: Symbol) => {
switch (symbol.Kind) {
const getSymbolIcon = (symbol: SearchSymbol) => {
switch (symbol.kind) {
case "methodSpec":
case "method":
case "function":
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/app/[domain]/connections/[id]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import { isServiceError } from "@/lib/utils"
import { notFound } from "next/navigation"
import { OrgRole } from "@sourcebot/db"
import { CodeHostType } from "@/lib/utils"
import { BitbucketConnectionConfig } from "@sourcebot/schemas/v3/bitbucket.type"

interface ConnectionManagementPageProps {
params: {
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/connections/quickActions.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -403,7 +403,7 @@ export const bitbucketCloudQuickActions: QuickAction<BitbucketConnectionConfig>[
selectionText: "username",
description: (
<div className="flex flex-col">
<span>Username to use for authentication. This is only required if you're using an App Password (stored in <Code>token</Code>) for authentication.</span>
<span>Username to use for authentication. This is only required if you&apos;re using an App Password (stored in <Code>token</Code>) for authentication.</span>
</div>
)
},
Expand Down
6 changes: 3 additions & 3 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/codePreview.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,12 @@
import { EditorContextMenu } from "@/app/[domain]/components/editorContextMenu";
import { Button } from "@/components/ui/button";
import { ScrollArea } from "@/components/ui/scroll-area";
import { SearchResultChunk } from "@/features/search/types";
import { useCodeMirrorTheme } from "@/hooks/useCodeMirrorTheme";
import { useKeymapExtension } from "@/hooks/useKeymapExtension";
import { useSyntaxHighlightingExtension } from "@/hooks/useSyntaxHighlightingExtension";
import { gutterWidthExtension } from "@/lib/extensions/gutterWidthExtension";
import { highlightRanges, searchResultHighlightExtension } from "@/lib/extensions/searchResultHighlightExtension";
import { SearchResultFileMatch } from "@/lib/types";
import { search } from "@codemirror/search";
import { EditorView } from "@codemirror/view";
import { Cross1Icon, FileIcon } from "@radix-ui/react-icons";
Expand All@@ -22,7 +22,7 @@ export interface CodePreviewFile {
content: string;
filepath: string;
link?: string;
matches: SearchResultFileMatch[];
matches: SearchResultChunk[];
language: string;
revision: string;
}
Expand DownExpand Up@@ -84,7 +84,7 @@ export const CodePreview = ({
}

return file.matches.flatMap((match) => {
return match.Ranges;
return match.matchRanges;
})
}, [file]);

Expand Down
30 changes: 13 additions & 17 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,10 @@ import { fetchFileSource } from "@/app/api/(client)/client";
import { base64Decode } from "@/lib/utils";
import { useQuery } from "@tanstack/react-query";
import { CodePreview, CodePreviewFile } from "./codePreview";
import { SearchResultFile } from "@/lib/types";
import { SearchResultFile } from "@/features/search/types";
import { useDomain } from "@/hooks/useDomain";
import { SymbolIcon } from "@radix-ui/react-icons";

interface CodePreviewPanelProps {
fileMatch?: SearchResultFile;
onClose: () => void;
Expand All@@ -25,24 +26,24 @@ export const CodePreviewPanel = ({
const domain = useDomain();

const { data: file, isLoading } = useQuery({
queryKey: ["source", fileMatch?.FileName, fileMatch?.Repository, fileMatch?.Branches],
queryKey: ["source", fileMatch?.fileName, fileMatch?.repository, fileMatch?.branches],
queryFn: async (): Promise<CodePreviewFile | undefined> => {
if (!fileMatch) {
return undefined;
}

// If there are multiple branches pointing to the same revision of this file, it doesn't
// matter which branch we use here, so use the first one.
const branch = fileMatch.Branches && fileMatch.Branches.length > 0 ? fileMatch.Branches[0] : undefined;
const branch = fileMatch.branches && fileMatch.branches.length > 0 ? fileMatch.branches[0] : undefined;

return fetchFileSource({
fileName: fileMatch.FileName,
repository: fileMatch.Repository,
fileName: fileMatch.fileName.text,
repository: fileMatch.repository,
branch,
}, domain)
.then(({ source }) => {
const link = (() => {
const template = repoUrlTemplates[fileMatch.Repository];
const template = repoUrlTemplates[fileMatch.repository];

// This is a hacky parser for templates generated by
// the go text/template package. Example template:
Expand All@@ -55,7 +56,7 @@ export const CodePreviewPanel = ({
const url =
template.substring("{{URLJoinPath ".length,template.indexOf("}}"))
.replace(".Version", branch ?? "HEAD")
.replace(".Path", fileMatch.FileName)
.replace(".Path", fileMatch.fileName.text)
.split(" ")
.map((part) => {
// remove wrapping quotes
Expand All@@ -68,24 +69,19 @@ export const CodePreviewPanel = ({
const optionalQueryParams =
template.substring(template.indexOf("}}") + 2)
.replace("{{.Version}}", branch ?? "HEAD")
.replace("{{.Path}}", fileMatch.FileName);
.replace("{{.Path}}", fileMatch.fileName.text);

return url + optionalQueryParams;
})();

const decodedSource = base64Decode(source);

// Filter out filename matches
const filteredMatches = fileMatch.ChunkMatches.filter((match) => {
return !match.FileName;
});

return {
content: decodedSource,
filepath: fileMatch.FileName,
matches: filteredMatches,
filepath: fileMatch.fileName.text,
matches: fileMatch.chunks,
link: link,
language: fileMatch.Language,
language: fileMatch.language,
revision: branch ?? "HEAD",
};
});
Expand All@@ -103,7 +99,7 @@ export const CodePreviewPanel = ({
return (
<CodePreview
file={file}
repoName={fileMatch?.Repository}
repoName={fileMatch?.repository}
onClose={onClose}
selectedMatchIndex={selectedMatchIndex}
onSelectedMatchIndexChange={onSelectedMatchIndexChange}
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/app/[domain]/search/components/filterPanel/filter.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
import { useMemo, useState } from "react";
import { compareEntries, Entry } from "./entry";
import { Input } from "@/components/ui/input";
import { ScrollArea } from "@/components/ui/scroll-area";
import Fuse from "fuse.js";
import { cn } from "@/lib/utils"

Expand Down
22 changes: 11 additions & 11 deletions packages/web/src/app/[domain]/search/components/filterPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
'use client';

import { FileIcon } from "@/components/ui/fileIcon";
import { Repository, SearchResultFile } from "@/lib/types";
import { Repository, SearchResultFile } from "@/features/search/types";
import { cn, getRepoCodeHostInfo } from "@/lib/utils";
import { LaptopIcon } from "@radix-ui/react-icons";
import Image from "next/image";
import { useRouter, useSearchParams } from "next/navigation";
import { useEffect, useMemo } from "react";
import { useCallback, useEffect, useMemo } from "react";
import { Entry } from "./entry";
import { Filter } from "./filter";

Expand All@@ -28,15 +28,15 @@ export const FilterPanel = ({
const searchParams = useSearchParams();

// Helper to parse query params into sets
const getSelectedFromQuery = (param: string) => {
const getSelectedFromQuery = useCallback((param: string) => {
const value = searchParams.get(param);
return value ? new Set(value.split(',')) : new Set();
};
}, [searchParams]);

const repos = useMemo(() => {
const selectedRepos = getSelectedFromQuery(REPOS_QUERY_PARAM);
return aggregateMatches(
"Repository",
"repository",
matches,
(key) => {
const repo: Repository | undefined = repoMetadata[key];
Expand All@@ -60,12 +60,12 @@ export const FilterPanel = ({
};
}
)
}, [searchParams]);
}, [getSelectedFromQuery, matches, repoMetadata]);

const languages = useMemo(() => {
const selectedLanguages = getSelectedFromQuery(LANGUAGES_QUERY_PARAM);
return aggregateMatches(
"Language",
"language",
matches,
(key) => {
const Icon = (
Expand All@@ -81,7 +81,7 @@ export const FilterPanel = ({
} satisfies Entry;
}
);
}, [searchParams]);
}, [getSelectedFromQuery, matches]);

// Calls `onFilterChanged` with the filtered list of matches
// whenever the filter state changes.
Expand All@@ -91,8 +91,8 @@ export const FilterPanel = ({

const filteredMatches = matches.filter((match) =>
(
(selectedRepos.size === 0 ? true : selectedRepos.has(match.Repository)) &&
(selectedLanguages.size === 0 ? true : selectedLanguages.has(match.Language))
(selectedRepos.size === 0 ? true : selectedRepos.has(match.repository)) &&
(selectedLanguages.size === 0 ? true : selectedLanguages.has(match.language))
)
);
onFilterChanged(filteredMatches);
Expand DownExpand Up@@ -166,7 +166,7 @@ export const FilterPanel = ({
* }
*/
const aggregateMatches = (
propName: 'Repository' | 'Language',
propName: 'repository' | 'language',
matches: SearchResultFile[],
createEntry: (key: string) => Entry
) => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

chore: Sourcebot REST api surface#290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendan-kellam merged 5 commits into from
May 3, 2025
Merged

chore: Sourcebot REST api surface #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d254e28
Api shim wip
brendan-kellam May 2, 2025
cfb523f
further wip
brendan-kellam May 3, 2025
9f87212
lint
brendan-kellam May 3, 2025
ae96bd5
nits
brendan-kellam May 3, 2025
177a182
feedback
brendan-kellam May 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/web/.eslintrc.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"next/core-web-vitals"
],
"rules": {
Expand Down
3 changes: 2 additions & 1 deletion packages/web/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
"lint": "cross-env SKIP_ENV_VALIDATION=1 next lint",
Comment thread
brendan-kellam marked this conversation as resolved.
"test": "vitest",
"dev:emails": "email dev --dir ./src/emails",
"stripe:listen": "stripe listen --forward-to http://localhost:3000/api/stripe"
Expand DownExpand Up@@ -146,6 +146,7 @@
"@types/react-dom": "^18",
"@typescript-eslint/eslint-plugin": "^8.3.0",
"@typescript-eslint/parser": "^8.3.0",
"cross-env": "^7.0.3",
"eslint": "^8",
"eslint-config-next": "14.2.6",
"eslint-plugin-react": "^7.35.0",
Expand Down
7 changes: 4 additions & 3 deletions packages/web/src/app/[domain]/browse/[...path]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { FileHeader } from "@/app/[domain]/components/fileHeader";
import { TopBar } from "@/app/[domain]/components/topBar";
import { Separator } from '@/components/ui/separator';
import { getFileSource, listRepositories } from '@/lib/server/searchService';
import { getFileSource } from '@/features/search/fileSourceApi';
import { listRepositories } from '@/features/search/listReposApi';
import { base64Decode, isServiceError } from "@/lib/utils";
import { CodePreview } from "./codePreview";
import { ErrorCode } from "@/lib/errorCodes";
Expand DownExpand Up@@ -57,7 +58,7 @@ export default async function BrowsePage({
if (isServiceError(reposResponse)) {
throw new ServiceErrorException(reposResponse);
}
const repo = reposResponse.List.Repos.find(r => r.Repository.Name === repoName);
const repo = reposResponse.repos.find(r => r.name === repoName);

if (pathType === 'tree') {
// @todo : proper tree handling
Expand All@@ -81,7 +82,7 @@ export default async function BrowsePage({
<div className="bg-accent py-1 px-2 flex flex-row">
<FileHeader
fileName={path}
repo={repo.Repository}
repo={repo}
branchDisplayName={revisionName}
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/components/fileHeader.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { Repository } from "@/lib/types";
import { Repository } from "@/features/search/types";
import { getRepoCodeHostInfo } from "@/lib/utils";
import { LaptopIcon } from "@radix-ui/react-icons";
import clsx from "clsx";
Expand Down
1 change: 1 addition & 0 deletions packages/web/src/app/[domain]/components/searchBar/searchSuggestionsBox.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ const SearchSuggestionsBox = forwardRef(({
searchHistorySuggestions,
languageSuggestions,
searchContextSuggestions,
refineModeSuggestions,
]);

// When the list of suggestions change, reset the highlight index
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/components/searchBar/useSuggestionModeAndQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@ export const useSuggestionModeAndQuery = ({
suggestionQuery: part,
suggestionMode: "refine",
}
}, [cursorPosition, isSuggestionsEnabled, query, isHistorySearchEnabled]);
}, [cursorPosition, isSuggestionsEnabled, query, isHistorySearchEnabled, suggestionModeMappings]);

// Debug logging for tracking mode transitions.
const [prevSuggestionMode, setPrevSuggestionMode] = useState<SuggestionMode>("none");
Expand Down
29 changes: 15 additions & 14 deletions packages/web/src/app/[domain]/components/searchBar/useSuggestionsData.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Suggestion, SuggestionMode } from "./searchSuggestionsBox";
import { getRepos, search } from "@/app/api/(client)/client";
import { getSearchContexts } from "@/actions";
import { useMemo } from "react";
import { Symbol } from "@/lib/types";
import { SearchSymbol } from "@/features/search/types";
import { languageMetadataMap } from "@/lib/languageMetadata";
import {
VscSymbolClass,
Expand DownExpand Up@@ -40,10 +40,9 @@ export const useSuggestionsData = ({
queryKey: ["repoSuggestions"],
queryFn: () => getRepos(domain),
select: (data): Suggestion[] => {
return data.List.Repos
.map(r => r.Repository)
return data.repos
.map(r => ({
value: r.Name
value: r.name,
}));
},
enabled: suggestionMode === "repo",
Expand All@@ -54,16 +53,17 @@ export const useSuggestionsData = ({
queryKey: ["fileSuggestions", suggestionQuery],
queryFn: () => search({
query: `file:${suggestionQuery}`,
maxMatchDisplayCount: 15,
matches: 15,
contextLines: 1,
}, domain),
select: (data): Suggestion[] => {
if (isServiceError(data)) {
return [];
}

return data.Result.Files?.map((file) => ({
value: file.FileName
})) ?? [];
return data.files.map((file) => ({
value: file.fileName.text,
}));
},
enabled: suggestionMode === "file"
});
Expand All@@ -73,22 +73,23 @@ export const useSuggestionsData = ({
queryKey: ["symbolSuggestions", suggestionQuery],
queryFn: () => search({
query: `sym:${suggestionQuery.length > 0 ? suggestionQuery : ".*"}`,
maxMatchDisplayCount: 15,
matches: 15,
contextLines: 1,
}, domain),
select: (data): Suggestion[] => {
if (isServiceError(data)) {
return [];
}

const symbols = data.Result.Files?.flatMap((file) => file.ChunkMatches).flatMap((chunk) => chunk.SymbolInfo ?? []);
const symbols = data.files.flatMap((file) => file.chunks).flatMap((chunk) => chunk.symbols ?? []);
if (!symbols) {
return [];
}

// De-duplicate on symbol name & kind.
const symbolMap = new Map<string, Symbol>(symbols.map((symbol: Symbol) => [`${symbol.Kind}.${symbol.Sym}`, symbol]));
const symbolMap = new Map<string, SearchSymbol>(symbols.map((symbol: SearchSymbol) => [`${symbol.kind}.${symbol.symbol}`, symbol]));
const suggestions = Array.from(symbolMap.values()).map((symbol) => ({
value: symbol.Sym,
value: symbol.symbol,
Icon: getSymbolIcon(symbol),
} satisfies Suggestion));

Expand DownExpand Up@@ -157,8 +158,8 @@ export const useSuggestionsData = ({
}
}

const getSymbolIcon = (symbol: Symbol) => {
switch (symbol.Kind) {
const getSymbolIcon = (symbol: SearchSymbol) => {
switch (symbol.kind) {
case "methodSpec":
case "method":
case "function":
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/app/[domain]/connections/[id]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import { isServiceError } from "@/lib/utils"
import { notFound } from "next/navigation"
import { OrgRole } from "@sourcebot/db"
import { CodeHostType } from "@/lib/utils"
import { BitbucketConnectionConfig } from "@sourcebot/schemas/v3/bitbucket.type"

interface ConnectionManagementPageProps {
params: {
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/connections/quickActions.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -403,7 +403,7 @@ export const bitbucketCloudQuickActions: QuickAction<BitbucketConnectionConfig>[
selectionText: "username",
description: (
<div className="flex flex-col">
<span>Username to use for authentication. This is only required if you're using an App Password (stored in <Code>token</Code>) for authentication.</span>
<span>Username to use for authentication. This is only required if you&apos;re using an App Password (stored in <Code>token</Code>) for authentication.</span>
</div>
)
},
Expand Down
6 changes: 3 additions & 3 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/codePreview.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,12 @@
import { EditorContextMenu } from "@/app/[domain]/components/editorContextMenu";
import { Button } from "@/components/ui/button";
import { ScrollArea } from "@/components/ui/scroll-area";
import { SearchResultChunk } from "@/features/search/types";
import { useCodeMirrorTheme } from "@/hooks/useCodeMirrorTheme";
import { useKeymapExtension } from "@/hooks/useKeymapExtension";
import { useSyntaxHighlightingExtension } from "@/hooks/useSyntaxHighlightingExtension";
import { gutterWidthExtension } from "@/lib/extensions/gutterWidthExtension";
import { highlightRanges, searchResultHighlightExtension } from "@/lib/extensions/searchResultHighlightExtension";
import { SearchResultFileMatch } from "@/lib/types";
import { search } from "@codemirror/search";
import { EditorView } from "@codemirror/view";
import { Cross1Icon, FileIcon } from "@radix-ui/react-icons";
Expand All@@ -22,7 +22,7 @@ export interface CodePreviewFile {
content: string;
filepath: string;
link?: string;
matches: SearchResultFileMatch[];
matches: SearchResultChunk[];
language: string;
revision: string;
}
Expand DownExpand Up@@ -84,7 +84,7 @@ export const CodePreview = ({
}

return file.matches.flatMap((match) => {
return match.Ranges;
return match.matchRanges;
})
}, [file]);

Expand Down
30 changes: 13 additions & 17 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,10 @@ import { fetchFileSource } from "@/app/api/(client)/client";
import { base64Decode } from "@/lib/utils";
import { useQuery } from "@tanstack/react-query";
import { CodePreview, CodePreviewFile } from "./codePreview";
import { SearchResultFile } from "@/lib/types";
import { SearchResultFile } from "@/features/search/types";
import { useDomain } from "@/hooks/useDomain";
import { SymbolIcon } from "@radix-ui/react-icons";

interface CodePreviewPanelProps {
fileMatch?: SearchResultFile;
onClose: () => void;
Expand All@@ -25,24 +26,24 @@ export const CodePreviewPanel = ({
const domain = useDomain();

const { data: file, isLoading } = useQuery({
queryKey: ["source", fileMatch?.FileName, fileMatch?.Repository, fileMatch?.Branches],
queryKey: ["source", fileMatch?.fileName, fileMatch?.repository, fileMatch?.branches],
queryFn: async (): Promise<CodePreviewFile | undefined> => {
if (!fileMatch) {
return undefined;
}

// If there are multiple branches pointing to the same revision of this file, it doesn't
// matter which branch we use here, so use the first one.
const branch = fileMatch.Branches && fileMatch.Branches.length > 0 ? fileMatch.Branches[0] : undefined;
const branch = fileMatch.branches && fileMatch.branches.length > 0 ? fileMatch.branches[0] : undefined;

return fetchFileSource({
fileName: fileMatch.FileName,
repository: fileMatch.Repository,
fileName: fileMatch.fileName.text,
repository: fileMatch.repository,
branch,
}, domain)
.then(({ source }) => {
const link = (() => {
const template = repoUrlTemplates[fileMatch.Repository];
const template = repoUrlTemplates[fileMatch.repository];

// This is a hacky parser for templates generated by
// the go text/template package. Example template:
Expand All@@ -55,7 +56,7 @@ export const CodePreviewPanel = ({
const url =
template.substring("{{URLJoinPath ".length,template.indexOf("}}"))
.replace(".Version", branch ?? "HEAD")
.replace(".Path", fileMatch.FileName)
.replace(".Path", fileMatch.fileName.text)
.split(" ")
.map((part) => {
// remove wrapping quotes
Expand All@@ -68,24 +69,19 @@ export const CodePreviewPanel = ({
const optionalQueryParams =
template.substring(template.indexOf("}}") + 2)
.replace("{{.Version}}", branch ?? "HEAD")
.replace("{{.Path}}", fileMatch.FileName);
.replace("{{.Path}}", fileMatch.fileName.text);

return url + optionalQueryParams;
})();

const decodedSource = base64Decode(source);

// Filter out filename matches
const filteredMatches = fileMatch.ChunkMatches.filter((match) => {
return !match.FileName;
});

return {
content: decodedSource,
filepath: fileMatch.FileName,
matches: filteredMatches,
filepath: fileMatch.fileName.text,
matches: fileMatch.chunks,
link: link,
language: fileMatch.Language,
language: fileMatch.language,
revision: branch ?? "HEAD",
};
});
Expand All@@ -103,7 +99,7 @@ export const CodePreviewPanel = ({
return (
<CodePreview
file={file}
repoName={fileMatch?.Repository}
repoName={fileMatch?.repository}
onClose={onClose}
selectedMatchIndex={selectedMatchIndex}
onSelectedMatchIndexChange={onSelectedMatchIndexChange}
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/app/[domain]/search/components/filterPanel/filter.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
import { useMemo, useState } from "react";
import { compareEntries, Entry } from "./entry";
import { Input } from "@/components/ui/input";
import { ScrollArea } from "@/components/ui/scroll-area";
import Fuse from "fuse.js";
import { cn } from "@/lib/utils"

Expand Down
22 changes: 11 additions & 11 deletions packages/web/src/app/[domain]/search/components/filterPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
'use client';

import { FileIcon } from "@/components/ui/fileIcon";
import { Repository, SearchResultFile } from "@/lib/types";
import { Repository, SearchResultFile } from "@/features/search/types";
import { cn, getRepoCodeHostInfo } from "@/lib/utils";
import { LaptopIcon } from "@radix-ui/react-icons";
import Image from "next/image";
import { useRouter, useSearchParams } from "next/navigation";
import { useEffect, useMemo } from "react";
import { useCallback, useEffect, useMemo } from "react";
import { Entry } from "./entry";
import { Filter } from "./filter";

Expand All@@ -28,15 +28,15 @@ export const FilterPanel = ({
const searchParams = useSearchParams();

// Helper to parse query params into sets
const getSelectedFromQuery = (param: string) => {
const getSelectedFromQuery = useCallback((param: string) => {
const value = searchParams.get(param);
return value ? new Set(value.split(',')) : new Set();
};
}, [searchParams]);

const repos = useMemo(() => {
const selectedRepos = getSelectedFromQuery(REPOS_QUERY_PARAM);
return aggregateMatches(
"Repository",
"repository",
matches,
(key) => {
const repo: Repository | undefined = repoMetadata[key];
Expand All@@ -60,12 +60,12 @@ export const FilterPanel = ({
};
}
)
}, [searchParams]);
}, [getSelectedFromQuery, matches, repoMetadata]);

const languages = useMemo(() => {
const selectedLanguages = getSelectedFromQuery(LANGUAGES_QUERY_PARAM);
return aggregateMatches(
"Language",
"language",
matches,
(key) => {
const Icon = (
Expand All@@ -81,7 +81,7 @@ export const FilterPanel = ({
} satisfies Entry;
}
);
}, [searchParams]);
}, [getSelectedFromQuery, matches]);

// Calls `onFilterChanged` with the filtered list of matches
// whenever the filter state changes.
Expand All@@ -91,8 +91,8 @@ export const FilterPanel = ({

const filteredMatches = matches.filter((match) =>
(
(selectedRepos.size === 0 ? true : selectedRepos.has(match.Repository)) &&
(selectedLanguages.size === 0 ? true : selectedLanguages.has(match.Language))
(selectedRepos.size === 0 ? true : selectedRepos.has(match.repository)) &&
(selectedLanguages.size === 0 ? true : selectedLanguages.has(match.language))
)
);
onFilterChanged(filteredMatches);
Expand DownExpand Up@@ -166,7 +166,7 @@ export const FilterPanel = ({
* }
*/
const aggregateMatches = (
propName: 'Repository' | 'Language',
propName: 'repository' | 'language',
matches: SearchResultFile[],
createEntry: (key: string) => Entry
) => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

chore: Sourcebot REST api surface#290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendan-kellam merged 5 commits into from
May 3, 2025
Merged

chore: Sourcebot REST api surface #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d254e28
Api shim wip
brendan-kellam May 2, 2025
cfb523f
further wip
brendan-kellam May 3, 2025
9f87212
lint
brendan-kellam May 3, 2025
ae96bd5
nits
brendan-kellam May 3, 2025
177a182
feedback
brendan-kellam May 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/web/.eslintrc.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"next/core-web-vitals"
],
"rules": {
Expand Down
3 changes: 2 additions & 1 deletion packages/web/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
"lint": "cross-env SKIP_ENV_VALIDATION=1 next lint",
Comment thread
brendan-kellam marked this conversation as resolved.
"test": "vitest",
"dev:emails": "email dev --dir ./src/emails",
"stripe:listen": "stripe listen --forward-to http://localhost:3000/api/stripe"
Expand DownExpand Up@@ -146,6 +146,7 @@
"@types/react-dom": "^18",
"@typescript-eslint/eslint-plugin": "^8.3.0",
"@typescript-eslint/parser": "^8.3.0",
"cross-env": "^7.0.3",
"eslint": "^8",
"eslint-config-next": "14.2.6",
"eslint-plugin-react": "^7.35.0",
Expand Down
7 changes: 4 additions & 3 deletions packages/web/src/app/[domain]/browse/[...path]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { FileHeader } from "@/app/[domain]/components/fileHeader";
import { TopBar } from "@/app/[domain]/components/topBar";
import { Separator } from '@/components/ui/separator';
import { getFileSource, listRepositories } from '@/lib/server/searchService';
import { getFileSource } from '@/features/search/fileSourceApi';
import { listRepositories } from '@/features/search/listReposApi';
import { base64Decode, isServiceError } from "@/lib/utils";
import { CodePreview } from "./codePreview";
import { ErrorCode } from "@/lib/errorCodes";
Expand DownExpand Up@@ -57,7 +58,7 @@ export default async function BrowsePage({
if (isServiceError(reposResponse)) {
throw new ServiceErrorException(reposResponse);
}
const repo = reposResponse.List.Repos.find(r => r.Repository.Name === repoName);
const repo = reposResponse.repos.find(r => r.name === repoName);

if (pathType === 'tree') {
// @todo : proper tree handling
Expand All@@ -81,7 +82,7 @@ export default async function BrowsePage({
<div className="bg-accent py-1 px-2 flex flex-row">
<FileHeader
fileName={path}
repo={repo.Repository}
repo={repo}
branchDisplayName={revisionName}
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/components/fileHeader.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { Repository } from "@/lib/types";
import { Repository } from "@/features/search/types";
import { getRepoCodeHostInfo } from "@/lib/utils";
import { LaptopIcon } from "@radix-ui/react-icons";
import clsx from "clsx";
Expand Down
1 change: 1 addition & 0 deletions packages/web/src/app/[domain]/components/searchBar/searchSuggestionsBox.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ const SearchSuggestionsBox = forwardRef(({
searchHistorySuggestions,
languageSuggestions,
searchContextSuggestions,
refineModeSuggestions,
]);

// When the list of suggestions change, reset the highlight index
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/components/searchBar/useSuggestionModeAndQuery.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,7 +69,7 @@ export const useSuggestionModeAndQuery = ({
suggestionQuery: part,
suggestionMode: "refine",
}
}, [cursorPosition, isSuggestionsEnabled, query, isHistorySearchEnabled]);
}, [cursorPosition, isSuggestionsEnabled, query, isHistorySearchEnabled, suggestionModeMappings]);

// Debug logging for tracking mode transitions.
const [prevSuggestionMode, setPrevSuggestionMode] = useState<SuggestionMode>("none");
Expand Down
29 changes: 15 additions & 14 deletions packages/web/src/app/[domain]/components/searchBar/useSuggestionsData.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Suggestion, SuggestionMode } from "./searchSuggestionsBox";
import { getRepos, search } from "@/app/api/(client)/client";
import { getSearchContexts } from "@/actions";
import { useMemo } from "react";
import { Symbol } from "@/lib/types";
import { SearchSymbol } from "@/features/search/types";
import { languageMetadataMap } from "@/lib/languageMetadata";
import {
VscSymbolClass,
Expand DownExpand Up@@ -40,10 +40,9 @@ export const useSuggestionsData = ({
queryKey: ["repoSuggestions"],
queryFn: () => getRepos(domain),
select: (data): Suggestion[] => {
return data.List.Repos
.map(r => r.Repository)
return data.repos
.map(r => ({
value: r.Name
value: r.name,
}));
},
enabled: suggestionMode === "repo",
Expand All@@ -54,16 +53,17 @@ export const useSuggestionsData = ({
queryKey: ["fileSuggestions", suggestionQuery],
queryFn: () => search({
query: `file:${suggestionQuery}`,
maxMatchDisplayCount: 15,
matches: 15,
contextLines: 1,
}, domain),
select: (data): Suggestion[] => {
if (isServiceError(data)) {
return [];
}

return data.Result.Files?.map((file) => ({
value: file.FileName
})) ?? [];
return data.files.map((file) => ({
value: file.fileName.text,
}));
},
enabled: suggestionMode === "file"
});
Expand All@@ -73,22 +73,23 @@ export const useSuggestionsData = ({
queryKey: ["symbolSuggestions", suggestionQuery],
queryFn: () => search({
query: `sym:${suggestionQuery.length > 0 ? suggestionQuery : ".*"}`,
maxMatchDisplayCount: 15,
matches: 15,
contextLines: 1,
}, domain),
select: (data): Suggestion[] => {
if (isServiceError(data)) {
return [];
}

const symbols = data.Result.Files?.flatMap((file) => file.ChunkMatches).flatMap((chunk) => chunk.SymbolInfo ?? []);
const symbols = data.files.flatMap((file) => file.chunks).flatMap((chunk) => chunk.symbols ?? []);
if (!symbols) {
return [];
}

// De-duplicate on symbol name & kind.
const symbolMap = new Map<string, Symbol>(symbols.map((symbol: Symbol) => [`${symbol.Kind}.${symbol.Sym}`, symbol]));
const symbolMap = new Map<string, SearchSymbol>(symbols.map((symbol: SearchSymbol) => [`${symbol.kind}.${symbol.symbol}`, symbol]));
const suggestions = Array.from(symbolMap.values()).map((symbol) => ({
value: symbol.Sym,
value: symbol.symbol,
Icon: getSymbolIcon(symbol),
} satisfies Suggestion));

Expand DownExpand Up@@ -157,8 +158,8 @@ export const useSuggestionsData = ({
}
}

const getSymbolIcon = (symbol: Symbol) => {
switch (symbol.Kind) {
const getSymbolIcon = (symbol: SearchSymbol) => {
switch (symbol.kind) {
case "methodSpec":
case "method":
case "function":
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/app/[domain]/connections/[id]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import { isServiceError } from "@/lib/utils"
import { notFound } from "next/navigation"
import { OrgRole } from "@sourcebot/db"
import { CodeHostType } from "@/lib/utils"
import { BitbucketConnectionConfig } from "@sourcebot/schemas/v3/bitbucket.type"

interface ConnectionManagementPageProps {
params: {
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app/[domain]/connections/quickActions.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -403,7 +403,7 @@ export const bitbucketCloudQuickActions: QuickAction<BitbucketConnectionConfig>[
selectionText: "username",
description: (
<div className="flex flex-col">
<span>Username to use for authentication. This is only required if you're using an App Password (stored in <Code>token</Code>) for authentication.</span>
<span>Username to use for authentication. This is only required if you&apos;re using an App Password (stored in <Code>token</Code>) for authentication.</span>
</div>
)
},
Expand Down
6 changes: 3 additions & 3 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/codePreview.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,12 @@
import { EditorContextMenu } from "@/app/[domain]/components/editorContextMenu";
import { Button } from "@/components/ui/button";
import { ScrollArea } from "@/components/ui/scroll-area";
import { SearchResultChunk } from "@/features/search/types";
import { useCodeMirrorTheme } from "@/hooks/useCodeMirrorTheme";
import { useKeymapExtension } from "@/hooks/useKeymapExtension";
import { useSyntaxHighlightingExtension } from "@/hooks/useSyntaxHighlightingExtension";
import { gutterWidthExtension } from "@/lib/extensions/gutterWidthExtension";
import { highlightRanges, searchResultHighlightExtension } from "@/lib/extensions/searchResultHighlightExtension";
import { SearchResultFileMatch } from "@/lib/types";
import { search } from "@codemirror/search";
import { EditorView } from "@codemirror/view";
import { Cross1Icon, FileIcon } from "@radix-ui/react-icons";
Expand All@@ -22,7 +22,7 @@ export interface CodePreviewFile {
content: string;
filepath: string;
link?: string;
matches: SearchResultFileMatch[];
matches: SearchResultChunk[];
language: string;
revision: string;
}
Expand DownExpand Up@@ -84,7 +84,7 @@ export const CodePreview = ({
}

return file.matches.flatMap((match) => {
return match.Ranges;
return match.matchRanges;
})
}, [file]);

Expand Down
30 changes: 13 additions & 17 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,10 @@ import { fetchFileSource } from "@/app/api/(client)/client";
import { base64Decode } from "@/lib/utils";
import { useQuery } from "@tanstack/react-query";
import { CodePreview, CodePreviewFile } from "./codePreview";
import { SearchResultFile } from "@/lib/types";
import { SearchResultFile } from "@/features/search/types";
import { useDomain } from "@/hooks/useDomain";
import { SymbolIcon } from "@radix-ui/react-icons";

interface CodePreviewPanelProps {
fileMatch?: SearchResultFile;
onClose: () => void;
Expand All@@ -25,24 +26,24 @@ export const CodePreviewPanel = ({
const domain = useDomain();

const { data: file, isLoading } = useQuery({
queryKey: ["source", fileMatch?.FileName, fileMatch?.Repository, fileMatch?.Branches],
queryKey: ["source", fileMatch?.fileName, fileMatch?.repository, fileMatch?.branches],
queryFn: async (): Promise<CodePreviewFile | undefined> => {
if (!fileMatch) {
return undefined;
}

// If there are multiple branches pointing to the same revision of this file, it doesn't
// matter which branch we use here, so use the first one.
const branch = fileMatch.Branches && fileMatch.Branches.length > 0 ? fileMatch.Branches[0] : undefined;
const branch = fileMatch.branches && fileMatch.branches.length > 0 ? fileMatch.branches[0] : undefined;

return fetchFileSource({
fileName: fileMatch.FileName,
repository: fileMatch.Repository,
fileName: fileMatch.fileName.text,
repository: fileMatch.repository,
branch,
}, domain)
.then(({ source }) => {
const link = (() => {
const template = repoUrlTemplates[fileMatch.Repository];
const template = repoUrlTemplates[fileMatch.repository];

// This is a hacky parser for templates generated by
// the go text/template package. Example template:
Expand All@@ -55,7 +56,7 @@ export const CodePreviewPanel = ({
const url =
template.substring("{{URLJoinPath ".length,template.indexOf("}}"))
.replace(".Version", branch ?? "HEAD")
.replace(".Path", fileMatch.FileName)
.replace(".Path", fileMatch.fileName.text)
.split(" ")
.map((part) => {
// remove wrapping quotes
Expand All@@ -68,24 +69,19 @@ export const CodePreviewPanel = ({
const optionalQueryParams =
template.substring(template.indexOf("}}") + 2)
.replace("{{.Version}}", branch ?? "HEAD")
.replace("{{.Path}}", fileMatch.FileName);
.replace("{{.Path}}", fileMatch.fileName.text);

return url + optionalQueryParams;
})();

const decodedSource = base64Decode(source);

// Filter out filename matches
const filteredMatches = fileMatch.ChunkMatches.filter((match) => {
return !match.FileName;
});

return {
content: decodedSource,
filepath: fileMatch.FileName,
matches: filteredMatches,
filepath: fileMatch.fileName.text,
matches: fileMatch.chunks,
link: link,
language: fileMatch.Language,
language: fileMatch.language,
revision: branch ?? "HEAD",
};
});
Expand All@@ -103,7 +99,7 @@ export const CodePreviewPanel = ({
return (
<CodePreview
file={file}
repoName={fileMatch?.Repository}
repoName={fileMatch?.repository}
onClose={onClose}
selectedMatchIndex={selectedMatchIndex}
onSelectedMatchIndexChange={onSelectedMatchIndexChange}
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/app/[domain]/search/components/filterPanel/filter.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
import { useMemo, useState } from "react";
import { compareEntries, Entry } from "./entry";
import { Input } from "@/components/ui/input";
import { ScrollArea } from "@/components/ui/scroll-area";
import Fuse from "fuse.js";
import { cn } from "@/lib/utils"

Expand Down
22 changes: 11 additions & 11 deletions packages/web/src/app/[domain]/search/components/filterPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
'use client';

import { FileIcon } from "@/components/ui/fileIcon";
import { Repository, SearchResultFile } from "@/lib/types";
import { Repository, SearchResultFile } from "@/features/search/types";
import { cn, getRepoCodeHostInfo } from "@/lib/utils";
import { LaptopIcon } from "@radix-ui/react-icons";
import Image from "next/image";
import { useRouter, useSearchParams } from "next/navigation";
import { useEffect, useMemo } from "react";
import { useCallback, useEffect, useMemo } from "react";
import { Entry } from "./entry";
import { Filter } from "./filter";

Expand All@@ -28,15 +28,15 @@ export const FilterPanel = ({
const searchParams = useSearchParams();

// Helper to parse query params into sets
const getSelectedFromQuery = (param: string) => {
const getSelectedFromQuery = useCallback((param: string) => {
const value = searchParams.get(param);
return value ? new Set(value.split(',')) : new Set();
};
}, [searchParams]);

const repos = useMemo(() => {
const selectedRepos = getSelectedFromQuery(REPOS_QUERY_PARAM);
return aggregateMatches(
"Repository",
"repository",
matches,
(key) => {
const repo: Repository | undefined = repoMetadata[key];
Expand All@@ -60,12 +60,12 @@ export const FilterPanel = ({
};
}
)
}, [searchParams]);
}, [getSelectedFromQuery, matches, repoMetadata]);

const languages = useMemo(() => {
const selectedLanguages = getSelectedFromQuery(LANGUAGES_QUERY_PARAM);
return aggregateMatches(
"Language",
"language",
matches,
(key) => {
const Icon = (
Expand All@@ -81,7 +81,7 @@ export const FilterPanel = ({
} satisfies Entry;
}
);
}, [searchParams]);
}, [getSelectedFromQuery, matches]);

// Calls `onFilterChanged` with the filtered list of matches
// whenever the filter state changes.
Expand All@@ -91,8 +91,8 @@ export const FilterPanel = ({

const filteredMatches = matches.filter((match) =>
(
(selectedRepos.size === 0 ? true : selectedRepos.has(match.Repository)) &&
(selectedLanguages.size === 0 ? true : selectedLanguages.has(match.Language))
(selectedRepos.size === 0 ? true : selectedRepos.has(match.repository)) &&
(selectedLanguages.size === 0 ? true : selectedLanguages.has(match.language))
)
);
onFilterChanged(filteredMatches);
Expand DownExpand Up@@ -166,7 +166,7 @@ export const FilterPanel = ({
* }
*/
const aggregateMatches = (
propName: 'Repository' | 'Language',
propName: 'repository' | 'language',
matches: SearchResultFile[],
createEntry: (key: string) => Entry
) => {
Expand Down
Loading