Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/src/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@ export const getRepos = async ({
repoName: repo.name,
path: '',
pathType: 'tree',
domain: org.domain,
})}`,
externalWebUrl: repo.webUrl ?? undefined,
imageUrl: repo.imageUrl ?? undefined,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { FileTreeItemComponent } from "@/app/[domain]/browse/components/fileTree
import { getBrowsePath } from "../../hooks/utils";
import { ScrollArea } from "@/components/ui/scroll-area";
import { useBrowseParams } from "../../hooks/useBrowseParams";
import { useDomain } from "@/hooks/useDomain";
import { FileTreeItem } from "@/features/git";

interface PureTreePreviewPanelProps {
Expand All @@ -15,7 +14,6 @@ interface PureTreePreviewPanelProps {
export const PureTreePreviewPanel = ({ items }: PureTreePreviewPanelProps) => {
const { repoName, revisionName } = useBrowseParams();
const scrollAreaRef = useRef<HTMLDivElement>(null);
const domain = useDomain();

return (
<ScrollArea
Expand All @@ -35,7 +33,6 @@ export const PureTreePreviewPanel = ({ items }: PureTreePreviewPanelProps) => {
revisionName,
path: item.path,
pathType: item.type === 'tree' ? 'tree' : 'blob',
domain,
})}
/>
))}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import React, { useCallback, useMemo, useRef } from "react";
import { FileTreeItemComponent } from "./fileTreeItemComponent";
import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
import { useBrowseParams } from "@/app/[domain]/browse/hooks/useBrowseParams";
import { useDomain } from "@/hooks/useDomain";

const renderLoadingSkeleton = (depth: number) => {
return (
Expand All @@ -28,7 +27,6 @@ interface PureFileTreePanelProps {
export const PureFileTreePanel = ({ tree, openPaths, path, onTreeNodeClicked }: PureFileTreePanelProps) => {
const scrollAreaRef = useRef<HTMLDivElement>(null);
const { repoName, revisionName } = useBrowseParams();
const domain = useDomain();

const renderTree = useCallback((nodes: FileTreeNode, depth = 0): React.ReactNode => {
return (
Expand All @@ -42,7 +40,6 @@ export const PureFileTreePanel = ({ tree, openPaths, path, onTreeNodeClicked }:
revisionName,
path: node.path,
pathType: node.type === 'tree' ? 'tree' : 'blob',
domain,
})}
key={node.path}
node={node}
Expand Down Expand Up @@ -80,7 +77,7 @@ export const PureFileTreePanel = ({ tree, openPaths, path, onTreeNodeClicked }:
})}
</>
);
}, [domain, onTreeNodeClicked, path, repoName, revisionName, openPaths]);
}, [onTreeNodeClicked, path, repoName, revisionName, openPaths]);

const renderedTree = useMemo(() => renderTree(tree), [tree, renderTree]);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
'use client';

import { useRouter } from "next/navigation";
import { useDomain } from "@/hooks/useDomain";
import { useCallback } from "react";
import { getBrowsePath, GetBrowsePathProps } from "./utils";

export const useBrowseNavigation = () => {
const router = useRouter();
const domain = useDomain();

const navigateToPath = useCallback(({
repoName,
Expand All @@ -16,21 +14,20 @@ export const useBrowseNavigation = () => {
pathType,
highlightRange,
setBrowseState,
}: Omit<GetBrowsePathProps, 'domain'>) => {
}: GetBrowsePathProps) => {
const browsePath = getBrowsePath({
repoName,
revisionName,
path,
pathType,
highlightRange,
setBrowseState,
domain,
});

router.push(browsePath);
}, [domain, router]);
}, [router]);

return {
navigateToPath,
};
};
};
5 changes: 3 additions & 2 deletions packages/web/src/app/[domain]/browse/hooks/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { BrowseState, SET_BROWSE_STATE_QUERY_PARAM } from "../browseStateProvider";
import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";

export const HIGHLIGHT_RANGE_QUERY_PARAM = 'highlightRange';

Expand All @@ -17,7 +18,6 @@ export interface GetBrowsePathProps {
pathType: 'blob' | 'tree';
highlightRange?: BrowseHighlightRange;
setBrowseState?: Partial<BrowseState>;
domain: string;
}

export const getBrowseParamsFromPathParam = (pathParam: string) => {
Expand Down Expand Up @@ -64,8 +64,9 @@ export const getBrowseParamsFromPathParam = (pathParam: string) => {
};

export const getBrowsePath = ({
repoName, revisionName, path, pathType, highlightRange, setBrowseState, domain,
repoName, revisionName, path, pathType, highlightRange, setBrowseState,
}: GetBrowsePathProps) => {
const domain = SINGLE_TENANT_ORG_DOMAIN;
const params = new URLSearchParams();

if (highlightRange) {
Expand Down
6 changes: 0 additions & 6 deletions packages/web/src/app/[domain]/components/pathHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import {
import { VscodeFileIcon } from "@/app/components/vscodeFileIcon";
import { CopyIconButton } from "./copyIconButton";
import Link from "next/link";
import { useDomain } from "@/hooks/useDomain";
import { CodeHostType } from "@sourcebot/db";

interface FileHeaderProps {
Expand Down Expand Up @@ -74,8 +73,6 @@ export const PathHeader = ({
const containerRef = useRef<HTMLDivElement>(null);
const breadcrumbsRef = useRef<HTMLDivElement>(null);
const [visibleSegmentCount, setVisibleSegmentCount] = useState<number | null>(null);
const domain = useDomain();

// Create breadcrumb segments from file path
const breadcrumbSegments = useMemo(() => {
const pathParts = path.split('/').filter(Boolean);
Expand Down Expand Up @@ -223,7 +220,6 @@ export const PathHeader = ({
path: '/',
pathType: 'tree',
revisionName,
domain,
})}
>
{info?.displayName}
Expand Down Expand Up @@ -262,7 +258,6 @@ export const PathHeader = ({
path: segment.fullPath,
pathType: segment.isLastSegment ? pathType : 'tree',
revisionName,
domain,
})}
className="font-mono text-sm hover:cursor cursor-pointer"
key={segment.fullPath}
Expand Down Expand Up @@ -291,7 +286,6 @@ export const PathHeader = ({
path: segment.fullPath,
pathType: segment.isLastSegment ? pathType : 'tree',
revisionName,
domain,
})}
>
{renderSegmentWithHighlight(segment)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ export const getColumns = (context: ColumnsContext): ColumnDef<Repo>[] => [
repoName: repo.name,
path: '/',
pathType: 'tree',
domain: SINGLE_TENANT_ORG_DOMAIN,
})}
className="font-medium hover:underline"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { SearchResultFile, SearchResultChunk } from "@/features/search";
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";
import Link from "next/link";
import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
import { useDomain } from "@/hooks/useDomain";


interface FileMatchProps {
Expand All @@ -16,8 +15,6 @@ export const FileMatch = ({
match,
file,
}: FileMatchProps) => {
const domain = useDomain();

// If it's just the title, don't show a code preview
if (match.matchRanges.length === 0) {
return null;
Expand All @@ -32,7 +29,6 @@ export const FileMatch = ({
revisionName: file.branches?.[0] ?? 'HEAD',
path: file.fileName.text,
pathType: 'blob',
domain,
highlightRange: {
start: {
lineNumber: match.contentStart.lineNumber,
Expand Down
1 change: 0 additions & 1 deletion packages/web/src/app/api/(server)/repos/listReposApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ export const listRepos = async ({ query, page, perPage, sort, direction, source
repoName: repo.name,
path: '',
pathType: 'tree',
domain: org.domain,
})}`,
repoDisplayName: repo.displayName ?? undefined,
externalWebUrl: repo.webUrl ?? undefined,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { useMemo, useRef } from "react";
import useCaptureEvent from "@/hooks/useCaptureEvent";
import { useVirtualizer } from "@tanstack/react-virtual";
import Link from "next/link";
import { useDomain } from "@/hooks/useDomain";

interface ReferenceListProps {
data: FindRelatedSymbolsResponse;
Expand All @@ -23,7 +22,6 @@ export const ReferenceList = ({
data,
revisionName,
}: ReferenceListProps) => {
const domain = useDomain();
const repoInfoMap = useMemo(() => {
return data.repositoryInfo.reduce((acc, repo) => {
acc[repo.id] = repo;
Expand Down Expand Up @@ -112,7 +110,6 @@ export const ReferenceList = ({
path: file.fileName,
pathType: 'blob',
highlightRange: match.range,
domain,
})}
onClick={() => {
captureEvent('wa_explore_menu_reference_clicked', {});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import { VscodeFileIcon } from "@/app/components/vscodeFileIcon";
import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";
import Link from "next/link";

type FileInfo = {
Expand All @@ -22,7 +21,6 @@ export const FileRow = ({ file }: { file: FileInfo }) => {
revisionName: file.revision,
path: file.path,
pathType: 'blob',
domain: SINGLE_TENANT_ORG_DOMAIN,
});

return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { ListTreeMetadata, ToolResult } from "@/features/tools";
import { RepoBadge } from "./repoBadge";
import { Separator } from "@/components/ui/separator";
import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";
import { FolderIcon } from "lucide-react";
import Link from "next/link";

Expand All @@ -18,7 +17,6 @@ export const ListTreeToolComponent = ({ metadata }: ToolResult<ListTreeMetadata>
revisionName: metadata.ref,
path: metadata.path,
pathType: 'tree',
domain: SINGLE_TENANT_ORG_DOMAIN,
})}
onClick={(e) => e.stopPropagation()}
className="inline-flex items-center gap-1 text-xs bg-muted hover:bg-accent px-1.5 py-0.5 rounded truncate text-foreground font-medium transition-colors min-w-0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import { ReadFileMetadata, ToolResult } from "@/features/tools";
import { VscodeFileIcon } from "@/app/components/vscodeFileIcon";
import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";
import { Separator } from "@/components/ui/separator";
import Link from "next/link";
import { RepoBadge } from "./repoBadge";
Expand All @@ -15,7 +14,6 @@ export const ReadFileToolComponent = ({ metadata }: ToolResult<ReadFileMetadata>
revisionName: metadata.ref,
path: metadata.path,
pathType: 'blob',
domain: SINGLE_TENANT_ORG_DOMAIN,
highlightRange: (metadata.isTruncated || metadata.startLine > 1) ? {
start: { lineNumber: metadata.startLine },
end: { lineNumber: metadata.endLine },
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
'use client';

import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";
import { getCodeHostIcon } from "@/lib/utils";
import { CodeHostType } from "@sourcebot/db";
import Image from "next/image";
Expand All @@ -13,7 +12,6 @@ export const RepoBadge = ({ repo }: { repo: { name: string; displayName: string;
repoName: repo.name,
path: '',
pathType: 'tree',
domain: SINGLE_TENANT_ORG_DOMAIN,
});

return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
'use client';

import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";
import { cn, getCodeHostIcon } from "@/lib/utils";
import { CodeHostType } from "@sourcebot/db";
import Image from "next/image";
Expand All @@ -20,7 +19,6 @@ export const RepoHeader = ({ repo, repoName, isPrimary }: { repo: RepoInfo | und
repoName: repoName,
path: '',
pathType: 'tree',
domain: SINGLE_TENANT_ORG_DOMAIN,
});

const className = cn("top-0 flex items-center gap-1.5 px-3 py-1.5 text-xs font-medium bg-popover border-b border-border",
Expand Down
2 changes: 0 additions & 2 deletions packages/web/src/features/chat/utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { BrowseHighlightRange, getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";
import { CreateUIMessage, TextUIPart, UIMessagePart } from "ai";
import { Descendant, Editor, Point, Range, Transforms } from "slate";
import { ANSWER_TAG, FILE_REFERENCE_PREFIX, FILE_REFERENCE_REGEX } from "./constants";
Expand Down Expand Up @@ -271,7 +270,6 @@ export const convertLLMOutputToPortableMarkdown = (text: string, baseUrl: string
repoName: repo,
path: fileName,
pathType: 'blob',
domain: SINGLE_TENANT_ORG_DOMAIN,
highlightRange,
});

Expand Down
2 changes: 0 additions & 2 deletions packages/web/src/features/git/getFileSourceApi.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { sew } from "@/middleware/sew";
import { getBrowsePath } from '@/app/[domain]/browse/hooks/utils';
import { getAuditService } from '@/ee/features/audit/factory';
import { SINGLE_TENANT_ORG_DOMAIN } from '@/lib/constants';
import { parseGitAttributes, resolveLanguageFromGitAttributes } from '@/lib/gitattributes';
import { detectLanguageFromFilename } from '@/lib/languageDetection';
import { ServiceError, notFound, fileNotFound, invalidGitRef, unexpectedError } from '@/lib/serviceError';
Expand Down Expand Up @@ -90,7 +89,6 @@ export const getFileSource = async ({ path: filePath, repo: repoName, ref }: Fil
revisionName: ref,
path: filePath,
pathType: 'blob',
domain: SINGLE_TENANT_ORG_DOMAIN,
})}`;

return {
Expand Down
2 changes: 0 additions & 2 deletions packages/web/src/features/search/zoektSearcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import { isBranchQuery, QueryIR, someInQueryIR } from './ir';
import { RepositoryInfo, SearchResponse, SearchResultFile, SearchStats, SourceRange, StreamedSearchErrorResponse, StreamedSearchResponse } from "./types";
import { captureEvent } from "@/lib/posthog";
import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";

const logger = createLogger("zoekt-searcher");

Expand Down Expand Up @@ -430,7 +429,6 @@ const transformZoektSearchResponse = async (response: ZoektGrpcSearchResponse, r
repoName: repo.name,
path: fileName,
pathType: 'blob',
domain: SINGLE_TENANT_ORG_DOMAIN,
revisionName: branchName,
})}`,
externalWebUrl: getCodeHostBrowseFileAtBranchUrl({
Expand Down
Loading