π OpenHands: AI-Driven Development
fix(frontend): hide repo button on local backend in GitControlBar (#464)
Hiep Le00f35cd8b1e9
diff --git a/__tests__/components/features/chat/git-control-bar-repo-button.test.tsx b/__tests__/components/features/chat/git-control-bar-repo-button.test.tsxindex f1886ccbc2..d6fc20b482 100644--- a/__tests__/components/features/chat/git-control-bar-repo-button.test.tsx+++ b/__tests__/components/features/chat/git-control-bar-repo-button.test.tsx@@ -120,21 +120,6 @@ describe("GitControlBarRepoButton", () => {expect(screen.getByText("COMMON$CONNECT_REPO")).toBeInTheDocument();});- it("should render a custom empty-state label when provided", () => {- render(- <GitControlBarRepoButton- selectedRepository={null}- gitProvider={null}- emptyStateLabel="Open Workspace"- />,- );-- expect(screen.getByText("Open Workspace")).toBeInTheDocument();- expect(- screen.queryByText("COMMON$CONNECT_REPO"),- ).not.toBeInTheDocument();- });-it("should show folder-open icon for connect-repo CTA", () => {render(<GitControlBarRepoButtondiff --git a/__tests__/components/features/chat/git-control-bar.test.tsx b/__tests__/components/features/chat/git-control-bar.test.tsxindex 659b9e7b94..e6f4e5ead1 100644--- a/__tests__/components/features/chat/git-control-bar.test.tsx+++ b/__tests__/components/features/chat/git-control-bar.test.tsx@@ -1,4 +1,72 @@-import { describe, it, expect } from "vitest";+import { describe, it, expect, vi, beforeEach } from "vitest";+import { screen } from "@testing-library/react";+import { renderWithProviders } from "test-utils";++import { useActiveBackend } from "#/contexts/active-backend-context";+import { useActiveConversation } from "#/hooks/query/use-active-conversation";+import { useTaskPolling } from "#/hooks/query/use-task-polling";+import { useLocalGitInfo } from "#/hooks/query/use-local-git-info";+import { useUnifiedWebSocketStatus } from "#/hooks/use-unified-websocket-status";+import { useSendMessage } from "#/hooks/use-send-message";+import { useUpdateConversationRepository } from "#/hooks/mutation/use-update-conversation-repository";+import { useHomeStore } from "#/stores/home-store";+import { useOptimisticUserMessageStore } from "#/stores/optimistic-user-message-store";+import { getStoredConversationMetadata } from "#/api/conversation-metadata-store";+import { GitControlBar } from "#/components/features/chat/git-control-bar";++vi.mock("#/hooks/use-conversation-id", () => ({+ useConversationId: () => ({ conversationId: "test-conversation-id" }),+}));+vi.mock("#/contexts/active-backend-context");+vi.mock("#/hooks/query/use-active-conversation");+vi.mock("#/hooks/query/use-task-polling");+vi.mock("#/hooks/query/use-local-git-info");+vi.mock("#/hooks/use-unified-websocket-status");+vi.mock("#/hooks/use-send-message");+vi.mock("#/hooks/mutation/use-update-conversation-repository");+vi.mock("#/stores/home-store");+vi.mock("#/stores/optimistic-user-message-store");+vi.mock("#/api/conversation-metadata-store");++vi.mock("#/components/features/chat/git-control-bar-repo-button", () => ({+ GitControlBarRepoButton: ({ disabled }: { disabled?: boolean }) => (+ <button+ data-testid="git-control-bar-repo-button"+ type="button"+ data-disabled={String(!!disabled)}+ />+ ),+}));+vi.mock("#/components/features/chat/git-control-bar-branch-button", () => ({+ GitControlBarBranchButton: () => null,+}));+vi.mock("#/components/features/chat/git-control-bar-pull-button", () => ({+ GitControlBarPullButton: () => null,+}));+vi.mock("#/components/features/chat/git-control-bar-push-button", () => ({+ GitControlBarPushButton: () => null,+}));+vi.mock("#/components/features/chat/git-control-bar-pr-button", () => ({+ GitControlBarPrButton: () => null,+}));+vi.mock("#/components/features/chat/git-control-bar-tooltip-wrapper", () => ({+ GitControlBarTooltipWrapper: ({ children }: { children: React.ReactNode }) =>+ children,+}));+vi.mock("#/components/features/chat/open-repository-modal", () => ({+ OpenRepositoryModal: () => null,+}));++const makeBackend = (kind: "local" | "cloud") => ({+ backend: {+ id: "backend-id",+ name: kind === "local" ? "Local" : "Cloud",+ host: "http://example.test",+ apiKey: "test-key",+ kind,+ },+ orgId: null,+});describe("GitControlBar clone prompt format", () => {// Helper function that mirrors the logic in git-control-bar.tsx@@ -14,7 +82,9 @@ describe("GitControlBar clone prompt format", () => {it("should include GitHub in clone prompt for github provider", () => {const prompt = generateClonePrompt("user/repo", "github", "main");- expect(prompt).toBe("Clone user/repo from Github and checkout branch main.");+ expect(prompt).toBe(+ "Clone user/repo from Github and checkout branch main.",+ );});it("should include GitLab in clone prompt for gitlab provider", () => {@@ -43,3 +113,67 @@ describe("GitControlBar clone prompt format", () => {expect(gitlabPrompt).toContain("from Gitlab");});});++describe("GitControlBar repo button visibility", () => {+ beforeEach(() => {+ vi.mocked(useActiveConversation).mockReturnValue({+ data: { id: "test-conversation-id" },+ } as ReturnType<typeof useActiveConversation>);+ vi.mocked(useTaskPolling).mockReturnValue({+ repositoryInfo: null,+ } as unknown as ReturnType<typeof useTaskPolling>);+ vi.mocked(useLocalGitInfo).mockReturnValue({+ data: null,+ } as unknown as ReturnType<typeof useLocalGitInfo>);+ vi.mocked(useUnifiedWebSocketStatus).mockReturnValue("OPEN");+ vi.mocked(useSendMessage).mockReturnValue({+ send: vi.fn(),+ } as unknown as ReturnType<typeof useSendMessage>);+ vi.mocked(useUpdateConversationRepository).mockReturnValue({+ mutate: vi.fn(),+ } as unknown as ReturnType<typeof useUpdateConversationRepository>);+ vi.mocked(useHomeStore).mockReturnValue({+ addRecentRepository: vi.fn(),+ } as unknown as ReturnType<typeof useHomeStore>);+ vi.mocked(useOptimisticUserMessageStore).mockImplementation(((+ selector: (s: unknown) => unknown,+ ) =>+ selector({+ enqueuePendingMessage: vi.fn(),+ markPendingMessageError: vi.fn(),+ })) as unknown as typeof useOptimisticUserMessageStore);+ vi.mocked(getStoredConversationMetadata).mockReturnValue(null);+ });++ it("hides the repo button on a local backend with no repository or workspace name", () => {+ vi.mocked(useActiveBackend).mockReturnValue(makeBackend("local"));++ renderWithProviders(<GitControlBar onSuggestionsClick={vi.fn()} />);++ expect(+ screen.queryByTestId("git-control-bar-repo-button"),+ ).not.toBeInTheDocument();+ });++ it("shows the repo button on a cloud backend with no repository connected", () => {+ vi.mocked(useActiveBackend).mockReturnValue(makeBackend("cloud"));++ renderWithProviders(<GitControlBar onSuggestionsClick={vi.fn()} />);++ expect(+ screen.getByTestId("git-control-bar-repo-button"),+ ).toBeInTheDocument();+ });++ it("renders the repo button as disabled on a local backend when only a workspace name is available", () => {+ vi.mocked(useActiveBackend).mockReturnValue(makeBackend("local"));+ vi.mocked(getStoredConversationMetadata).mockReturnValue({+ selected_workspace: "/projects/my-app",+ } as ReturnType<typeof getStoredConversationMetadata>);++ renderWithProviders(<GitControlBar onSuggestionsClick={vi.fn()} />);++ const button = screen.getByTestId("git-control-bar-repo-button");+ expect(button).toHaveAttribute("data-disabled", "true");+ });+});diff --git a/src/components/features/chat/git-control-bar-repo-button.tsx b/src/components/features/chat/git-control-bar-repo-button.tsxindex d8d949977c..866bc9ba02 100644--- a/src/components/features/chat/git-control-bar-repo-button.tsx+++ b/src/components/features/chat/git-control-bar-repo-button.tsx@@ -12,7 +12,6 @@ interface GitControlBarRepoButtonProps {selectedRepository: string | null | undefined;gitProvider: Provider | null | undefined;workspaceName?: string | null;- emptyStateLabel?: string;onClick?: () => void;disabled?: boolean;}@@ -21,7 +20,6 @@ export function GitControlBarRepoButton({selectedRepository,gitProvider,workspaceName,- emptyStateLabel,onClick,disabled,}: GitControlBarRepoButtonProps) {@@ -45,10 +43,7 @@ export function GitControlBarRepoButton({const showConnectRepoCta = !selectedRepository && !workspaceName;const buttonText =- selectedRepository ||- workspaceName ||- emptyStateLabel ||- t(I18nKey.COMMON$CONNECT_REPO);+ selectedRepository || workspaceName || t(I18nKey.COMMON$CONNECT_REPO);if (hasLinkableRepo) {return (diff --git a/src/components/features/chat/git-control-bar.tsx b/src/components/features/chat/git-control-bar.tsxindex 992da372e7..c8842bd738 100644--- a/src/components/features/chat/git-control-bar.tsx+++ b/src/components/features/chat/git-control-bar.tsx@@ -11,7 +11,6 @@ import { useTaskPolling } from "#/hooks/query/use-task-polling";import { useUnifiedWebSocketStatus } from "#/hooks/use-unified-websocket-status";import { useSendMessage } from "#/hooks/use-send-message";import { useUpdateConversationRepository } from "#/hooks/mutation/use-update-conversation-repository";-import { useCreateConversation } from "#/hooks/mutation/use-create-conversation";import { Provider } from "#/types/settings";import { Branch, GitRepository } from "#/types/git";import { I18nKey } from "#/i18n/declaration";@@ -23,11 +22,6 @@ import { useHomeStore } from "#/stores/home-store";import { useOptimisticUserMessageStore } from "#/stores/optimistic-user-message-store";import { getStoredConversationMetadata } from "#/api/conversation-metadata-store";import { useActiveBackend } from "#/contexts/active-backend-context";-import { useResolvedWorkspaces } from "#/hooks/query/use-resolved-workspaces";-import { useWorkspacesStore } from "#/stores/workspaces-store";-import { useNavigation } from "#/context/navigation-context";-import { FolderBrowserModal } from "#/components/features/home/workspace-dropdown/folder-browser-modal";-import RepoIcon from "#/icons/repo.svg?react";interface GitControlBarProps {onSuggestionsClick: (value: string) => void;@@ -37,11 +31,7 @@ export function GitControlBar({ onSuggestionsClick }: GitControlBarProps) {const { t } = useTranslation("openhands");const { conversationId } = useConversationId();const [isOpenRepoModalOpen, setIsOpenRepoModalOpen] = useState(false);- const [isWorkspaceMenuOpen, setIsWorkspaceMenuOpen] = useState(false);- const [isFolderBrowserOpen, setIsFolderBrowserOpen] = useState(false);- const workspaceMenuContainerRef = useRef<HTMLDivElement>(null);const { addRecentRepository } = useHomeStore();- const { navigate } = useNavigation();const enqueuePendingMessage = useOptimisticUserMessageStore((state) => state.enqueuePendingMessage,);@@ -50,8 +40,6 @@ export function GitControlBar({ onSuggestionsClick }: GitControlBarProps) {);const { backend } = useActiveBackend();const isLocalBackend = backend.kind === "local";- const { addWorkspaces, addWorkspaceParents } = useWorkspacesStore();- const { workspaces } = useResolvedWorkspaces();const { data: conversation } = useActiveConversation();const { repositoryInfo } = useTaskPolling();@@ -67,8 +55,6 @@ export function GitControlBar({ onSuggestionsClick }: GitControlBarProps) {sendRef.current = send;}, [send]);const { mutate: updateRepository } = useUpdateConversationRepository();- const { mutate: createConversation, isPending: isCreatingConversation } =- useCreateConversation();// Priority: conversation data > task data > locally-detected git info.// The local fallback runs `git remote get-url origin` / `git rev-parse --abbrev-ref HEAD`@@ -108,31 +94,6 @@ export function GitControlBar({ onSuggestionsClick }: GitControlBarProps) {// Enable buttons only when conversation exists and WS is connectedconst isConversationReady = !!conversation && webSocketStatus === "OPEN";- useEffect(() => {- if (!isWorkspaceMenuOpen || isFolderBrowserOpen) return undefined;- const onMouseDown = (event: MouseEvent) => {- if (- workspaceMenuContainerRef.current &&- !workspaceMenuContainerRef.current.contains(event.target as Node)- ) {- setIsWorkspaceMenuOpen(false);- }- };- document.addEventListener("mousedown", onMouseDown);- return () => document.removeEventListener("mousedown", onMouseDown);- }, [isWorkspaceMenuOpen, isFolderBrowserOpen]);-- useEffect(() => {- if (!isWorkspaceMenuOpen || isFolderBrowserOpen) return undefined;- const onKeyDown = (event: KeyboardEvent) => {- if (event.key === "Escape") {- setIsWorkspaceMenuOpen(false);- }- };- window.addEventListener("keydown", onKeyDown);- return () => window.removeEventListener("keydown", onKeyDown);- }, [isWorkspaceMenuOpen, isFolderBrowserOpen]);-const handleLaunchRepository = (repository: GitRepository,branch: Branch,@@ -197,106 +158,29 @@ export function GitControlBar({ onSuggestionsClick }: GitControlBarProps) {);};- const handleOpenWorkspaceClick = () => {- if (!isConversationReady || isCreatingConversation) return;-- if (workspaces.length === 0) {- setIsFolderBrowserOpen(true);- setIsWorkspaceMenuOpen(false);- return;- }-- setIsWorkspaceMenuOpen((open) => !open);- };-- const handleLaunchWorkspaceConversation = (workingDir?: string) => {- if (isCreatingConversation) return;- createConversation(- { workingDir },- {- onSuccess: (data) => {- setIsWorkspaceMenuOpen(false);- navigate(`/conversations/${data.conversation_id}`);- },- },- );- };+ // Local backends never use the remote-repo "Connect Repo" CTA, so suppress the+ // empty-state button there. A repo or workspace label inferred from local git+ // metadata is still informational and stays visible.+ const showRepoButton =+ !isLocalBackend || !!selectedRepository || !!workspaceName;+ // On a local backend the informational pill (e.g. workspace name, or a repo+ // detected without a recognized provider) should not open the remote-repo+ // modal β that flow is cloud-only. Disable the button in that case so the+ // click is a no-op. Linkable repos render as <a> and ignore `disabled`.+ const isRepoButtonInert = isLocalBackend && !hasRepository;return (<div className="flex flex-row items-center"><div className="flex flex-row gap-2.5 items-center overflow-x-auto flex-wrap md:flex-nowrap relative scrollbar-hide">- <div className="relative" ref={workspaceMenuContainerRef}>+ {showRepoButton ? (<GitControlBarRepoButtonselectedRepository={selectedRepository}gitProvider={gitProvider}workspaceName={workspaceName}- emptyStateLabel={isLocalBackend ? "Open Workspace" : undefined}- onClick={- isLocalBackend- ? handleOpenWorkspaceClick- : () => setIsOpenRepoModalOpen(true)- }- disabled={!isConversationReady}+ onClick={() => setIsOpenRepoModalOpen(true)}+ disabled={!isConversationReady || isRepoButtonInert}/>- {isLocalBackend && isWorkspaceMenuOpen && (- <div- data-testid="git-control-bar-workspace-menu"- className="absolute z-50 left-0 bottom-full mb-2 min-w-[220px] rounded-[6px] bg-tertiary context-menu-box-shadow py-[6px] px-1"- >- <ul className="max-h-64 overflow-y-auto">- <li>- <button- type="button"- disabled={isCreatingConversation}- data-testid="git-control-bar-open-no-workspace"- onClick={() => handleLaunchWorkspaceConversation()}- className="flex items-center w-full px-2 py-2 text-sm text-white text-left hover:bg-[#5C5D62] rounded font-normal cursor-pointer disabled:opacity-60 disabled:cursor-not-allowed"- >- <span className="italic text-[#A3A3A3]">- {t(I18nKey.HOME$NO_WORKSPACE_OPTION)}- </span>- </button>- </li>- {workspaces.map((workspace) => (- <li key={workspace.id}>- <button- type="button"- disabled={isCreatingConversation}- data-testid="git-control-bar-open-workspace"- data-workspace-path={workspace.path}- onClick={() =>- handleLaunchWorkspaceConversation(workspace.path)- }- className="flex items-center gap-2 w-full px-2 py-2 text-sm text-white text-left hover:bg-[#5C5D62] rounded font-normal cursor-pointer disabled:opacity-60 disabled:cursor-not-allowed"- >- <RepoIcon width={14} height={14} className="shrink-0" />- <span className="truncate">{workspace.name}</span>- </button>- </li>- ))}- </ul>- <div className="border-t border-[#5C5D62] mt-1 pt-1">- <button- type="button"- data-testid="git-control-bar-add-workspace"- onMouseDown={(event) => {- event.preventDefault();- event.stopPropagation();- }}- onClick={(event) => {- event.preventDefault();- event.stopPropagation();- setIsFolderBrowserOpen(true);- setIsWorkspaceMenuOpen(false);- }}- className="flex items-center w-full px-2 py-2 text-sm text-white hover:bg-[#5C5D62] rounded font-normal cursor-pointer"- >- {t(I18nKey.HOME$ADD_WORKSPACES)}- </button>- </div>- </div>- )}- </div>+ ) : null}{selectedBranch ? (<GitControlBarBranchButton@@ -354,12 +238,6 @@ export function GitControlBar({ onSuggestionsClick }: GitControlBarProps) {onLaunch={handleLaunchRepository}defaultProvider={gitProvider}/>- <FolderBrowserModal- isOpen={isFolderBrowserOpen}- onClose={() => setIsFolderBrowserOpen(false)}- onAdd={(items) => addWorkspaces(items)}- onAddParent={(items) => addWorkspaceParents(items)}- /></div>);}