From b876e1e253ec2a5066fb80a0363a94fff4530d38 Mon Sep 17 00:00:00 2001
From: Nuwan <nuwanchaturanga@gmail.com>
Date: Thu, 19 Sep 2024 04:56:21 +0530
Subject: [PATCH] open help pages on new tab

---
 jam-ui/src/components/dashboard/JKDashboardMain.js       | 4 ++--
 jam-ui/src/components/help/JKForum.js                    | 5 +++--
 jam-ui/src/components/help/JKHelp.js                     | 5 +++--
 jam-ui/src/components/help/JKHelpDesk.js                 | 5 +++--
 .../help/{JKKnowladgeBase.js => JKKnowledgeBase.js}      | 9 +++++----
 jam-ui/src/routes.js                                     | 2 +-
 6 files changed, 17 insertions(+), 13 deletions(-)
 rename jam-ui/src/components/help/{JKKnowladgeBase.js => JKKnowledgeBase.js} (57%)

diff --git a/jam-ui/src/components/dashboard/JKDashboardMain.js b/jam-ui/src/components/dashboard/JKDashboardMain.js
index e311246c6..880082e5c 100644
--- a/jam-ui/src/components/dashboard/JKDashboardMain.js
+++ b/jam-ui/src/components/dashboard/JKDashboardMain.js
@@ -23,7 +23,7 @@ import { truncate } from '../../helpers/utils';
 import HomePage from '../page/JKHomePage';
 
 import JKHelp from '../help/JKHelp';
-import JKKnowladgeBase from '../help/JKKnowladgeBase';
+import JKKnowledgeBase from '../help/JKKnowledgeBase';
 import JKHelpDesk from '../help/JKHelpDesk';
 import JKForum from '../help/JKForum';
 import JKPrivacy from '../page/JKPrivacy';
@@ -276,7 +276,7 @@ function JKDashboardMain() {
         <Switch>
           <Route path="/privacy" component={JKPrivacy} />
           <Route path="/help" component={JKHelp} />
-          <Route path="/knowladge-base" component={JKKnowladgeBase} />
+          <Route path="/knowledge-base" component={JKKnowledgeBase} />
           <Route path="/help-desk" component={JKHelpDesk} />
           <Route path="/forum" component={JKForum} />
           <Route path="/unsubscribe" exact component={JKUnsubscribe} />
diff --git a/jam-ui/src/components/help/JKForum.js b/jam-ui/src/components/help/JKForum.js
index 8cadbdc58..e0289dec4 100644
--- a/jam-ui/src/components/help/JKForum.js
+++ b/jam-ui/src/components/help/JKForum.js
@@ -3,13 +3,14 @@ import React, {useEffect} from 'react'
 const JKForum = () => {
   const pageUrl = "https://forum.jamkazam.com/"
   useEffect(() => {
-    window.location.href = pageUrl;
+    window.open(pageUrl, '_blank').focus();
+    window.history.go(-1)
     return () => {
     };
   }, [])
   return (
     <div>
-      redirecting...
+      opening...
     </div>
   )
 }
diff --git a/jam-ui/src/components/help/JKHelp.js b/jam-ui/src/components/help/JKHelp.js
index 09dbb69bd..c910b8dae 100644
--- a/jam-ui/src/components/help/JKHelp.js
+++ b/jam-ui/src/components/help/JKHelp.js
@@ -3,13 +3,14 @@ import React, {useEffect} from 'react'
 const JKHelp = () => {
   const pageUrl = "https://www.jamkazam.com/corp/help"
   useEffect(() => {
-    window.location.href = pageUrl;
+    window.open(pageUrl, '_blank').focus();
+    window.history.go(-1)
     return () => {
     };
   }, [])
   return (
     <div>
-      redirecting...
+      opening...
     </div>
   )
 }
diff --git a/jam-ui/src/components/help/JKHelpDesk.js b/jam-ui/src/components/help/JKHelpDesk.js
index 2b6e44c37..027629fab 100644
--- a/jam-ui/src/components/help/JKHelpDesk.js
+++ b/jam-ui/src/components/help/JKHelpDesk.js
@@ -3,13 +3,14 @@ import React, {useEffect} from 'react'
 const JKHelpDesk = () => {
   const pageUrl = "https://www.jamkazam.com/corp/help"
   useEffect(() => {
-    window.location.href = pageUrl;
+    window.open(pageUrl, '_blank').focus();
+    window.history.go(-1)
     return () => {
     };
   }, [])
   return (
     <div>
-      redirecting...
+      opening...
     </div>
   )
 }
diff --git a/jam-ui/src/components/help/JKKnowladgeBase.js b/jam-ui/src/components/help/JKKnowledgeBase.js
similarity index 57%
rename from jam-ui/src/components/help/JKKnowladgeBase.js
rename to jam-ui/src/components/help/JKKnowledgeBase.js
index b8b34f7ac..6a759392e 100644
--- a/jam-ui/src/components/help/JKKnowladgeBase.js
+++ b/jam-ui/src/components/help/JKKnowledgeBase.js
@@ -1,17 +1,18 @@
 import React, {useEffect} from 'react'
 
-const JKKnowladgeBase = () => {
+const JKKnowledgeBase = () => {
   const pageUrl = "https://jamkazam.freshdesk.com/support/home"
   useEffect(() => {
-    window.location.href = pageUrl;
+    window.open(pageUrl, '_blank').focus();
+    window.history.go(-1)
     return () => {
     };
   }, [])
   return (
     <div>
-      redirecting...
+      opening...
     </div>
   )
 }
 
-export default JKKnowladgeBase
\ No newline at end of file
+export default JKKnowledgeBase
\ No newline at end of file
diff --git a/jam-ui/src/routes.js b/jam-ui/src/routes.js
index 65869a329..1548924e3 100644
--- a/jam-ui/src/routes.js
+++ b/jam-ui/src/routes.js
@@ -83,7 +83,7 @@ export const helpRoutes = {
   exact: true,
   icon: 'question-circle',
   children: [
-    { to: '/knowladge-base', name: 'Knowladge Base' },
+    { to: '/knowledge-base', name: 'Knowledge Base' },
     { to: '/help-desk', name: 'Help Desk'},
     { to: '/forum', name: 'Forum'}