From 8c6373f4b1830ed690d0674c8e9fc840d2fdc17a Mon Sep 17 00:00:00 2001
From: Vijaykant Yadav <vjy239@gmail.com>
Date: Wed, 26 Mar 2025 11:08:52 +0530
Subject: [PATCH 1/2] feat: add open webpage target on event

---
 .../RightSideBar/Inspector/EventManager.jsx         | 13 +++++++++++++
 .../src/AppBuilder/_stores/slices/eventsSlice.js    |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/frontend/src/AppBuilder/RightSideBar/Inspector/EventManager.jsx b/frontend/src/AppBuilder/RightSideBar/Inspector/EventManager.jsx
index c3add3f1cc..b6b6f0c4f9 100644
--- a/frontend/src/AppBuilder/RightSideBar/Inspector/EventManager.jsx
+++ b/frontend/src/AppBuilder/RightSideBar/Inspector/EventManager.jsx
@@ -30,6 +30,8 @@ import { appService } from '@/_services';
 import { deepClone } from '@/_helpers/utilities/utils.helpers';
 import useStore from '@/AppBuilder/_stores/store';
 import { useEventActions, useEvents } from '@/AppBuilder/_stores/slices/eventsSlice';
+import ToggleGroup from '@/ToolJetUI/SwitchGroup/ToggleGroup';
+import ToggleGroupItem from '@/ToolJetUI/SwitchGroup/ToggleGroupItem';
 
 export const EventManager = ({
   sourceId,
@@ -512,6 +514,17 @@ export const EventManager = ({
                   usePortalEditor={false}
                   component={component}
                 />
+                <div className="d-flex align-items-center justify-content-between mt-1">
+                  <label className="form-label mt-1">Open in</label>
+                  <ToggleGroup
+                    onValueChange={(_value) => handlerChanged(index, 'windowTarget', _value)}
+                    defaultValue={event?.windowTarget || 'newTab'}
+                    style={{ width: '58%' }}
+                  >
+                    <ToggleGroupItem value="newTab">New tab</ToggleGroupItem>
+                    <ToggleGroupItem value="currentTab">Current tab</ToggleGroupItem>
+                  </ToggleGroup>
+                </div>
               </div>
             )}
 
diff --git a/frontend/src/AppBuilder/_stores/slices/eventsSlice.js b/frontend/src/AppBuilder/_stores/slices/eventsSlice.js
index 948ac39b39..c9f62df177 100644
--- a/frontend/src/AppBuilder/_stores/slices/eventsSlice.js
+++ b/frontend/src/AppBuilder/_stores/slices/eventsSlice.js
@@ -584,7 +584,7 @@ export const createEventsSlice = (set, get) => ({
             //! if resolvecode default value should be the value itself not empty string ... Ask KAVIN
             const resolvedValue = getResolvedValue(event.url, customVariables);
             // const url = resolveReferences(event.url, undefined, customVariables);
-            window.open(resolvedValue, '_blank');
+            window.open(resolvedValue, event?.windowTarget === 'newTab' ? '_blank' : '_self');
             return Promise.resolve();
           }
           case 'go-to-app': {

From 6497e1a78928910b11f7e5d70eb9329ec122164f Mon Sep 17 00:00:00 2001
From: Vijaykant Yadav <vjy239@gmail.com>
Date: Thu, 27 Mar 2025 12:22:24 +0530
Subject: [PATCH 2/2] fix: window target styling

---
 .../src/AppBuilder/RightSideBar/Inspector/EventManager.jsx  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/AppBuilder/RightSideBar/Inspector/EventManager.jsx b/frontend/src/AppBuilder/RightSideBar/Inspector/EventManager.jsx
index b6b6f0c4f9..6c8398724d 100644
--- a/frontend/src/AppBuilder/RightSideBar/Inspector/EventManager.jsx
+++ b/frontend/src/AppBuilder/RightSideBar/Inspector/EventManager.jsx
@@ -505,7 +505,7 @@ export const EventManager = ({
             )}
 
             {event.actionId === 'open-webpage' && (
-              <div className="p-1">
+              <div>
                 <label className="form-label mt-1">{t('editor.inspector.eventManager.url', 'URL')}</label>
                 <CodeHinter
                   type="basic"
@@ -514,12 +514,12 @@ export const EventManager = ({
                   usePortalEditor={false}
                   component={component}
                 />
-                <div className="d-flex align-items-center justify-content-between mt-1">
+                <div className="d-flex align-items-center justify-content-between mt-3">
                   <label className="form-label mt-1">Open in</label>
                   <ToggleGroup
                     onValueChange={(_value) => handlerChanged(index, 'windowTarget', _value)}
                     defaultValue={event?.windowTarget || 'newTab'}
-                    style={{ width: '58%' }}
+                    style={{ width: '74%' }}
                   >
                     <ToggleGroupItem value="newTab">New tab</ToggleGroupItem>
                     <ToggleGroupItem value="currentTab">Current tab</ToggleGroupItem>