From c8fb3adda39b4bf979ed94f79c0a222e6be41e5d Mon Sep 17 00:00:00 2001
From: Matt Hook <hookenz@gmail.com>
Date: Mon, 18 Mar 2024 10:21:20 +1300
Subject: [PATCH] fix(kube): fix edit application webhook link [EE-6861]
 (#11390)

---
 app/portainer/react/components/git-form.ts                   | 2 +-
 app/portainer/react/components/index.ts                      | 2 +-
 app/react/components/{PageHeader => }/HelpLink/HelpLink.tsx  | 2 +-
 app/react/components/{PageHeader => }/HelpLink/index.ts      | 0
 .../portainer/gitops/AutoUpdateFieldset/WebhookSettings.tsx  | 5 +++--
 5 files changed, 6 insertions(+), 5 deletions(-)
 rename app/react/components/{PageHeader => }/HelpLink/HelpLink.tsx (82%)
 rename app/react/components/{PageHeader => }/HelpLink/index.ts (100%)

diff --git a/app/portainer/react/components/git-form.ts b/app/portainer/react/components/git-form.ts
index 1f0bf100d..bc74e3715 100644
--- a/app/portainer/react/components/git-form.ts
+++ b/app/portainer/react/components/git-form.ts
@@ -43,7 +43,7 @@ export const gitFormModule = angular
   )
   .component(
     'reactGitFormAutoUpdateFieldset',
-    r2a(AutoUpdateFieldset, [
+    r2a(withUIRouter(withReactQuery(AutoUpdateFieldset)), [
       'value',
       'onChange',
       'environmentType',
diff --git a/app/portainer/react/components/index.ts b/app/portainer/react/components/index.ts
index e9b2ba556..7f1262010 100644
--- a/app/portainer/react/components/index.ts
+++ b/app/portainer/react/components/index.ts
@@ -36,7 +36,7 @@ import { Slider } from '@@/form-components/Slider';
 import { TagButton } from '@@/TagButton';
 import { BETeaserButton } from '@@/BETeaserButton';
 import { CodeEditor } from '@@/CodeEditor';
-import { HelpLink } from '@@/PageHeader/HelpLink';
+import { HelpLink } from '@@/HelpLink';
 
 import { fileUploadField } from './file-upload-field';
 import { switchField } from './switch-field';
diff --git a/app/react/components/PageHeader/HelpLink/HelpLink.tsx b/app/react/components/HelpLink/HelpLink.tsx
similarity index 82%
rename from app/react/components/PageHeader/HelpLink/HelpLink.tsx
rename to app/react/components/HelpLink/HelpLink.tsx
index 1c116c56a..5ced05c95 100644
--- a/app/react/components/PageHeader/HelpLink/HelpLink.tsx
+++ b/app/react/components/HelpLink/HelpLink.tsx
@@ -1,4 +1,4 @@
-import { useDocsUrl } from '../ContextHelp/ContextHelp';
+import { useDocsUrl } from '../PageHeader/ContextHelp/ContextHelp';
 
 type HelpLinkProps = {
   docLink?: string;
diff --git a/app/react/components/PageHeader/HelpLink/index.ts b/app/react/components/HelpLink/index.ts
similarity index 100%
rename from app/react/components/PageHeader/HelpLink/index.ts
rename to app/react/components/HelpLink/index.ts
diff --git a/app/react/portainer/gitops/AutoUpdateFieldset/WebhookSettings.tsx b/app/react/portainer/gitops/AutoUpdateFieldset/WebhookSettings.tsx
index baf4efa26..00bd61b07 100644
--- a/app/react/portainer/gitops/AutoUpdateFieldset/WebhookSettings.tsx
+++ b/app/react/portainer/gitops/AutoUpdateFieldset/WebhookSettings.tsx
@@ -1,5 +1,6 @@
 import { truncateLeftRight } from '@/portainer/filters/filters';
 
+import { HelpLink } from '@@/HelpLink';
 import { CopyButton } from '@@/buttons';
 import { FormControl } from '@@/form-components/FormControl';
 
@@ -21,9 +22,9 @@ export function WebhookSettings({
         !!docsLink && (
           <>
             See{' '}
-            <a href={docsLink} target="_blank" rel="noreferrer">
+            <HelpLink docLink={docsLink}>
               Portainer documentation on webhook usage
-            </a>
+            </HelpLink>
             .
           </>
         )