Merge pull request #911 from devtron-labs/feat/infra-overview

arunjaindev · web-flow · commit 7c274e20fa9f · 2025-10-10T16:53:16.000+05:30
feat: infrastructure management overview
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.20.6-pre-2",
+    "version": "1.20.6-pre-3",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
diff --git a/src/Assets/IconV2/ic-bg-cpu.svg b/src/Assets/IconV2/ic-bg-cpu.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <g clip-path="url(#a)">
+    <path fill="#FFF5E5" d="M0 6a6 6 0 0 1 6-6h12a6 6 0 0 1 6 6v12a6 6 0 0 1-6 6H6a6 6 0 0 1-6-6V6Z"/>
+    <path stroke="#FFB549" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M18.154 10.154H20m-1.846 3.692H20M4 10.154h1.846M4 13.846h1.846m8 4.308V20m-3.692-1.846V20m3.692-16v1.846M10.154 4v1.846m-.308 4h4.308v4.308H9.846V9.846Zm-4-1.949v8.206c0 1.132.919 2.05 2.051 2.05h8.206a2.051 2.051 0 0 0 2.05-2.05V7.897a2.051 2.051 0 0 0-2.05-2.05H7.897a2.051 2.051 0 0 0-2.05 2.05Z" vector-effect="non-scaling-stroke"/>
+  </g>
+  <defs>
+    <clipPath id="a">
+      <path fill="#fff" d="M0 0h24v24H0z"/>
+    </clipPath>
+  </defs>
+</svg>
diff --git a/src/Assets/IconV2/ic-bg-memory.svg b/src/Assets/IconV2/ic-bg-memory.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <g clip-path="url(#a)">
+    <path fill="#FCF3F0" d="M0 6a6 6 0 0 1 6-6h12a6 6 0 0 1 6 6v12a6 6 0 0 1-6 6H6a6 6 0 0 1-6-6V6Z"/>
+    <path stroke="#FF7E5B" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M7.2 17.5v-2.357m3.2 2.357v-2.357m3.2 2.357v-2.357m3.2 2.357v-2.357m-8-3.929V9.643m6.4 1.571V9.643M12 11.214V9.643m-8 4.714h16M4 8.071c0-.416.169-.816.469-1.11.3-.295.707-.461 1.131-.461h12.8c.424 0 .831.166 1.131.46.3.295.469.695.469 1.111v.865a1.6 1.6 0 0 0-.83.566 1.553 1.553 0 0 0 0 1.882 1.6 1.6 0 0 0 .83.566v3.979c0 .416-.169.816-.469 1.11-.3.295-.707.461-1.131.461H5.6c-.424 0-.831-.166-1.131-.46A1.557 1.557 0 0 1 4 15.929V11.92a1.6 1.6 0 0 0 .83-.566 1.553 1.553 0 0 0 0-1.882A1.6 1.6 0 0 0 4 8.907V8.07Z" vector-effect="non-scaling-stroke"/>
+  </g>
+  <defs>
+    <clipPath id="a">
+      <path fill="#fff" d="M0 0h24v24H0z"/>
+    </clipPath>
+  </defs>
+</svg>
diff --git a/src/Assets/IconV2/ic-check-circle.svg b/src/Assets/IconV2/ic-check-circle.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 9-6.667 6.666L7 12.333M22 12c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2s10 4.477 10 10Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-gift-animated.svg b/src/Assets/IconV2/ic-gift-animated.svg
@@ -1 +1,38 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg"><style>@keyframes top-move{0%,20%,to{transform:translateY(0)}10%{transform:translateY(-5px)}}@keyframes top-shake{0%,25%,5%,to{transform:rotate(0deg)}10%{transform:rotate(-8deg)}15%{transform:rotate(8deg)}}@keyframes bottom-jump{0%{transform:translateY(0)}5%{transform:translateY(-5px)}15%,to{transform:translateX(0)}}</style><g style="animation:bottom-jump 5s infinite ease-out;transform-origin:center;transform-box:fill-box"><path d="M8 27.996h34v19a3 3 0 0 1-3 3H11a3 3 0 0 1-3-3z" fill="#D0DBF7"/><path fill="#376CFB" d="M19 27.996h12v22H19z"/></g><g style="animation:top-move 5s infinite ease-out;transform-origin:center;transform-box:fill-box"><g style="animation:top-shake 5s infinite ease-out;transform-origin:center;transform-box:fill-box"><path d="M12.49 12.819c1.226-2.666 4.074-3.172 6.21-2.619 1.97.512 3.69 1.925 4.93 3.37 1.227 1.428 2.146 3.078 2.354 4.252l.208 1.174H16.036c-1.625 0-2.904-.794-3.56-2.037-.642-1.213-.632-2.734.014-4.14m5.708-.683c-1.58-.41-3.214.048-3.89 1.519-.427.928-.373 1.787-.065 2.37.293.553.87.971 1.793.971h7.526a11.3 11.3 0 0 0-1.449-2.124c-1.106-1.289-2.498-2.369-3.915-2.736" fill="#376CFB"/><path d="M37.51 12.819c-1.226-2.666-4.075-3.172-6.21-2.619-1.97.512-3.69 1.925-4.93 3.37-1.227 1.428-2.146 3.078-2.354 4.252l-.208 1.174h10.156c1.625 0 2.904-.794 3.56-2.037.642-1.213.632-2.734-.014-4.14m-5.708-.683c1.58-.41 3.214.048 3.89 1.519.427.928.373 1.787.065 2.37-.293.553-.87.971-1.793.971h-7.526a11.3 11.3 0 0 1 1.449-2.124c1.106-1.289 2.499-2.369 3.915-2.736" fill="#376CFB"/><path fill="#00173F" opacity=".15" d="M8 27.996h34v3H8z"/><rect x="5" y="16.996" width="40" height="11" rx="3" fill="#E6ECFF"/><path fill="#4294FF" d="M16 16.996h18v11H16z"/></g></g></svg>
+<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <!-- Bottom jump group -->
+    <g transform="translate(0 0)">
+        <animateTransform attributeName="transform" type="translate" values="0 0; 0 -5; 0 0; 0 0"
+            keyTimes="0;0.06;0.15;1" dur="5s" repeatCount="indefinite" calcMode="spline"
+            keySplines="0.25 0.1 0.25 1;0.42 0 0.58 1;0 0 1 1" />
+        <path d="M8 27.996h34v19a3 3 0 0 1-3 3H11a3 3 0 0 1-3-3z" fill="#D0DBF7" />
+        <path fill="#376CFB" d="M19 27.996h12v22H19z" />
+    </g>
+
+    <!-- Top group (translate + nested rotate) -->
+    <g transform="translate(0 0)">
+        <animateTransform attributeName="transform" type="translate" values="0 0; 0 -5; 0 0; 0 0" keyTimes="0;0.1;0.2;1"
+            dur="5s" repeatCount="indefinite" calcMode="spline" keySplines="0.25 0.1 0.25 1;0.42 0 0.58 1;0 0 1 1" />
+
+        <!-- Nested rotate: rotate(angle cx cy) values to keep center consistent -->
+        <g transform="rotate(0 25 18)">
+            <animateTransform attributeName="transform" type="rotate"
+                values="0 25 18; -8 25 18; 8 25 18; 0 25 18; 0 25 18" keyTimes="0;0.1;0.15;0.25;1" dur="5s"
+                repeatCount="indefinite" calcMode="spline" keySplines="
+                0.25 0.1 0.25 1;
+                0.42 0 0.58 1;
+                0.42 0 1 1;
+                0 0 1 1" />
+
+
+            <path
+                d="M12.49 12.819c1.226-2.666 4.074-3.172 6.21-2.619 1.97.512 3.69 1.925 4.93 3.37 1.227 1.428 2.146 3.078 2.354 4.252l.208 1.174H16.036c-1.625 0-2.904-.794-3.56-2.037-.642-1.213-.632-2.734.014-4.14m5.708-.683c-1.58-.41-3.214.048-3.89 1.519-.427.928-.373 1.787-.065 2.37.293.553.87.971 1.793.971h7.526a11.3 11.3 0 0 0-1.449-2.124c-1.106-1.289-2.498-2.369-3.915-2.736"
+                fill="#376CFB" />
+            <path
+                d="M37.51 12.819c-1.226-2.666-4.075-3.172-6.21-2.619-1.97.512-3.69 1.925-4.93 3.37-1.227 1.428-2.146 3.078-2.354 4.252l-.208 1.174h10.156c1.625 0 2.904-.794 3.56-2.037.642-1.213.632-2.734-.014-4.14m-5.708-.683c1.58-.41 3.214.048 3.89 1.519.427.928.373 1.787.065 2.37-.293.553-.87.971-1.793.971h-7.526a11.3 11.3 0 0 1 1.449-2.124c1.106-1.289 2.499-2.369 3.915-2.736"
+                fill="#376CFB" />
+            <path fill="#00173F" opacity=".15" d="M8 27.996h34v3H8z" />
+            <rect x="5" y="16.996" width="40" height="11" rx="3" fill="#E6ECFF" />
+            <path fill="#4294FF" d="M16 16.996h18v11H16z" />
+        </g>
+    </g>
+</svg>
diff --git a/src/Assets/IconV2/ic-party.svg b/src/Assets/IconV2/ic-party.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path fill="#1DAD70" d="m5.52 14.521 3.96 3.959-4.747 1.725a.73.73 0 0 1-.937-.937L5.52 14.52Zm13.015-.442L9.921 5.465a.73.73 0 0 0-1.202.267L7.322 9.576l7.108 7.108 3.844-1.397a.73.73 0 0 0 .261-1.208Z" opacity=".2"/>
+  <path fill="#1DAD70" d="M10.452 4.934a1.482 1.482 0 0 0-2.437.541L3.094 19.011A1.484 1.484 0 0 0 4.478 21c.174-.001.348-.033.511-.094l13.535-4.922a1.48 1.48 0 0 0 .542-2.437l-8.614-8.613Zm-.78 12.676L6.39 14.329l1.234-3.395 5.442 5.442-3.395 1.234Zm-5.157 1.875 1.313-3.6 2.292 2.291-3.605 1.309Zm10.11-3.675L8.19 9.375l1.22-3.363 8.571 8.572-3.355 1.226ZM15 6.75a3.543 3.543 0 0 1 .36-1.46c.497-.993 1.434-1.54 2.64-1.54.628 0 1.031-.215 1.28-.676.13-.258.206-.54.22-.83a.75.75 0 1 1 1.5.006c0 1.206-.799 3-3 3-.628 0-1.031.215-1.28.676-.13.258-.205.54-.22.83A.751.751 0 0 1 15 6.75Zm-2.25-3V1.5a.75.75 0 1 1 1.5 0v2.25a.75.75 0 1 1-1.5 0Zm9.53 7.72a.752.752 0 0 1-.53 1.28.75.75 0 0 1-.53-.22l-1.5-1.5a.75.75 0 0 1 1.06-1.062l1.5 1.501Zm.457-4.008-2.25.75a.75.75 0 0 1-.474-1.424l2.25-.75a.75.75 0 1 1 .474 1.424Z"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-warning-stroke.svg b/src/Assets/IconV2/ic-warning-stroke.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="M12 16.5v.5m0-7.5v4m-1.298-9.751L2.454 17.998a1.5 1.5 0 0 0 1.298 2.251h16.496a1.5 1.5 0 0 0 1.298-2.251l-8.248-14.25a1.5 1.5 0 0 0-2.596 0Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/Illustration/img-folder-empty.svg b/src/Assets/Illustration/img-folder-empty.svg
@@ -0,0 +1,33 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="250" height="200" fill="none" viewBox="0 0 250 200">
+  <ellipse cx="187" cy="168" fill="#000A14" fill-opacity=".05" rx="30" ry="4"/>
+  <rect width="72" height="60" x="151" y="76" fill="#FDBF00" rx="4"/>
+  <path fill="#FFDA2D" d="M161 84a4 4 0 0 1 4-4h12.31a2 2 0 0 1 1.233.425l10.414 8.15a2 2 0 0 0 1.233.425H223v43a4 4 0 0 1-4 4h-54a4 4 0 0 1-4-4V84Z"/>
+  <path fill="#fff" d="M167 125h24v5h-24z"/>
+  <rect width="15" height="2" x="203" y="94" fill="#FDBF00" rx="1"/>
+  <rect width="21" height="2" x="197" y="99" fill="#FDBF00" rx="1"/>
+  <path fill="#80AEF2" d="M55.877 189.887c0-.113 1.132-3.227 2.49-6.963l2.491-6.792 6.34-.17 6.283-.17 2.717 2.264c2.264 1.925 12.557 7.406 13.868 8.151.875.497 2.028 1.762 3.46 3.793-25.1-.038-37.649-.075-37.649-.113Z"/>
+  <path fill="#94BBF8" d="M22.943 189.887c0-.113 1.133-3.227 2.491-6.963l2.49-6.792 6.34-.17 6.283-.17 2.718 2.264c2.264 1.925 12.556 7.406 13.868 8.151.874.497 2.027 1.762 3.46 3.793-25.1-.038-37.65-.075-37.65-.113Z"/>
+  <path fill="#1D225F" d="M65.785 109.936c1.07 3.098 1.792 5.787 2.166 8.065.374 2.279 2.47 21.742 6.292 58.39H56.6c-1.417-2.569-2.126-4.374-2.126-5.414 0-1.561.897-3.699.897-5.955 0-1.504-1.997-6.696-5.991-15.575l3.858-38.614 12.547-.897Z"/>
+  <path fill="url(#a)" fill-rule="evenodd" d="M41.151 176.391h-16.48c-.391-1.359-.776-3.193-1.152-5.502-.736-4.698-.176-7.811 2.994-14.264 3.17-6.397 4.774-9.885 4.774-13.508.057-5.66 1.2-11.104 4.2-16.991 2.32-4.642 3.43-4.992 3.656-7.822l.412-6.086h20.684c.503 1.407.684 3.999.54 7.777-.142 3.778-6.685 22.577-19.628 56.396Z" clip-rule="evenodd"/>
+  <path fill="#98BDF9" d="m85.69 52.019 16.526-20.442h19.815L104.917 52.02H85.69Z"/>
+  <path fill="#2174DB" d="M107.476 29.022a2.555 2.555 0 0 1 2.549 2.38l.006.175h-.568a1.987 1.987 0 1 0-2.15 1.98l.163.008v.567a2.555 2.555 0 0 1 0-5.11Zm6.814 0a2.555 2.555 0 0 1 2.549 2.38l.006.175h-.568a1.987 1.987 0 1 0-2.15 1.98l.163.008v.567a2.555 2.555 0 1 1 0-5.11Z"/>
+  <path fill="#F3A29D" d="M84.25 55.955c2.754-.944 5.45-2.256 8.087-3.936h6.743c-2.33 2.129-3.897 3.637-4.701 4.523-.805.887-2.462 2.59-4.974 5.11-1.07 5.672-2.211 8.055-3.422 7.148-1.815-1.36-7.79-10.694-1.734-12.845Z"/>
+  <path fill="#FAB6AF" d="M87.96 61.671c4.282-1.636 7.045-2.803 8.29-3.5 1.472-.85 2.038-1.642 3.736-5.208.226-.453.679-2.32 1.075-4.075.906-4.472 2.378-4.246 2.491.34.057 1.244.34 2.377.679 2.49.283.113 1.925-1.472 3.566-3.51 1.642-2.038 3.227-3.679 3.51-3.679.679 0 .679 5.208-.057 7.019-.283.85-4.641 5.604-9.679 10.642-3.359 3.358-8.274 7.917-14.746 13.677l1.136-14.196Z"/>
+  <path fill="#F3A29D" d="M68.656 37.255c.757-3.028 1.514-4.92 2.27-5.678-1.135-1.136-2.27-2.271-4.542-3.407-.757 1.514-2.27 3.028-4.542 4.543 0 2.271.757 3.785 2.271 4.542 1.514.757 3.028.757 4.543 0Z"/>
+  <path fill="url(#b)" d="M39.929 113.021c-2.321-.17-6.114-.962-8.321-1.698l-4.132-1.359-.114-4.245c-.283-11.717.566-20.265 3.227-31.19 3.623-15 14.038-30.34 26.66-39.34 4.869-3.51 4.982-3.51 6.397-1.132.623 1.132 1.925 2.264 2.83 2.604l2.121.583c-2.99 28.777-1.834 52.63 3.466 71.556-1.136 1.136-1.91 1.651-2.756 2.013-1.02.397-2.321.793-3 .849-.68.057-2.944.51-5.151 1.019-4.133.906-13.133 1.076-21.227.34Z"/>
+  <path fill="#D6D7D8" fill-rule="evenodd" d="m84.25 55.955 1.734 11.1-19.6 2.595 1.086-15.36c2.102 1.702 4.263 2.724 6.484 3.065 2.222.34 5.654-.126 10.296-1.4Z" clip-rule="evenodd"/>
+  <path fill="#E9E9E9" d="m87.961 61.672 4.812 22.712c-.558 1.136-1.973 1.893-4.244 2.271-5.11.568-10.22-1.703-16.467-1.703-6.246 0-5.977 3.975-15.062.568-6.056-2.271-8.517-12.492-7.381-30.662l17.716-1.697c-.076 5.673.643 9.078 2.157 10.214 1.484 1.113 7.428.59 17.83-1.57l.64-.133Z"/>
+  <path fill="#FAB6AF" d="M80.16 17.305c1.05 1.491 1.46 3.47 1.229 5.936-.06.643-.368.866-.368 2.014 0 1.1.069 2.46.207 4.08l-2.273.158c-2.181 2.366-4.49 3.415-6.924 3.146-2.434-.269-4.172-1.318-5.212-3.146-2.138-3.949-1.59-7.306 1.645-10.071 3.235-2.766 7.133-3.471 11.696-2.117Z"/>
+  <path fill="#E94A47" fill-rule="evenodd" d="M69.7 10c2.55 0 5.61.998 7.845 2.689 2.234 1.69 3.773 2.964 4.465 5.002.46 1.358.243 3.252-.652 5.683.127-2.301-.047-3.579-.522-3.833-.658 1.622-1.566 1.95-2.653 2.734-.609.44-2.74.509-4.826.88-2.579 1.69-4.222 3.27-4.775 4.77-.44 1.196-.395 2.559.145 4.099l.123.332-.529.207c-.701-1.799-.795-3.413-.272-4.833.512-1.39 1.815-2.785 3.82-4.24-1.068.3-2.012.74-2.584 1.421-1.255 1.498-1.99 3.695-2.204 6.591-2.714-.49-5.206-1.407-7.475-2.747-2.269-1.341-4.362-3.135-6.279-5.381.39-.82.887-1.496 1.494-2.031.658-.582 1.898-1.088 3.109-1.79l-.064.022-1.181.394c-1.237.416-1.92.699-2.351 1.012-.814.59-1.236 1.251-1.288 1.994l-.005.188-.568.006c-.012-1.019.506-1.907 1.527-2.648.42-.304.995-.563 1.947-.899l1.722-.58.6-.208a14.213 14.213 0 0 0 1.412-.573c1.272-1.373 2.13-3.897 4.012-5.572C65.771 10.839 67.151 10 69.7 10Z" clip-rule="evenodd"/>
+  <path fill="#222768" d="M74.327 23.322c.585-1.61 2.128-2.55 3.469-2.061 1.041.379 1.622 1.495 1.556 2.729a3.95 3.95 0 0 1 .97-.134l.204.008c.25.019.457.054.624.11.502-1.246 1.676-1.984 2.698-1.612 1.05.383 1.47 1.769.993 3.081s-1.69 2.104-2.741 1.721c-.935-.34-1.371-1.475-1.12-2.646a1.96 1.96 0 0 0-.497-.088c-.328-.025-.724.028-1.187.161l-.03.01a3.86 3.86 0 0 1-.137.468c-.586 1.61-2.129 2.55-3.47 2.061-1.34-.488-1.918-2.2-1.332-3.808Zm9.326-.426c-.717-.261-1.633.336-2.013 1.382-.38 1.045-.063 2.092.654 2.353.717.26 1.633-.337 2.014-1.382.38-1.046.063-2.092-.655-2.353Zm-6.051-1.102c-1.017-.37-2.255.384-2.742 1.722-.487 1.337-.023 2.71.994 3.08 1.016.37 2.254-.383 2.741-1.72.487-1.338.023-2.712-.993-3.082Z"/>
+  <defs>
+    <linearGradient id="a" x1="43.912" x2="29.088" y1="112.218" y2="174.104" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#2A318C"/>
+      <stop offset="1" stop-color="#1D225F"/>
+    </linearGradient>
+    <linearGradient id="b" x1="49.687" x2="49.687" y1="32.395" y2="113.481" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#EEE"/>
+      <stop offset="1" stop-color="#D6D7D8"/>
+    </linearGradient>
+  </defs>
+</svg>
diff --git a/src/Pages/ResourceBrowser/types.ts b/src/Pages/ResourceBrowser/types.ts
@@ -25,6 +25,7 @@ export enum ClusterFiltersType {
     ALL_CLUSTERS = 'all',
     HEALTHY = 'healthy',
     UNHEALTHY = 'unhealthy',
+    CONNECTION_FAILED = 'connectionFailed',
 }
 
 export enum InstallationClusterStatus {
diff --git a/src/Shared/Components/AppStatusModal/AppStatusModal.component.tsx b/src/Shared/Components/AppStatusModal/AppStatusModal.component.tsx
@@ -28,6 +28,7 @@ import {
     ComponentSizeType,
     PROGRESSING_DEPLOYMENT_STATUS_POLLING_INTERVAL,
 } from '@Shared/constants'
+import { useMainContext } from '@Shared/Providers'
 import { AppType } from '@Shared/types'
 
 import { APIResponseHandler } from '../APIResponseHandler'
@@ -57,7 +58,7 @@ const AppStatusModal = ({
     initialTab,
     debugWithAIButton,
 }: AppStatusModalProps) => {
-    const [showConfigDriftModal, setShowConfigDriftModal] = useState(false)
+    const { setTempAppWindowConfig } = useMainContext()
     const [selectedTab, setSelectedTab] = useState<AppStatusModalTabType>(initialTab || null)
 
     const appDetailsAbortControllerRef = useRef<AbortController>(new AbortController())
@@ -241,30 +242,20 @@ const AppStatusModal = ({
 
     const handleShowConfigDriftModal = isConfigDriftEnabled
         ? () => {
-              setShowConfigDriftModal(true)
+              handleClose()
+              setTempAppWindowConfig({
+                  open: true,
+                  title: `${appDetails.appName} / Live and desired manifest comparison`,
+                  component: <ConfigDriftModal appId={appDetails.appId} envId={appDetails.environmentId} />,
+              })
           }
         : null
 
-    const handleCloseConfigDriftModal = () => {
-        handleClose()
-        setShowConfigDriftModal(false)
-    }
-
     const handleSelectTab = async (updatedTab: AppStatusModalTabType) => {
         handleClearDeploymentStatusTimeout()
         setSelectedTab(updatedTab)
     }
 
-    if (showConfigDriftModal) {
-        return (
-            <ConfigDriftModal
-                appId={appDetails.appId}
-                envId={+appDetails.environmentId}
-                handleCloseModal={handleCloseConfigDriftModal}
-            />
-        )
-    }
-
     const filteredTitleSegments = (titleSegments || []).filter((segment) => !!segment)
 
     const getEmptyStateMessage = () => {
diff --git a/src/Shared/Components/Charts/Chart.component.tsx b/src/Shared/Components/Charts/Chart.component.tsx
@@ -277,6 +277,7 @@ const Chart = (props: ChartProps) => {
             chartProps: props,
             appTheme,
             externalTooltipHandler: debouncedExternalTooltipHandler,
+            setTooltipVisible,
         })
 
         chartRef.current = new ChartJS(ctx, {
diff --git a/src/Shared/Components/Charts/types.ts b/src/Shared/Components/Charts/types.ts
@@ -1,4 +1,4 @@
-import { ReactNode } from 'react'
+import { Dispatch, ReactNode, SetStateAction } from 'react'
 import { TooltipOptions, TooltipPositionerFunction } from 'chart.js'
 
 import { TooltipProps } from '@Common/Tooltip'
@@ -143,6 +143,7 @@ export interface GetDefaultOptionsParams {
     chartProps: ChartProps
     appTheme: AppThemeType
     externalTooltipHandler: TooltipOptions['external']
+    setTooltipVisible: Dispatch<SetStateAction<boolean>>
 }
 
 declare module 'chart.js' {
diff --git a/src/Shared/Components/Charts/utils.tsx b/src/Shared/Components/Charts/utils.tsx
@@ -96,7 +96,13 @@ export const getChartJSType = (type: ChartType): ChartJSChartType => {
 }
 
 const handleChartClick =
-    ({ type, onChartClick, datasets, xAxisLabels }: ChartProps) =>
+    ({
+        type,
+        onChartClick,
+        datasets,
+        xAxisLabels,
+        setTooltipVisible,
+    }: ChartProps & Pick<GetDefaultOptionsParams, 'setTooltipVisible'>) =>
     (_, elements: ActiveElement[]) => {
         if (!elements || elements.length === 0 || !datasets || (Array.isArray(datasets) && datasets.length === 0)) {
             return
@@ -117,6 +123,7 @@ const handleChartClick =
 
             onChartClick?.(datasets[datasetIndex].datasetName, index)
         }
+        setTooltipVisible(false)
     }
 
 const handleChartHover =
@@ -171,6 +178,7 @@ export const getDefaultOptions = ({
     chartProps,
     appTheme,
     externalTooltipHandler,
+    setTooltipVisible,
 }: GetDefaultOptionsParams): ChartOptions => {
     const {
         onChartClick,
@@ -219,7 +227,7 @@ export const getDefaultOptions = ({
         },
         ...(onChartClick
             ? {
-                  onClick: handleChartClick(chartProps),
+                  onClick: handleChartClick({ ...chartProps, setTooltipVisible }),
                   onHover: handleChartHover(chartProps),
               }
             : {}),
diff --git a/src/Shared/Components/ContextSwitcher/ContextSwitcher.tsx b/src/Shared/Components/ContextSwitcher/ContextSwitcher.tsx
@@ -45,6 +45,7 @@ export const ContextSwitcher = ({
     optionListError,
     reloadOptionList,
     classNamePrefix,
+    resource,
 }: ContextSwitcherTypes) => {
     const selectRef = useRef<SelectInstance<SelectPickerOptionType>>(null)
     const shouldShowToastRef = useRef<boolean>(true)
@@ -60,7 +61,7 @@ export const ContextSwitcher = ({
         if (shouldShowToastRef.current) {
             ToastManager.showToast({
                 variant: ToastVariantType.shortcut,
-                text: 'to switch Applications',
+                text: `to switch ${resource}`,
                 shortcuts: ['S'],
             })
         }
diff --git a/src/Shared/Components/ContextSwitcher/types.ts b/src/Shared/Components/ContextSwitcher/types.ts
@@ -36,6 +36,7 @@ export interface ContextSwitcherTypes
     > {
     options: GroupBase<SelectPickerOptionType<string | number>>[]
     isAppDataAvailable?: boolean
+    resource: 'Cluster' | 'Release' | 'Tenant' | 'Application' | 'Job' | 'Application Group' | 'Chart Store'
 }
 
 export interface RecentlyVisitedOptions extends SelectPickerOptionType<number> {
diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx
diff --git a/src/Shared/Components/Illustration/Illustration.tsx b/src/Shared/Components/Illustration/Illustration.tsx
diff --git a/src/Shared/Components/SelectPicker/utils.ts b/src/Shared/Components/SelectPicker/utils.ts
diff --git a/src/Shared/constants.tsx b/src/Shared/constants.tsx
diff --git a/src/Shared/types.ts b/src/Shared/types.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@devtron-labs/devtron-fe-common-lib",`
`3`		`- "version": "1.20.6-pre-2",`
	`3`	`+ "version": "1.20.6-pre-3",`
`4`	`4`	`"description": "Supporting common component library",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"main": "dist/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ export enum ClusterFiltersType {`
`25`	`25`	`ALL_CLUSTERS = 'all',`
`26`	`26`	`HEALTHY = 'healthy',`
`27`	`27`	`UNHEALTHY = 'unhealthy',`
	`28`	`+ CONNECTION_FAILED = 'connectionFailed',`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`export enum InstallationClusterStatus {`