🙌 OpenHands: AI-Driven Development
Polish Jira DC webhook settings UX (#14547)
Alonaae8caca41aef
diff --git a/enterprise/server/routes/integration/jira_dc.py b/enterprise/server/routes/integration/jira_dc.pyindex e684322cb3..6a9f03d68a 100644--- a/enterprise/server/routes/integration/jira_dc.py+++ b/enterprise/server/routes/integration/jira_dc.py@@ -192,7 +192,10 @@ def _jira_dc_events_url(workspace_id: int) -> str:async def _handle_workspace_link_creation(- user_id: str, jira_dc_user_id: str, target_workspace: str+ user_id: str,+ jira_dc_user_id: str,+ target_workspace: str,+ require_active_workspace: bool = True,):"""Handle the creation or reactivation of a workspace link for a user."""# Verify workspace exists and is active@@ -205,7 +208,7 @@ async def _handle_workspace_link_creation(detail=f'Workspace "{target_workspace}" not found',)- if workspace.status.lower() != 'active':+ if require_active_workspace and workspace.status.lower() != 'active':raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST,detail=f'Workspace "{target_workspace}" is not active',@@ -585,9 +588,17 @@ async def create_jira_dc_workspace()# Create a workspace link for the user (admin automatically gets linked)- await _handle_workspace_link_creation(- user_id, 'unavailable', workspace.name- )+ if workspace_data.is_active:+ await _handle_workspace_link_creation(+ user_id, 'unavailable', workspace.name+ )+ else:+ await _handle_workspace_link_creation(+ user_id,+ 'unavailable',+ workspace.name,+ require_active_workspace=False,+ )else:# Workspace exists - validate user can update itawait _validate_workspace_update_permissions(@@ -618,9 +629,17 @@ async def create_jira_dc_workspace(status='active' if workspace_data.is_active else 'inactive',)- await _handle_workspace_link_creation(- user_id, 'unavailable', workspace.name- )+ if workspace_data.is_active:+ await _handle_workspace_link_creation(+ user_id, 'unavailable', workspace.name+ )+ else:+ await _handle_workspace_link_creation(+ user_id,+ 'unavailable',+ workspace.name,+ require_active_workspace=False,+ )webhook_enrolled = await _maybe_register_webhook(workspace_data.admin_api_key,@@ -628,6 +647,12 @@ async def create_jira_dc_workspace(resolved_webhook_secret,workspace.id,)+ if workspace_data.admin_api_key and not webhook_enrolled:+ await jira_dc_manager.integration_store.update_workspace(+ id=workspace.id,+ status='inactive',+ )+return JSONResponse(content={'success': True,@@ -838,9 +863,17 @@ async def jira_dc_callback(request: Request, code: str, state: str):)# Create a workspace link for the user (admin automatically gets linked)- await _handle_workspace_link_creation(- user_id, jira_dc_user_id, target_workspace- )+ if integration_session['is_active']:+ await _handle_workspace_link_creation(+ user_id, jira_dc_user_id, target_workspace+ )+ else:+ await _handle_workspace_link_creation(+ user_id,+ jira_dc_user_id,+ target_workspace,+ require_active_workspace=False,+ )else:# Workspace exists - validate user can update itawait _validate_workspace_update_permissions(user_id, target_workspace)@@ -865,18 +898,38 @@ async def jira_dc_callback(request: Request, code: str, state: str):status='active' if integration_session['is_active'] else 'inactive',)- await _handle_workspace_link_creation(- user_id, jira_dc_user_id, target_workspace- )+ if integration_session['is_active']:+ await _handle_workspace_link_creation(+ user_id, jira_dc_user_id, target_workspace+ )+ else:+ await _handle_workspace_link_creation(+ user_id,+ jira_dc_user_id,+ target_workspace,+ require_active_workspace=False,+ )- await _maybe_register_webhook(+ webhook_enrolled = await _maybe_register_webhook(integration_session.get('admin_api_key'),JIRA_DC_BASE_URL,integration_session['webhook_secret'],workspace.id,)+ if integration_session.get('admin_api_key') and not webhook_enrolled:+ await jira_dc_manager.integration_store.update_workspace(+ id=workspace.id,+ status='inactive',+ )++ redirect_url = '/settings/integrations'+ if integration_session.get('admin_api_key') and not webhook_enrolled:+ redirect_url += '?jira_dc_webhook=install_failed'+ elif integration_session.get('admin_api_key') and webhook_enrolled:+ redirect_url += '?jira_dc_webhook=installed'+return RedirectResponse(- url='/settings/integrations',+ url=redirect_url,status_code=status.HTTP_302_FOUND,)elif integration_session.get('operation_type') == 'workspace_link':@@ -955,14 +1008,14 @@ async def get_current_workspace_link(request: Request):@jira_dc_integration_router.post('/workspaces/unlink')async def unlink_workspace(request: Request):- """Unlink from Jira DC and, for workspace admins, optionally revoke the hook.-- A non-admin user is only detached from the workspace (their personal link- goes inactive) -- never touching Jira. The workspace admin instead tears the- whole integration down: the workspace is deactivated and, when an admin PAT- is supplied in the request body, the Jira webhook is deleted too (best- effort, mirroring auto-enrollment). Deactivation never fails if the Jira-side- cleanup did; the admin can always remove the webhook by hand.+ """Unlink from Jira DC and, for integration owners, optionally revoke the hook.++ A non-owner user is only detached from the workspace (their personal link+ goes inactive) -- never touching Jira. The integration owner instead tears+ the whole integration down: the workspace is deactivated and, when a Jira+ admin PAT is supplied in the request body, the Jira webhook is deleted too+ (best effort, mirroring auto-enrollment). Deactivation never fails if the+ Jira-side cleanup did; the owner can always remove the webhook by hand."""try:user_auth = cast(SaasUserAuth, await get_user_auth(request))diff --git a/enterprise/tests/unit/server/routes/test_jira_dc_integration_routes.py b/enterprise/tests/unit/server/routes/test_jira_dc_integration_routes.pyindex 27617c8845..f359beb08a 100644--- a/enterprise/tests/unit/server/routes/test_jira_dc_integration_routes.py+++ b/enterprise/tests/unit/server/routes/test_jira_dc_integration_routes.py@@ -251,6 +251,76 @@ async def test_jira_dc_callback_workspace_integration_new_workspace()+@patch('server.routes.integration.jira_dc.redis_client')+@patch('requests.post')+@patch('requests.get')+@patch('server.routes.integration.jira_dc.jira_dc_manager', new_callable=AsyncMock)+@patch(+ 'server.routes.integration.jira_dc._handle_workspace_link_creation',+ new_callable=AsyncMock,+)+@patch(+ 'server.routes.integration.jira_dc._maybe_register_webhook',+ new_callable=AsyncMock,+)+async def test_jira_dc_callback_redirects_with_webhook_install_failure(+ mock_register_webhook,+ mock_handle_link,+ mock_manager,+ mock_get,+ mock_post,+ mock_redis,+ mock_request,+):+ state = 'test_state'+ session_data = {+ 'operation_type': 'workspace_integration',+ 'keycloak_user_id': 'user1',+ 'target_workspace': 'test.atlassian.net',+ 'webhook_secret': 'secret',+ 'svc_acc_email': '[email protected]',+ 'svc_acc_api_key': 'apikey',+ 'admin_api_key': 'bad-admin-pat',+ 'is_active': True,+ 'state': state,+ }+ mock_redis.get.return_value = json.dumps(session_data)+ mock_post.return_value = MagicMock(+ status_code=200, json=lambda: {'access_token': 'token'}+ )+ mock_get.return_value = MagicMock(+ status_code=200,+ json=lambda: {'key': 'jira_user_123'},+ text='Success',+ )+ mock_manager.integration_store.get_workspace_by_name.return_value = None+ mock_workspace = MagicMock(id=1)+ mock_manager.integration_store.create_workspace.return_value = mock_workspace+ mock_register_webhook.return_value = False++ with patch('server.routes.integration.jira_dc.token_manager') as mock_token_manager:+ with patch(+ 'server.routes.integration.jira_dc.JIRA_DC_BASE_URL',+ 'https://test.atlassian.net',+ ):+ mock_token_manager.encrypt_text.side_effect = lambda x: f'enc_{x}'++ response = await jira_dc_callback(mock_request, 'code', state)++ assert isinstance(response, RedirectResponse)+ assert response.status_code == status.HTTP_302_FOUND+ assert response.headers['location'] == (+ '/settings/integrations?jira_dc_webhook=install_failed'+ )+ mock_register_webhook.assert_awaited_once_with(+ 'bad-admin-pat', 'https://test.atlassian.net', 'secret', 1+ )+ mock_handle_link.assert_called_once_with(+ 'user1', 'jira_user_123', 'test.atlassian.net'+ )++@pytest.mark.asyncio@patch('server.routes.integration.jira_dc.redis_client')@patch('requests.post')@@ -373,6 +443,39 @@ async def test_unlink_workspace_admin()+@patch('server.routes.integration.jira_dc.get_user_auth')+@patch('server.routes.integration.jira_dc.jira_dc_manager', new_callable=AsyncMock)+@patch(+ 'server.routes.integration.jira_dc._maybe_delete_webhook',+ new_callable=AsyncMock,+)+@patch('server.routes.integration.jira_dc.JIRA_DC_ENABLE_OAUTH', False)+async def test_unlink_workspace_admin_reports_webhook_delete_failure(+ mock_delete_webhook, mock_manager, mock_get_auth, mock_request, mock_user_auth+):+ mock_get_auth.return_value = mock_user_auth+ user_id = 'test_user_id'+ mock_request.json = AsyncMock(return_value={'admin_api_key': 'bad-admin-pat'})+ mock_user = MagicMock(jira_dc_workspace_id=10)+ mock_workspace = MagicMock(id=10, admin_user_id=user_id)+ mock_workspace.name = 'test-workspace'+ mock_manager.integration_store.get_user_by_active_workspace.return_value = mock_user+ mock_manager.integration_store.get_workspace_by_id.return_value = mock_workspace+ mock_delete_webhook.return_value = False++ response = await unlink_workspace(mock_request)+ content = json.loads(response.body)++ assert content == {'success': True, 'webhookRemoved': False}+ mock_delete_webhook.assert_awaited_once_with(+ 'bad-admin-pat', 'https://test-workspace', 10+ )+ mock_manager.integration_store.deactivate_workspace.assert_called_once_with(+ workspace_id=10+ )++@pytest.mark.asyncio@patch('server.routes.integration.jira_dc.get_user_auth')@patch('server.routes.integration.jira_dc.jira_dc_manager', new_callable=AsyncMock)@@ -673,6 +776,108 @@ async def test_create_jira_dc_workspace_oauth_disabled_new_workspace(mock_handle_link.assert_called_once()+@patch('server.routes.integration.jira_dc.get_user_auth')+@patch('server.routes.integration.jira_dc.jira_dc_manager', new_callable=AsyncMock)+@patch('server.routes.integration.jira_dc.JIRA_DC_ENABLE_OAUTH', False)+@patch(+ 'server.routes.integration.jira_dc._handle_workspace_link_creation',+ new_callable=AsyncMock,+)+async def test_create_jira_dc_workspace_manual_setup_starts_inactive(+ mock_handle_link, mock_manager, mock_get_auth, mock_request, mock_user_auth+):+ mock_get_auth.return_value = mock_user_auth+ mock_manager.integration_store.get_workspace_by_name.return_value = None+ mock_workspace = MagicMock(name='test-workspace')+ mock_workspace.id = 10+ mock_workspace.name = 'test-workspace'+ mock_manager.integration_store.create_workspace.return_value = mock_workspace++ workspace_data = JiraDcWorkspaceCreate(+ workspace_name='test-workspace',+ webhook_secret='secret',+ svc_acc_email='[email protected]',+ svc_acc_api_key='key',+ is_active=False,+ )++ with patch('server.routes.integration.jira_dc.token_manager') as mock_token_manager:+ mock_token_manager.encrypt_text.side_effect = lambda x: f'enc_{x}'++ response = await create_jira_dc_workspace(mock_request, workspace_data)++ content = json.loads(response.body)+ assert response.status_code == 200+ assert content['success'] is True+ assert content['webhookEnrolled'] is False+ assert content['eventsUrl'].endswith('/integration/jira-dc/connections/10/events')++ create_kwargs = mock_manager.integration_store.create_workspace.call_args.kwargs+ assert create_kwargs['status'] == 'inactive'+ mock_handle_link.assert_awaited_once_with(+ 'test_user_id',+ 'unavailable',+ 'test-workspace',+ require_active_workspace=False,+ )+++@patch('server.routes.integration.jira_dc.get_user_auth')+@patch('server.routes.integration.jira_dc.jira_dc_manager', new_callable=AsyncMock)+@patch('server.routes.integration.jira_dc.JIRA_DC_ENABLE_OAUTH', False)+@patch(+ 'server.routes.integration.jira_dc._handle_workspace_link_creation',+ new_callable=AsyncMock,+)+@patch(+ 'server.routes.integration.jira_dc._maybe_register_webhook',+ new_callable=AsyncMock,+)+async def test_create_jira_dc_workspace_reports_webhook_install_failure(+ mock_register_webhook,+ mock_handle_link,+ mock_manager,+ mock_get_auth,+ mock_request,+ mock_user_auth,+):+ mock_get_auth.return_value = mock_user_auth+ mock_manager.integration_store.get_workspace_by_name.return_value = None+ mock_workspace = MagicMock(id=10)+ mock_workspace.name = 'test-workspace'+ mock_manager.integration_store.create_workspace.return_value = mock_workspace+ mock_register_webhook.return_value = False++ workspace_data = JiraDcWorkspaceCreate(+ workspace_name='test-workspace',+ webhook_secret='secret',+ svc_acc_email='[email protected]',+ svc_acc_api_key='key',+ admin_api_key='bad-admin-pat',+ is_active=True,+ )++ with patch('server.routes.integration.jira_dc.token_manager') as mock_token_manager:+ mock_token_manager.encrypt_text.side_effect = lambda x: f'enc_{x}'++ response = await create_jira_dc_workspace(mock_request, workspace_data)++ content = json.loads(response.body)+ assert content['success'] is True+ assert content['webhookEnrolled'] is False+ assert content['eventsUrl'].endswith('/integration/jira-dc/connections/10/events')+ mock_register_webhook.assert_awaited_once_with(+ 'bad-admin-pat', 'https://test-workspace', 'secret', 10+ )+ mock_handle_link.assert_called_once()+ mock_manager.integration_store.update_workspace.assert_awaited_once_with(+ id=10,+ status='inactive',+ )++@pytest.mark.asyncio@patch('server.routes.integration.jira_dc.get_user_auth')@patch('server.routes.integration.jira_dc.jira_dc_manager', new_callable=AsyncMock)diff --git a/frontend/src/components/features/settings/project-management/jira-dc-integration-panel.tsx b/frontend/src/components/features/settings/project-management/jira-dc-integration-panel.tsxindex a562d4b2c8..207a37af3d 100644--- a/frontend/src/components/features/settings/project-management/jira-dc-integration-panel.tsx+++ b/frontend/src/components/features/settings/project-management/jira-dc-integration-panel.tsx@@ -1,4 +1,5 @@import React, { useState } from "react";+import { useQueryClient } from "@tanstack/react-query";import { useTranslation } from "react-i18next";import { I18nKey } from "#/i18n/declaration";import { BrandButton } from "#/components/features/settings/brand-button";@@ -12,8 +13,11 @@ import { BaseModalTitle } from "#/components/shared/modals/confirmation-modals/bimport { useConfig } from "#/hooks/query/use-config";import { useIntegrationStatus } from "#/hooks/query/use-integration-status";import { useConfigureIntegration } from "#/hooks/mutation/use-configure-integration";+import { useLinkIntegration } from "#/hooks/mutation/use-link-integration";import { useUnlinkIntegration } from "#/hooks/mutation/use-unlink-integration";import { useUpdateJiraDcWorkspaceStatus } from "#/hooks/mutation/use-update-jira-dc-workspace-status";+import { useValidateIntegration } from "#/hooks/mutation/use-validate-integration";+import { displaySuccessToast } from "#/utils/custom-toast-handlers";import { CopyableValue, generateWebhookSecret } from "./configure-modal";const EMAIL_RE = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;@@ -48,6 +52,7 @@ function buildJiraDcEventsUrl(workspaceId?: number, serverEventsUrl?: string) {*/export function JiraDcIntegrationPanel() {const { t } = useTranslation();+ const queryClient = useQueryClient();const { data: config } = useConfig();// OAuth installs already know the host; pre-fill + lock it.const jiraDcOAuthHost = config?.jira_dc_oauth_host ?? null;@@ -61,21 +66,22 @@ export function JiraDcIntegrationPanel() {const { data: integrationData } = useIntegrationStatus("jira-dc");const existingWorkspace = integrationData?.workspace;const isWorkspaceEditable = existingWorkspace?.editable ?? false;- const isActiveIntegration = integrationData?.status === "active";+ const isActiveIntegration = existingWorkspace+ ? existingWorkspace.status === "active"+ : integrationData?.status === "active";const configureMutation = useConfigureIntegration("jira-dc", {onSettled: () => {},});+ const linkMutation = useLinkIntegration("jira-dc", {+ onSettled: () => {},+ });const unlinkMutation = useUnlinkIntegration("jira-dc", {onSettled: () => {},});const statusMutation = useUpdateJiraDcWorkspaceStatus({onSettled: () => {},});- const isBusy =- configureMutation.isPending ||- unlinkMutation.isPending ||- statusMutation.isPending;const eventsUrl = buildJiraDcEventsUrl(existingWorkspace?.id,@@ -136,6 +142,9 @@ export function JiraDcIntegrationPanel() {const openEdit = () => {seedForm();+ if (existingWorkspace && !isActiveIntegration) {+ setIsActive(true);+ }setModalView("edit");};const openRemove = () => {@@ -145,14 +154,40 @@ export function JiraDcIntegrationPanel() {};const closeModal = () => {if (manualSetupSaved) {- window.location.reload();- return;+ queryClient.invalidateQueries({+ queryKey: ["integration-status", "jira-dc"],+ });}seedForm();setRemoveAdminApiKey("");setModalView(null);};+ const validateMutation = useValidateIntegration("jira-dc", {+ onSuccess: (data) => {+ if (data.data.status === "active") {+ linkMutation.mutate((jiraDcOAuthHost ?? workspace).trim());+ }+ },+ onError: () => {+ openEdit();+ },+ });+ const isBusy =+ configureMutation.isPending ||+ linkMutation.isPending ||+ unlinkMutation.isPending ||+ validateMutation.isPending ||+ statusMutation.isPending;++ const handleInitialAction = () => {+ if (jiraDcOAuthHost) {+ validateMutation.mutate(jiraDcOAuthHost);+ return;+ }+ openEdit();+ };+const handleEmailChange = (value: string) => {if (!existingWorkspace) {setManualEventsUrl("");@@ -192,10 +227,29 @@ export function JiraDcIntegrationPanel() {const handleSubmit = () => {if (manualMode && !existingWorkspace && manualEventsUrl) {- window.location.reload();+ statusMutation.mutate(+ {+ workspace,+ isActive: true,+ },+ {+ onSuccess: () => {+ displaySuccessToast(+ t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_SETUP_SAVED),+ );+ queryClient.invalidateQueries({+ queryKey: ["integration-status", "jira-dc"],+ });+ seedForm();+ setModalView(null);+ },+ },+ );return;}+ const shouldGenerateManualDetails = manualMode && !existingWorkspace;+// Manual mode sends the generated secret the admin is copying into Jira;// auto mode sends a blank secret (server-generated) + the one-time admin PAT.configureMutation.mutate(@@ -207,17 +261,36 @@ export function JiraDcIntegrationPanel() {: serviceAccountEmail,serviceAccountApiKey: serviceAccountManaged ? "" : serviceAccountApiKey,adminApiKey: manualMode ? "" : adminApiKey.trim(),- isActive,- reloadOnSuccess: !(manualMode && !existingWorkspace),- invalidateOnSuccess: !(manualMode && !existingWorkspace),+ isActive: shouldGenerateManualDetails ? false : isActive,+ reloadOnSuccess: false,+ invalidateOnSuccess: !shouldGenerateManualDetails,},{onSuccess: (data) => {- if (manualMode && !existingWorkspace && data.eventsUrl) {+ if (data.redirect) {+ return;+ }++ if (shouldGenerateManualDetails && data.eventsUrl) {setManualEventsUrl(data.eventsUrl);setManualSetupSaved(true);setHasSavedApiKey(true);+ return;+ }++ if (+ !manualMode &&+ adminApiKey.trim() &&+ data.webhookEnrolled === false+ ) {+ return;}++ displaySuccessToast(+ t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_SETUP_SAVED),+ );+ seedForm();+ setModalView(null);},},);@@ -226,7 +299,12 @@ export function JiraDcIntegrationPanel() {const confirmRemove = () => {const trimmedAdminApiKey = removeAdminApiKey.trim();if (!trimmedAdminApiKey) return;- unlinkMutation.mutate(trimmedAdminApiKey);+ unlinkMutation.mutate(trimmedAdminApiKey, {+ onSuccess: () => {+ setRemoveAdminApiKey("");+ setModalView(null);+ },+ });};const handleActiveToggle = (nextActive: boolean) => {@@ -258,7 +336,9 @@ export function JiraDcIntegrationPanel() {I18nKey.PROJECT_MANAGEMENT$JIRA_DC_GENERATE_WEBHOOK_DETAILS_BUTTON,);} else if (generatedFirstManualSetup) {- submitButtonLabel = t(I18nKey.ENTERPRISE$DONE_BUTTON);+ submitButtonLabel = t(+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_CREATED_BUTTON,+ );} else if (existingWorkspace) {submitButtonLabel = t(I18nKey.PROJECT_MANAGEMENT$UPDATE_BUTTON_LABEL);}@@ -287,10 +367,10 @@ export function JiraDcIntegrationPanel() {? I18nKey.PROJECT_MANAGEMENT$JIRA_DC_SVC_ACC_API_SAVED_PLACEHOLDER: I18nKey.PROJECT_MANAGEMENT$JIRA_DC_SVC_ACC_API_PLACEHOLDER;- const statusBadge = () => {+ const statusBadge = (active = isActiveIntegration) => {let label: string;let classes: string;- if (isActiveIntegration) {+ if (active) {label = t(I18nKey.PROJECT_MANAGEMENT$ACTIVE_TOGGLE_LABEL);classes = "bg-green-500/20 text-green-400";} else {@@ -551,39 +631,47 @@ export function JiraDcIntegrationPanel() {<td className="px-4 py-3">{isWorkspaceEditable ? (<div className="flex flex-wrap items-center gap-2">+ {isActiveIntegration ? (+ <BrandButton+ variant="danger"+ onClick={openRemove}+ testId="remove-integration-button"+ type="button"+ isDisabled={isBusy}+ >+ {t(+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_DISABLE_BUTTON_LABEL,+ )}+ </BrandButton>+ ) : (+ <BrandButton+ variant="primary"+ onClick={openEdit}+ testId="jira-dc-configure-button"+ type="button"+ isDisabled={isBusy}+ >+ {t(I18nKey.PROJECT_MANAGEMENT$CONFIGURE_BUTTON_LABEL)}+ </BrandButton>+ )}+ </div>+ ) : (+ <div className="flex flex-col items-start gap-2"><BrandButtonvariant="secondary"- onClick={openEdit}- testId="jira-dc-edit-button"+ onClick={() => unlinkMutation.mutate(undefined)}+ testId="jira-dc-disconnect-button"type="button"isDisabled={isBusy}>- {t(- I18nKey.PROJECT_MANAGEMENT$JIRA_DC_EDIT_BUTTON_LABEL,- )}+ {t(I18nKey.PROJECT_MANAGEMENT$DISCONNECT_BUTTON_LABEL)}</BrandButton>- <BrandButton- variant="danger"- onClick={openRemove}- testId="remove-integration-button"- type="button"- isDisabled={isBusy}- >+ <Typography.Text className="text-xs text-tertiary-alt max-w-56">{t(- I18nKey.PROJECT_MANAGEMENT$JIRA_DC_DISABLE_BUTTON_LABEL,+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_INTEGRATION_OWNER_HELP,)}- </BrandButton>+ </Typography.Text></div>- ) : (- <BrandButton- variant="secondary"- onClick={() => unlinkMutation.mutate(undefined)}- testId="jira-dc-disconnect-button"- type="button"- isDisabled={isBusy}- >- {t(I18nKey.PROJECT_MANAGEMENT$DISCONNECT_BUTTON_LABEL)}- </BrandButton>)}</td></tr>@@ -594,12 +682,16 @@ export function JiraDcIntegrationPanel() {<div><BrandButtonvariant="primary"- onClick={openEdit}+ onClick={handleInitialAction}testId="jira-dc-configure-button"type="button"isDisabled={isBusy}>- {t(I18nKey.PROJECT_MANAGEMENT$CONFIGURE_BUTTON_LABEL)}+ {t(+ jiraDcOAuthHost+ ? I18nKey.PROJECT_MANAGEMENT$CONNECT_BUTTON_LABEL+ : I18nKey.PROJECT_MANAGEMENT$CONFIGURE_BUTTON_LABEL,+ )}</BrandButton></div>)}@@ -639,17 +731,15 @@ export function JiraDcIntegrationPanel() {>{submitButtonLabel}</BrandButton>- {!generatedFirstManualSetup && (- <BrandButton- variant="secondary"- onClick={closeModal}- testId="jira-dc-cancel-button"- type="button"- isDisabled={isBusy}- >- {t(I18nKey.FEEDBACK$CANCEL_LABEL)}- </BrandButton>- )}+ <BrandButton+ variant="secondary"+ onClick={closeModal}+ testId="jira-dc-cancel-button"+ type="button"+ isDisabled={isBusy}+ >+ {t(I18nKey.FEEDBACK$CANCEL_LABEL)}+ </BrandButton></div></ModalBody></ModalBackdrop>@@ -663,9 +753,12 @@ export function JiraDcIntegrationPanel() {/><div className="flex flex-col gap-4 w-full"><div className="flex flex-col gap-3">- {sectionLabel(- I18nKey.PROJECT_MANAGEMENT$JIRA_DC_PAUSE_SECTION_LABEL,- )}+ <div className="flex items-center gap-2">+ {sectionLabel(+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_PAUSE_SECTION_LABEL,+ )}+ {statusBadge(isActive)}+ </div><div className="flex flex-col gap-1"><SettingsSwitchtestId="active-toggle"@@ -725,7 +818,7 @@ export function JiraDcIntegrationPanel() {testId="cancel-remove-integration-button"type="button">- {t(I18nKey.FEEDBACK$CANCEL_LABEL)}+ {t(I18nKey.SETTINGS_FORM$CLOSE_LABEL)}</BrandButton></div></div>diff --git a/frontend/src/hooks/mutation/use-configure-integration.ts b/frontend/src/hooks/mutation/use-configure-integration.tsindex 0094519740..e92b6f688b 100644--- a/frontend/src/hooks/mutation/use-configure-integration.ts+++ b/frontend/src/hooks/mutation/use-configure-integration.ts@@ -58,6 +58,11 @@ export function useConfigureIntegration();const { success, redirect, authorizationUrl } = response.data;+ const webhookInstallFailed = Boolean(+ platform === "jira-dc" &&+ data.adminApiKey?.trim() &&+ response.data.webhookEnrolled === false,+ );if (success) {if (redirect) {@@ -66,6 +71,10 @@ export function useConfigureIntegration(} else {throw new Error("Could not get authorization URL from the server.");}+ } else if (webhookInstallFailed) {+ displayErrorToast(+ t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_INSTALL_FAILED),+ );} else if (data.reloadOnSuccess !== false) {window.location.reload();}diff --git a/frontend/src/hooks/mutation/use-unlink-integration.ts b/frontend/src/hooks/mutation/use-unlink-integration.tsindex 03e973610b..9611de73e0 100644--- a/frontend/src/hooks/mutation/use-unlink-integration.ts+++ b/frontend/src/hooks/mutation/use-unlink-integration.ts@@ -21,16 +21,27 @@ export function useUnlinkIntegration(const { t } = useTranslation();return useMutation({- // adminApiKey is Jira DC only: a workspace admin tearing the integration+ // adminApiKey is Jira DC only: the integration owner tearing it// down may pass a one-time PAT so the Jira webhook is revoked too. Never- // stored. Omitted for the non-admin self-disconnect path.+ // stored. Omitted for the non-owner self-disconnect path.mutationFn: (adminApiKey?: string) =>openHands.post(`/integration/${platform}/workspaces/unlink`,adminApiKey ? { admin_api_key: adminApiKey } : {},),- onSuccess: () => {- displaySuccessToast(t(I18nKey.SETTINGS$SAVED));+ onSuccess: (response, adminApiKey) => {+ const webhookRemoveFailed =+ platform === "jira-dc" &&+ !!adminApiKey?.trim() &&+ response.data?.webhookRemoved === false;++ if (webhookRemoveFailed) {+ displayErrorToast(+ t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_REMOVE_FAILED),+ );+ } else {+ displaySuccessToast(t(I18nKey.SETTINGS$SAVED));+ }queryClient.invalidateQueries({queryKey: ["integration-status", platform],});diff --git a/frontend/src/i18n/declaration.ts b/frontend/src/i18n/declaration.tsindex 4c5f42855c..7d85eebbfe 100644--- a/frontend/src/i18n/declaration.ts+++ b/frontend/src/i18n/declaration.ts@@ -1061,6 +1061,7 @@ export enum I18nKey {PROJECT_MANAGEMENT$JIRA_DC_MANUAL_PREPARE_INSTRUCTIONS = "PROJECT_MANAGEMENT$JIRA_DC_MANUAL_PREPARE_INSTRUCTIONS",PROJECT_MANAGEMENT$JIRA_DC_MANUAL_INSTRUCTIONS = "PROJECT_MANAGEMENT$JIRA_DC_MANUAL_INSTRUCTIONS",PROJECT_MANAGEMENT$JIRA_DC_GENERATE_WEBHOOK_DETAILS_BUTTON = "PROJECT_MANAGEMENT$JIRA_DC_GENERATE_WEBHOOK_DETAILS_BUTTON",+ PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_CREATED_BUTTON = "PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_CREATED_BUTTON",PROJECT_MANAGEMENT$JIRA_DC_MANUAL_UPDATE_INSTRUCTIONS = "PROJECT_MANAGEMENT$JIRA_DC_MANUAL_UPDATE_INSTRUCTIONS",PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_URL_LABEL = "PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_URL_LABEL",PROJECT_MANAGEMENT$JIRA_DC_AUTO_SETUP_LINK = "PROJECT_MANAGEMENT$JIRA_DC_AUTO_SETUP_LINK",@@ -1534,6 +1535,10 @@ export enum I18nKey {PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_LABEL = "PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_LABEL",PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_HELP = "PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_HELP",PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_REQUIRED_HELP = "PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_REQUIRED_HELP",+ PROJECT_MANAGEMENT$JIRA_DC_INTEGRATION_OWNER_HELP = "PROJECT_MANAGEMENT$JIRA_DC_INTEGRATION_OWNER_HELP",+ PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_INSTALL_FAILED = "PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_INSTALL_FAILED",+ PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_SETUP_SAVED = "PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_SETUP_SAVED",+ PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_REMOVE_FAILED = "PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_REMOVE_FAILED",PROJECT_MANAGEMENT$JIRA_DC_DISABLE_BUTTON_LABEL = "PROJECT_MANAGEMENT$JIRA_DC_DISABLE_BUTTON_LABEL",PROJECT_MANAGEMENT$JIRA_DC_DISABLE_MODAL_TITLE = "PROJECT_MANAGEMENT$JIRA_DC_DISABLE_MODAL_TITLE",PROJECT_MANAGEMENT$JIRA_DC_PAUSE_SECTION_LABEL = "PROJECT_MANAGEMENT$JIRA_DC_PAUSE_SECTION_LABEL",diff --git a/frontend/src/i18n/translation.json b/frontend/src/i18n/translation.jsonindex dbc36e756f..975203f801 100644--- a/frontend/src/i18n/translation.json+++ b/frontend/src/i18n/translation.json@@ -17935,38 +17935,38 @@"uk": "Вставте короткостроковий PAT адміністратора Jira"},"PROJECT_MANAGEMENT$JIRA_DC_ADMIN_TOKEN_HELP": {- "en": "Used once to create the Jira webhook, then discarded. Use manual setup if you cannot share an admin PAT.",- "ja": "Jira Webhookの作成に一度だけ使用され、その後破棄されます。管理者PATを共有できない場合は手動設定を使用してください。",- "zh-CN": "仅用于创建 Jira webhook 一次,随后会被丢弃。如果无法共享管理员 PAT,请使用手动设置。",- "zh-TW": "僅用於建立 Jira webhook 一次,之後會捨棄。如果無法共用管理員 PAT,請使用手動設定。",- "ko-KR": "Jira webhook을 만들 때 한 번만 사용한 후 폐기됩니다. 관리자 PAT를 공유할 수 없으면 수동 설정을 사용하세요.",- "no": "Brukes én gang til å opprette Jira-webhooken og forkastes deretter. Bruk manuelt oppsett hvis du ikke kan dele en administrator-PAT.",- "ar": "يُستخدم مرة واحدة لإنشاء Jira webhook ثم يتم التخلص منه. استخدم الإعداد اليدوي إذا لم تتمكن من مشاركة PAT مسؤول.",- "de": "Wird einmalig zum Erstellen des Jira-Webhooks verwendet und danach verworfen. Verwenden Sie die manuelle Einrichtung, wenn Sie kein Administrator-PAT teilen können.",- "fr": "Utilisé une seule fois pour créer le webhook Jira, puis supprimé. Utilisez la configuration manuelle si vous ne pouvez pas partager un PAT d’administrateur.",- "it": "Usato una sola volta per creare il webhook Jira, poi eliminato. Usa la configurazione manuale se non puoi condividere un PAT amministratore.",- "pt": "Usado uma vez para criar o webhook do Jira e depois descartado. Use a configuração manual se não puder compartilhar um PAT de administrador.",- "es": "Se usa una sola vez para crear el webhook de Jira y después se descarta. Usa la configuración manual si no puedes compartir un PAT de administrador.",- "ca": "S’utilitza una sola vegada per crear el webhook de Jira i després es descarta. Fes servir la configuració manual si no pots compartir un PAT d’administrador.",- "tr": "Jira webhook'unu oluşturmak için bir kez kullanılır ve ardından atılır. Yönetici PAT'sini paylaşamıyorsanız manuel kurulumu kullanın.",- "uk": "Використовується один раз для створення webhook Jira, після чого видаляється. Якщо ви не можете надати PAT адміністратора, скористайтеся ручним налаштуванням."+ "en": "Used once to call Jira's webhook API, then discarded. This does not link or verify the Jira admin user in OpenHands. Use manual setup if you cannot share an admin PAT.",+ "ja": "Jira の webhook API を呼び出すために一度だけ使用され、その後破棄されます。これにより OpenHands で Jira 管理者ユーザーがリンクまたは検証されることはありません。管理者 PAT を共有できない場合は手動設定を使用してください。",+ "zh-CN": "仅用于调用 Jira 的 webhook API 一次,随后会被丢弃。这不会在 OpenHands 中关联或验证 Jira 管理员用户。如果无法共享管理员 PAT,请使用手动设置。",+ "zh-TW": "僅用於呼叫 Jira 的 webhook API 一次,之後會捨棄。這不會在 OpenHands 中連結或驗證 Jira 管理員使用者。如果無法共用管理員 PAT,請使用手動設定。",+ "ko-KR": "Jira webhook API를 호출할 때 한 번만 사용한 후 폐기됩니다. OpenHands에서 Jira 관리자 사용자를 연결하거나 확인하지 않습니다. 관리자 PAT를 공유할 수 없으면 수동 설정을 사용하세요.",+ "no": "Brukes én gang til å kalle Jiras webhook-API og forkastes deretter. Dette kobler ikke til eller bekrefter Jira-administratorbrukeren i OpenHands. Bruk manuelt oppsett hvis du ikke kan dele en administrator-PAT.",+ "ar": "يُستخدم مرة واحدة لاستدعاء واجهة Jira webhook API ثم يتم التخلص منه. لا يؤدي ذلك إلى ربط مستخدم مسؤول Jira أو التحقق منه في OpenHands. استخدم الإعداد اليدوي إذا لم تتمكن من مشاركة PAT مسؤول.",+ "de": "Wird einmalig zum Aufrufen der Jira-Webhook-API verwendet und danach verworfen. Dadurch wird der Jira-Administratorbenutzer in OpenHands nicht verknüpft oder verifiziert. Verwenden Sie die manuelle Einrichtung, wenn Sie kein Administrator-PAT teilen können.",+ "fr": "Utilisé une seule fois pour appeler l’API webhook de Jira, puis supprimé. Cela ne lie ni ne vérifie l’utilisateur administrateur Jira dans OpenHands. Utilisez la configuration manuelle si vous ne pouvez pas partager un PAT d’administrateur.",+ "it": "Usato una sola volta per chiamare l’API webhook di Jira, poi eliminato. Questo non collega né verifica l’utente amministratore Jira in OpenHands. Usa la configurazione manuale se non puoi condividere un PAT amministratore.",+ "pt": "Usado uma vez para chamar a API de webhook do Jira e depois descartado. Isso não vincula nem verifica o usuário administrador do Jira no OpenHands. Use a configuração manual se não puder compartilhar um PAT de administrador.",+ "es": "Se usa una sola vez para llamar a la API de webhooks de Jira y después se descarta. Esto no vincula ni verifica al usuario administrador de Jira en OpenHands. Usa la configuración manual si no puedes compartir un PAT de administrador.",+ "ca": "S’utilitza una sola vegada per cridar l’API de webhooks de Jira i després es descarta. Això no enllaça ni verifica l’usuari administrador de Jira a OpenHands. Fes servir la configuració manual si no pots compartir un PAT d’administrador.",+ "tr": "Jira webhook API'sini çağırmak için bir kez kullanılır ve ardından atılır. Bu, OpenHands'te Jira yönetici kullanıcısını bağlamaz veya doğrulamaz. Yönetici PAT'sini paylaşamıyorsanız manuel kurulumu kullanın.",+ "uk": "Використовується один раз для виклику API webhook Jira, після чого видаляється. Це не прив’язує й не перевіряє користувача адміністратора Jira в OpenHands. Якщо ви не можете надати PAT адміністратора, скористайтеся ручним налаштуванням."},"PROJECT_MANAGEMENT$JIRA_DC_EXISTING_ADMIN_TOKEN_HELP": {- "en": "Enter a Jira admin PAT to reinstall or refresh the webhook. It is used once and never stored.",- "ja": "Webhook を再インストールまたは更新するには、Jira 管理者 PAT を入力してください。これは一度だけ使用され、保存されません。",- "zh-CN": "输入 Jira 管理员 PAT 以重新安装或刷新 webhook。它只会使用一次,绝不会被存储。",- "zh-TW": "輸入 Jira 管理員 PAT,以重新安裝或重新整理 webhook。它只會使用一次,絕不會被儲存。",- "ko-KR": "Webhook을 다시 설치하거나 새로 고치려면 Jira 관리자 PAT를 입력하세요. 이 값은 한 번만 사용되며 저장되지 않습니다.",- "no": "Skriv inn en Jira-administrator-PAT for å installere webhooken på nytt eller oppdatere den. Den brukes én gang og lagres aldri.",- "ar": "أدخل PAT مسؤول Jira لإعادة تثبيت الـ webhook أو تحديثه. يُستخدم مرة واحدة ولا يتم تخزينه أبدًا.",- "de": "Geben Sie ein Jira-Administrator-PAT ein, um den Webhook neu zu installieren oder zu aktualisieren. Es wird einmalig verwendet und nie gespeichert.",- "fr": "Saisissez un PAT d’administrateur Jira pour réinstaller ou actualiser le webhook. Il est utilisé une seule fois et n’est jamais stocké.",- "it": "Inserisci un PAT amministratore Jira per reinstallare o aggiornare il webhook. Viene usato una sola volta e non viene mai memorizzato.",- "pt": "Insira um PAT de administrador do Jira para reinstalar ou atualizar o webhook. Ele é usado uma vez e nunca é armazenado.",- "es": "Introduce un PAT de administrador de Jira para reinstalar o actualizar el webhook. Se usa una sola vez y nunca se almacena.",- "ca": "Introdueix un PAT d’administrador de Jira per reinstal·lar o actualitzar el webhook. S’utilitza una sola vegada i no s’emmagatzema mai.",- "tr": "Webhook'u yeniden yüklemek veya yenilemek için bir Jira yönetici PAT'si girin. Bir kez kullanılır ve hiçbir zaman saklanmaz.",- "uk": "Введіть PAT адміністратора Jira, щоб повторно встановити або оновити webhook. Він використовується один раз і ніколи не зберігається."+ "en": "Enter a Jira admin PAT to reinstall or refresh the webhook. It is used once for Jira's webhook API and never stored.",+ "ja": "Webhook を再インストールまたは更新するには、Jira 管理者 PAT を入力してください。Jira の webhook API に一度だけ使用され、保存されません。",+ "zh-CN": "输入 Jira 管理员 PAT 以重新安装或刷新 webhook。它只会用于 Jira 的 webhook API 一次,绝不会被存储。",+ "zh-TW": "輸入 Jira 管理員 PAT,以重新安裝或重新整理 webhook。它只會用於 Jira 的 webhook API 一次,絕不會被儲存。",+ "ko-KR": "Webhook을 다시 설치하거나 새로 고치려면 Jira 관리자 PAT를 입력하세요. Jira webhook API에 한 번만 사용되며 저장되지 않습니다.",+ "no": "Skriv inn en Jira-administrator-PAT for å installere webhooken på nytt eller oppdatere den. Den brukes én gang for Jiras webhook-API og lagres aldri.",+ "ar": "أدخل PAT مسؤول Jira لإعادة تثبيت الـ webhook أو تحديثه. يُستخدم مرة واحدة لواجهة Jira webhook API ولا يتم تخزينه أبدًا.",+ "de": "Geben Sie ein Jira-Administrator-PAT ein, um den Webhook neu zu installieren oder zu aktualisieren. Es wird einmalig für die Jira-Webhook-API verwendet und nie gespeichert.",+ "fr": "Saisissez un PAT d’administrateur Jira pour réinstaller ou actualiser le webhook. Il est utilisé une seule fois pour l’API webhook de Jira et n’est jamais stocké.",+ "it": "Inserisci un PAT amministratore Jira per reinstallare o aggiornare il webhook. Viene usato una sola volta per l’API webhook di Jira e non viene mai memorizzato.",+ "pt": "Insira um PAT de administrador do Jira para reinstalar ou atualizar o webhook. Ele é usado uma vez para a API de webhook do Jira e nunca é armazenado.",+ "es": "Introduce un PAT de administrador de Jira para reinstalar o actualizar el webhook. Se usa una sola vez para la API de webhooks de Jira y nunca se almacena.",+ "ca": "Introdueix un PAT d’administrador de Jira per reinstal·lar o actualitzar el webhook. S’utilitza una sola vegada per l’API de webhooks de Jira i no s’emmagatzema mai.",+ "tr": "Webhook'u yeniden yüklemek veya yenilemek için bir Jira yönetici PAT'si girin. Jira webhook API'si için bir kez kullanılır ve hiçbir zaman saklanmaz.",+ "uk": "Введіть PAT адміністратора Jira, щоб повторно встановити або оновити webhook. Він використовується один раз для API webhook Jira і ніколи не зберігається."},"PROJECT_MANAGEMENT$JIRA_DC_MANUAL_SETUP_LINK": {"en": "Set up the webhook manually",@@ -18003,21 +18003,21 @@"uk": "Згенеруйте дані webhook, щоб зберегти цю конфігурацію та створити URL webhook і секрет підпису для цього підключення."},"PROJECT_MANAGEMENT$JIRA_DC_MANUAL_INSTRUCTIONS": {- "en": "Create a global Jira webhook with these values, then click Connect. Subscribe to comment_created and jira:issue_updated.",- "ja": "これらの値でJiraのグローバルWebhookを作成し、[接続]をクリックします。comment_created と jira:issue_updated を購読してください。",- "zh-CN": "使用这些值创建全局 Jira webhook,然后点击“连接”。订阅 comment_created 和 jira:issue_updated。",- "zh-TW": "使用這些值建立全域 Jira webhook,然後點擊「連線」。訂閱 comment_created 和 jira:issue_updated。",- "ko-KR": "이 값으로 전역 Jira webhook을 만든 다음 연결을 클릭하세요. comment_created 및 jira:issue_updated를 구독하세요.",- "no": "Opprett en global Jira-webhook med disse verdiene, og klikk deretter Koble til. Abonner på comment_created og jira:issue_updated.",- "ar": "أنشئ Jira webhook عامًا بهذه القيم، ثم انقر على اتصال. اشترك في comment_created و jira:issue_updated.",- "de": "Erstellen Sie mit diesen Werten einen globalen Jira-Webhook und klicken Sie dann auf Verbinden. Abonnieren Sie comment_created und jira:issue_updated.",- "fr": "Créez un webhook Jira global avec ces valeurs, puis cliquez sur Connecter. Abonnez-vous à comment_created et jira:issue_updated.",- "it": "Crea un webhook Jira globale con questi valori, poi fai clic su Connetti. Iscriviti a comment_created e jira:issue_updated.",- "pt": "Crie um webhook global do Jira com estes valores e clique em Conectar. Assine comment_created e jira:issue_updated.",- "es": "Crea un webhook global de Jira con estos valores y haz clic en Conectar. Suscríbete a comment_created y jira:issue_updated.",- "ca": "Crea un webhook global de Jira amb aquests valors i fes clic a Connecta. Subscriu-te a comment_created i jira:issue_updated.",- "tr": "Bu değerlerle genel bir Jira webhook'u oluşturun, ardından Bağlan'a tıklayın. comment_created ve jira:issue_updated olaylarına abone olun.",- "uk": "Створіть глобальний webhook Jira з цими значеннями, а потім натисніть Підключити. Підпишіться на comment_created і jira:issue_updated."+ "en": "Create a global webhook in Jira using the URL and secret below. Subscribe to comment_created and jira:issue_updated. After you save it in Jira, click I created the webhook so OpenHands starts listening.",+ "ja": "下の URL とシークレットを使用して、Jira でグローバル Webhook を作成します。comment_created と jira:issue_updated を購読してください。Jira で保存したら、[Webhook を作成しました]をクリックして OpenHands がイベントを受信できるようにします。",+ "zh-CN": "使用下面的 URL 和密钥在 Jira 中创建全局 webhook。订阅 comment_created 和 jira:issue_updated。在 Jira 中保存后,点击“我已创建 webhook”,让 OpenHands 开始监听。",+ "zh-TW": "使用下方的 URL 和密鑰在 Jira 中建立全域 webhook。訂閱 comment_created 和 jira:issue_updated。在 Jira 中儲存後,點擊「我已建立 webhook」,讓 OpenHands 開始監聽。",+ "ko-KR": "아래 URL과 시크릿을 사용해 Jira에서 전역 webhook을 만드세요. comment_created 및 jira:issue_updated를 구독하세요. Jira에 저장한 후 Webhook을 만들었습니다를 클릭하면 OpenHands가 이벤트 수신을 시작합니다.",+ "no": "Opprett en global webhook i Jira med URL-en og hemmeligheten nedenfor. Abonner på comment_created og jira:issue_updated. Når du har lagret den i Jira, klikker du Jeg har opprettet webhooken slik at OpenHands begynner å lytte.",+ "ar": "أنشئ webhook عامًا في Jira باستخدام عنوان URL والسر أدناه. اشترك في comment_created و jira:issue_updated. بعد حفظه في Jira، انقر على لقد أنشأت الـ webhook ليبدأ OpenHands في الاستماع.",+ "de": "Erstellen Sie in Jira einen globalen Webhook mit der unten stehenden URL und dem Secret. Abonnieren Sie comment_created und jira:issue_updated. Nachdem Sie ihn in Jira gespeichert haben, klicken Sie auf Ich habe den Webhook erstellt, damit OpenHands auf Ereignisse wartet.",+ "fr": "Créez un webhook global dans Jira avec l’URL et le secret ci-dessous. Abonnez-vous à comment_created et jira:issue_updated. Après l’avoir enregistré dans Jira, cliquez sur J’ai créé le webhook pour qu’OpenHands commence à écouter.",+ "it": "Crea un webhook globale in Jira usando l'URL e il segreto qui sotto. Iscriviti a comment_created e jira:issue_updated. Dopo averlo salvato in Jira, fai clic su Ho creato il webhook così OpenHands inizia ad ascoltare.",+ "pt": "Crie um webhook global no Jira usando a URL e o segredo abaixo. Assine comment_created e jira:issue_updated. Depois de salvá-lo no Jira, clique em Criei o webhook para que o OpenHands comece a escutar.",+ "es": "Crea un webhook global en Jira con la URL y el secreto de abajo. Suscríbete a comment_created y jira:issue_updated. Después de guardarlo en Jira, haz clic en He creado el webhook para que OpenHands empiece a escuchar.",+ "ca": "Crea un webhook global a Jira amb l'URL i el secret de sota. Subscriu-te a comment_created i jira:issue_updated. Després de desar-lo a Jira, fes clic a He creat el webhook perquè OpenHands comenci a escoltar.",+ "tr": "Aşağıdaki URL ve gizli anahtarı kullanarak Jira'da genel bir webhook oluşturun. comment_created ve jira:issue_updated olaylarına abone olun. Jira'da kaydettikten sonra OpenHands'in dinlemeye başlaması için Webhook'u oluşturdum'a tıklayın.",+ "uk": "Створіть глобальний webhook у Jira, використовуючи URL і секрет нижче. Підпишіться на comment_created і jira:issue_updated. Після збереження в Jira натисніть Я створив webhook, щоб OpenHands почав слухати події."},"PROJECT_MANAGEMENT$JIRA_DC_GENERATE_WEBHOOK_DETAILS_BUTTON": {"en": "Generate webhook details",@@ -18036,6 +18036,23 @@"tr": "Webhook ayrıntılarını oluştur","uk": "Згенерувати дані webhook"},+ "PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_CREATED_BUTTON": {+ "en": "I created the webhook",+ "ja": "Webhook を作成しました",+ "zh-CN": "我已创建 webhook",+ "zh-TW": "我已建立 webhook",+ "ko-KR": "Webhook을 만들었습니다",+ "no": "Jeg har opprettet webhooken",+ "ar": "لقد أنشأت الـ webhook",+ "de": "Ich habe den Webhook erstellt",+ "fr": "J’ai créé le webhook",+ "it": "Ho creato il webhook",+ "pt": "Criei o webhook",+ "es": "He creado el webhook",+ "ca": "He creat el webhook",+ "tr": "Webhook'u oluşturdum",+ "uk": "Я створив webhook"+ },"PROJECT_MANAGEMENT$JIRA_DC_MANUAL_UPDATE_INSTRUCTIONS": {"en": "Update the global Jira webhook with these values, then click Update. This rotates the signing secret stored in OpenHands.","ja": "これらの値でJiraのグローバルWebhookを更新し、[更新]をクリックします。これによりOpenHandsに保存されている署名シークレットがローテーションされます。",@@ -26061,21 +26078,89 @@"uk": "Введіть PAT адміністратора, щоб видалити webhook Jira з Jira. Залиште порожнім, щоб видалити лише інтеграцію OpenHands."},"PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_REQUIRED_HELP": {- "en": "Required to remove the integration and delete the Jira webhook. It is used once and never stored.",- "ja": "統合を削除して Jira webhook を削除するために必要です。これは一度だけ使用され、保存されません。",- "zh-CN": "需要此项才能移除集成并删除 Jira webhook。它只会使用一次,绝不会被存储。",- "zh-TW": "需要此項才能移除整合並刪除 Jira webhook。它只會使用一次,絕不會被儲存。",- "ko-KR": "통합을 제거하고 Jira webhook을 삭제하는 데 필요합니다. 한 번만 사용되며 저장되지 않습니다.",- "no": "Kreves for å fjerne integrasjonen og slette Jira-webhooken. Den brukes én gang og lagres aldri.",- "ar": "مطلوب لإزالة التكامل وحذف Jira webhook. يُستخدم مرة واحدة ولا يتم تخزينه أبدًا.",- "de": "Erforderlich, um die Integration zu entfernen und den Jira-Webhook zu löschen. Es wird einmalig verwendet und nie gespeichert.",- "fr": "Requis pour supprimer l’intégration et le webhook Jira. Il est utilisé une seule fois et n’est jamais stocké.",- "it": "Necessario per rimuovere l’integrazione ed eliminare il webhook Jira. Viene usato una sola volta e non viene mai memorizzato.",- "pt": "Necessário para remover a integração e excluir o webhook do Jira. Ele é usado uma vez e nunca é armazenado.",- "es": "Obligatorio para eliminar la integración y borrar el webhook de Jira. Se usa una sola vez y nunca se almacena.",- "ca": "És necessari per eliminar la integració i suprimir el webhook de Jira. S’utilitza una sola vegada i no s’emmagatzema mai.",- "tr": "Entegrasyonu kaldırmak ve Jira webhook'unu silmek için gereklidir. Bir kez kullanılır ve hiçbir zaman saklanmaz.",- "uk": "Потрібно, щоб видалити інтеграцію та webhook Jira. Він використовується один раз і ніколи не зберігається."+ "en": "Required to remove the integration and delete the Jira webhook. It is used once for Jira's webhook API and never stored.",+ "ja": "統合を削除して Jira webhook を削除するために必要です。Jira の webhook API に一度だけ使用され、保存されません。",+ "zh-CN": "需要此项才能移除集成并删除 Jira webhook。它只会用于 Jira 的 webhook API 一次,绝不会被存储。",+ "zh-TW": "需要此項才能移除整合並刪除 Jira webhook。它只會用於 Jira 的 webhook API 一次,絕不會被儲存。",+ "ko-KR": "통합을 제거하고 Jira webhook을 삭제하는 데 필요합니다. Jira webhook API에 한 번만 사용되며 저장되지 않습니다.",+ "no": "Kreves for å fjerne integrasjonen og slette Jira-webhooken. Den brukes én gang for Jiras webhook-API og lagres aldri.",+ "ar": "مطلوب لإزالة التكامل وحذف Jira webhook. يُستخدم مرة واحدة لواجهة Jira webhook API ولا يتم تخزينه أبدًا.",+ "de": "Erforderlich, um die Integration zu entfernen und den Jira-Webhook zu löschen. Es wird einmalig für die Jira-Webhook-API verwendet und nie gespeichert.",+ "fr": "Requis pour supprimer l’intégration et le webhook Jira. Il est utilisé une seule fois pour l’API webhook de Jira et n’est jamais stocké.",+ "it": "Necessario per rimuovere l’integrazione ed eliminare il webhook Jira. Viene usato una sola volta per l’API webhook di Jira e non viene mai memorizzato.",+ "pt": "Necessário para remover a integração e excluir o webhook do Jira. Ele é usado uma vez para a API de webhook do Jira e nunca é armazenado.",+ "es": "Obligatorio para eliminar la integración y borrar el webhook de Jira. Se usa una sola vez para la API de webhooks de Jira y nunca se almacena.",+ "ca": "És necessari per eliminar la integració i suprimir el webhook de Jira. S’utilitza una sola vegada per l’API de webhooks de Jira i no s’emmagatzema mai.",+ "tr": "Entegrasyonu kaldırmak ve Jira webhook'unu silmek için gereklidir. Jira webhook API'si için bir kez kullanılır ve hiçbir zaman saklanmaz.",+ "uk": "Потрібно, щоб видалити інтеграцію та webhook Jira. Він використовується один раз для API webhook Jira і ніколи не зберігається."+ },+ "PROJECT_MANAGEMENT$JIRA_DC_INTEGRATION_OWNER_HELP": {+ "en": "Webhook setup is managed by the OpenHands user who created this integration.",+ "ja": "Webhook の設定は、この連携を作成した OpenHands ユーザーが管理します。",+ "zh-CN": "Webhook 设置由创建此集成的 OpenHands 用户管理。",+ "zh-TW": "Webhook 設定由建立此整合的 OpenHands 使用者管理。",+ "ko-KR": "Webhook 설정은 이 통합을 만든 OpenHands 사용자가 관리합니다.",+ "no": "Webhook-oppsettet administreres av OpenHands-brukeren som opprettet denne integrasjonen.",+ "ar": "تتم إدارة إعداد webhook بواسطة مستخدم OpenHands الذي أنشأ هذا التكامل.",+ "de": "Die Webhook-Einrichtung wird von dem OpenHands-Benutzer verwaltet, der diese Integration erstellt hat.",+ "fr": "La configuration du webhook est gérée par l’utilisateur OpenHands qui a créé cette intégration.",+ "it": "La configurazione del webhook è gestita dall’utente OpenHands che ha creato questa integrazione.",+ "pt": "A configuração do webhook é gerenciada pelo usuário do OpenHands que criou esta integração.",+ "es": "La configuración del webhook la gestiona el usuario de OpenHands que creó esta integración.",+ "ca": "La configuració del webhook la gestiona l’usuari d’OpenHands que ha creat aquesta integració.",+ "tr": "Webhook kurulumu, bu entegrasyonu oluşturan OpenHands kullanıcısı tarafından yönetilir.",+ "uk": "Налаштуванням webhook керує користувач OpenHands, який створив цю інтеграцію."+ },+ "PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_INSTALL_FAILED": {+ "en": "OpenHands saved the Jira Data Center integration, but could not install the Jira webhook. Check the Jira admin PAT or set up the webhook manually.",+ "ja": "OpenHands は Jira Data Center 連携を保存しましたが、Jira webhook をインストールできませんでした。Jira 管理者 PAT を確認するか、webhook を手動で設定してください。",+ "zh-CN": "OpenHands 已保存 Jira Data Center 集成,但无法安装 Jira webhook。请检查 Jira 管理员 PAT,或手动设置 webhook。",+ "zh-TW": "OpenHands 已儲存 Jira Data Center 整合,但無法安裝 Jira webhook。請檢查 Jira 管理員 PAT,或手動設定 webhook。",+ "ko-KR": "OpenHands가 Jira Data Center 통합을 저장했지만 Jira webhook을 설치할 수 없습니다. Jira 관리자 PAT를 확인하거나 webhook을 수동으로 설정하세요.",+ "no": "OpenHands lagret Jira Data Center-integrasjonen, men kunne ikke installere Jira-webhooken. Kontroller Jira-administrator-PAT-en eller sett opp webhooken manuelt.",+ "ar": "حفظ OpenHands تكامل Jira Data Center، لكنه تعذّر عليه تثبيت Jira webhook. تحقق من PAT مسؤول Jira أو قم بإعداد webhook يدويًا.",+ "de": "OpenHands hat die Jira Data Center-Integration gespeichert, konnte den Jira-Webhook aber nicht installieren. Prüfen Sie das Jira-Administrator-PAT oder richten Sie den Webhook manuell ein.",+ "fr": "OpenHands a enregistré l’intégration Jira Data Center, mais n’a pas pu installer le webhook Jira. Vérifiez le PAT d’administrateur Jira ou configurez le webhook manuellement.",+ "it": "OpenHands ha salvato l’integrazione Jira Data Center, ma non ha potuto installare il webhook Jira. Controlla il PAT amministratore Jira o configura il webhook manualmente.",+ "pt": "O OpenHands salvou a integração do Jira Data Center, mas não conseguiu instalar o webhook do Jira. Verifique o PAT de administrador do Jira ou configure o webhook manualmente.",+ "es": "OpenHands guardó la integración de Jira Data Center, pero no pudo instalar el webhook de Jira. Comprueba el PAT de administrador de Jira o configura el webhook manualmente.",+ "ca": "OpenHands ha desat la integració de Jira Data Center, però no ha pogut instal·lar el webhook de Jira. Comprova el PAT d’administrador de Jira o configura el webhook manualment.",+ "tr": "OpenHands Jira Data Center entegrasyonunu kaydetti ancak Jira webhook'unu yükleyemedi. Jira yönetici PAT'sini kontrol edin veya webhook'u manuel olarak kurun.",+ "uk": "OpenHands зберіг інтеграцію Jira Data Center, але не зміг установити webhook Jira. Перевірте PAT адміністратора Jira або налаштуйте webhook вручну."+ },+ "PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_SETUP_SAVED": {+ "en": "Jira webhook setup saved",+ "ja": "Jira webhook の設定を保存しました",+ "zh-CN": "Jira webhook 设置已保存",+ "zh-TW": "Jira webhook 設定已儲存",+ "ko-KR": "Jira webhook 설정이 저장되었습니다",+ "no": "Jira-webhook-oppsett lagret",+ "ar": "تم حفظ إعداد Jira webhook",+ "de": "Jira-Webhook-Einrichtung gespeichert",+ "fr": "Configuration du webhook Jira enregistrée",+ "it": "Configurazione webhook Jira salvata",+ "pt": "Configuração do webhook do Jira salva",+ "es": "Configuración del webhook de Jira guardada",+ "ca": "Configuració del webhook de Jira desada",+ "tr": "Jira webhook kurulumu kaydedildi",+ "uk": "Налаштування webhook Jira збережено"+ },+ "PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_REMOVE_FAILED": {+ "en": "OpenHands removed the Jira Data Center integration, but could not delete the Jira webhook in Jira. Check the Jira admin PAT or remove it manually.",+ "ja": "OpenHands は Jira Data Center 連携を削除しましたが、Jira 内の Jira webhook を削除できませんでした。Jira 管理者 PAT を確認するか、手動で削除してください。",+ "zh-CN": "OpenHands 已移除 Jira Data Center 集成,但无法删除 Jira 中的 Jira webhook。请检查 Jira 管理员 PAT,或手动移除它。",+ "zh-TW": "OpenHands 已移除 Jira Data Center 整合,但無法刪除 Jira 中的 Jira webhook。請檢查 Jira 管理員 PAT,或手動移除它。",+ "ko-KR": "OpenHands가 Jira Data Center 통합을 제거했지만 Jira의 Jira webhook을 삭제할 수 없습니다. Jira 관리자 PAT를 확인하거나 수동으로 제거하세요.",+ "no": "OpenHands fjernet Jira Data Center-integrasjonen, men kunne ikke slette Jira-webhooken i Jira. Kontroller Jira-administrator-PAT-en eller fjern den manuelt.",+ "ar": "أزال OpenHands تكامل Jira Data Center، لكنه تعذّر عليه حذف Jira webhook في Jira. تحقق من PAT مسؤول Jira أو أزله يدويًا.",+ "de": "OpenHands hat die Jira Data Center-Integration entfernt, konnte den Jira-Webhook in Jira aber nicht löschen. Prüfen Sie das Jira-Administrator-PAT oder entfernen Sie ihn manuell.",+ "fr": "OpenHands a supprimé l’intégration Jira Data Center, mais n’a pas pu supprimer le webhook Jira dans Jira. Vérifiez le PAT d’administrateur Jira ou supprimez-le manuellement.",+ "it": "OpenHands ha rimosso l’integrazione Jira Data Center, ma non ha potuto eliminare il webhook Jira in Jira. Controlla il PAT amministratore Jira o rimuovilo manualmente.",+ "pt": "O OpenHands removeu a integração do Jira Data Center, mas não conseguiu excluir o webhook do Jira no Jira. Verifique o PAT de administrador do Jira ou remova-o manualmente.",+ "es": "OpenHands eliminó la integración de Jira Data Center, pero no pudo borrar el webhook de Jira en Jira. Comprueba el PAT de administrador de Jira o elimínalo manualmente.",+ "ca": "OpenHands ha eliminat la integració de Jira Data Center, però no ha pogut suprimir el webhook de Jira a Jira. Comprova el PAT d’administrador de Jira o elimina’l manualment.",+ "tr": "OpenHands Jira Data Center entegrasyonunu kaldırdı ancak Jira'daki Jira webhook'unu silemedi. Jira yönetici PAT'sini kontrol edin veya manuel olarak kaldırın.",+ "uk": "OpenHands видалив інтеграцію Jira Data Center, але не зміг видалити webhook Jira в Jira. Перевірте PAT адміністратора Jira або видаліть його вручну."},"PROJECT_MANAGEMENT$JIRA_DC_DISABLE_BUTTON_LABEL": {"en": "Disable",@@ -26112,21 +26197,21 @@"uk": "Вимкнути інтеграцію"},"PROJECT_MANAGEMENT$JIRA_DC_PAUSE_SECTION_LABEL": {- "en": "Pause",- "ja": "一時停止",- "zh-CN": "暂停",- "zh-TW": "暫停",- "ko-KR": "일시 중지",- "no": "Pause",- "ar": "إيقاف مؤقت",- "de": "Pausieren",- "fr": "Mettre en pause",- "it": "Metti in pausa",- "pt": "Pausar",- "es": "Pausar",- "ca": "Pausa",- "tr": "Duraklat",- "uk": "Призупинити"+ "en": "Event processing",+ "ja": "イベント処理",+ "zh-CN": "事件处理",+ "zh-TW": "事件處理",+ "ko-KR": "이벤트 처리",+ "no": "Hendelsesbehandling",+ "ar": "معالجة الأحداث",+ "de": "Ereignisverarbeitung",+ "fr": "Traitement des événements",+ "it": "Elaborazione eventi",+ "pt": "Processamento de eventos",+ "es": "Procesamiento de eventos",+ "ca": "Processament d’esdeveniments",+ "tr": "Olay işleme",+ "uk": "Обробка подій"},"PROJECT_MANAGEMENT$JIRA_DC_EVENT_RESPONSES_TOGGLE_LABEL": {"en": "OpenHands responds to Jira events",@@ -26146,21 +26231,21 @@"uk": "OpenHands відповідає на події Jira"},"PROJECT_MANAGEMENT$JIRA_DC_PAUSE_HELP": {- "en": "Turn this off to pause OpenHands while keeping the Jira configuration.",- "ja": "これをオフにすると、Jira 設定を保持したまま OpenHands を一時停止します。",- "zh-CN": "关闭此选项可在保留 Jira 配置的同时暂停 OpenHands。",- "zh-TW": "關閉此選項可在保留 Jira 設定的同時暫停 OpenHands。",- "ko-KR": "이 옵션을 끄면 Jira 구성을 유지한 채 OpenHands를 일시 중지합니다.",- "no": "Slå dette av for å pause OpenHands mens Jira-konfigurasjonen beholdes.",- "ar": "أوقف تشغيل هذا الخيار لإيقاف OpenHands مؤقتًا مع الاحتفاظ بتكوين Jira.",- "de": "Deaktivieren Sie dies, um OpenHands zu pausieren und die Jira-Konfiguration beizubehalten.",- "fr": "Désactivez cette option pour mettre OpenHands en pause tout en conservant la configuration Jira.",- "it": "Disattiva questa opzione per mettere in pausa OpenHands mantenendo la configurazione Jira.",- "pt": "Desative isto para pausar o OpenHands mantendo a configuração do Jira.",- "es": "Desactiva esto para pausar OpenHands conservando la configuración de Jira.",- "ca": "Desactiva-ho per pausar OpenHands mantenint la configuració de Jira.",- "tr": "Jira yapılandırmasını korurken OpenHands'i duraklatmak için bunu kapatın.",- "uk": "Вимкніть це, щоб призупинити OpenHands, зберігши конфігурацію Jira."+ "en": "On means OpenHands responds to Jira events. Off pauses responses but keeps the Jira webhook installed.",+ "ja": "オンの場合、OpenHands は Jira イベントに応答します。オフの場合、Jira webhook はインストールされたまま応答を一時停止します。",+ "zh-CN": "开启表示 OpenHands 会响应 Jira 事件。关闭会暂停响应,但保留已安装的 Jira webhook。",+ "zh-TW": "開啟表示 OpenHands 會回應 Jira 事件。關閉會暫停回應,但保留已安裝的 Jira webhook。",+ "ko-KR": "켜짐이면 OpenHands가 Jira 이벤트에 응답합니다. 꺼짐이면 Jira webhook은 유지한 채 응답을 일시 중지합니다.",+ "no": "På betyr at OpenHands svarer på Jira-hendelser. Av pauser svar, men beholder Jira-webhooken installert.",+ "ar": "يعني التشغيل أن OpenHands يستجيب لأحداث Jira. يؤدي الإيقاف إلى إيقاف الاستجابات مؤقتًا مع إبقاء Jira webhook مثبتًا.",+ "de": "Ein bedeutet, dass OpenHands auf Jira-Ereignisse reagiert. Aus pausiert Antworten, lässt den Jira-Webhook aber installiert.",+ "fr": "Activé signifie qu’OpenHands répond aux événements Jira. Désactivé met les réponses en pause tout en conservant le webhook Jira installé.",+ "it": "Attivo significa che OpenHands risponde agli eventi Jira. Disattivo mette in pausa le risposte ma mantiene installato il webhook Jira.",+ "pt": "Ativado significa que o OpenHands responde a eventos do Jira. Desativado pausa as respostas, mas mantém o webhook do Jira instalado.",+ "es": "Activado significa que OpenHands responde a eventos de Jira. Desactivado pausa las respuestas, pero conserva instalado el webhook de Jira.",+ "ca": "Activat vol dir que OpenHands respon als esdeveniments de Jira. Desactivat posa en pausa les respostes, però manté instal·lat el webhook de Jira.",+ "tr": "Açık, OpenHands’in Jira olaylarına yanıt verdiği anlamına gelir. Kapalı, yanıtları duraklatır ancak Jira webhook’unu kurulu tutar.",+ "uk": "Увімкнено означає, що OpenHands відповідає на події Jira. Вимкнено призупиняє відповіді, але залишає Jira webhook встановленим."},"PROJECT_MANAGEMENT$ACTIVE_TOGGLE_HELP": {"en": "Turn off to keep the configuration but stop OpenHands from responding.",@@ -26214,21 +26299,21 @@"uk": "Сервер"},"PROJECT_MANAGEMENT$JIRA_DC_STATUS_INACTIVE": {- "en": "Inactive",- "ja": "非アクティブ",- "zh-CN": "未激活",- "zh-TW": "非使用中",- "ko-KR": "비활성",- "no": "Inaktiv",- "ar": "غير نشط",- "de": "Inaktiv",- "fr": "Inactif",- "it": "Inattivo",- "pt": "Inativo",- "es": "Inactivo",- "ca": "Inactiu",- "tr": "Etkin değil",- "uk": "Неактивно"+ "en": "Paused",+ "ja": "一時停止中",+ "zh-CN": "已暂停",+ "zh-TW": "已暫停",+ "ko-KR": "일시 중지됨",+ "no": "Pauset",+ "ar": "متوقف مؤقتًا",+ "de": "Pausiert",+ "fr": "En pause",+ "it": "In pausa",+ "pt": "Pausado",+ "es": "En pausa",+ "ca": "En pausa",+ "tr": "Duraklatıldı",+ "uk": "Призупинено"},"PROJECT_MANAGEMENT$JIRA_DC_STATUS_NOT_CONNECTED": {"en": "Not connected",diff --git a/frontend/src/routes/git-settings.tsx b/frontend/src/routes/git-settings.tsxindex c1d6cf5c1e..e3fe5bebc9 100644--- a/frontend/src/routes/git-settings.tsx+++ b/frontend/src/routes/git-settings.tsx@@ -42,6 +42,34 @@ function GitSettingsScreen() {const { data: config } = useConfig();+ React.useEffect(() => {+ const params = new URLSearchParams(window.location.search);+ const jiraDcWebhookStatus = params.get("jira_dc_webhook");+ if (!jiraDcWebhookStatus) {+ return;+ }++ if (jiraDcWebhookStatus === "install_failed") {+ displayErrorToast(+ t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_INSTALL_FAILED),+ );+ } else if (jiraDcWebhookStatus === "installed") {+ displaySuccessToast(+ t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_SETUP_SAVED),+ );+ }++ params.delete("jira_dc_webhook");+ const query = params.toString();+ window.history.replaceState(+ null,+ "",+ `${window.location.pathname}${query ? `?${query}` : ""}${+ window.location.hash+ }`,+ );+ }, [t]);+const [githubTokenInputHasValue, setGithubTokenInputHasValue] =React.useState(false);const [gitlabTokenInputHasValue, setGitlabTokenInputHasValue] =diff --git a/frontend/src/utils/retrieve-axios-error-message.ts b/frontend/src/utils/retrieve-axios-error-message.tsindex 49493f349a..a56f154d36 100644--- a/frontend/src/utils/retrieve-axios-error-message.ts+++ b/frontend/src/utils/retrieve-axios-error-message.ts@@ -1,5 +1,6 @@import { AxiosError } from "axios";import {+ isAxiosErrorWithDetailField,isAxiosErrorWithErrorField,isAxiosErrorWithMessageField,} from "./type-guards";@@ -13,6 +14,11 @@ export const retrieveAxiosErrorMessage = (error: AxiosError) => {if (isAxiosErrorWithErrorField(error) && error.response?.data.error) {errorMessage = error.response?.data.error;+ } else if (+ isAxiosErrorWithDetailField(error) &&+ error.response?.data.detail+ ) {+ errorMessage = error.response?.data.detail;} else if (isAxiosErrorWithMessageField(error) &&error.response?.data.messagediff --git a/frontend/src/utils/type-guards.ts b/frontend/src/utils/type-guards.tsindex 3d4f22e9da..c51acffa2b 100644--- a/frontend/src/utils/type-guards.ts+++ b/frontend/src/utils/type-guards.ts@@ -8,6 +8,14 @@ export const isAxiosErrorWithErrorField = ("error" in error.response.data &&typeof error.response?.data?.error === "string";+export const isAxiosErrorWithDetailField = (+ error: AxiosError,+): error is AxiosError<{ detail: string }> =>+ typeof error.response?.data === "object" &&+ error.response?.data !== null &&+ "detail" in error.response.data &&+ typeof error.response?.data?.detail === "string";+export const isAxiosErrorWithMessageField = (error: AxiosError,): error is AxiosError<{ message: string }> =>