🙌 OpenHands: AI-Driven Development
feat(frontend): replace mocked git conversation routing with real API integration (#13698)
Hiep Le7bb567734de6
diff --git a/frontend/__tests__/components/features/org/claim-button.test.tsx b/frontend/__tests__/components/features/org/claim-button.test.tsxindex c65d4ed758..c467dcd909 100644--- a/frontend/__tests__/components/features/org/claim-button.test.tsx+++ b/frontend/__tests__/components/features/org/claim-button.test.tsx@@ -6,10 +6,11 @@ import {ClaimButton,getButtonState,} from "#/components/features/org/claim-button";-import type { GitOrg } from "#/hooks/organizations/use-git-conversation-routing";+import type { GitOrg } from "#/types/org";const createOrg = (overrides: Partial<GitOrg> = {}): GitOrg => ({id: "1",+ claimId: null,provider: "GitHub",name: "TestOrg",status: "unclaimed",diff --git a/frontend/__tests__/components/features/org/git-conversation-routing.test.tsx b/frontend/__tests__/components/features/org/git-conversation-routing.test.tsxindex 4be50115a7..e6d585de37 100644--- a/frontend/__tests__/components/features/org/git-conversation-routing.test.tsx+++ b/frontend/__tests__/components/features/org/git-conversation-routing.test.tsx@@ -1,133 +1,104 @@-import { screen, act, waitFor } from "@testing-library/react";+import { screen } from "@testing-library/react";import userEvent from "@testing-library/user-event";import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";import { renderWithProviders } from "test-utils";import { GitConversationRouting } from "#/components/features/org/git-conversation-routing";-import * as ToastHandlers from "#/utils/custom-toast-handlers";++const mockMutate = vi.fn();+const mockDisconnectMutate = vi.fn();++vi.mock("#/hooks/query/use-git-organizations", () => ({+ useUserGitOrganizations: () => ({+ data: {+ provider: "github",+ organizations: ["OpenHands", "AcmeCo"],+ },+ isLoading: false,+ }),+ useGitClaims: () => ({+ data: [+ {+ id: "claim-1",+ org_id: "org-1",+ provider: "github",+ git_organization: "OpenHands",+ claimed_by: "user-1",+ claimed_at: "2026-01-01T00:00:00",+ },+ ],+ isLoading: false,+ }),+}));++vi.mock("#/hooks/mutation/use-claim-git-org", () => ({+ useClaimGitOrg: () => ({+ mutate: mockMutate,+ }),+}));++vi.mock("#/hooks/mutation/use-disconnect-git-org", () => ({+ useDisconnectGitOrg: () => ({+ mutate: mockDisconnectMutate,+ }),+}));describe("GitConversationRouting", () => {beforeEach(() => {- vi.useFakeTimers({ shouldAdvanceTime: true });+ vi.clearAllMocks();});afterEach(() => {- vi.useRealTimers();vi.restoreAllMocks();});- it("should render all mock organizations", () => {- // Arrange & Act+ it("should render organizations from API data", () => {renderWithProviders(<GitConversationRouting />);- // Assert- expect(screen.getByTestId("org-row-1")).toHaveTextContent(- "GitHub/OpenHands",- );- expect(screen.getByTestId("org-row-2")).toHaveTextContent("GitHub/AcmeCo");- expect(screen.getByTestId("org-row-3")).toHaveTextContent(- "GitHub/already-claimed",- );- expect(screen.getByTestId("org-row-4")).toHaveTextContent(- "GitLab/OpenHands",- );+ expect(+ screen.getByTestId("org-row-github:openhands"),+ ).toHaveTextContent("github/OpenHands");+ expect(+ screen.getByTestId("org-row-github:acmeco"),+ ).toHaveTextContent("github/AcmeCo");});- it("should show pre-claimed org with 'Claimed' label", () => {- // Arrange & Act+ it("should show claimed org with 'Claimed' label", () => {renderWithProviders(<GitConversationRouting />);- // Assert- const claimedButton = screen.getByTestId("claim-button-1");+ const claimedButton = screen.getByTestId("claim-button-github:openhands");expect(claimedButton).toHaveTextContent("ORG$CLAIMED");});it("should show unclaimed orgs with 'Claim' label", () => {- // Arrange & ActrenderWithProviders(<GitConversationRouting />);- // Assert- expect(screen.getByTestId("claim-button-2")).toHaveTextContent("ORG$CLAIM");+ expect(+ screen.getByTestId("claim-button-github:acmeco"),+ ).toHaveTextContent("ORG$CLAIM");});- it("should claim an organization and show success toast", async () => {- // Arrange- const successToastSpy = vi.spyOn(ToastHandlers, "displaySuccessToast");+ it("should call claim mutation when clicking claim on unclaimed org", async () => {renderWithProviders(<GitConversationRouting />);- const user = userEvent.setup({ advanceTimers: vi.advanceTimersByTime });-- // Act- await user.click(screen.getByTestId("claim-button-2"));- // Move pointer away so hover state resets after transition- await user.unhover(screen.getByTestId("claim-button-2"));- act(() => {- vi.advanceTimersByTime(1000);- });-- // Assert- await waitFor(() => {- expect(screen.getByTestId("claim-button-2")).toHaveTextContent(- "ORG$CLAIMED",- );- });- expect(successToastSpy).toHaveBeenCalledWith("ORG$CLAIM_SUCCESS");- });+ const user = userEvent.setup();- it("should show error toast when claiming an already-claimed org", async () => {- // Arrange- const errorToastSpy = vi.spyOn(ToastHandlers, "displayErrorToast");- renderWithProviders(<GitConversationRouting />);- const user = userEvent.setup({ advanceTimers: vi.advanceTimersByTime });-- // Act- await user.click(screen.getByTestId("claim-button-3"));- act(() => {- vi.advanceTimersByTime(1000);- });-- // Assert- await waitFor(() => {- expect(screen.getByTestId("claim-button-3")).toHaveTextContent(- "ORG$CLAIM",- );- });- expect(errorToastSpy).toHaveBeenCalledWith("ORG$CLAIM_ERROR");- });+ await user.click(screen.getByTestId("claim-button-github:acmeco"));- it("should disconnect a claimed org and show success toast", async () => {- // Arrange- const successToastSpy = vi.spyOn(ToastHandlers, "displaySuccessToast");- renderWithProviders(<GitConversationRouting />);- const user = userEvent.setup({ advanceTimers: vi.advanceTimersByTime });-- // Act — disconnect the pre-claimed org (id: 1)- await user.click(screen.getByTestId("claim-button-1"));- act(() => {- vi.advanceTimersByTime(1000);- });-- // Assert- await waitFor(() => {- expect(screen.getByTestId("claim-button-1")).toHaveTextContent(- "ORG$CLAIM",- );- });- expect(successToastSpy).toHaveBeenCalledWith("ORG$DISCONNECT_SUCCESS");+ expect(mockMutate).toHaveBeenCalledWith(+ { provider: "github", gitOrganization: "AcmeCo" },+ expect.objectContaining({ onSettled: expect.any(Function) }),+ );});- it("should disable the button during claiming transition", async () => {- // Arrange+ it("should call disconnect mutation when clicking disconnect on claimed org", async () => {renderWithProviders(<GitConversationRouting />);- const user = userEvent.setup({ advanceTimers: vi.advanceTimersByTime });+ const user = userEvent.setup();- // Act- await user.click(screen.getByTestId("claim-button-2"));+ await user.click(screen.getByTestId("claim-button-github:openhands"));- // Assert — button is disabled while claiming- expect(screen.getByTestId("claim-button-2")).toBeDisabled();-- // Cleanup — advance timer to complete transition- act(() => {- vi.advanceTimersByTime(1000);- });+ expect(mockDisconnectMutate).toHaveBeenCalledWith(+ { claimId: "claim-1" },+ expect.objectContaining({ onSettled: expect.any(Function) }),+ );});+});diff --git a/frontend/__tests__/components/features/org/git-org-row.test.tsx b/frontend/__tests__/components/features/org/git-org-row.test.tsxindex f127db4836..ce7dbbf92c 100644--- a/frontend/__tests__/components/features/org/git-org-row.test.tsx+++ b/frontend/__tests__/components/features/org/git-org-row.test.tsx@@ -2,10 +2,11 @@ import { screen } from "@testing-library/react";import { describe, expect, it, vi } from "vitest";import { renderWithProviders } from "test-utils";import { GitOrgRow } from "#/components/features/org/git-org-row";-import type { GitOrg } from "#/hooks/organizations/use-git-conversation-routing";+import type { GitOrg } from "#/types/org";const createOrg = (overrides: Partial<GitOrg> = {}): GitOrg => ({id: "1",+ claimId: null,provider: "GitHub",name: "TestOrg",status: "unclaimed",diff --git a/frontend/__tests__/hooks/use-git-conversation-routing.test.ts b/frontend/__tests__/hooks/use-git-conversation-routing.test.tsnew file mode 100644index 0000000000..6050bbfca8--- /dev/null+++ b/frontend/__tests__/hooks/use-git-conversation-routing.test.ts@@ -0,0 +1,255 @@+import { renderHook, act } from "@testing-library/react";+import { describe, expect, it, vi, beforeEach } from "vitest";++const mockClaimMutate = vi.fn();+const mockDisconnectMutate = vi.fn();++vi.mock("#/hooks/query/use-git-organizations", () => ({+ useUserGitOrganizations: vi.fn(),+ useGitClaims: vi.fn(),+}));++vi.mock("#/hooks/mutation/use-claim-git-org", () => ({+ useClaimGitOrg: () => ({ mutate: mockClaimMutate }),+}));++vi.mock("#/hooks/mutation/use-disconnect-git-org", () => ({+ useDisconnectGitOrg: () => ({ mutate: mockDisconnectMutate }),+}));++import { useGitConversationRouting } from "#/hooks/organizations/use-git-conversation-routing";+import {+ useUserGitOrganizations,+ useGitClaims,+} from "#/hooks/query/use-git-organizations";++const mockUseUserGitOrganizations = vi.mocked(useUserGitOrganizations);+const mockUseGitClaims = vi.mocked(useGitClaims);++function setupMocks({+ userOrgs = { provider: "github", organizations: ["OpenHands", "AcmeCo"] },+ claims = [] as Array<{+ id: string;+ org_id: string;+ provider: string;+ git_organization: string;+ claimed_by: string;+ claimed_at: string;+ }>,+ isLoadingUserOrgs = false,+ isLoadingClaims = false,+} = {}) {+ mockUseUserGitOrganizations.mockReturnValue({+ data: userOrgs,+ isLoading: isLoadingUserOrgs,+ } as ReturnType<typeof useUserGitOrganizations>);++ mockUseGitClaims.mockReturnValue({+ data: claims,+ isLoading: isLoadingClaims,+ } as ReturnType<typeof useGitClaims>);+}++describe("useGitConversationRouting", () => {+ beforeEach(() => {+ vi.clearAllMocks();+ });++ it("returns empty orgs when user git orgs is undefined", () => {+ mockUseUserGitOrganizations.mockReturnValue({+ data: undefined,+ isLoading: true,+ } as ReturnType<typeof useUserGitOrganizations>);+ mockUseGitClaims.mockReturnValue({+ data: undefined,+ isLoading: true,+ } as ReturnType<typeof useGitClaims>);++ const { result } = renderHook(() => useGitConversationRouting());++ expect(result.current.orgs).toEqual([]);+ expect(result.current.isLoading).toBe(true);+ });++ it("merges user git orgs with claims correctly", () => {+ setupMocks({+ claims: [+ {+ id: "claim-1",+ org_id: "org-1",+ provider: "github",+ git_organization: "openhands",+ claimed_by: "user-1",+ claimed_at: "2026-01-01T00:00:00",+ },+ ],+ });++ const { result } = renderHook(() => useGitConversationRouting());++ expect(result.current.orgs).toHaveLength(2);++ const claimedOrg = result.current.orgs.find(+ (o) => o.name === "OpenHands",+ );+ expect(claimedOrg).toMatchObject({+ id: "github:openhands",+ claimId: "claim-1",+ provider: "github",+ status: "claimed",+ });++ const unclaimedOrg = result.current.orgs.find(+ (o) => o.name === "AcmeCo",+ );+ expect(unclaimedOrg).toMatchObject({+ id: "github:acmeco",+ claimId: null,+ provider: "github",+ status: "unclaimed",+ });+ });++ it("handles case-insensitive matching between user orgs and claims", () => {+ setupMocks({+ userOrgs: {+ provider: "GitHub",+ organizations: ["All-Hands-AI"],+ },+ claims: [+ {+ id: "claim-1",+ org_id: "org-1",+ provider: "github",+ git_organization: "all-hands-ai",+ claimed_by: "user-1",+ claimed_at: "2026-01-01T00:00:00",+ },+ ],+ });++ const { result } = renderHook(() => useGitConversationRouting());++ expect(result.current.orgs[0]).toMatchObject({+ status: "claimed",+ claimId: "claim-1",+ name: "All-Hands-AI",+ });+ });++ it("returns unclaimed when no claims data is available", () => {+ setupMocks({ claims: [] });++ const { result } = renderHook(() => useGitConversationRouting());++ expect(result.current.orgs).toHaveLength(2);+ expect(result.current.orgs.every((o) => o.status === "unclaimed")).toBe(+ true,+ );+ expect(result.current.orgs.every((o) => o.claimId === null)).toBe(true);+ });++ it("sets pending claiming state when claimOrg is called", () => {+ setupMocks();++ const { result } = renderHook(() => useGitConversationRouting());++ act(() => {+ result.current.claimOrg("github:acmeco");+ });++ expect(mockClaimMutate).toHaveBeenCalledWith(+ { provider: "github", gitOrganization: "AcmeCo" },+ expect.objectContaining({ onSettled: expect.any(Function) }),+ );++ const org = result.current.orgs.find((o) => o.id === "github:acmeco");+ expect(org?.status).toBe("claiming");+ });++ it("sets pending disconnecting state when disconnectOrg is called", () => {+ setupMocks({+ claims: [+ {+ id: "claim-1",+ org_id: "org-1",+ provider: "github",+ git_organization: "openhands",+ claimed_by: "user-1",+ claimed_at: "2026-01-01T00:00:00",+ },+ ],+ });++ const { result } = renderHook(() => useGitConversationRouting());++ act(() => {+ result.current.disconnectOrg("github:openhands");+ });++ expect(mockDisconnectMutate).toHaveBeenCalledWith(+ { claimId: "claim-1" },+ expect.objectContaining({ onSettled: expect.any(Function) }),+ );++ const org = result.current.orgs.find((o) => o.id === "github:openhands");+ expect(org?.status).toBe("disconnecting");+ });++ it("clears pending state on settle", () => {+ setupMocks();++ mockClaimMutate.mockImplementation(+ (+ _args: unknown,+ options: { onSettled?: () => void },+ ) => {+ options?.onSettled?.();+ },+ );++ const { result } = renderHook(() => useGitConversationRouting());++ act(() => {+ result.current.claimOrg("github:acmeco");+ });++ const org = result.current.orgs.find((o) => o.id === "github:acmeco");+ expect(org?.status).toBe("unclaimed");+ });++ it("does not claim an already claimed org", () => {+ setupMocks({+ claims: [+ {+ id: "claim-1",+ org_id: "org-1",+ provider: "github",+ git_organization: "openhands",+ claimed_by: "user-1",+ claimed_at: "2026-01-01T00:00:00",+ },+ ],+ });++ const { result } = renderHook(() => useGitConversationRouting());++ act(() => {+ result.current.claimOrg("github:openhands");+ });++ expect(mockClaimMutate).not.toHaveBeenCalled();+ });++ it("does not disconnect an unclaimed org", () => {+ setupMocks();++ const { result } = renderHook(() => useGitConversationRouting());++ act(() => {+ result.current.disconnectOrg("github:acmeco");+ });++ expect(mockDisconnectMutate).not.toHaveBeenCalled();+ });+});diff --git a/frontend/src/api/organization-service/organization-service.api.ts b/frontend/src/api/organization-service/organization-service.api.tsindex 36a424e07f..9684deb1e6 100644--- a/frontend/src/api/organization-service/organization-service.api.ts+++ b/frontend/src/api/organization-service/organization-service.api.ts@@ -1,4 +1,5 @@import {+ GitOrgClaim,Organization,OrganizationMember,OrganizationMembersPage,@@ -167,4 +168,37 @@ export const organizationService = {return data;},++ getGitClaims: async ({ orgId }: { orgId: string }) => {+ const { data } = await openHands.get<GitOrgClaim[]>(+ `/api/organizations/${orgId}/git-claims`,+ );+ return data;+ },++ claimGitOrg: async ({+ orgId,+ provider,+ gitOrganization,+ }: {+ orgId: string;+ provider: string;+ gitOrganization: string;+ }) => {+ const { data } = await openHands.post<GitOrgClaim>(+ `/api/organizations/${orgId}/git-claims`,+ { provider, git_organization: gitOrganization },+ );+ return data;+ },++ disconnectGitOrg: async ({+ orgId,+ claimId,+ }: {+ orgId: string;+ claimId: string;+ }) => {+ await openHands.delete(`/api/organizations/${orgId}/git-claims/${claimId}`);+ },};diff --git a/frontend/src/api/user-service/user-service.api.ts b/frontend/src/api/user-service/user-service.api.tsindex 1372fc8db8..41154367b2 100644--- a/frontend/src/api/user-service/user-service.api.ts+++ b/frontend/src/api/user-service/user-service.api.ts@@ -1,5 +1,6 @@import { openHands } from "../open-hands-axios";import { GitUser } from "#/types/git";+import { UserGitOrganizationsResponse } from "#/types/org";/*** User Service API - Handles all user-related API endpoints@@ -25,6 +26,17 @@ class UserService {return user;}++ /**+ * Get the current user's Git organizations+ * @returns Git organizations for the current user's provider+ */+ static async getGitOrganizations(): Promise<UserGitOrganizationsResponse> {+ const { data } = await openHands.get<UserGitOrganizationsResponse>(+ "/api/user/git-organizations",+ );+ return data;+ }}export default UserService;diff --git a/frontend/src/components/features/org/claim-button.tsx b/frontend/src/components/features/org/claim-button.tsxindex 210a3c3e35..1d345850ca 100644--- a/frontend/src/components/features/org/claim-button.tsx+++ b/frontend/src/components/features/org/claim-button.tsx@@ -2,7 +2,7 @@ import React from "react";import { useTranslation } from "react-i18next";import { I18nKey } from "#/i18n/declaration";import { cn } from "#/utils/utils";-import type { GitOrg } from "#/hooks/organizations/use-git-conversation-routing";+import type { GitOrg } from "#/types/org";type ButtonState =| "claiming"diff --git a/frontend/src/components/features/org/git-conversation-routing.tsx b/frontend/src/components/features/org/git-conversation-routing.tsxindex 1dd524f6fc..38e897a282 100644--- a/frontend/src/components/features/org/git-conversation-routing.tsx+++ b/frontend/src/components/features/org/git-conversation-routing.tsx@@ -2,11 +2,13 @@ import { useTranslation } from "react-i18next";import { I18nKey } from "#/i18n/declaration";import { Text, Paragraph } from "#/ui/typography";import { useGitConversationRouting } from "#/hooks/organizations/use-git-conversation-routing";+import { LoadingSpinner } from "#/components/shared/loading-spinner";import { GitOrgRow } from "./git-org-row";export function GitConversationRouting() {const { t } = useTranslation();- const { orgs, claimOrg, disconnectOrg } = useGitConversationRouting();+ const { orgs, claimOrg, disconnectOrg, isLoading } =+ useGitConversationRouting();return (<div@@ -21,17 +23,31 @@ export function GitConversationRouting() {{t(I18nKey.ORG$GIT_CONVERSATION_ROUTING_DESCRIPTION)}</Paragraph>- <div className="border border-[#242424] rounded-[6px] overflow-hidden">- {orgs.map((org, index) => (- <GitOrgRow- key={org.id}- org={org}- isLast={index === orgs.length - 1}- onClaim={claimOrg}- onDisconnect={disconnectOrg}- />- ))}- </div>+ {isLoading && (+ <div className="flex justify-center py-4">+ <LoadingSpinner size="small" />+ </div>+ )}++ {!isLoading && orgs.length > 0 && (+ <div className="border border-[#242424] rounded-[6px] overflow-hidden">+ {orgs.map((org, index) => (+ <GitOrgRow+ key={org.id}+ org={org}+ isLast={index === orgs.length - 1}+ onClaim={claimOrg}+ onDisconnect={disconnectOrg}+ />+ ))}+ </div>+ )}++ {!isLoading && orgs.length === 0 && (+ <Paragraph className="text-center py-4 text-[#8c8c8c] text-sm">+ {t(I18nKey.ORG$NO_GIT_ORGANIZATIONS)}+ </Paragraph>+ )}</div>);}diff --git a/frontend/src/components/features/org/git-org-row.tsx b/frontend/src/components/features/org/git-org-row.tsxindex 0d81a65aa2..50ba11e1be 100644--- a/frontend/src/components/features/org/git-org-row.tsx+++ b/frontend/src/components/features/org/git-org-row.tsx@@ -1,6 +1,6 @@import { cn } from "#/utils/utils";import { Text } from "#/ui/typography";-import type { GitOrg } from "#/hooks/organizations/use-git-conversation-routing";+import type { GitOrg } from "#/types/org";import { ClaimButton } from "./claim-button";interface GitOrgRowProps {diff --git a/frontend/src/hooks/mutation/use-claim-git-org.ts b/frontend/src/hooks/mutation/use-claim-git-org.tsnew file mode 100644index 0000000000..09342d7055--- /dev/null+++ b/frontend/src/hooks/mutation/use-claim-git-org.ts@@ -0,0 +1,45 @@+import { useMutation, useQueryClient } from "@tanstack/react-query";+import { useTranslation } from "react-i18next";+import { organizationService } from "#/api/organization-service/organization-service.api";+import { useSelectedOrganizationId } from "#/context/use-selected-organization";+import { I18nKey } from "#/i18n/declaration";+import { gitClaimsQueryKey } from "#/hooks/query/use-git-organizations";+import {+ displayErrorToast,+ displaySuccessToast,+} from "#/utils/custom-toast-handlers";+import { retrieveAxiosErrorMessage } from "#/utils/retrieve-axios-error-message";++export const useClaimGitOrg = () => {+ const queryClient = useQueryClient();+ const { organizationId } = useSelectedOrganizationId();+ const { t } = useTranslation();++ return useMutation({+ mutationFn: ({+ provider,+ gitOrganization,+ }: {+ provider: string;+ gitOrganization: string;+ }) => {+ if (!organizationId) throw new Error("Organization ID is required");+ return organizationService.claimGitOrg({+ orgId: organizationId,+ provider,+ gitOrganization,+ });+ },+ onSuccess: () => {+ displaySuccessToast(t(I18nKey.ORG$CLAIM_SUCCESS));+ queryClient.invalidateQueries({+ queryKey: gitClaimsQueryKey(organizationId),+ });+ },+ onError: (error) => {+ const errorMessage = retrieveAxiosErrorMessage(error);+ displayErrorToast(errorMessage || t(I18nKey.ORG$CLAIM_ERROR));+ },+ meta: { disableToast: true },+ });+};diff --git a/frontend/src/hooks/mutation/use-disconnect-git-org.ts b/frontend/src/hooks/mutation/use-disconnect-git-org.tsnew file mode 100644index 0000000000..0c84126bb9--- /dev/null+++ b/frontend/src/hooks/mutation/use-disconnect-git-org.ts@@ -0,0 +1,38 @@+import { useMutation, useQueryClient } from "@tanstack/react-query";+import { useTranslation } from "react-i18next";+import { organizationService } from "#/api/organization-service/organization-service.api";+import { useSelectedOrganizationId } from "#/context/use-selected-organization";+import { I18nKey } from "#/i18n/declaration";+import { gitClaimsQueryKey } from "#/hooks/query/use-git-organizations";+import {+ displayErrorToast,+ displaySuccessToast,+} from "#/utils/custom-toast-handlers";+import { retrieveAxiosErrorMessage } from "#/utils/retrieve-axios-error-message";++export const useDisconnectGitOrg = () => {+ const queryClient = useQueryClient();+ const { organizationId } = useSelectedOrganizationId();+ const { t } = useTranslation();++ return useMutation({+ mutationFn: ({ claimId }: { claimId: string }) => {+ if (!organizationId) throw new Error("Organization ID is required");+ return organizationService.disconnectGitOrg({+ orgId: organizationId,+ claimId,+ });+ },+ onSuccess: () => {+ displaySuccessToast(t(I18nKey.ORG$DISCONNECT_SUCCESS));+ queryClient.invalidateQueries({+ queryKey: gitClaimsQueryKey(organizationId),+ });+ },+ onError: (error) => {+ const errorMessage = retrieveAxiosErrorMessage(error);+ displayErrorToast(errorMessage || t(I18nKey.ORG$DISCONNECT_ERROR));+ },+ meta: { disableToast: true },+ });+};diff --git a/frontend/src/hooks/organizations/use-git-conversation-routing.ts b/frontend/src/hooks/organizations/use-git-conversation-routing.tsindex b3a1a9512d..c684e44b49 100644--- a/frontend/src/hooks/organizations/use-git-conversation-routing.ts+++ b/frontend/src/hooks/organizations/use-git-conversation-routing.ts@@ -1,81 +1,113 @@import React from "react";-import { useTranslation } from "react-i18next";-import { I18nKey } from "#/i18n/declaration";import {- displaySuccessToast,- displayErrorToast,-} from "#/utils/custom-toast-handlers";--// TODO: This entire hook uses mock data and simulated async behavior.-// Replace with real API calls (e.g., organizationService.claimOrg / disconnectOrg)-// once the backend endpoints for organization claims are implemented.-export interface GitOrg {- id: string;- provider: "GitHub" | "GitLab";- name: string;- status: "unclaimed" | "claimed" | "claiming" | "disconnecting";-}+ useUserGitOrganizations,+ useGitClaims,+} from "#/hooks/query/use-git-organizations";+import { useClaimGitOrg } from "#/hooks/mutation/use-claim-git-org";+import { useDisconnectGitOrg } from "#/hooks/mutation/use-disconnect-git-org";+import type { GitOrg } from "#/types/org";-// TODO: Remove mock data once the backend API for fetching available git organizations is ready.-const INITIAL_ORGS: GitOrg[] = [- { id: "1", provider: "GitHub", name: "OpenHands", status: "claimed" },- { id: "2", provider: "GitHub", name: "AcmeCo", status: "unclaimed" },- {- id: "3",- provider: "GitHub",- name: "already-claimed",- status: "unclaimed",- },- { id: "4", provider: "GitLab", name: "OpenHands", status: "unclaimed" },-];+function buildOrgId(provider: string, name: string): string {+ return `${provider.toLowerCase()}:${name.toLowerCase()}`;+}export function useGitConversationRouting() {- const { t } = useTranslation();- const [orgs, setOrgs] = React.useState<GitOrg[]>(INITIAL_ORGS);+ const { data: userGitOrgs, isLoading: isLoadingUserOrgs } =+ useUserGitOrganizations();+ const { data: claims, isLoading: isLoadingClaims } = useGitClaims();+ const { mutate: claimGitOrg } = useClaimGitOrg();+ const { mutate: disconnectGitOrg } = useDisconnectGitOrg();- const updateOrgStatus = React.useCallback(- (id: string, status: GitOrg["status"]) => {- setOrgs((prev) =>- prev.map((org) => (org.id === id ? { ...org, status } : org)),- );- },- [],+ const [pendingClaims, setPendingClaims] = React.useState<Set<string>>(+ new Set(),);+ const [pendingDisconnects, setPendingDisconnects] = React.useState<+ Set<string>+ >(new Set());++ const orgs = React.useMemo<GitOrg[]>(() => {+ if (!userGitOrgs) return [];++ const claimMap = new Map(+ (claims ?? []).map((c) => [+ buildOrgId(c.provider, c.git_organization),+ c,+ ]),+ );++ return userGitOrgs.organizations.map((name) => {+ const id = buildOrgId(userGitOrgs.provider, name);+ const claim = claimMap.get(id);++ let status: GitOrg["status"] = "unclaimed";+ if (pendingClaims.has(id)) {+ status = "claiming";+ } else if (pendingDisconnects.has(id)) {+ status = "disconnecting";+ } else if (claim) {+ status = "claimed";+ }++ return {+ id,+ claimId: claim?.id ?? null,+ provider: userGitOrgs.provider,+ name,+ status,+ };+ });+ }, [userGitOrgs, claims, pendingClaims, pendingDisconnects]);++ const orgsRef = React.useRef(orgs);+ orgsRef.current = orgs;const claimOrg = React.useCallback((id: string) => {- const org = orgs.find((o) => o.id === id);+ const org = orgsRef.current.find((o) => o.id === id);if (!org || org.status !== "unclaimed") return;- updateOrgStatus(id, "claiming");-- setTimeout(() => {- if (org.name === "already-claimed") {- updateOrgStatus(id, "unclaimed");- displayErrorToast(t(I18nKey.ORG$CLAIM_ERROR));- } else {- updateOrgStatus(id, "claimed");- displaySuccessToast(t(I18nKey.ORG$CLAIM_SUCCESS));- }- }, 1000);+ setPendingClaims((prev) => new Set(prev).add(id));++ claimGitOrg(+ { provider: org.provider, gitOrganization: org.name },+ {+ onSettled: () => {+ setPendingClaims((prev) => {+ const next = new Set(prev);+ next.delete(id);+ return next;+ });+ },+ },+ );},- [orgs, updateOrgStatus, t],+ [claimGitOrg],);const disconnectOrg = React.useCallback((id: string) => {- const org = orgs.find((o) => o.id === id);- if (!org || org.status !== "claimed") return;+ const org = orgsRef.current.find((o) => o.id === id);+ if (!org || org.status !== "claimed" || !org.claimId) return;- updateOrgStatus(id, "disconnecting");+ setPendingDisconnects((prev) => new Set(prev).add(id));- setTimeout(() => {- updateOrgStatus(id, "unclaimed");- displaySuccessToast(t(I18nKey.ORG$DISCONNECT_SUCCESS));- }, 1000);+ disconnectGitOrg(+ { claimId: org.claimId },+ {+ onSettled: () => {+ setPendingDisconnects((prev) => {+ const next = new Set(prev);+ next.delete(id);+ return next;+ });+ },+ },+ );},- [orgs, updateOrgStatus, t],+ [disconnectGitOrg],);- return { orgs, claimOrg, disconnectOrg };+ const isLoading = isLoadingUserOrgs || isLoadingClaims;++ return { orgs, claimOrg, disconnectOrg, isLoading };}diff --git a/frontend/src/hooks/query/use-git-organizations.ts b/frontend/src/hooks/query/use-git-organizations.tsnew file mode 100644index 0000000000..ca2475224a--- /dev/null+++ b/frontend/src/hooks/query/use-git-organizations.ts@@ -0,0 +1,26 @@+import { useQuery } from "@tanstack/react-query";+import { organizationService } from "#/api/organization-service/organization-service.api";+import UserService from "#/api/user-service/user-service.api";+import { useSelectedOrganizationId } from "#/context/use-selected-organization";++export const gitClaimsQueryKey = (organizationId: string | null) =>+ ["organizations", organizationId, "git-claims"] as const;++export const useUserGitOrganizations = () =>+ useQuery({+ queryKey: ["user", "git-organizations"],+ queryFn: () => UserService.getGitOrganizations(),+ staleTime: 1000 * 60 * 5,+ meta: { disableToast: true },+ });++export const useGitClaims = () => {+ const { organizationId } = useSelectedOrganizationId();++ return useQuery({+ queryKey: gitClaimsQueryKey(organizationId),+ queryFn: () => organizationService.getGitClaims({ orgId: organizationId! }),+ enabled: !!organizationId,+ staleTime: 1000 * 30,+ });+};diff --git a/frontend/src/i18n/declaration.ts b/frontend/src/i18n/declaration.tsindex 8ca8d76a6a..f327b7e12b 100644--- a/frontend/src/i18n/declaration.ts+++ b/frontend/src/i18n/declaration.ts@@ -1279,4 +1279,6 @@ export enum I18nKey {ORG$CLAIM_SUCCESS = "ORG$CLAIM_SUCCESS",ORG$DISCONNECT_SUCCESS = "ORG$DISCONNECT_SUCCESS",ORG$CLAIM_ERROR = "ORG$CLAIM_ERROR",+ ORG$DISCONNECT_ERROR = "ORG$DISCONNECT_ERROR",+ ORG$NO_GIT_ORGANIZATIONS = "ORG$NO_GIT_ORGANIZATIONS",}diff --git a/frontend/src/i18n/translation.json b/frontend/src/i18n/translation.jsonindex 9d08de518a..d71d59035e 100644--- a/frontend/src/i18n/translation.json+++ b/frontend/src/i18n/translation.json@@ -21747,5 +21747,39 @@"de": "Verbindung fehlgeschlagen. Organisation wurde bereits beansprucht.","uk": "Помилка з'єднання. Організація вже заявлена.","ca": "Error de connexió. L'organització ja ha estat reclamada."+ },+ "ORG$DISCONNECT_ERROR": {+ "en": "Failed to disconnect organization.",+ "ja": "組織の切断に失敗しました。",+ "zh-CN": "断开组织连接失败。",+ "zh-TW": "斷開組織連接失敗。",+ "ko-KR": "조직 연결 해제에 실패했습니다.",+ "no": "Kunne ikke koble fra organisasjonen.",+ "it": "Impossibile disconnettere l'organizzazione.",+ "pt": "Falha ao desconectar a organização.",+ "es": "Error al desconectar la organización.",+ "ar": "فشل في قطع اتصال المنظمة.",+ "fr": "Échec de la déconnexion de l'organisation.",+ "tr": "Organizasyon bağlantısı kesilemedi.",+ "de": "Trennung der Organisation fehlgeschlagen.",+ "uk": "Не вдалося від'єднати організацію.",+ "ca": "No s'ha pogut desconnectar l'organització."+ },+ "ORG$NO_GIT_ORGANIZATIONS": {+ "en": "No Git organizations found.",+ "ja": "Git組織が見つかりません。",+ "zh-CN": "未找到 Git 组织。",+ "zh-TW": "未找到 Git 組織。",+ "ko-KR": "Git 조직을 찾을 수 없습니다.",+ "no": "Ingen Git-organisasjoner funnet.",+ "it": "Nessuna organizzazione Git trovata.",+ "pt": "Nenhuma organização Git encontrada.",+ "es": "No se encontraron organizaciones Git.",+ "ar": "لم يتم العثور على منظمات Git.",+ "fr": "Aucune organisation Git trouvée.",+ "tr": "Git organizasyonu bulunamadı.",+ "de": "Keine Git-Organisationen gefunden.",+ "uk": "Організації Git не знайдено.",+ "ca": "No s'han trobat organitzacions Git."}}diff --git a/frontend/src/types/org.ts b/frontend/src/types/org.tsindex a7b83c1092..68c773d85d 100644--- a/frontend/src/types/org.ts+++ b/frontend/src/types/org.ts@@ -65,3 +65,25 @@ export type OrganizationsQueryData = {items: Organization[];currentOrgId: string | null;};++export interface GitOrgClaim {+ id: string;+ org_id: string;+ provider: string;+ git_organization: string;+ claimed_by: string;+ claimed_at: string;+}++export interface UserGitOrganizationsResponse {+ provider: string;+ organizations: string[];+}++export interface GitOrg {+ id: string;+ claimId: string | null;+ provider: string;+ name: string;+ status: "unclaimed" | "claimed" | "claiming" | "disconnecting";+}