Merge branch 'kubecon-2025' of https://github.com/devtron-labs/devtron-fe-common-lib into feat/security-overview

arunjaindev · arunjaindev · commit 095e4a0c572d · 2025-10-31T12:46:35.000+05:30
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-30",
+    "version": "1.20.6-pre-31",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
diff --git a/src/Assets/IconV2/ic-ai.svg b/src/Assets/IconV2/ic-ai.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-width="1.5" d="M8.108 18.162a3.83 3.83 0 0 0-2.27-2.27l-3.137-1.156a.69.69 0 0 1 0-1.293l3.137-1.157a3.83 3.83 0 0 0 2.27-2.27L9.264 6.88a.69.69 0 0 1 1.293 0l1.157 3.138a3.83 3.83 0 0 0 2.27 2.27l3.137 1.155a.69.69 0 0 1 0 1.294l-3.138 1.156a3.83 3.83 0 0 0-2.27 2.27L10.558 21.3a.69.69 0 0 1-1.294 0l-1.156-3.137Zm9.34-10.579a1.741 1.741 0 0 0-1.031-1.031l-1.426-.526a.313.313 0 0 1 0-.588l1.426-.525a1.741 1.741 0 0 0 1.031-1.032l.526-1.426a.313.313 0 0 1 .588 0l.525 1.426a1.74 1.74 0 0 0 1.032 1.032l1.426.525a.313.313 0 0 1 0 .588l-1.426.526a1.74 1.74 0 0 0-1.032 1.031l-.525 1.426a.313.313 0 0 1-.588 0l-.526-1.426Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-application-group.svg b/src/Assets/IconV2/ic-application-group.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="M2.25 10.259h19.5m-18.6-3.83h17.7c.497 0 .9.428.9.957v13.406c0 .53-.404.958-.9.958H3.15c-.496 0-.9-.429-.9-.958V7.386c0-.529.404-.958.9-.958ZM18.839 2.25c.426 0 .771.468.771 1.045v3.134H4.395l.001-3.134c0-.577.345-1.045.771-1.045h13.671Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-application-management.svg b/src/Assets/IconV2/ic-application-management.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="M10.428 21.75v-5.571H3.086c-.461 0-.835-.39-.835-.871V3.121c0-.481.374-.871.836-.871h15.042c.461 0 .835.39.835.87v4.701M10.429 21.75h3.112m-3.112 0H7.315M2.25 5.732h16.714m-.487 10.383v-.374m0 .374a.358.358 0 0 1-.273-.127m.273.127a.354.354 0 0 0 .15-.033m.213-.341a.38.38 0 0 0-.087-.244m.087.244h-.363m.363 0a.379.379 0 0 1-.09.247m-.273-.621c.11 0 .21.05.276.13m-.276-.13v.374m0-.374a.34.34 0 0 0-.143.03m-.221.344h.364m-.364 0a.38.38 0 0 1 .103-.26m-.103.26c0 .043.007.084.02.123m.62-.367-.276.244m0 0-.273.247m.273-.247-.261-.26m.26.26.274.247m-.273-.247-.344.123m.344-.123-.143-.344m.143.344.15.34m-.423-.093a.375.375 0 0 1-.07-.124m.082-.384a.363.363 0 0 1 .118-.083m.416.59a.366.366 0 0 1-.123.095m3.123 1.386v-3.454a.286.286 0 0 0-.139-.245l-3-1.733a.267.267 0 0 0-.268 0l-3 1.733a.286.286 0 0 0-.139.244v3.455a.287.287 0 0 0 .138.244l3.001 1.734a.268.268 0 0 0 .267 0l3.001-1.734a.277.277 0 0 0 .139-.244Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-application-template.svg b/src/Assets/IconV2/ic-application-template.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="M2.25 7.5h19.5m-6.45 8.7h1.503m.747-4.5H15.3M3.15 3.75h17.7c.497 0 .9.42.9.938v14.623c0 .518-.404.938-.9.938H3.15c-.496 0-.9-.42-.9-.938V4.688c0-.517.404-.937.9-.937Zm8.1 7.95h-4.5v4.5h4.5v-4.5Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-application.svg b/src/Assets/IconV2/ic-application.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="M2.25 6h19.5M8.25 21.75H12m0 0v-4.5m0 4.5h3.75M12 17.25H3.15c-.496 0-.9-.42-.9-.938V3.188c0-.517.404-.937.9-.937h17.7c.497 0 .9.42.9.938v13.122c0 .518-.404.938-.9.938H12Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-backup-and-schedule.svg b/src/Assets/IconV2/ic-backup-and-schedule.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.852 6.706c0-2.047-3.493-3.706-7.8-3.706-4.308 0-7.8 1.66-7.8 3.706m15.6 0v3.21m0-3.21c0 1.275-1.355 2.4-3.419 3.067M2.251 6.706c0 2.047 3.493 3.706 7.8 3.706 1.625 0 3.133-.236 4.382-.64M2.251 6.707v5.167m0 0c0 2.047 3.493 3.706 7.8 3.706m-7.8-3.706v5.167c0 2.047 3.493 3.707 7.8 3.707 1.162 0 2.265-.121 3.255-.338m2.596-7.44.02 2.346h2.326m-.396-5.399a5.976 5.976 0 0 0-1.95-.324c-.507 0-1 .062-1.469.18m3.419.144a5.878 5.878 0 0 1 .89.392c1.795.974 3.01 2.843 3.01 4.988 0 3.15-2.62 5.704-5.85 5.704a5.948 5.948 0 0 1-2.596-.59m1.127-10.637c-2.099.529-3.74 2.165-4.231 4.232a5.63 5.63 0 0 0 1.812 5.554 5.87 5.87 0 0 0 1.292.85" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-backup-location.svg b/src/Assets/IconV2/ic-backup-location.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="M7.355 5.998a3.972 3.972 0 0 0-1.72-.068 4.024 4.024 0 0 0-1.595.667 4.17 4.17 0 0 0-1.187 1.285 4.344 4.344 0 0 0-.422 3.443c.17.572.457 1.1.84 1.55a4.103 4.103 0 0 0 1.98 1.277c.126.036.255.066.384.09M16.441 3.587a5.769 5.769 0 0 0-2.532-1.222 5.682 5.682 0 0 0-3.378.343 5.888 5.888 0 0 0-2.623 2.22 6.134 6.134 0 0 0-.947 2.663m14.79 2.938c0 1.636-2.687 2.962-6 2.962-3.314 0-6-1.326-6-2.962m12 0c0-1.636-2.687-2.962-6-2.962-3.314 0-6 1.326-6 2.962m12 0v4.13m-12-4.13v4.13m0 0c0 1.635 2.686 2.96 6 2.96 3.313 0 6-1.325 6-2.96m-12 0v4.128c0 1.636 2.686 2.962 6 2.962 3.313 0 6-1.326 6-2.962V14.66" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-chart-line-up.svg b/src/Assets/IconV2/ic-chart-line-up.svg
@@ -1,3 +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="M7.5 12a7.5 7.5 0 1 1 7.5 7.5H6.75A5.249 5.249 0 1 1 8.055 9.163" vector-effect="non-scaling-stroke"/>
+  <path stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M21 19.5H3v-15M19.5 6 12 13.5l-3-3-6 6M19.5 6v3.75m0-3.75h-3.75" vector-effect="non-scaling-stroke"/>
 </svg>
diff --git a/src/Assets/IconV2/ic-cost-visibility.svg b/src/Assets/IconV2/ic-cost-visibility.svg
@@ -1,3 +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="m21.75 15.14-4.527 4.89-2.053-2.053-3.743 3.773m10.323-6.61v2.565m0-2.566h-2.523m2.181-5.609v-.76 3.039m0-2.279V6.546c0-.472-.429-.855-.958-.855h-2.88m3.838 3.839h-.839a3 3 0 0 1-3-3v-.839m0 0H3.208c-.529 0-.958.383-.958.855V18.8c0 .472.429.855.958.855H8.78M2.25 9.53h.183a3.656 3.656 0 0 0 3.656-3.656V5.69M2.25 15.816h.183a3.656 3.656 0 0 1 3.656 3.657v.182m7.631-9.154-.098-.082a1.379 1.379 0 0 0-.882-.318h-1.6c-.665 0-1.205.538-1.205 1.201s.54 1.201 1.205 1.201h1.72c.665 0 1.205.538 1.205 1.2 0 .664-.54 1.202-1.205 1.202h-1.953c-.358 0-.703-.14-.96-.389l-.012-.011m2.053-4.404v-1.04m0 6.883v-1.04M4.774 2.25H18.94" vector-effect="non-scaling-stroke"/>
+  <path stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m21.75 15.14-4.527 4.89-2.053-2.053-3.743 3.773m10.323-6.61v2.565m0-2.566h-2.523m2.181-5.609v-.76 3.039m0-2.279V6.546c0-.472-.429-.855-.958-.855h-2.88m3.838 3.839h-.839a3 3 0 0 1-3-3v-.839m0 0H3.208c-.529 0-.958.383-.958.855V18.8c0 .472.429.855.958.855H8.78M2.25 9.53h.183a3.656 3.656 0 0 0 3.656-3.656V5.69M2.25 15.816h.183a3.656 3.656 0 0 1 3.656 3.657v.182M4.774 2.25H18.94M9.42 12.56a2.579 2.579 0 1 0 5.158 0 2.579 2.579 0 0 0-5.158 0Z" vector-effect="non-scaling-stroke"/>
 </svg>
diff --git a/src/Assets/IconV2/ic-global-overview.svg b/src/Assets/IconV2/ic-global-overview.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="M2.25 12.278C2.25 6.739 6.616 2.25 12 2.25M2.25 12.278c0 2.182.679 4.203 1.83 5.849a9.902 9.902 0 0 0 3.045 2.837l.117.063m-4.992-8.75h19.5C21.75 6.74 17.386 2.25 12 2.25m0 0c-2.07 0-3.75 4.49-3.75 10.028 0 1.97.323 3.706.815 5.198M12.001 2.25c2.07 0 3.75 4.49 3.75 10.028 0 .524.029 1.27 0 1.774-.012.2-.032.439-.066.706m6.065 1.37v2.284m0-2.284h-2.452m2.453 0-4.965 4.968-2.246-2.468-3.46 3.122" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-infrastructure-management.svg b/src/Assets/IconV2/ic-infrastructure-management.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="M7.988 12.375c0-1.483.42-2.933 1.21-4.167a7.256 7.256 0 0 1 3.22-2.762 6.892 6.892 0 0 1 4.148-.427c.91.19 1.771.56 2.539 1.086M8.519 9.538a4.815 4.815 0 0 0-2.113-.084 4.907 4.907 0 0 0-1.958.83 5.16 5.16 0 0 0-1.458 1.6 5.406 5.406 0 0 0-.7 2.083 5.475 5.475 0 0 0 .182 2.2c.21.712.561 1.37 1.032 1.928a5.045 5.045 0 0 0 1.7 1.313 4.843 4.843 0 0 0 2.066.467h1.648m4.7-5h7.34m-7.34 0c-.437 0-.792-.373-.792-.833v-3.334c0-.46.355-.833.792-.833h7.34c.437 0 .792.373.792.833v3.334c0 .46-.355.833-.792.833m-7.34 0c-.437 0-.792.373-.792.833v3.334c0 .46.355.833.792.833h7.34c.437 0 .792-.373.792-.833v-3.334c0-.46-.355-.833-.792-.833m-4.375-2.468h-.345m.345 5h-.345" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-release-hub.svg b/src/Assets/IconV2/ic-release-hub.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 12.004v9.75m0-9.75H7.124m4.874 0h4.876m-4.876 9.75H2.25v-9.75h4.876M12 21.754h9.75v-9.75h-4.874m-9.75 0v3.246m0-3.246h9.75m-9.75 0v-9.75H12m4.876 9.75v3.246m0-3.246v-9.75H12m0 0V5.5" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-resource-browser.svg b/src/Assets/IconV2/ic-resource-browser.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="M19.764 5.7V4.453c0-.388-.294-.703-.657-.703h-16.2c-.363 0-.657.315-.657.703v15.094c0 .388.294.703.657.703h3.149M2.25 8.4h3.806m12.505 9.71 3.19 3.19m-1.576-7.088a5.513 5.513 0 1 1-11.025 0 5.513 5.513 0 0 1 11.025 0Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-resource-watcher.svg b/src/Assets/IconV2/ic-resource-watcher.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="M19.765 5.7V4.453c0-.388-.294-.703-.657-.703h-16.2c-.363 0-.657.315-.657.703v15.094c0 .388.294.703.657.703h3.149M2.25 8.4h3.806m8.402.6c-5.354 0-7.291 5.25-7.291 5.25s1.937 5.25 7.291 5.25c5.355 0 7.292-5.25 7.292-5.25S19.813 9 14.459 9Zm1.568 5.325c0 .953-.739 1.725-1.591 1.725-.853 0-1.68-.772-1.68-1.725 0-.953.827-1.725 1.68-1.725.852 0 1.59.772 1.59 1.725Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-security-policy.svg b/src/Assets/IconV2/ic-security-policy.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.47" d="M20.028 6.058c0-.453-.297-.856-.737-1L11.14 2.4 2.987 5.06c-.44.143-.737.546-.737 1v3.983c0 8.301 7.203 11.051 8.64 11.518a.783.783 0 0 0 .497 0M8.123 10.042h2.34m-2.34 3.306h.47m6.701 4.754H12.81a.423.423 0 0 1-.293-.117.39.39 0 0 1-.121-.281v-2.221a.384.384 0 0 1 .12-.281l6.214-5.965a.423.423 0 0 1 .586 0l2.314 2.221a.39.39 0 0 1 0 .562l-6.335 6.082Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-security-scan.svg b/src/Assets/IconV2/ic-security-scan.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.535" d="M19.666 13.451c-1.458 5.396-6.24 7.337-7.33 7.715a.654.654 0 0 1-.444 0c-1.09-.378-5.872-2.32-7.33-7.715M20.09 9.938v-3.64c0-.435-.267-.82-.661-.958l-7.314-2.55-7.313 2.55a1.006 1.006 0 0 0-.661.959v3.64M2.25 13.45h19.499" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-software-release-management.svg b/src/Assets/IconV2/ic-software-release-management.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="M19.92 7.13a.714.714 0 0 1 .102.368V9.75m-.101-2.62a.736.736 0 0 0-.276-.267l-4.073-2.26M19.92 7.13 11.224 12m-.088 9.75a.749.749 0 0 1-.363-.094l-8.146-4.518a.737.737 0 0 1-.377-.636V7.498a.722.722 0 0 1 .377-.636l8.146-4.518a.75.75 0 0 1 .726 0l4.073 2.259M11.136 21.75a.748.748 0 0 0 .363-.094l2.037-1.13m-2.4 1.224.044-4.875.044-4.875m0 0L6.788 9.564M2.353 7.128l4.435 2.436m8.784-4.961-8.784 4.96m0 0-.062 3.405m11.815 3.517v-.361m0 .361a.354.354 0 0 1-.268-.123m.268.123a.35.35 0 0 0 .147-.032m.21-.33a.364.364 0 0 0-.086-.235m.086.236h-.357m.357 0a.363.363 0 0 1-.09.238m-.267-.6c.108 0 .205.049.27.126m-.27-.126v.362m0-.362c-.05 0-.097.01-.14.029m-.216.333h.356m-.356 0c0-.098.038-.187.1-.252m-.1.252c0 .041.007.081.02.119m.607-.355-.27.236m0 0-.269.238m.268-.238-.256-.252m.256.252.268.238m-.268-.238-.337.119m.337-.12-.14-.332m.14.333.147.329m-.415-.09a.365.365 0 0 1-.069-.12m.081-.371a.357.357 0 0 1 .116-.081m.408.571a.357.357 0 0 1-.12.091m3.061 1.34v-3.34a.273.273 0 0 0-.136-.235l-2.942-1.676a.265.265 0 0 0-.262 0l-2.941 1.676a.268.268 0 0 0-.137.236v3.34a.273.273 0 0 0 .137.235l2.941 1.676a.265.265 0 0 0 .262 0l2.942-1.676a.27.27 0 0 0 .136-.236Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-tenants.svg b/src/Assets/IconV2/ic-tenants.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="M2.25 21h19.5m-1.234 0V3.783a.808.808 0 0 0-.216-.554.717.717 0 0 0-.52-.229h-8.85a.716.716 0 0 0-.521.23.808.808 0 0 0-.216.553m4.637 3.13h2.95m-1.475 6.26h2.95m-5.474 3.914h2.311m-7.373-2.944c1.864 0 3.375-1.535 3.375-3.429 0-1.893-1.511-3.428-3.375-3.428S5.344 8.82 5.344 10.714s1.51 3.429 3.375 3.429Zm0 0c2.796 0 5.062 2.302 5.062 5.143V21M8.72 14.143c-2.796 0-5.063 2.302-5.063 5.143V21" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Common/BreadCrumb/BreadCrumb.tsx b/src/Common/BreadCrumb/BreadCrumb.tsx
@@ -61,7 +61,7 @@ export function useBreadcrumb(props?: UseBreadcrumbOptionalProps, deps?: any[]):
     const { res: breadcrumbs } = useMemo(
         () =>
             levels.reduce(
-                (agg, curr, idx) => {
+                (agg, curr) => {
                     const { res, prefix } = agg
                     const { to, name } = curr
                     res.push({
diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts
@@ -18,6 +18,8 @@ import { SelectPickerOptionType } from '@Shared/Components'
 import { CostBreakdownItemViewParamsType, CostBreakdownViewType } from '@PagesDevtron2.0/CostVisibility'
 import { BackupAndScheduleListViewEnum, BackupLocationsTypes } from '@PagesDevtron2.0/DataProtectionManagement'
 
+import { InfrastructureManagementAppListType } from './Types'
+
 export const FALLBACK_REQUEST_TIMEOUT = 60000
 export const Host = window?.__ORCHESTRATOR_ROOT__ ?? '/orchestrator'
 
@@ -91,9 +93,9 @@ export const URLS = {
     APPLICATION_MANAGEMENT: APPLICATION_MANAGEMENT_ROOT,
     APPLICATION_MANAGEMENT_OVERVIEW: `${APPLICATION_MANAGEMENT_ROOT}/overview`,
     APPLICATION_MANAGEMENT_APP: `${APPLICATION_MANAGEMENT_ROOT}/app`,
+    APPLICATION_MANAGEMENT_APP_LIST: `${APPLICATION_MANAGEMENT_ROOT}/devtron-apps`,
+    APPLICATION_MANAGEMENT_CREATE_DEVTRON_APP: `${APPLICATION_MANAGEMENT_ROOT}/devtron-apps/create-app`,
     APPLICATION_MANAGEMENT_APPLICATION_GROUP: `${APPLICATION_MANAGEMENT_ROOT}/application-group`,
-    APPLICATION_MANAGEMENT_CHART_STORE: `${APPLICATION_MANAGEMENT_ROOT}/chart-store`,
-    APPLICATION_MANAGEMENT_CHART_STORE_DISCOVER: `${APPLICATION_MANAGEMENT_ROOT}/chart-store/discover`,
     APPLICATION_MANAGEMENT_TEMPLATES_DEVTRON_APP,
     APPLICATION_MANAGEMENT_TEMPLATES_DEVTRON_APP_CREATE: `${APPLICATION_MANAGEMENT_TEMPLATES_DEVTRON_APP}/create`,
     // NOTE: using appId since we are re-using AppConfig component
@@ -108,6 +110,10 @@ export const URLS = {
     // INFRASTRUCTURE MANAGEMENT
     INFRASTRUCTURE_MANAGEMENT: INFRASTRUCTURE_MANAGEMENT_ROOT,
     INFRASTRUCTURE_MANAGEMENT_OVERVIEW: `${INFRASTRUCTURE_MANAGEMENT_ROOT}/overview`,
+    INFRASTRUCTURE_MANAGEMENT_APP_LIST: `${INFRASTRUCTURE_MANAGEMENT_ROOT}/apps/:appType(${Object.values(InfrastructureManagementAppListType).join('|')})`,
+    INFRASTRUCTURE_MANAGEMENT_APP: `${INFRASTRUCTURE_MANAGEMENT_ROOT}/app`,
+    INFRASTRUCTURE_MANAGEMENT_CHART_STORE: `${INFRASTRUCTURE_MANAGEMENT_ROOT}/chart-store`,
+    INFRASTRUCTURE_MANAGEMENT_CHART_STORE_DISCOVER: `${INFRASTRUCTURE_MANAGEMENT_ROOT}/chart-store/discover`,
     INFRASTRUCTURE_MANAGEMENT_RESOURCE_BROWSER: `${INFRASTRUCTURE_MANAGEMENT_ROOT}/resource-browser`,
     INFRASTRUCTURE_MANAGEMENT_RESOURCE_WATCHER: `${INFRASTRUCTURE_MANAGEMENT_ROOT}/resource-watcher`,
     // SOFTWARE RELEASE MANAGEMENT
diff --git a/src/Common/Types.ts b/src/Common/Types.ts
@@ -1173,3 +1173,9 @@ export interface ClusterDetailListType
     category: SelectPickerOptionType
     status: ClusterStatusType
 }
+
+export enum InfrastructureManagementAppListType {
+    HELM = 'helm',
+    ARGO_CD = 'argocd',
+    FLUX_CD = 'fluxcd'
+}
diff --git a/src/Pages-Devtron-2.0/ApplicationManagement/Shared/ApplicationManagementIcon/ApplicationManagementIcon.tsx b/src/Pages-Devtron-2.0/ApplicationManagement/Shared/ApplicationManagementIcon/ApplicationManagementIcon.tsx
@@ -9,10 +9,10 @@ export const ApplicationManagementIcon = () => (
         size={ComponentSizeType.xs}
         variant={ButtonVariantType.borderLess}
         linkProps={{
-            to: URLS.APPLICATION_MANAGEMENT_APP,
+            to: URLS.APPLICATION_MANAGEMENT_OVERVIEW,
         }}
         ariaLabel="Application Management"
         showAriaLabelInTippy
-        icon={<Icon name="ic-grid-view" color={null} />}
+        icon={<Icon name="ic-application-management" color={null} />}
     />
 )
diff --git a/src/Pages-Devtron-2.0/ApplicationManagement/Shared/ApplicationManagementIcon/utils.tsx b/src/Pages-Devtron-2.0/ApplicationManagement/Shared/ApplicationManagementIcon/utils.tsx
@@ -1,13 +1,8 @@
-import { BreadcrumbText } from '@Common/index'
-
 import { ApplicationManagementIcon } from './ApplicationManagementIcon'
 
 export const getApplicationManagementBreadcrumb = () => ({
     'application-management': {
         component: <ApplicationManagementIcon />,
         linked: true,
     },
-    list: { component: <BreadcrumbText heading="Applications" isActive /> },
-    d: null,
-    app: null,
 })
diff --git a/src/Pages-Devtron-2.0/InfrastructureManagement/Shared/InfrastructureManagementIcon/InfrastructureManagementIcon.tsx b/src/Pages-Devtron-2.0/InfrastructureManagement/Shared/InfrastructureManagementIcon/InfrastructureManagementIcon.tsx
@@ -9,10 +9,10 @@ export const InfrastructureManagementIcon = () => (
         size={ComponentSizeType.xs}
         variant={ButtonVariantType.borderLess}
         linkProps={{
-            to: URLS.INFRASTRUCTURE_MANAGEMENT_RESOURCE_BROWSER,
+            to: URLS.INFRASTRUCTURE_MANAGEMENT_OVERVIEW,
         }}
         ariaLabel="Infrastructure Management"
         showAriaLabelInTippy
-        icon={<Icon name="ic-cloud" color={null} />}
+        icon={<Icon name="ic-infrastructure-management" color={null} />}
     />
 )
diff --git a/src/Shared/Components/CICDHistory/DeploymentDetailSteps.tsx b/src/Shared/Components/CICDHistory/DeploymentDetailSteps.tsx
@@ -138,7 +138,7 @@ const DeploymentDetailSteps = ({
     const redirectToDeploymentStatus = () => {
         if (isHelmApps) {
             getHandleOpenURL(
-                `${window.__BASE_URL__}${URLS.APPLICATION_MANAGEMENT_APP}/${URLS.DEVTRON_CHARTS}/${URLS.APP_DEPLOYMNENT_HISTORY}/${appId}/env/${envId}/${URLS.DETAILS}/${URLS.APP_DETAILS_K8}?${DEPLOYMENT_STATUS_QUERY_PARAM}`,
+                `${window.__BASE_URL__}${URLS.INFRASTRUCTURE_MANAGEMENT_APP}/${URLS.DEVTRON_CHARTS}/${URLS.APP_DEPLOYMNENT_HISTORY}/${appId}/env/${envId}/${URLS.DETAILS}/${URLS.APP_DETAILS_K8}?${DEPLOYMENT_STATUS_QUERY_PARAM}`,
             )()
             return
         }
diff --git a/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx b/src/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.tsx
diff --git a/src/Shared/Components/Header/HeaderWithCreateButton/types.ts b/src/Shared/Components/Header/HeaderWithCreateButton/types.ts
diff --git a/src/Shared/Components/Header/HeaderWithCreateButton/utils.ts b/src/Shared/Components/Header/HeaderWithCreateButton/utils.ts
diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx
diff --git a/src/Shared/Hooks/useUserPreferences/types.ts b/src/Shared/Hooks/useUserPreferences/types.ts
diff --git a/src/Shared/constants.tsx b/src/Shared/constants.tsx
diff --git a/src/index.ts b/src/index.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-30",`
	`3`	`+ "version": "1.20.6-pre-31",`
`4`	`4`	`"description": "Supporting common component library",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"main": "dist/index.js",`