π OpenHands: AI-Driven Development
hotfix(frontend): Navigate user to `/settings/git` instead of `/settings` when their intention is to connect to GitHub (#8200)
sp.wack3edea7c710c6
diff --git a/frontend/__tests__/components/features/home/repo-connector.test.tsx b/frontend/__tests__/components/features/home/repo-connector.test.tsxindex 52ca1b4903..1ce4b40c1f 100644--- a/frontend/__tests__/components/features/home/repo-connector.test.tsx+++ b/frontend/__tests__/components/features/home/repo-connector.test.tsx@@ -4,7 +4,7 @@ import userEvent from "@testing-library/user-event";import { QueryClientProvider, QueryClient } from "@tanstack/react-query";import { setupStore } from "test-utils";import { Provider } from "react-redux";-import { createRoutesStub } from "react-router";+import { createRoutesStub, Outlet } from "react-router";import OpenHands from "#/api/open-hands";import { AuthProvider } from "#/context/auth-context";import { GitRepository } from "#/types/git";@@ -23,8 +23,18 @@ const renderRepoConnector = (initialProvidersAreSet = true) => {path: "/conversations/:conversationId",},{- Component: () => <div data-testid="settings-screen" />,+ Component: Outlet,path: "/settings",+ children: [+ {+ Component: () => <div data-testid="settings-screen" />,+ path: "/settings",+ },+ {+ Component: () => <div data-testid="git-settings-screen" />,+ path: "/settings/git",+ },+ ],},]);@@ -226,6 +236,6 @@ describe("RepoConnector", () => {expect(goToSettingsButton).toBeInTheDocument();await userEvent.click(goToSettingsButton);- await screen.findByTestId("settings-screen");+ await screen.findByTestId("git-settings-screen");});});diff --git a/frontend/__tests__/components/features/home/task-suggestions.test.tsx b/frontend/__tests__/components/features/home/task-suggestions.test.tsxindex d5d08119d1..8dfe75d0f3 100644--- a/frontend/__tests__/components/features/home/task-suggestions.test.tsx+++ b/frontend/__tests__/components/features/home/task-suggestions.test.tsx@@ -4,7 +4,6 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query";import { Provider } from "react-redux";import { createRoutesStub } from "react-router";import { setupStore } from "test-utils";-import userEvent from "@testing-library/user-event";import { TaskSuggestions } from "#/components/features/home/tasks/task-suggestions";import { SuggestionsService } from "#/api/suggestions-service/suggestions-service.api";import { MOCK_TASKS } from "#/mocks/task-suggestions-handlers";@@ -97,17 +96,4 @@ describe("TaskSuggestions", () => {expect(screen.queryByTestId("task-group-skeleton")).not.toBeInTheDocument();});-- it("should display a button to settings if the user needs to sign in with their git provider", async () => {- renderTaskSuggestions(false);-- expect(getSuggestedTasksSpy).not.toHaveBeenCalled();- const goToSettingsButton = await screen.findByTestId(- "navigate-to-settings-button",- );- expect(goToSettingsButton).toBeInTheDocument();-- await userEvent.click(goToSettingsButton);- await screen.findByTestId("settings-screen");- });});diff --git a/frontend/__tests__/routes/home-screen.test.tsx b/frontend/__tests__/routes/home-screen.test.tsxindex 2b327028a3..7d9599ce85 100644--- a/frontend/__tests__/routes/home-screen.test.tsx+++ b/frontend/__tests__/routes/home-screen.test.tsx@@ -93,8 +93,10 @@ describe("HomeScreen", () => {it("should have responsive layout for mobile and desktop screens", async () => {renderHomeScreen();-- const mainContainer = screen.getByTestId("home-screen").querySelector("main");++ const mainContainer = screen+ .getByTestId("home-screen")+ .querySelector("main");expect(mainContainer).toHaveClass("flex", "flex-col", "md:flex-row");});diff --git a/frontend/src/components/features/home/connect-to-provider-message.tsx b/frontend/src/components/features/home/connect-to-provider-message.tsxindex 605f00b8dd..04aea14f34 100644--- a/frontend/src/components/features/home/connect-to-provider-message.tsx+++ b/frontend/src/components/features/home/connect-to-provider-message.tsx@@ -10,7 +10,7 @@ export function ConnectToProviderMessage() {return (<div className="flex flex-col gap-4"><p>{t("HOME$CONNECT_PROVIDER_MESSAGE")}</p>- <Link data-testid="navigate-to-settings-button" to="/settings">+ <Link data-testid="navigate-to-settings-button" to="/settings/git"><BrandButton type="button" variant="primary" isDisabled={isLoading}>{!isLoading && t("SETTINGS$TITLE")}{isLoading && t("HOME$LOADING")}diff --git a/frontend/src/components/features/home/tasks/task-suggestions.tsx b/frontend/src/components/features/home/tasks/task-suggestions.tsxindex 680a78d342..57af886272 100644--- a/frontend/src/components/features/home/tasks/task-suggestions.tsx+++ b/frontend/src/components/features/home/tasks/task-suggestions.tsx@@ -1,17 +1,13 @@import { TaskGroup } from "./task-group";import { useSuggestedTasks } from "#/hooks/query/use-suggested-tasks";import { TaskSuggestionsSkeleton } from "./task-suggestions-skeleton";-import { useAuth } from "#/context/auth-context";import { cn } from "#/utils/utils";-import { ConnectToProviderMessage } from "../connect-to-provider-message";interface TaskSuggestionsProps {filterFor?: string | null;}export function TaskSuggestions({ filterFor }: TaskSuggestionsProps) {- const { providersAreSet } = useAuth();-const { data: tasks, isLoading } = useSuggestedTasks();const suggestedTasks = filterFor? tasks?.filter((task) => task.title === filterFor)@@ -27,7 +23,6 @@ export function TaskSuggestions({ filterFor }: TaskSuggestionsProps) {<h2 className="heading">Suggested Tasks</h2><div className="flex flex-col gap-6">- {!providersAreSet && <ConnectToProviderMessage />}{isLoading && <TaskSuggestionsSkeleton />}{!hasSuggestedTasks && !isLoading && <p>No tasks available</p>}{suggestedTasks?.map((taskGroup, index) => (diff --git a/frontend/src/i18n/declaration.ts b/frontend/src/i18n/declaration.tsindex fd478c368c..1a694056cf 100644--- a/frontend/src/i18n/declaration.ts+++ b/frontend/src/i18n/declaration.ts@@ -456,6 +456,7 @@ export enum I18nKey {GITLAB$INSTRUCTIONS_LINK_TEXT = "GITLAB$INSTRUCTIONS_LINK_TEXT",GITLAB$OR_SEE = "GITLAB$OR_SEE",COMMON$DOCUMENTATION = "COMMON$DOCUMENTATION",+ AGENT_ERROR$ERROR_ACTION_NOT_EXECUTED = "AGENT_ERROR$ERROR_ACTION_NOT_EXECUTED",DIFF_VIEWER$LOADING = "DIFF_VIEWER$LOADING",DIFF_VIEWER$GETTING_LATEST_CHANGES = "DIFF_VIEWER$GETTING_LATEST_CHANGES",DIFF_VIEWER$NOT_A_GIT_REPO = "DIFF_VIEWER$NOT_A_GIT_REPO",