From 1c31c9021b247f3137efd09c1c9993d88da696bc Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Wed, 23 Oct 2024 11:47:56 +0530
Subject: [PATCH 01/16] feat: try button added

---
 .../HeaderWithCreateButon.tsx                 | 26 ++++----
 src/Shared/Components/Header/PageHeader.tsx   | 62 +++++++++++++++++--
 src/index.ts                                  |  3 +
 3 files changed, 74 insertions(+), 17 deletions(-)

diff --git a/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx b/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx
index d9ca3b71b..3797f799d 100644
--- a/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx
+++ b/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx
@@ -16,13 +16,14 @@
 
 import { useState } from 'react'
 import { useHistory, useLocation, useParams } from 'react-router-dom'
+import Button from '@Shared/Components/Button/Button.component'
 import { Modal, SERVER_MODE, URLS } from '../../../../Common'
 import PageHeader from '../PageHeader'
 import { ReactComponent as DropDown } from '../../../../Assets/Icon/ic-dropdown-filled.svg'
 import { ReactComponent as ChartIcon } from '../../../../Assets/Icon/ic-charts.svg'
 import { ReactComponent as AddIcon } from '../../../../Assets/Icon/ic-add.svg'
 import { ReactComponent as JobIcon } from '../../../../Assets/Icon/ic-k8s-job.svg'
-import { AppListConstants } from '../../../constants'
+import { AppListConstants, ComponentSizeType } from '../../../constants'
 import './HeaderWithCreateButton.scss'
 import { useMainContext } from '../../../Providers'
 
@@ -56,19 +57,20 @@ export const HeaderWithCreateButton = ({ headerName }: HeaderWithCreateButtonPro
 
     const renderActionButtons = () =>
         serverMode === SERVER_MODE.FULL ? (
-            <button
-                type="button"
-                className="flex cta h-32 lh-n"
+            <Button
+                text="Create"
                 onClick={handleCreateButton}
-                data-testid="create-app-button-on-header"
-            >
-                Create
-                <DropDown className="icon-dim-20" />
-            </button>
+                dataTestId="create-app-button-on-header"
+                endIcon={<DropDown className="icon-dim-20" />}
+                size={ComponentSizeType.medium}
+            />
         ) : (
-            <button type="button" className="flex cta h-32 lh-n" onClick={redirectToHelmAppDiscover}>
-                Deploy helm charts
-            </button>
+            <Button
+                text="Deploy helm charts"
+                onClick={redirectToHelmAppDiscover}
+                dataTestId="deploy-helm-chart-on-header"
+                size={ComponentSizeType.medium}
+            />
         )
 
     const renderCreateSelectionModal = () => (
diff --git a/src/Shared/Components/Header/PageHeader.tsx b/src/Shared/Components/Header/PageHeader.tsx
index eddfc87ac..b84b2226b 100644
--- a/src/Shared/Components/Header/PageHeader.tsx
+++ b/src/Shared/Components/Header/PageHeader.tsx
@@ -18,7 +18,8 @@ import { useEffect, useState } from 'react'
 import Tippy from '@tippyjs/react'
 import './pageHeader.css'
 import ReactGA from 'react-ga4'
-import { getRandomColor } from '../../../Common'
+import { ComponentSizeType } from '@Shared/constants'
+import { getRandomColor, VisibleModal } from '../../../Common'
 import LogoutCard from '../LogoutCard'
 import { setActionWithExpiry, handlePostHogEventUpdate } from './utils'
 import { InstallationType, ServerInfo, PageHeaderType } from './types'
@@ -32,6 +33,8 @@ import { ReactComponent as DropDownIcon } from '../../../Assets/Icon/ic-chevron-
 import AnnouncementBanner from '../AnnouncementBanner/AnnouncementBanner'
 import { useMainContext, useUserEmail } from '../../Providers'
 import { InfoIconTippy } from '../InfoIconTippy'
+import { ButtonStyleType, ButtonVariantType } from '../Button/types'
+import { Button } from '../Button'
 
 const PageHeader = ({
     headerName,
@@ -61,6 +64,8 @@ const PageHeader = ({
         },
     )
     const [expiryDate, setExpiryDate] = useState(0)
+    const [showTryDevtronModal, setShowTryDevtronModal] = useState(false)
+    const tryDevtronButtonText = window._env_.FEATURE_HEADER_TRY_DEVTRON_BUTTON_TEXT
 
     const getCurrentServerInfo = async () => {
         try {
@@ -121,8 +126,8 @@ const PageHeader = ({
 
     const renderLogoutHelpSection = () => (
         <>
-            <div className="flex left cursor mr-16" onClick={onClickHelp}>
-                <span className="icon-dim-24 fcn-9 mr-4 ml-16">
+            <div className="flex left cursor dc__gap-8" onClick={onClickHelp}>
+                <span className="icon-dim-24 fcn-9">
                     <Question />
                 </span>
                 <span className="fs-13 cn-9" data-testid="go-to-get-started">
@@ -156,6 +161,50 @@ const PageHeader = ({
         <span className="fs-12 fw-4 lh-18 pt-1 pb-1 pl-6 pr-6 ml-8 cn-9 bcy-5 br-4">Beta</span>
     )
 
+    const toggleTryDevtronModal = () => setShowTryDevtronModal(!showTryDevtronModal)
+    const closeTryDevtronModal = () => setShowTryDevtronModal(false)
+
+    const renderIframeDrawer = () => (
+        <VisibleModal close={closeTryDevtronModal}>
+            <div className="modal-body--ci-material h-100 dc__overflow-hidden dc__border-left">
+                <div className="trigger-modal__header">
+                    <h1 className="modal__title flex left fs-16" data-testid="app-details-url-heading">
+                        {window._env_.FEATURE_HEADER_TRY_DEVTRON_TITLE || tryDevtronButtonText}
+                    </h1>
+                    <Button
+                        ariaLabel="Try Devtron"
+                        dataTestId="iframe-modal-close-button"
+                        size={ComponentSizeType.medium}
+                        onClick={closeTryDevtronModal}
+                        style={ButtonStyleType.neutral}
+                        variant={ButtonVariantType.borderLess}
+                        icon={<Close />}
+                        showAriaLabelInTippy={false}
+                    />
+                </div>
+                <iframe
+                    title={window._env_.FEATURE_HEADER_TRY_DEVTRON_TITLE || tryDevtronButtonText}
+                    src={window._env_.FEATURE_HEADER_TRY_DEVTRON_URL}
+                    width="100%"
+                    height="100%"
+                    className="dc__no-border"
+                    sandbox="allow-same-origin allow-scripts"
+                    referrerPolicy="no-referrer"
+                />
+            </div>
+        </VisibleModal>
+    )
+
+    const renderIframeButton = () =>
+        tryDevtronButtonText && (
+            <Button
+                dataTestId="iframe-header-button"
+                size={ComponentSizeType.small}
+                onClick={toggleTryDevtronModal}
+                text={tryDevtronButtonText}
+                variant={ButtonVariantType.secondary}
+            />
+        )
     return (
         <div
             className={`dc__page-header dc__content-space cn-9 bcn-0 pl-20 pr-20 ${
@@ -220,7 +269,8 @@ const PageHeader = ({
                     {markAsBeta && renderBetaTag()}
                 </div>
                 {showTabs && (
-                    <div className="flex left">
+                    <div className="flex left dc__gap-12">
+                        {renderIframeButton()}
                         {typeof renderActionButtons === 'function' && renderActionButtons()}
                         {renderLogoutHelpSection()}
                     </div>
@@ -258,11 +308,13 @@ const PageHeader = ({
                 />
             )}
             {!showTabs && (
-                <div className="flex left">
+                <div className="flex left dc__gap-12">
                     {typeof renderActionButtons === 'function' && renderActionButtons()}
+                    {renderIframeButton()}
                     {renderLogoutHelpSection()}
                 </div>
             )}
+            {showTryDevtronModal && renderIframeDrawer()}
             {showAnnouncementHeader && <AnnouncementBanner parentClassName="page-header-banner" />}
         </div>
     )
diff --git a/src/index.ts b/src/index.ts
index 57d0183d5..4ae41fd20 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -76,6 +76,9 @@ export interface customEnv {
     SYSTEM_CONTROLLER_LISTING_TIMEOUT?: number
     FEATURE_STEP_WISE_LOGS_ENABLE?: boolean
     FEATURE_IMAGE_PROMOTION_ENABLE?: boolean
+    FEATURE_HEADER_TRY_DEVTRON_BUTTON_TEXT: string
+    FEATURE_HEADER_TRY_DEVTRON_TITLE: string
+    FEATURE_HEADER_TRY_DEVTRON_URL: string
 }
 declare global {
     interface Window {

From 53ba9da13325df8030ac37142aa2ebdd95939bd3 Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Wed, 23 Oct 2024 11:49:33 +0530
Subject: [PATCH 02/16] chore: version bump

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 08296dfc8..d9d0c4b43 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.5.7",
+    "version": "0.5.7-beta-1",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@devtron-labs/devtron-fe-common-lib",
-            "version": "0.5.7",
+            "version": "0.5.7-beta-1",
             "license": "ISC",
             "dependencies": {
                 "@types/react-dates": "^21.8.6",
diff --git a/package.json b/package.json
index 181ba8cca..e54baa8d1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.5.7",
+    "version": "0.5.7-beta-1",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

From e3f767a8128df82250ed49bc39c35a86a3dd276b Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Wed, 23 Oct 2024 12:29:33 +0530
Subject: [PATCH 03/16] fix: create button css

---
 src/Assets/Icon/ic-caret-down-small.svg       |  3 +++
 .../HeaderWithCreateButon.tsx                 | 20 +++++++++++--------
 .../HeaderWithCreateButton.scss               |  4 ++++
 3 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 src/Assets/Icon/ic-caret-down-small.svg

diff --git a/src/Assets/Icon/ic-caret-down-small.svg b/src/Assets/Icon/ic-caret-down-small.svg
new file mode 100644
index 000000000..2c11afc63
--- /dev/null
+++ b/src/Assets/Icon/ic-caret-down-small.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m17 10-5 5-5-5" vector-effect="non-scaling-stroke"/>
+</svg>
\ No newline at end of file
diff --git a/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx b/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx
index 3797f799d..b8533274a 100644
--- a/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx
+++ b/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx
@@ -17,12 +17,12 @@
 import { useState } from 'react'
 import { useHistory, useLocation, useParams } from 'react-router-dom'
 import Button from '@Shared/Components/Button/Button.component'
-import { Modal, SERVER_MODE, URLS } from '../../../../Common'
+import { ReactComponent as DropDown } from '@Icons/ic-caret-down-small.svg'
+import { ReactComponent as ChartIcon } from '@Icons/ic-charts.svg'
+import { ReactComponent as AddIcon } from '@Icons/ic-add.svg'
+import { ReactComponent as JobIcon } from '@Icons/ic-k8s-job.svg'
 import PageHeader from '../PageHeader'
-import { ReactComponent as DropDown } from '../../../../Assets/Icon/ic-dropdown-filled.svg'
-import { ReactComponent as ChartIcon } from '../../../../Assets/Icon/ic-charts.svg'
-import { ReactComponent as AddIcon } from '../../../../Assets/Icon/ic-add.svg'
-import { ReactComponent as JobIcon } from '../../../../Assets/Icon/ic-k8s-job.svg'
+import { Modal, SERVER_MODE, URLS } from '../../../../Common'
 import { AppListConstants, ComponentSizeType } from '../../../constants'
 import './HeaderWithCreateButton.scss'
 import { useMainContext } from '../../../Providers'
@@ -62,19 +62,23 @@ export const HeaderWithCreateButton = ({ headerName }: HeaderWithCreateButtonPro
                 onClick={handleCreateButton}
                 dataTestId="create-app-button-on-header"
                 endIcon={<DropDown className="icon-dim-20" />}
-                size={ComponentSizeType.medium}
+                size={ComponentSizeType.small}
             />
         ) : (
             <Button
                 text="Deploy helm charts"
                 onClick={redirectToHelmAppDiscover}
                 dataTestId="deploy-helm-chart-on-header"
-                size={ComponentSizeType.medium}
+                size={ComponentSizeType.small}
             />
         )
 
     const renderCreateSelectionModal = () => (
-        <Modal rootClassName="create-modal-wrapper" onClick={handleCreateButton}>
+        <Modal
+            rootClassName={`create-modal-wrapper
+                ${window._env_.FEATURE_HEADER_TRY_DEVTRON_BUTTON_TEXT ? 'create-modal-wrapper--try-devtron' : ''}`}
+            onClick={handleCreateButton}
+        >
             <div
                 className="create-modal-child cursor"
                 onClick={openCreateDevtronAppModel}
diff --git a/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButton.scss b/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButton.scss
index fc4ae57ae..f6555a9d0 100644
--- a/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButton.scss
+++ b/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButton.scss
@@ -32,4 +32,8 @@
             background-color: var(--N100);
         }
     }
+
+    &--try-devtron {
+        right: 84px !important;
+    }
 }

From 90287e7a1794b910b4e1a71017ec4e592a7fa316 Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Wed, 23 Oct 2024 12:32:17 +0530
Subject: [PATCH 04/16] chore: version bump

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d9d0c4b43..7e47ca2c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.5.7-beta-1",
+    "version": "0.5.7-beta-2",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@devtron-labs/devtron-fe-common-lib",
-            "version": "0.5.7-beta-1",
+            "version": "0.5.7-beta-2",
             "license": "ISC",
             "dependencies": {
                 "@types/react-dates": "^21.8.6",
diff --git a/package.json b/package.json
index e54baa8d1..892e2ab5e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.5.7-beta-1",
+    "version": "0.5.7-beta-2",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

From eb7a4665995e821a0195f627f45cdd6a86a1698e Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Wed, 23 Oct 2024 12:48:49 +0530
Subject: [PATCH 05/16] chore: css fixes

---
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 src/Shared/Components/Header/PageHeader.tsx | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7e47ca2c1..53122de8e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.5.7-beta-2",
+    "version": "0.5.7-beta-3",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@devtron-labs/devtron-fe-common-lib",
-            "version": "0.5.7-beta-2",
+            "version": "0.5.7-beta-3",
             "license": "ISC",
             "dependencies": {
                 "@types/react-dates": "^21.8.6",
diff --git a/package.json b/package.json
index 892e2ab5e..16d270bfd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.5.7-beta-2",
+    "version": "0.5.7-beta-3",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
diff --git a/src/Shared/Components/Header/PageHeader.tsx b/src/Shared/Components/Header/PageHeader.tsx
index b84b2226b..77c18a641 100644
--- a/src/Shared/Components/Header/PageHeader.tsx
+++ b/src/Shared/Components/Header/PageHeader.tsx
@@ -168,15 +168,15 @@ const PageHeader = ({
         <VisibleModal close={closeTryDevtronModal}>
             <div className="modal-body--ci-material h-100 dc__overflow-hidden dc__border-left">
                 <div className="trigger-modal__header">
-                    <h1 className="modal__title flex left fs-16" data-testid="app-details-url-heading">
+                    <h1 className="modal__title flex left fs-16 fw-6" data-testid="app-details-url-heading">
                         {window._env_.FEATURE_HEADER_TRY_DEVTRON_TITLE || tryDevtronButtonText}
                     </h1>
                     <Button
                         ariaLabel="Try Devtron"
                         dataTestId="iframe-modal-close-button"
-                        size={ComponentSizeType.medium}
+                        size={ComponentSizeType.small}
                         onClick={closeTryDevtronModal}
-                        style={ButtonStyleType.neutral}
+                        style={ButtonStyleType.negativeGrey}
                         variant={ButtonVariantType.borderLess}
                         icon={<Close />}
                         showAriaLabelInTippy={false}

From 0230e3ec81becddc72c8f52bdeca744e918e78d5 Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Wed, 23 Oct 2024 13:18:15 +0530
Subject: [PATCH 06/16] chore:version bump

---
 package.json                                | 2 +-
 src/Shared/Components/Header/PageHeader.tsx | 4 ++--
 src/index.ts                                | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 16d270bfd..46f2c6128 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.5.7-beta-3",
+    "version": "0.5.7-beta-4",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
diff --git a/src/Shared/Components/Header/PageHeader.tsx b/src/Shared/Components/Header/PageHeader.tsx
index 77c18a641..7fa1c361c 100644
--- a/src/Shared/Components/Header/PageHeader.tsx
+++ b/src/Shared/Components/Header/PageHeader.tsx
@@ -161,14 +161,14 @@ const PageHeader = ({
         <span className="fs-12 fw-4 lh-18 pt-1 pb-1 pl-6 pr-6 ml-8 cn-9 bcy-5 br-4">Beta</span>
     )
 
-    const toggleTryDevtronModal = () => setShowTryDevtronModal(!showTryDevtronModal)
+    const toggleTryDevtronModal = () => setShowTryDevtronModal(true)
     const closeTryDevtronModal = () => setShowTryDevtronModal(false)
 
     const renderIframeDrawer = () => (
         <VisibleModal close={closeTryDevtronModal}>
             <div className="modal-body--ci-material h-100 dc__overflow-hidden dc__border-left">
                 <div className="trigger-modal__header">
-                    <h1 className="modal__title flex left fs-16 fw-6" data-testid="app-details-url-heading">
+                    <h1 className="modal__title flex left fs-16 fw-6-imp" data-testid="app-details-url-heading">
                         {window._env_.FEATURE_HEADER_TRY_DEVTRON_TITLE || tryDevtronButtonText}
                     </h1>
                     <Button
diff --git a/src/index.ts b/src/index.ts
index 4ae41fd20..74c914605 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -76,9 +76,9 @@ export interface customEnv {
     SYSTEM_CONTROLLER_LISTING_TIMEOUT?: number
     FEATURE_STEP_WISE_LOGS_ENABLE?: boolean
     FEATURE_IMAGE_PROMOTION_ENABLE?: boolean
-    FEATURE_HEADER_TRY_DEVTRON_BUTTON_TEXT: string
-    FEATURE_HEADER_TRY_DEVTRON_TITLE: string
-    FEATURE_HEADER_TRY_DEVTRON_URL: string
+    FEATURE_HEADER_TRY_DEVTRON_BUTTON_TEXT?: string
+    FEATURE_HEADER_TRY_DEVTRON_TITLE?: string
+    FEATURE_HEADER_TRY_DEVTRON_URL?: string
 }
 declare global {
     interface Window {

From bf71d360b0345ea93c8e624c812692bd1d97284f Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Wed, 23 Oct 2024 13:25:08 +0530
Subject: [PATCH 07/16] chore: variable name update

---
 package-lock.json                           |  4 ++--
 src/Shared/Components/Header/PageHeader.tsx | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 53122de8e..62fb0a6c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.5.7-beta-3",
+    "version": "0.5.7-beta-4",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@devtron-labs/devtron-fe-common-lib",
-            "version": "0.5.7-beta-3",
+            "version": "0.5.7-beta-4",
             "license": "ISC",
             "dependencies": {
                 "@types/react-dates": "^21.8.6",
diff --git a/src/Shared/Components/Header/PageHeader.tsx b/src/Shared/Components/Header/PageHeader.tsx
index 7fa1c361c..6a39e5417 100644
--- a/src/Shared/Components/Header/PageHeader.tsx
+++ b/src/Shared/Components/Header/PageHeader.tsx
@@ -161,11 +161,11 @@ const PageHeader = ({
         <span className="fs-12 fw-4 lh-18 pt-1 pb-1 pl-6 pr-6 ml-8 cn-9 bcy-5 br-4">Beta</span>
     )
 
-    const toggleTryDevtronModal = () => setShowTryDevtronModal(true)
-    const closeTryDevtronModal = () => setShowTryDevtronModal(false)
+    const sonClickShowTryDevtronModal = () => setShowTryDevtronModal(true)
+    const onClickCloseTryDevtronModal = () => setShowTryDevtronModal(false)
 
     const renderIframeDrawer = () => (
-        <VisibleModal close={closeTryDevtronModal}>
+        <VisibleModal close={onClickCloseTryDevtronModal}>
             <div className="modal-body--ci-material h-100 dc__overflow-hidden dc__border-left">
                 <div className="trigger-modal__header">
                     <h1 className="modal__title flex left fs-16 fw-6-imp" data-testid="app-details-url-heading">
@@ -175,7 +175,7 @@ const PageHeader = ({
                         ariaLabel="Try Devtron"
                         dataTestId="iframe-modal-close-button"
                         size={ComponentSizeType.small}
-                        onClick={closeTryDevtronModal}
+                        onClick={onClickCloseTryDevtronModal}
                         style={ButtonStyleType.negativeGrey}
                         variant={ButtonVariantType.borderLess}
                         icon={<Close />}
@@ -200,7 +200,7 @@ const PageHeader = ({
             <Button
                 dataTestId="iframe-header-button"
                 size={ComponentSizeType.small}
-                onClick={toggleTryDevtronModal}
+                onClick={sonClickShowTryDevtronModal}
                 text={tryDevtronButtonText}
                 variant={ButtonVariantType.secondary}
             />

From 859ae0ef0a4db28e605b46c6e7aabc2c11f0ab2a Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Wed, 23 Oct 2024 13:33:07 +0530
Subject: [PATCH 08/16] chore: renaming of variable

---
 src/Shared/Components/Header/PageHeader.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Shared/Components/Header/PageHeader.tsx b/src/Shared/Components/Header/PageHeader.tsx
index 6a39e5417..74e0e9485 100644
--- a/src/Shared/Components/Header/PageHeader.tsx
+++ b/src/Shared/Components/Header/PageHeader.tsx
@@ -161,7 +161,7 @@ const PageHeader = ({
         <span className="fs-12 fw-4 lh-18 pt-1 pb-1 pl-6 pr-6 ml-8 cn-9 bcy-5 br-4">Beta</span>
     )
 
-    const sonClickShowTryDevtronModal = () => setShowTryDevtronModal(true)
+    const onClickShowTryDevtronModal = () => setShowTryDevtronModal(true)
     const onClickCloseTryDevtronModal = () => setShowTryDevtronModal(false)
 
     const renderIframeDrawer = () => (
@@ -200,7 +200,7 @@ const PageHeader = ({
             <Button
                 dataTestId="iframe-header-button"
                 size={ComponentSizeType.small}
-                onClick={sonClickShowTryDevtronModal}
+                onClick={onClickShowTryDevtronModal}
                 text={tryDevtronButtonText}
                 variant={ButtonVariantType.secondary}
             />

From 5eb8299c6f1a9fbde57bd55701f14d9e94093935 Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Wed, 23 Oct 2024 13:59:41 +0530
Subject: [PATCH 09/16] chore: renaming of cm values

---
 .../HeaderWithCreateButon.tsx                 |  2 +-
 src/Shared/Components/Header/PageHeader.tsx   | 24 +++++++++----------
 src/index.ts                                  |  6 ++---
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx b/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx
index b8533274a..e27666807 100644
--- a/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx
+++ b/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx
@@ -76,7 +76,7 @@ export const HeaderWithCreateButton = ({ headerName }: HeaderWithCreateButtonPro
     const renderCreateSelectionModal = () => (
         <Modal
             rootClassName={`create-modal-wrapper
-                ${window._env_.FEATURE_HEADER_TRY_DEVTRON_BUTTON_TEXT ? 'create-modal-wrapper--try-devtron' : ''}`}
+                ${window._env_.FEATURE_PROMO_EMBEDDED_BUTTON_TEXT ? 'create-modal-wrapper--try-devtron' : ''}`}
             onClick={handleCreateButton}
         >
             <div
diff --git a/src/Shared/Components/Header/PageHeader.tsx b/src/Shared/Components/Header/PageHeader.tsx
index 74e0e9485..5a4868fe7 100644
--- a/src/Shared/Components/Header/PageHeader.tsx
+++ b/src/Shared/Components/Header/PageHeader.tsx
@@ -64,8 +64,8 @@ const PageHeader = ({
         },
     )
     const [expiryDate, setExpiryDate] = useState(0)
-    const [showTryDevtronModal, setShowTryDevtronModal] = useState(false)
-    const tryDevtronButtonText = window._env_.FEATURE_HEADER_TRY_DEVTRON_BUTTON_TEXT
+    const [showEmbeddedIframeModal, setEmbeddedIframeModal] = useState(false)
+    const embedIframeButtonText = window._env_.FEATURE_PROMO_EMBEDDED_BUTTON_TEXT
 
     const getCurrentServerInfo = async () => {
         try {
@@ -161,15 +161,15 @@ const PageHeader = ({
         <span className="fs-12 fw-4 lh-18 pt-1 pb-1 pl-6 pr-6 ml-8 cn-9 bcy-5 br-4">Beta</span>
     )
 
-    const onClickShowTryDevtronModal = () => setShowTryDevtronModal(true)
-    const onClickCloseTryDevtronModal = () => setShowTryDevtronModal(false)
+    const onClickShowTryDevtronModal = () => setEmbeddedIframeModal(true)
+    const onClickCloseTryDevtronModal = () => setEmbeddedIframeModal(false)
 
     const renderIframeDrawer = () => (
         <VisibleModal close={onClickCloseTryDevtronModal}>
-            <div className="modal-body--ci-material h-100 dc__overflow-hidden dc__border-left">
-                <div className="trigger-modal__header">
+            <div className="modal-body--ci-material h-100 dc__overflow-hidden dc__border-left flex column dc__content-space w-100">
+                <div className="trigger-modal__header w-100">
                     <h1 className="modal__title flex left fs-16 fw-6-imp" data-testid="app-details-url-heading">
-                        {window._env_.FEATURE_HEADER_TRY_DEVTRON_TITLE || tryDevtronButtonText}
+                        {window._env_.FEATURE_PROMO_EMBEDDED_MODAL_TITLE || embedIframeButtonText}
                     </h1>
                     <Button
                         ariaLabel="Try Devtron"
@@ -183,8 +183,8 @@ const PageHeader = ({
                     />
                 </div>
                 <iframe
-                    title={window._env_.FEATURE_HEADER_TRY_DEVTRON_TITLE || tryDevtronButtonText}
-                    src={window._env_.FEATURE_HEADER_TRY_DEVTRON_URL}
+                    title={window._env_.FEATURE_PROMO_EMBEDDED_MODAL_TITLE || embedIframeButtonText}
+                    src={window._env_.FEATURE_PROMO_EMBEDDED_IFRAME_URL}
                     width="100%"
                     height="100%"
                     className="dc__no-border"
@@ -196,12 +196,12 @@ const PageHeader = ({
     )
 
     const renderIframeButton = () =>
-        tryDevtronButtonText && (
+        embedIframeButtonText && (
             <Button
                 dataTestId="iframe-header-button"
                 size={ComponentSizeType.small}
                 onClick={onClickShowTryDevtronModal}
-                text={tryDevtronButtonText}
+                text={embedIframeButtonText}
                 variant={ButtonVariantType.secondary}
             />
         )
@@ -314,7 +314,7 @@ const PageHeader = ({
                     {renderLogoutHelpSection()}
                 </div>
             )}
-            {showTryDevtronModal && renderIframeDrawer()}
+            {showEmbeddedIframeModal && renderIframeDrawer()}
             {showAnnouncementHeader && <AnnouncementBanner parentClassName="page-header-banner" />}
         </div>
     )
diff --git a/src/index.ts b/src/index.ts
index 74c914605..78644c17e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -76,9 +76,9 @@ export interface customEnv {
     SYSTEM_CONTROLLER_LISTING_TIMEOUT?: number
     FEATURE_STEP_WISE_LOGS_ENABLE?: boolean
     FEATURE_IMAGE_PROMOTION_ENABLE?: boolean
-    FEATURE_HEADER_TRY_DEVTRON_BUTTON_TEXT?: string
-    FEATURE_HEADER_TRY_DEVTRON_TITLE?: string
-    FEATURE_HEADER_TRY_DEVTRON_URL?: string
+    FEATURE_PROMO_EMBEDDED_BUTTON_TEXT?: string
+    FEATURE_PROMO_EMBEDDED_MODAL_TITLE?: string
+    FEATURE_PROMO_EMBEDDED_IFRAME_URL?: string
 }
 declare global {
     interface Window {

From d7d21b6342399560a96067e51dc0d7fa00de844e Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Wed, 23 Oct 2024 15:38:38 +0530
Subject: [PATCH 10/16] chore: code refactoring

---
 .../Components/Header/IframePromoButton.tsx   | 67 +++++++++++++++++++
 src/Shared/Components/Header/PageHeader.tsx   | 53 +--------------
 2 files changed, 70 insertions(+), 50 deletions(-)
 create mode 100644 src/Shared/Components/Header/IframePromoButton.tsx

diff --git a/src/Shared/Components/Header/IframePromoButton.tsx b/src/Shared/Components/Header/IframePromoButton.tsx
new file mode 100644
index 000000000..9a79adacf
--- /dev/null
+++ b/src/Shared/Components/Header/IframePromoButton.tsx
@@ -0,0 +1,67 @@
+import { VisibleModal } from '@Common/index'
+import { ComponentSizeType } from '@Shared/constants'
+import { useState, useCallback } from 'react'
+import { ReactComponent as Close } from '@Icons/ic-close.svg'
+import { Button, ButtonStyleType, ButtonVariantType } from '../Button'
+
+export const IframePromoButton = () => {
+    const [showEmbeddedIframeModal, setEmbeddedIframeModal] = useState(false)
+
+    const {
+        FEATURE_PROMO_EMBEDDED_BUTTON_TEXT,
+        FEATURE_PROMO_EMBEDDED_MODAL_TITLE,
+        FEATURE_PROMO_EMBEDDED_IFRAME_URL,
+    } = window._env_
+
+    const onClickShowIframeModal = useCallback(() => setEmbeddedIframeModal(true), [])
+    const onClickCloseIframeModal = useCallback(() => setEmbeddedIframeModal(false), [])
+
+    const renderIframeDrawer = () => (
+        <VisibleModal close={onClickCloseIframeModal}>
+            <div className="modal-body--ci-material h-100 dc__overflow-hidden dc__border-left flex column dc__content-space w-100">
+                <div className="trigger-modal__header w-100">
+                    <h1 className="modal__title flex left fs-16 fw-6-imp" data-testid="app-details-url-heading">
+                        {FEATURE_PROMO_EMBEDDED_MODAL_TITLE || FEATURE_PROMO_EMBEDDED_BUTTON_TEXT}
+                    </h1>
+                    <Button
+                        ariaLabel="promo-header-button"
+                        dataTestId="iframe-modal-close-button"
+                        size={ComponentSizeType.small}
+                        onClick={onClickCloseIframeModal}
+                        style={ButtonStyleType.negativeGrey}
+                        variant={ButtonVariantType.borderLess}
+                        icon={<Close />}
+                        showAriaLabelInTippy={false}
+                    />
+                </div>
+                <iframe
+                    title={FEATURE_PROMO_EMBEDDED_MODAL_TITLE || FEATURE_PROMO_EMBEDDED_BUTTON_TEXT}
+                    src={FEATURE_PROMO_EMBEDDED_IFRAME_URL}
+                    width="100%"
+                    height="100%"
+                    className="dc__no-border"
+                    sandbox="allow-same-origin allow-scripts"
+                    referrerPolicy="no-referrer"
+                />
+            </div>
+        </VisibleModal>
+    )
+
+    const renderIframeButton = () =>
+        FEATURE_PROMO_EMBEDDED_BUTTON_TEXT && (
+            <Button
+                dataTestId="iframe-header-button"
+                size={ComponentSizeType.small}
+                onClick={onClickShowIframeModal}
+                text={FEATURE_PROMO_EMBEDDED_BUTTON_TEXT}
+                variant={ButtonVariantType.secondary}
+            />
+        )
+
+    return (
+        <div>
+            {renderIframeButton()}
+            {showEmbeddedIframeModal && renderIframeDrawer()}
+        </div>
+    )
+}
diff --git a/src/Shared/Components/Header/PageHeader.tsx b/src/Shared/Components/Header/PageHeader.tsx
index 5a4868fe7..aa2bc51eb 100644
--- a/src/Shared/Components/Header/PageHeader.tsx
+++ b/src/Shared/Components/Header/PageHeader.tsx
@@ -18,8 +18,7 @@ import { useEffect, useState } from 'react'
 import Tippy from '@tippyjs/react'
 import './pageHeader.css'
 import ReactGA from 'react-ga4'
-import { ComponentSizeType } from '@Shared/constants'
-import { getRandomColor, VisibleModal } from '../../../Common'
+import { getRandomColor } from '../../../Common'
 import LogoutCard from '../LogoutCard'
 import { setActionWithExpiry, handlePostHogEventUpdate } from './utils'
 import { InstallationType, ServerInfo, PageHeaderType } from './types'
@@ -33,8 +32,7 @@ import { ReactComponent as DropDownIcon } from '../../../Assets/Icon/ic-chevron-
 import AnnouncementBanner from '../AnnouncementBanner/AnnouncementBanner'
 import { useMainContext, useUserEmail } from '../../Providers'
 import { InfoIconTippy } from '../InfoIconTippy'
-import { ButtonStyleType, ButtonVariantType } from '../Button/types'
-import { Button } from '../Button'
+import { IframePromoButton } from './IframePromoButton'
 
 const PageHeader = ({
     headerName,
@@ -64,8 +62,6 @@ const PageHeader = ({
         },
     )
     const [expiryDate, setExpiryDate] = useState(0)
-    const [showEmbeddedIframeModal, setEmbeddedIframeModal] = useState(false)
-    const embedIframeButtonText = window._env_.FEATURE_PROMO_EMBEDDED_BUTTON_TEXT
 
     const getCurrentServerInfo = async () => {
         try {
@@ -161,50 +157,8 @@ const PageHeader = ({
         <span className="fs-12 fw-4 lh-18 pt-1 pb-1 pl-6 pr-6 ml-8 cn-9 bcy-5 br-4">Beta</span>
     )
 
-    const onClickShowTryDevtronModal = () => setEmbeddedIframeModal(true)
-    const onClickCloseTryDevtronModal = () => setEmbeddedIframeModal(false)
+    const renderIframeButton = () => <IframePromoButton />
 
-    const renderIframeDrawer = () => (
-        <VisibleModal close={onClickCloseTryDevtronModal}>
-            <div className="modal-body--ci-material h-100 dc__overflow-hidden dc__border-left flex column dc__content-space w-100">
-                <div className="trigger-modal__header w-100">
-                    <h1 className="modal__title flex left fs-16 fw-6-imp" data-testid="app-details-url-heading">
-                        {window._env_.FEATURE_PROMO_EMBEDDED_MODAL_TITLE || embedIframeButtonText}
-                    </h1>
-                    <Button
-                        ariaLabel="Try Devtron"
-                        dataTestId="iframe-modal-close-button"
-                        size={ComponentSizeType.small}
-                        onClick={onClickCloseTryDevtronModal}
-                        style={ButtonStyleType.negativeGrey}
-                        variant={ButtonVariantType.borderLess}
-                        icon={<Close />}
-                        showAriaLabelInTippy={false}
-                    />
-                </div>
-                <iframe
-                    title={window._env_.FEATURE_PROMO_EMBEDDED_MODAL_TITLE || embedIframeButtonText}
-                    src={window._env_.FEATURE_PROMO_EMBEDDED_IFRAME_URL}
-                    width="100%"
-                    height="100%"
-                    className="dc__no-border"
-                    sandbox="allow-same-origin allow-scripts"
-                    referrerPolicy="no-referrer"
-                />
-            </div>
-        </VisibleModal>
-    )
-
-    const renderIframeButton = () =>
-        embedIframeButtonText && (
-            <Button
-                dataTestId="iframe-header-button"
-                size={ComponentSizeType.small}
-                onClick={onClickShowTryDevtronModal}
-                text={embedIframeButtonText}
-                variant={ButtonVariantType.secondary}
-            />
-        )
     return (
         <div
             className={`dc__page-header dc__content-space cn-9 bcn-0 pl-20 pr-20 ${
@@ -314,7 +268,6 @@ const PageHeader = ({
                     {renderLogoutHelpSection()}
                 </div>
             )}
-            {showEmbeddedIframeModal && renderIframeDrawer()}
             {showAnnouncementHeader && <AnnouncementBanner parentClassName="page-header-banner" />}
         </div>
     )

From 2caa3a7cf9078379ea0bf55fb1e2d32e821dc862 Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Wed, 23 Oct 2024 15:40:41 +0530
Subject: [PATCH 11/16] chore: version bump

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 62fb0a6c1..cf0f86ac3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.5.7-beta-4",
+    "version": "0.5.7-patch-1",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@devtron-labs/devtron-fe-common-lib",
-            "version": "0.5.7-beta-4",
+            "version": "0.5.7-patch-1",
             "license": "ISC",
             "dependencies": {
                 "@types/react-dates": "^21.8.6",
diff --git a/package.json b/package.json
index 46f2c6128..5c4537ca0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.5.7-beta-4",
+    "version": "0.5.7-patch-1",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

From 128242347c89bc486ae02e5e28c85dd9b6e768fd Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Wed, 23 Oct 2024 15:47:16 +0530
Subject: [PATCH 12/16] url check added

---
 .../Components/Header/IframePromoButton.tsx   | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/Shared/Components/Header/IframePromoButton.tsx b/src/Shared/Components/Header/IframePromoButton.tsx
index 9a79adacf..69bc41c99 100644
--- a/src/Shared/Components/Header/IframePromoButton.tsx
+++ b/src/Shared/Components/Header/IframePromoButton.tsx
@@ -34,15 +34,19 @@ export const IframePromoButton = () => {
                         showAriaLabelInTippy={false}
                     />
                 </div>
-                <iframe
-                    title={FEATURE_PROMO_EMBEDDED_MODAL_TITLE || FEATURE_PROMO_EMBEDDED_BUTTON_TEXT}
-                    src={FEATURE_PROMO_EMBEDDED_IFRAME_URL}
-                    width="100%"
-                    height="100%"
-                    className="dc__no-border"
-                    sandbox="allow-same-origin allow-scripts"
-                    referrerPolicy="no-referrer"
-                />
+                {FEATURE_PROMO_EMBEDDED_IFRAME_URL ? (
+                    <iframe
+                        title={FEATURE_PROMO_EMBEDDED_MODAL_TITLE || FEATURE_PROMO_EMBEDDED_BUTTON_TEXT}
+                        src={FEATURE_PROMO_EMBEDDED_IFRAME_URL}
+                        width="100%"
+                        height="100%"
+                        className="dc__no-border"
+                        sandbox="allow-same-origin allow-scripts"
+                        referrerPolicy="no-referrer"
+                    />
+                ) : (
+                    <div className="flex h-100">No data available.</div>
+                )}
             </div>
         </VisibleModal>
     )

From 6a1d40dcaccaedb2f508ea694c6037dedd11b613 Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Wed, 23 Oct 2024 16:04:58 +0530
Subject: [PATCH 13/16] chore: code refactoring

---
 .../Components/Header/IframePromoButton.tsx   | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/Shared/Components/Header/IframePromoButton.tsx b/src/Shared/Components/Header/IframePromoButton.tsx
index 69bc41c99..b234955e2 100644
--- a/src/Shared/Components/Header/IframePromoButton.tsx
+++ b/src/Shared/Components/Header/IframePromoButton.tsx
@@ -51,20 +51,17 @@ export const IframePromoButton = () => {
         </VisibleModal>
     )
 
-    const renderIframeButton = () =>
-        FEATURE_PROMO_EMBEDDED_BUTTON_TEXT && (
-            <Button
-                dataTestId="iframe-header-button"
-                size={ComponentSizeType.small}
-                onClick={onClickShowIframeModal}
-                text={FEATURE_PROMO_EMBEDDED_BUTTON_TEXT}
-                variant={ButtonVariantType.secondary}
-            />
-        )
-
     return (
         <div>
-            {renderIframeButton()}
+            {FEATURE_PROMO_EMBEDDED_BUTTON_TEXT && (
+                <Button
+                    dataTestId="iframe-header-button"
+                    size={ComponentSizeType.small}
+                    onClick={onClickShowIframeModal}
+                    text={FEATURE_PROMO_EMBEDDED_BUTTON_TEXT}
+                    variant={ButtonVariantType.secondary}
+                />
+            )}
             {showEmbeddedIframeModal && renderIframeDrawer()}
         </div>
     )

From 6f2b3072cf698de9b2a117b3e7e1041bb4444eb0 Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Wed, 23 Oct 2024 17:09:48 +0530
Subject: [PATCH 14/16] empty state for no iframe

---
 src/Shared/Components/Header/IframePromoButton.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Shared/Components/Header/IframePromoButton.tsx b/src/Shared/Components/Header/IframePromoButton.tsx
index b234955e2..8de6b87bf 100644
--- a/src/Shared/Components/Header/IframePromoButton.tsx
+++ b/src/Shared/Components/Header/IframePromoButton.tsx
@@ -1,4 +1,4 @@
-import { VisibleModal } from '@Common/index'
+import { GenericEmptyState, VisibleModal } from '@Common/index'
 import { ComponentSizeType } from '@Shared/constants'
 import { useState, useCallback } from 'react'
 import { ReactComponent as Close } from '@Icons/ic-close.svg'
@@ -45,7 +45,12 @@ export const IframePromoButton = () => {
                         referrerPolicy="no-referrer"
                     />
                 ) : (
-                    <div className="flex h-100">No data available.</div>
+                    <div className="flex h-100">
+                        <GenericEmptyState
+                            title="Nothing to show"
+                            subTitle="An iframe appears here in a parallel universe"
+                        />
+                    </div>
                 )}
             </div>
         </VisibleModal>

From 805160d24f47a0bc2a2481ff7c28865ffb612287 Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Wed, 23 Oct 2024 17:21:00 +0530
Subject: [PATCH 15/16] chore: version bump

---
 package-lock.json | 19 +++++++++----------
 package.json      |  7 +++----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cf0f86ac3..371caf83c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,19 +1,19 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.5.7-patch-1",
+    "version": "0.5.9",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@devtron-labs/devtron-fe-common-lib",
-            "version": "0.5.7-patch-1",
+            "version": "0.5.9",
             "license": "ISC",
             "dependencies": {
                 "@types/react-dates": "^21.8.6",
                 "ansi_up": "^5.2.1",
                 "dayjs": "^1.11.13",
                 "fast-json-patch": "^3.1.1",
-                "jsonpath-plus": "^10.0.0",
+                "jsonpath-plus": "^9.0.0",
                 "react-dates": "^21.8.0",
                 "react-monaco-editor": "^0.54.0",
                 "sass": "^1.69.7",
@@ -21,7 +21,7 @@
             },
             "devDependencies": {
                 "@esbuild-plugins/node-globals-polyfill": "0.2.3",
-                "@sentry/browser": "^7.119.1",
+                "@sentry/browser": "^7.31.1",
                 "@testing-library/jest-dom": "^5.16.2",
                 "@testing-library/react": "^12.1.4",
                 "@tippyjs/react": "^4.2.0",
@@ -70,7 +70,6 @@
                 "react-draggable": "^4.4.5",
                 "react-ga4": "^1.4.1",
                 "react-mde": "^11.5.0",
-                "react-router": "^5.3.0",
                 "react-router-dom": "^5.3.0",
                 "react-select": "5.8.0",
                 "rxjs": "^7.8.1",
@@ -6827,20 +6826,20 @@
             }
         },
         "node_modules/jsonpath-plus": {
-            "version": "10.1.0",
-            "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-10.1.0.tgz",
-            "integrity": "sha512-gHfV1IYqH8uJHYVTs8BJX1XKy2/rR93+f8QQi0xhx95aCiXn1ettYAd5T+7FU6wfqyDoX/wy0pm/fL3jOKJ9Lg==",
+            "version": "9.0.0",
+            "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-9.0.0.tgz",
+            "integrity": "sha512-bqE77VIDStrOTV/czspZhTn+o27Xx9ZJRGVkdVShEtPoqsIx5yALv3lWVU6y+PqYvWPJNWE7ORCQheQkEe0DDA==",
             "dependencies": {
                 "@jsep-plugin/assignment": "^1.2.1",
                 "@jsep-plugin/regex": "^1.0.3",
-                "jsep": "^1.3.9"
+                "jsep": "^1.3.8"
             },
             "bin": {
                 "jsonpath": "bin/jsonpath-cli.js",
                 "jsonpath-plus": "bin/jsonpath-cli.js"
             },
             "engines": {
-                "node": ">=18.0.0"
+                "node": ">=14.0.0"
             }
         },
         "node_modules/jsonpointer": {
diff --git a/package.json b/package.json
index 5c4537ca0..b069fad15 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.5.7-patch-1",
+    "version": "0.5.9",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
@@ -35,7 +35,7 @@
     },
     "devDependencies": {
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
-        "@sentry/browser": "^7.119.1",
+        "@sentry/browser": "^7.31.1",
         "@testing-library/jest-dom": "^5.16.2",
         "@testing-library/react": "^12.1.4",
         "@tippyjs/react": "^4.2.0",
@@ -84,7 +84,6 @@
         "react-draggable": "^4.4.5",
         "react-ga4": "^1.4.1",
         "react-mde": "^11.5.0",
-        "react-router": "^5.3.0",
         "react-router-dom": "^5.3.0",
         "react-select": "5.8.0",
         "rxjs": "^7.8.1",
@@ -95,7 +94,7 @@
         "ansi_up": "^5.2.1",
         "dayjs": "^1.11.13",
         "fast-json-patch": "^3.1.1",
-        "jsonpath-plus": "^10.0.0",
+        "jsonpath-plus": "^9.0.0",
         "react-dates": "^21.8.0",
         "react-monaco-editor": "^0.54.0",
         "sass": "^1.69.7",

From 104843d4451dddb5fe8a5166cb02bd9951a8ab27 Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Wed, 23 Oct 2024 17:49:22 +0530
Subject: [PATCH 16/16] chore: version change

---
 package-lock.json | 15 ++++++++-------
 package.json      |  5 +++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 371caf83c..10adadb0e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
                 "ansi_up": "^5.2.1",
                 "dayjs": "^1.11.13",
                 "fast-json-patch": "^3.1.1",
-                "jsonpath-plus": "^9.0.0",
+                "jsonpath-plus": "^10.0.0",
                 "react-dates": "^21.8.0",
                 "react-monaco-editor": "^0.54.0",
                 "sass": "^1.69.7",
@@ -21,7 +21,7 @@
             },
             "devDependencies": {
                 "@esbuild-plugins/node-globals-polyfill": "0.2.3",
-                "@sentry/browser": "^7.31.1",
+                "@sentry/browser": "^7.119.1",
                 "@testing-library/jest-dom": "^5.16.2",
                 "@testing-library/react": "^12.1.4",
                 "@tippyjs/react": "^4.2.0",
@@ -70,6 +70,7 @@
                 "react-draggable": "^4.4.5",
                 "react-ga4": "^1.4.1",
                 "react-mde": "^11.5.0",
+                "react-router": "^5.3.0",
                 "react-router-dom": "^5.3.0",
                 "react-select": "5.8.0",
                 "rxjs": "^7.8.1",
@@ -6826,20 +6827,20 @@
             }
         },
         "node_modules/jsonpath-plus": {
-            "version": "9.0.0",
-            "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-9.0.0.tgz",
-            "integrity": "sha512-bqE77VIDStrOTV/czspZhTn+o27Xx9ZJRGVkdVShEtPoqsIx5yALv3lWVU6y+PqYvWPJNWE7ORCQheQkEe0DDA==",
+            "version": "10.1.0",
+            "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-10.1.0.tgz",
+            "integrity": "sha512-gHfV1IYqH8uJHYVTs8BJX1XKy2/rR93+f8QQi0xhx95aCiXn1ettYAd5T+7FU6wfqyDoX/wy0pm/fL3jOKJ9Lg==",
             "dependencies": {
                 "@jsep-plugin/assignment": "^1.2.1",
                 "@jsep-plugin/regex": "^1.0.3",
-                "jsep": "^1.3.8"
+                "jsep": "^1.3.9"
             },
             "bin": {
                 "jsonpath": "bin/jsonpath-cli.js",
                 "jsonpath-plus": "bin/jsonpath-cli.js"
             },
             "engines": {
-                "node": ">=14.0.0"
+                "node": ">=18.0.0"
             }
         },
         "node_modules/jsonpointer": {
diff --git a/package.json b/package.json
index b069fad15..c31630f5e 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     },
     "devDependencies": {
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
-        "@sentry/browser": "^7.31.1",
+        "@sentry/browser": "^7.119.1",
         "@testing-library/jest-dom": "^5.16.2",
         "@testing-library/react": "^12.1.4",
         "@tippyjs/react": "^4.2.0",
@@ -84,6 +84,7 @@
         "react-draggable": "^4.4.5",
         "react-ga4": "^1.4.1",
         "react-mde": "^11.5.0",
+        "react-router": "^5.3.0",
         "react-router-dom": "^5.3.0",
         "react-select": "5.8.0",
         "rxjs": "^7.8.1",
@@ -94,7 +95,7 @@
         "ansi_up": "^5.2.1",
         "dayjs": "^1.11.13",
         "fast-json-patch": "^3.1.1",
-        "jsonpath-plus": "^9.0.0",
+        "jsonpath-plus": "^10.0.0",
         "react-dates": "^21.8.0",
         "react-monaco-editor": "^0.54.0",
         "sass": "^1.69.7",