= {}): Settings {
- return {
- ...MOCK_DEFAULT_USER_SETTINGS,
- ...overrides,
- provider_tokens_set: {
- ...MOCK_DEFAULT_USER_SETTINGS.provider_tokens_set,
- ...overrides.provider_tokens_set,
- },
- agent_settings: {
- ...MOCK_DEFAULT_USER_SETTINGS.agent_settings,
- ...overrides.agent_settings,
- },
- };
-}
-
-function renderGitSettingsScreen() {
- return render(, {
- wrapper: ({ children }) => (
-
- {children}
-
- ),
- });
-}
-
-describe("GitSettingsScreen", () => {
- beforeEach(() => {
- vi.restoreAllMocks();
- });
-
- it("renders OSS git provider token inputs", async () => {
- vi.spyOn(SettingsService, "getSettings").mockResolvedValue(buildSettings());
-
- renderGitSettingsScreen();
-
- const githubTokenInput = await screen.findByTestId("github-token-input");
-
- expect(githubTokenInput).toBeInTheDocument();
- expect(screen.getByTestId("gitlab-token-input")).toBeInTheDocument();
- expect(screen.getByTestId("submit-button")).toBeDisabled();
- });
-
- it("enables saving after a provider token changes", async () => {
- vi.spyOn(SettingsService, "getSettings").mockResolvedValue(buildSettings());
-
- renderGitSettingsScreen();
-
- const user = userEvent.setup();
- const githubTokenInput = await screen.findByTestId("github-token-input");
- const submitButton = screen.getByTestId("submit-button");
-
- expect(submitButton).toBeDisabled();
-
- await user.type(githubTokenInput, "ghp_test_token");
-
- expect(submitButton).toBeEnabled();
- });
-
- it("enables disconnecting when a provider is already configured", async () => {
- vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
- buildSettings({
- provider_tokens_set: {
- github: "github.com",
- },
- }),
- );
-
- renderGitSettingsScreen();
-
- await waitFor(() => {
- expect(screen.getByTestId("disconnect-tokens-button")).toBeEnabled();
- });
- });
-});
\ No newline at end of file
diff --git a/__tests__/routes/root-layout-refetch.test.tsx b/__tests__/routes/root-layout-refetch.test.tsx
index fab09e25c8..1f25667431 100644
--- a/__tests__/routes/root-layout-refetch.test.tsx
+++ b/__tests__/routes/root-layout-refetch.test.tsx
@@ -22,11 +22,7 @@ vi.mock("#/hooks/query/use-config", () => ({
const DEFAULT_FEATURE_FLAGS = {
hide_llm_settings: false,
- enable_jira: false,
- enable_jira_dc: false,
- enable_linear: false,
hide_users_page: false,
- hide_integrations_page: false,
};
const RouterStub = createRoutesStub([
diff --git a/__tests__/routes/settings.test.tsx b/__tests__/routes/settings.test.tsx
index 727cf45b6a..61b915e98d 100644
--- a/__tests__/routes/settings.test.tsx
+++ b/__tests__/routes/settings.test.tsx
@@ -4,12 +4,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import { createRoutesStub } from "react-router";
import SettingsScreen, { clientLoader } from "#/routes/settings";
import OptionService from "#/api/option-service/option-service.api";
-import {
- __resetActiveStoreForTests,
- setActiveSelection,
- setRegisteredBackends,
-} from "#/api/backend-registry/active-store";
-import type { Backend } from "#/api/backend-registry/types";
+import { __resetActiveStoreForTests } from "#/api/backend-registry/active-store";
import { getFirstAvailablePath } from "#/utils/settings-utils";
import { OSS_NAV_ITEMS } from "#/constants/settings-nav";
import { ActiveBackendProvider } from "#/contexts/active-backend-context";
@@ -17,18 +12,10 @@ import { ActiveBackendProvider } from "#/contexts/active-backend-context";
vi.mock("#/hooks/use-settings-nav-items", () => ({
useSettingsNavItems: () => [
{ type: "item", item: OSS_NAV_ITEMS[0] },
- { type: "item", item: OSS_NAV_ITEMS[6] },
+ { type: "item", item: OSS_NAV_ITEMS[5] },
],
}));
-const cloudBackend: Backend = {
- id: "prod",
- name: "Production",
- host: "https://app.all-hands.dev",
- apiKey: "bearer-token",
- kind: "cloud",
-};
-
describe("settings route", () => {
beforeEach(() => {
vi.restoreAllMocks();
@@ -45,11 +32,7 @@ describe("settings route", () => {
expect(
getFirstAvailablePath({
hide_llm_settings: true,
- enable_jira: false,
- enable_jira_dc: false,
- enable_linear: false,
hide_users_page: true,
- hide_integrations_page: false,
}),
).toBe("/settings/mcp");
});
@@ -59,11 +42,7 @@ describe("settings route", () => {
posthog_client_key: null,
feature_flags: {
hide_llm_settings: true,
- enable_jira: false,
- enable_jira_dc: false,
- enable_linear: false,
hide_users_page: true,
- hide_integrations_page: false,
},
providers_configured: [],
maintenance_start_time: null,
@@ -83,20 +62,28 @@ describe("settings route", () => {
expect(response.headers.get("Location")).toBe("/settings/mcp");
});
- it("redirects local-only settings paths to /settings when the active backend is cloud", async () => {
- setRegisteredBackends([cloudBackend]);
- setActiveSelection({ backendId: cloudBackend.id });
- const getConfigSpy = vi.spyOn(OptionService, "getConfig");
+ it("no longer treats /settings/integrations as a redirect target", async () => {
+ vi.spyOn(OptionService, "getConfig").mockResolvedValue({
+ posthog_client_key: null,
+ feature_flags: {
+ hide_llm_settings: false,
+ hide_users_page: true,
+ },
+ providers_configured: [],
+ maintenance_start_time: null,
+ recaptcha_site_key: null,
+ faulty_models: [],
+ error_message: null,
+ updated_at: new Date().toISOString(),
+ });
- const integrationsResponse = (await clientLoader({
+ const result = await clientLoader({
request: new Request("http://localhost/settings/integrations"),
params: {},
context: {},
- } as never)) as Response;
+ } as never);
- expect(integrationsResponse.status).toBe(302);
- expect(integrationsResponse.headers.get("Location")).toBe("/settings");
- expect(getConfigSpy).not.toHaveBeenCalled();
+ expect(result).toBeNull();
});
it("renders the current OSS section title", () => {
diff --git a/__tests__/task-suggestions.test.tsx b/__tests__/task-suggestions.test.tsx
deleted file mode 100644
index 930e078b98..0000000000
--- a/__tests__/task-suggestions.test.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import { render, screen } from "@testing-library/react";
-import { describe, it, expect, beforeEach, vi } from "vitest";
-import { MemoryRouter } from "react-router";
-import { TaskSuggestions } from "#/components/features/home/tasks/task-suggestions";
-
-// Mock translation
-vi.mock("react-i18next", () => ({
- useTranslation: () => ({
- t: (key: string) => key,
- }),
-}));
-
-// Mock suggested tasks hook
-vi.mock("#/hooks/query/use-suggested-tasks", () => ({
- useSuggestedTasks: () => ({
- data: [],
- isLoading: false,
- }),
-}));
-
-// Mock config hook
-vi.mock("#/hooks/query/use-config", () => ({
- useConfig: vi.fn(),
-}));
-
-// Mock user providers hook
-vi.mock("#/hooks/use-user-providers", () => ({
- useUserProviders: vi.fn(),
-}));
-
-import { useConfig } from "#/hooks/query/use-config";
-import { useUserProviders } from "#/hooks/use-user-providers";
-
-describe("TaskSuggestions empty states", () => {
- beforeEach(() => {
- vi.clearAllMocks();
- });
-
- it("OSS mode + no providers → shows Git provider empty state", () => {
- (useConfig as any).mockReturnValue({
- data: {},
- });
-
- (useUserProviders as any).mockReturnValue({
- providers: [],
- });
-
- render(
-
-
-
- );
-
- expect(screen.getByText("TASKS$NO_GIT_PROVIDERS_TITLE")).toBeInTheDocument();
- expect(screen.getByText("TASKS$NO_GIT_PROVIDERS_DESCRIPTION")).toBeInTheDocument();
- expect(screen.getByText("TASKS$NO_GIT_PROVIDERS_CTA")).toBeInTheDocument();
- });
-
- it("OSS mode + providers exist but no tasks → shows no tasks message", () => {
- (useConfig as any).mockReturnValue({
- data: {},
- });
-
- (useUserProviders as any).mockReturnValue({
- providers: [{ id: "github" }],
- });
-
- render(
-
-
-
- );
-
- expect(screen.getByText("TASKS$NO_TASKS_AVAILABLE")).toBeInTheDocument();
- });
-});
diff --git a/src/api/option-service/option-service.api.ts b/src/api/option-service/option-service.api.ts
index 4bd606a3ac..2245941750 100644
--- a/src/api/option-service/option-service.api.ts
+++ b/src/api/option-service/option-service.api.ts
@@ -37,11 +37,7 @@ class OptionService {
posthog_client_key: null,
feature_flags: {
hide_llm_settings: false,
- enable_jira: false,
- enable_jira_dc: false,
- enable_linear: false,
hide_users_page: true,
- hide_integrations_page: false,
},
providers_configured: [],
maintenance_start_time: null,
diff --git a/src/api/option-service/option.types.ts b/src/api/option-service/option.types.ts
index 9853a3846c..035ede1c1a 100644
--- a/src/api/option-service/option.types.ts
+++ b/src/api/option-service/option.types.ts
@@ -19,11 +19,7 @@ export interface ModelsResponse {
export interface WebClientFeatureFlags {
hide_llm_settings: boolean;
- enable_jira: boolean;
- enable_jira_dc: boolean;
- enable_linear: boolean;
hide_users_page: boolean;
- hide_integrations_page: boolean;
}
export interface WebClientConfig {
diff --git a/src/components/features/home/connect-to-provider-message.tsx b/src/components/features/home/connect-to-provider-message.tsx
deleted file mode 100644
index fa77ecabd1..0000000000
--- a/src/components/features/home/connect-to-provider-message.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { BrandButton } from "#/components/features/settings/brand-button";
-import { NavigationLink } from "#/components/shared/navigation-link";
-import { useSettings } from "#/hooks/query/use-settings";
-import RepoForkedIcon from "#/icons/repo-forked.svg?react";
-import { I18nKey } from "#/i18n/declaration";
-
-export function ConnectToProviderMessage() {
- const { isLoading } = useSettings();
- const { t } = useTranslation("openhands");
-
- return (
-
-
-
-
-
- {t(I18nKey.COMMON$OPEN_REPOSITORY)}
-
-
-
{t("HOME$CONNECT_PROVIDER_MESSAGE")}
-
-
-
- {!isLoading && t("SETTINGS$TITLE")}
- {isLoading && t("HOME$LOADING")}
-
-
-
-
- {t(I18nKey.TASKS$NO_GIT_PROVIDERS_TITLE)}
-
-
-
- {t(I18nKey.TASKS$NO_GIT_PROVIDERS_DESCRIPTION)}
-
-
-
-
- {t(I18nKey.TASKS$NO_GIT_PROVIDERS_CTA)}
-
-
-
- ) : (
-
- {t(I18nKey.TASKS$NO_TASKS_AVAILABLE)}
-
- ))}
+ {!hasSuggestedTasks && !isLoading && (
+
+ {t(I18nKey.TASKS$NO_TASKS_AVAILABLE)}
+
+ )}
{!isLoading &&
displayedTaskGroups &&
diff --git a/src/components/features/settings/git-settings/azure-devops-token-help-anchor.tsx b/src/components/features/settings/git-settings/azure-devops-token-help-anchor.tsx
deleted file mode 100644
index edee1335ea..0000000000
--- a/src/components/features/settings/git-settings/azure-devops-token-help-anchor.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-
-export function AzureDevOpsTokenHelpAnchor() {
- const { t } = useTranslation("openhands");
-
- return (
-
-
- {t(I18nKey.GIT$AZURE_DEVOPS_TOKEN_HELP)}
-
-
- );
-}
diff --git a/src/components/features/settings/git-settings/azure-devops-token-input.tsx b/src/components/features/settings/git-settings/azure-devops-token-input.tsx
deleted file mode 100644
index df451e7854..0000000000
--- a/src/components/features/settings/git-settings/azure-devops-token-input.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-import { SettingsInput } from "../settings-input";
-import { AzureDevOpsTokenHelpAnchor } from "./azure-devops-token-help-anchor";
-import { KeyStatusIcon } from "../key-status-icon";
-
-interface AzureDevOpsTokenInputProps {
- onChange: (value: string) => void;
- onAzureDevOpsHostChange: (value: string) => void;
- isAzureDevOpsTokenSet: boolean;
- name: string;
- azureDevOpsHostSet: string | null | undefined;
-}
-
-export function AzureDevOpsTokenInput({
- onChange,
- onAzureDevOpsHostChange,
- isAzureDevOpsTokenSet,
- name,
- azureDevOpsHostSet,
-}: AzureDevOpsTokenInputProps) {
- const { t } = useTranslation("openhands");
-
- return (
-
-
" : ""}
- startContent={
- isAzureDevOpsTokenSet && (
-
- )
- }
- />
-
- {})}
- name="azure-devops-host-input"
- testId="azure-devops-host-input"
- label={t(I18nKey.GIT$AZURE_DEVOPS_HOST)}
- type="text"
- className="w-full max-w-[680px]"
- placeholder={t(I18nKey.GIT$AZURE_DEVOPS_HOST_PLACEHOLDER)}
- defaultValue={azureDevOpsHostSet || undefined}
- startContent={
- azureDevOpsHostSet &&
- azureDevOpsHostSet.trim() !== "" && (
-
- )
- }
- />
-
-
-
- ,
- ]}
- />
-
- );
-}
diff --git a/src/components/features/settings/git-settings/bitbucket-dc-token-help-input.tsx b/src/components/features/settings/git-settings/bitbucket-dc-token-help-input.tsx
deleted file mode 100644
index c0043bd494..0000000000
--- a/src/components/features/settings/git-settings/bitbucket-dc-token-help-input.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-import { SettingsInput } from "../settings-input";
-import { BitbucketDCTokenHelpAnchor } from "./bitbucket-dc-token-help-anchor";
-import { KeyStatusIcon } from "../key-status-icon";
-import { cn } from "#/utils/utils";
-
-interface BitbucketDCTokenInputProps {
- onChange: (value: string) => void;
- onBitbucketDCHostChange: (value: string) => void;
- isBitbucketDCTokenSet: boolean;
- name: string;
- bitbucketDCHostSet: string | null | undefined;
- className?: string;
-}
-
-export function BitbucketDCTokenInput({
- onChange,
- onBitbucketDCHostChange,
- isBitbucketDCTokenSet,
- name,
- bitbucketDCHostSet,
- className,
-}: BitbucketDCTokenInputProps) {
- const { t } = useTranslation("openhands");
-
- return (
-
- " : "username:token"}
- startContent={
- isBitbucketDCTokenSet && (
-
- )
- }
- />
-
- {})}
- name="bitbucket-dc-host-input"
- testId="bitbucket-dc-host-input"
- label={t(I18nKey.BITBUCKET_DATA_CENTER$HOST_LABEL)}
- type="text"
- className="w-full max-w-[680px]"
- placeholder="bitbucket.your-company.com"
- defaultValue={bitbucketDCHostSet || undefined}
- startContent={
- bitbucketDCHostSet &&
- bitbucketDCHostSet.trim() !== "" && (
-
- )
- }
- />
-
-
-
- );
-}
diff --git a/src/components/features/settings/git-settings/bitbucket-token-help-anchor.tsx b/src/components/features/settings/git-settings/bitbucket-token-help-anchor.tsx
deleted file mode 100644
index 9c70f3874d..0000000000
--- a/src/components/features/settings/git-settings/bitbucket-token-help-anchor.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Trans, useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-
-export function BitbucketTokenHelpAnchor() {
- const { t } = useTranslation("openhands");
-
- return (
-
- ,
- ,
- ]}
- />
-
- );
-}
diff --git a/src/components/features/settings/git-settings/bitbucket-token-input.tsx b/src/components/features/settings/git-settings/bitbucket-token-input.tsx
deleted file mode 100644
index 121022fe3a..0000000000
--- a/src/components/features/settings/git-settings/bitbucket-token-input.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-import { SettingsInput } from "../settings-input";
-import { BitbucketTokenHelpAnchor } from "./bitbucket-token-help-anchor";
-import { KeyStatusIcon } from "../key-status-icon";
-import { cn } from "#/utils/utils";
-
-interface BitbucketTokenInputProps {
- onChange: (value: string) => void;
- onBitbucketHostChange: (value: string) => void;
- isBitbucketTokenSet: boolean;
- name: string;
- bitbucketHostSet: string | null | undefined;
- className?: string;
-}
-
-export function BitbucketTokenInput({
- onChange,
- onBitbucketHostChange,
- isBitbucketTokenSet,
- name,
- bitbucketHostSet,
- className,
-}: BitbucketTokenInputProps) {
- const { t } = useTranslation("openhands");
-
- return (
-
- " : "username:app_password"}
- startContent={
- isBitbucketTokenSet && (
-
- )
- }
- />
-
- {})}
- name="bitbucket-host-input"
- testId="bitbucket-host-input"
- label={t(I18nKey.BITBUCKET$HOST_LABEL)}
- type="text"
- className="w-full max-w-[680px]"
- placeholder="bitbucket.org"
- defaultValue={bitbucketHostSet || undefined}
- startContent={
- bitbucketHostSet &&
- bitbucketHostSet.trim() !== "" && (
-
- )
- }
- />
-
-
-
- );
-}
diff --git a/src/components/features/settings/git-settings/configure-github-repositories-anchor.tsx b/src/components/features/settings/git-settings/configure-github-repositories-anchor.tsx
deleted file mode 100644
index 14e0b383c2..0000000000
--- a/src/components/features/settings/git-settings/configure-github-repositories-anchor.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-import { BrandButton } from "../brand-button";
-
-interface ConfigureGitHubRepositoriesAnchorProps {
- slug: string;
-}
-
-export function ConfigureGitHubRepositoriesAnchor({
- slug,
-}: ConfigureGitHubRepositoriesAnchorProps) {
- const { t } = useTranslation("openhands");
-
- return (
-
-
- window.open(
- `https://github.com/apps/${slug}/installations/new`,
- "_blank",
- "noreferrer noopener",
- )
- }
- >
- {t(I18nKey.GITHUB$CONFIGURE_REPOS)}
-
-
- );
-}
diff --git a/src/components/features/settings/git-settings/forgejo-token-input.tsx b/src/components/features/settings/git-settings/forgejo-token-input.tsx
deleted file mode 100644
index d9df2059dd..0000000000
--- a/src/components/features/settings/git-settings/forgejo-token-input.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-import { SettingsInput } from "../settings-input";
-import { KeyStatusIcon } from "../key-status-icon";
-import { cn } from "#/utils/utils";
-
-interface ForgejoTokenInputProps {
- onChange: (value: string) => void;
- onForgejoHostChange: (value: string) => void;
- isForgejoTokenSet: boolean;
- name: string;
- forgejoHostSet: string | null | undefined;
- className?: string;
-}
-
-export function ForgejoTokenInput({
- onChange,
- onForgejoHostChange,
- isForgejoTokenSet,
- name,
- forgejoHostSet,
- className,
-}: ForgejoTokenInputProps) {
- const { t } = useTranslation("openhands");
-
- return (
-
- " : ""}
- startContent={
- isForgejoTokenSet && (
-
- )
- }
- />
-
- {})}
- name="forgejo-host-input"
- testId="forgejo-host-input"
- label={t(I18nKey.FORGEJO$HOST_LABEL)}
- type="text"
- className="w-full max-w-[680px]"
- placeholder="codeberg.org"
- defaultValue={forgejoHostSet || undefined}
- startContent={
- forgejoHostSet &&
- forgejoHostSet.trim() !== "" && (
-
- )
- }
- />
-
- );
-}
diff --git a/src/components/features/settings/git-settings/github-settings-inputs-skeleton.tsx b/src/components/features/settings/git-settings/github-settings-inputs-skeleton.tsx
deleted file mode 100644
index 9885b98cec..0000000000
--- a/src/components/features/settings/git-settings/github-settings-inputs-skeleton.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { InputSkeleton } from "../input-skeleton";
-import { SubtextSkeleton } from "../subtext-skeleton";
-
-export function GitSettingInputsSkeleton() {
- return (
-
- );
-}
diff --git a/src/components/features/settings/git-settings/github-token-help-anchor.tsx b/src/components/features/settings/git-settings/github-token-help-anchor.tsx
deleted file mode 100644
index 3566cd32a0..0000000000
--- a/src/components/features/settings/git-settings/github-token-help-anchor.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Trans, useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-
-export function GitHubTokenHelpAnchor() {
- const { t } = useTranslation("openhands");
-
- return (
-
- ,
- ,
- ]}
- />
-
- );
-}
diff --git a/src/components/features/settings/git-settings/github-token-input.tsx b/src/components/features/settings/git-settings/github-token-input.tsx
deleted file mode 100644
index d6d0fa3b1b..0000000000
--- a/src/components/features/settings/git-settings/github-token-input.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-import { SettingsInput } from "../settings-input";
-import { GitHubTokenHelpAnchor } from "./github-token-help-anchor";
-import { KeyStatusIcon } from "../key-status-icon";
-import { cn } from "#/utils/utils";
-
-interface GitHubTokenInputProps {
- onChange: (value: string) => void;
- onGitHubHostChange: (value: string) => void;
- isGitHubTokenSet: boolean;
- name: string;
- githubHostSet: string | null | undefined;
- className?: string;
-}
-
-export function GitHubTokenInput({
- onChange,
- onGitHubHostChange,
- isGitHubTokenSet,
- name,
- githubHostSet,
- className,
-}: GitHubTokenInputProps) {
- const { t } = useTranslation("openhands");
-
- return (
-
- " : ""}
- startContent={
- isGitHubTokenSet && (
-
- )
- }
- />
-
- {})}
- name="github-host-input"
- testId="github-host-input"
- label={t(I18nKey.GITHUB$HOST_LABEL)}
- type="text"
- className="w-full max-w-[680px]"
- placeholder="github.com"
- defaultValue={githubHostSet || undefined}
- startContent={
- githubHostSet &&
- githubHostSet.trim() !== "" && (
-
- )
- }
- />
-
-
-
- );
-}
diff --git a/src/components/features/settings/git-settings/gitlab-token-help-anchor.tsx b/src/components/features/settings/git-settings/gitlab-token-help-anchor.tsx
deleted file mode 100644
index a871d8ee30..0000000000
--- a/src/components/features/settings/git-settings/gitlab-token-help-anchor.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Trans, useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-
-export function GitLabTokenHelpAnchor() {
- const { t } = useTranslation("openhands");
-
- return (
-
- ,
- ,
- ]}
- />
-
- );
-}
diff --git a/src/components/features/settings/git-settings/gitlab-token-input.tsx b/src/components/features/settings/git-settings/gitlab-token-input.tsx
deleted file mode 100644
index cd9ce6c256..0000000000
--- a/src/components/features/settings/git-settings/gitlab-token-input.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-import { SettingsInput } from "../settings-input";
-import { GitLabTokenHelpAnchor } from "./gitlab-token-help-anchor";
-import { KeyStatusIcon } from "../key-status-icon";
-import { cn } from "#/utils/utils";
-
-interface GitLabTokenInputProps {
- onChange: (value: string) => void;
- onGitLabHostChange: (value: string) => void;
- isGitLabTokenSet: boolean;
- name: string;
- gitlabHostSet: string | null | undefined;
- className?: string;
-}
-
-export function GitLabTokenInput({
- onChange,
- onGitLabHostChange,
- isGitLabTokenSet,
- name,
- gitlabHostSet,
- className,
-}: GitLabTokenInputProps) {
- const { t } = useTranslation("openhands");
-
- return (
-
- " : ""}
- startContent={
- isGitLabTokenSet && (
-
- )
- }
- />
-
- {})}
- name="gitlab-host-input"
- testId="gitlab-host-input"
- label={t(I18nKey.GITLAB$HOST_LABEL)}
- type="text"
- className="w-full max-w-[680px]"
- placeholder="gitlab.com"
- defaultValue={gitlabHostSet || undefined}
- startContent={
- gitlabHostSet &&
- gitlabHostSet.trim() !== "" && (
-
- )
- }
- />
-
-
-
- );
-}
diff --git a/src/components/features/settings/git-settings/install-slack-app-anchor.tsx b/src/components/features/settings/git-settings/install-slack-app-anchor.tsx
deleted file mode 100644
index 2edc452b9b..0000000000
--- a/src/components/features/settings/git-settings/install-slack-app-anchor.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-import { BrandButton } from "../brand-button";
-
-export function InstallSlackAppAnchor() {
- const { t } = useTranslation("openhands");
-
- return (
-
-
- window.open(
- "https://slack.com/oauth/v2/authorize?client_id=7477886716822.8729519890534&scope=app_mentions:read,channels:history,chat:write,groups:history,im:history,mpim:history,users:read&user_scope=",
- "_blank",
- "noreferrer noopener",
- )
- }
- >
- {t(I18nKey.SLACK$INSTALL_APP)}
-
-
- );
-}
diff --git a/src/components/features/settings/git-settings/webhook-status-badge.tsx b/src/components/features/settings/git-settings/webhook-status-badge.tsx
deleted file mode 100644
index 159a0c6275..0000000000
--- a/src/components/features/settings/git-settings/webhook-status-badge.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-import { Typography } from "#/ui/typography";
-
-export interface WebhookStatusBadgeProps {
- webhookInstalled: boolean;
- installationResult?: { success: boolean; error: string | null } | null;
-}
-
-export function WebhookStatusBadge({
- webhookInstalled,
- installationResult,
-}: WebhookStatusBadgeProps) {
- const { t } = useTranslation("openhands");
-
- if (installationResult) {
- if (installationResult.success) {
- return (
-
- {t(I18nKey.GITLAB$WEBHOOK_STATUS_INSTALLED)}
-
- );
- }
- return (
-
-
- {t(I18nKey.GITLAB$WEBHOOK_STATUS_FAILED)}
-
-
- );
- }
-
- if (webhookInstalled) {
- return (
-
- {t(I18nKey.GITLAB$WEBHOOK_STATUS_INSTALLED)}
-
- );
- }
-
- return (
-
- {t(I18nKey.GITLAB$WEBHOOK_STATUS_NOT_INSTALLED)}
-
- );
-}
diff --git a/src/components/features/settings/project-management/configure-modal.tsx b/src/components/features/settings/project-management/configure-modal.tsx
deleted file mode 100644
index f4a99ad39b..0000000000
--- a/src/components/features/settings/project-management/configure-modal.tsx
+++ /dev/null
@@ -1,456 +0,0 @@
-import React, { useState } from "react";
-import { Trans, useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-import { BrandButton } from "#/components/features/settings/brand-button";
-import { SettingsInput } from "#/components/features/settings/settings-input";
-import { ModalBackdrop } from "#/components/shared/modals/modal-backdrop";
-import { ModalBody } from "#/components/shared/modals/modal-body";
-import {
- BaseModalDescription,
- BaseModalTitle,
-} from "#/components/shared/modals/confirmation-modals/base-modal";
-import { SettingsSwitch } from "#/components/features/settings/settings-switch";
-import { useValidateIntegration } from "#/hooks/mutation/use-validate-integration";
-
-interface ConfigureButtonProps {
- onClick: () => void;
- isDisabled: boolean;
- text?: string;
- "data-testid"?: string;
-}
-
-export function ConfigureButton({
- onClick,
- isDisabled,
- text,
- "data-testid": dataTestId,
-}: ConfigureButtonProps) {
- const { t } = useTranslation("openhands");
- return (
-
- {text || t(I18nKey.PROJECT_MANAGEMENT$CONFIGURE_BUTTON_LABEL)}
-
- );
-}
-
-interface ConfigureModalProps {
- isOpen: boolean;
- onClose: () => void;
- onConfirm: (data: {
- workspace: string;
- webhookSecret: string;
- serviceAccountEmail: string;
- serviceAccountApiKey: string;
- isActive: boolean;
- }) => void;
- onLink: (workspace: string) => void;
- onUnlink?: () => void;
- platformName: string;
- platform: "jira" | "jira-dc" | "linear";
- integrationData?: {
- id: number;
- keycloak_user_id: string;
- status: string;
- workspace?: {
- id: number;
- name: string;
- status: string;
- editable: boolean;
- };
- } | null;
-}
-
-export function ConfigureModal({
- isOpen,
- onClose,
- onConfirm,
- onLink,
- onUnlink,
- platformName,
- platform,
- integrationData,
-}: ConfigureModalProps) {
- const { t } = useTranslation("openhands");
- const [workspace, setWorkspace] = useState("");
- const [webhookSecret, setWebhookSecret] = useState("");
- const [serviceAccountEmail, setServiceAccountEmail] = useState("");
- const [serviceAccountApiKey, setServiceAccountApiKey] = useState("");
- const [isActive, setIsActive] = useState(true);
- const [showConfigurationFields, setShowConfigurationFields] = useState(false);
-
- // Determine initial state based on integrationData
- const existingWorkspace = integrationData?.workspace;
- const isWorkspaceEditable = existingWorkspace?.editable ?? false;
-
- // Set initial workspace value when modal opens
- React.useEffect(() => {
- if (isOpen && existingWorkspace) {
- setWorkspace(existingWorkspace.name);
- setShowConfigurationFields(isWorkspaceEditable);
- } else if (isOpen && !existingWorkspace) {
- setWorkspace("");
- setShowConfigurationFields(false);
- }
- }, [isOpen, existingWorkspace, isWorkspaceEditable]);
-
- // Helper function to get platform-specific placeholder
- const getWorkspacePlaceholder = () => {
- if (platform === "jira") {
- return I18nKey.PROJECT_MANAGEMENT$JIRA_WORKSPACE_NAME_PLACEHOLDER;
- }
- if (platform === "jira-dc") {
- return I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WORKSPACE_NAME_PLACEHOLDER;
- }
- return I18nKey.PROJECT_MANAGEMENT$LINEAR_WORKSPACE_NAME_PLACEHOLDER;
- };
-
- // Validation states
- const [workspaceError, setWorkspaceError] = useState(null);
- const [webhookSecretError, setWebhookSecretError] = useState(
- null,
- );
- const [emailError, setEmailError] = useState(null);
- const [apiKeyError, setApiKeyError] = useState(null);
-
- const validateMutation = useValidateIntegration(platform, {
- onSuccess: (data) => {
- if (data.data.status === "active") {
- // Validation successful, proceed with linking
- onLink(workspace.trim());
- } else {
- // Show configuration fields for further setup
- setShowConfigurationFields(true);
- setIsActive(true);
- }
- },
- onError: (error) => {
- if (error.response?.status === 404) {
- // Integration not found, show configuration fields
- setShowConfigurationFields(true);
- setIsActive(true);
- } else {
- // Other errors - still show configuration fields as fallback
- setShowConfigurationFields(true);
- setIsActive(true);
- }
- },
- });
-
- // Validation functions
- const validateWorkspace = (value: string) => {
- const isValid = /^[a-zA-Z0-9\-_.]*$/.test(value);
- if (!isValid && value.length > 0) {
- setWorkspaceError(
- t(I18nKey.PROJECT_MANAGEMENT$WORKSPACE_NAME_VALIDATION_ERROR),
- );
- } else {
- setWorkspaceError(null);
- }
- return isValid;
- };
-
- const validateWebhookSecret = (value: string) => {
- const hasSpaces = /\s/.test(value);
- if (hasSpaces) {
- setWebhookSecretError(
- t(I18nKey.PROJECT_MANAGEMENT$WEBHOOK_SECRET_NAME_VALIDATION_ERROR),
- );
- } else {
- setWebhookSecretError(null);
- }
- return !hasSpaces;
- };
-
- const validateEmail = (value: string) => {
- const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
- const isValid = emailRegex.test(value) || value.length === 0;
- if (!isValid && value.length > 0) {
- setEmailError(
- t(I18nKey.PROJECT_MANAGEMENT$SVC_ACC_EMAIL_VALIDATION_ERROR),
- );
- } else {
- setEmailError(null);
- }
- return isValid;
- };
-
- const validateApiKey = (value: string) => {
- const hasSpaces = /\s/.test(value);
- if (hasSpaces) {
- setApiKeyError(
- t(I18nKey.PROJECT_MANAGEMENT$SVC_ACC_API_KEY_VALIDATION_ERROR),
- );
- } else {
- setApiKeyError(null);
- }
- return !hasSpaces;
- };
-
- // Input handlers with validation
- const handleWorkspaceChange = (value: string) => {
- setWorkspace(value);
- validateWorkspace(value);
- };
-
- const handleWebhookSecretChange = (value: string) => {
- setWebhookSecret(value);
- validateWebhookSecret(value);
- };
-
- const handleEmailChange = (value: string) => {
- setServiceAccountEmail(value);
- validateEmail(value);
- };
-
- const handleApiKeyChange = (value: string) => {
- setServiceAccountApiKey(value);
- validateApiKey(value);
- };
-
- const handleClose = () => {
- setWorkspace("");
- setWebhookSecret("");
- setServiceAccountEmail("");
- setServiceAccountApiKey("");
- setIsActive(false);
- setShowConfigurationFields(false);
- setWorkspaceError(null);
- setWebhookSecretError(null);
- setEmailError(null);
- setApiKeyError(null);
- onClose();
- };
-
- if (!isOpen) {
- return null;
- }
-
- const handleConnect = () => {
- if (showConfigurationFields) {
- // Full configuration flow (either new configuration or editing existing)
- onConfirm({
- workspace,
- webhookSecret,
- serviceAccountEmail,
- serviceAccountApiKey,
- isActive,
- });
- } else if (!existingWorkspace) {
- // First check the workspace with validation for new integrations
- validateMutation.mutate(workspace.trim());
- }
- // For existing workspace that's not editable, no action needed
- // This case shouldn't happen as the button should be hidden
- };
-
- const isConnectDisabled = showConfigurationFields
- ? !workspace.trim() ||
- !webhookSecret.trim() ||
- !serviceAccountEmail.trim() ||
- !serviceAccountApiKey.trim() ||
- workspaceError !== null ||
- webhookSecretError !== null ||
- emailError !== null ||
- apiKeyError !== null ||
- validateMutation.isPending
- : !workspace.trim() ||
- workspaceError !== null ||
- validateMutation.isPending;
-
- return (
-
-
-
-
- {showConfigurationFields ? (
- ,
- a: (
-
- Check the document for more information
-
- ),
- }}
- />
- ) : (
- ,
- a: (
-
- Check the document for more information
-
- ),
- }}
- />
- )}
-
- {t(I18nKey.PROJECT_MANAGEMENT$WORKSPACE_NAME_HINT, {
- platform: platformName,
- })}
-
-
-
-
-
-
-
-
- {existingWorkspace && onUnlink && (
-
- {t(I18nKey.PROJECT_MANAGEMENT$UNLINK_BUTTON_LABEL)}
-
- )}
-
- {workspaceError && (
-
{workspaceError}
- )}
-
-
- {showConfigurationFields && (
- <>
-
-
- {webhookSecretError && (
-
- {webhookSecretError}
-
- )}
-
-
-
- {emailError && (
-
{emailError}
- )}
-
-
-
- {apiKeyError && (
-
{apiKeyError}
- )}
-
-
-
- {t(I18nKey.PROJECT_MANAGEMENT$ACTIVE_TOGGLE_LABEL)}
-
-
-
- )}
-
- {/* Hide the connect/edit button if workspace exists but is not editable */}
- {(!existingWorkspace || isWorkspaceEditable) && (
-
- {(() => {
- if (existingWorkspace && showConfigurationFields) {
- return t(I18nKey.PROJECT_MANAGEMENT$UPDATE_BUTTON_LABEL);
- }
- return t(I18nKey.PROJECT_MANAGEMENT$CONNECT_BUTTON_LABEL);
- })()}
-
- )}
-
- {t(I18nKey.FEEDBACK$CANCEL_LABEL)}
-
-
-
-
- );
-}
diff --git a/src/components/features/settings/project-management/integration-row.tsx b/src/components/features/settings/project-management/integration-row.tsx
deleted file mode 100644
index 5060a9d004..0000000000
--- a/src/components/features/settings/project-management/integration-row.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import React from "react";
-import { useTranslation } from "react-i18next";
-
-import { useIntegrationStatus } from "#/hooks/query/use-integration-status";
-import { useLinkIntegration } from "#/hooks/mutation/use-link-integration";
-import { useUnlinkIntegration } from "#/hooks/mutation/use-unlink-integration";
-import { useConfigureIntegration } from "#/hooks/mutation/use-configure-integration";
-import { I18nKey } from "#/i18n/declaration";
-import {
- ConfigureButton,
- ConfigureModal,
-} from "#/components/features/settings/project-management/configure-modal";
-
-interface IntegrationRowProps {
- platform: "jira" | "jira-dc" | "linear";
- platformName: string;
- "data-testid"?: string;
-}
-
-export function IntegrationRow({
- platform,
- platformName,
- "data-testid": dataTestId,
-}: IntegrationRowProps) {
- const [isConfigureModalOpen, setConfigureModalOpen] = React.useState(false);
- const { t } = useTranslation("openhands");
-
- const { data: integrationData, isLoading: isStatusLoading } =
- useIntegrationStatus(platform);
-
- const linkMutation = useLinkIntegration(platform, {
- onSettled: () => {
- setConfigureModalOpen(false);
- },
- });
-
- const unlinkMutation = useUnlinkIntegration(platform, {
- onSettled: () => {
- setConfigureModalOpen(false);
- },
- });
-
- const configureMutation = useConfigureIntegration(platform, {
- onSettled: () => {
- setConfigureModalOpen(false);
- },
- });
-
- const handleConfigure = () => {
- setConfigureModalOpen(true);
- };
-
- const handleLink = (workspace: string) => {
- linkMutation.mutate(workspace);
- };
-
- const handleUnlink = () => {
- unlinkMutation.mutate();
- };
-
- const handleConfigureConfirm = (data: {
- workspace: string;
- webhookSecret: string;
- serviceAccountEmail: string;
- serviceAccountApiKey: string;
- isActive: boolean;
- }) => {
- configureMutation.mutate(data);
- };
-
- const isLoading =
- isStatusLoading ||
- linkMutation.isPending ||
- unlinkMutation.isPending ||
- configureMutation.isPending;
-
- // Determine if integration is active and workspace exists
- const isIntegrationActive = integrationData?.status === "active";
- const hasWorkspace = integrationData?.workspace;
-
- // Determine button text based on integration state
- const buttonText =
- isIntegrationActive && hasWorkspace
- ? t(I18nKey.PROJECT_MANAGEMENT$EDIT_BUTTON_LABEL)
- : t(I18nKey.PROJECT_MANAGEMENT$CONFIGURE_BUTTON_LABEL);
-
- return (
-
-
{platformName}
-
-
-
-
setConfigureModalOpen(false)}
- onConfirm={handleConfigureConfirm}
- onLink={handleLink}
- onUnlink={handleUnlink}
- platformName={platformName}
- platform={platform}
- integrationData={integrationData}
- />
-
-
- {t(I18nKey.PROJECT_MANAGEMENT$TITLE)}
-
-
- {config?.feature_flags?.enable_jira && (
-
- )}
- {config?.feature_flags?.enable_jira_dc && (
-
- )}
- {config?.feature_flags?.enable_linear && (
-
- )}
-
-