Merge branch 'develop' into feat/cluster-env-categories

shivani170 · shivani170 · commit 1eaf38b0166f · 2025-05-30T18:39:57.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.14.1-pre-7-beta-1",
+    "version": "1.14.2-pre-1",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
diff --git a/src/Assets/Icon/ic-mechanical-operation.svg b/src/Assets/Icon/ic-mechanical-operation.svg
diff --git a/src/Assets/IconV2/ic-arrows-clockwise.svg b/src/Assets/IconV2/ic-arrows-clockwise.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="M16.516 9.348h4.5m0 0v-4.5m0 4.5-3.182-3.182a8.249 8.249 0 0 0-11.668 0m1.318 8.486h-4.5m0 0v4.5m0-4.5 3.182 3.182a8.25 8.25 0 0 0 11.668 0" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-fast-forward.svg b/src/Assets/IconV2/ic-fast-forward.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 stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2.5 6.964v10.53a.742.742 0 0 0 1.142.617l8.269-5.265a.732.732 0 0 0 0-1.235L3.642 6.346a.742.742 0 0 0-1.142.618Z" vector-effect="non-scaling-stroke"/>
+  <path stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12.251 6.964v10.53a.742.742 0 0 0 1.142.617l8.27-5.265a.732.732 0 0 0 0-1.235l-8.27-5.265a.742.742 0 0 0-1.142.618Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-filter-applied.svg b/src/Assets/IconV2/ic-filter-applied.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 data-style-override="false" fill="var(--R500)" d="M23 7a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z"/>
+  <path stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6 12h10M2 7.5h12m-4.25 9h4.5" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-filter.svg b/src/Assets/IconV2/ic-filter.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="M6 12h12M2 7.5h19.5m-11.75 9h4.5" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-flask.svg b/src/Assets/IconV2/ic-flask.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 3.5v5.835a4 4 0 0 1-.625 2.148l-5.397 7.48a1 1 0 0 0 .844 1.537h14.356a1 1 0 0 0 .844-1.537l-5.397-7.48A4 4 0 0 1 14 9.335V3.5m-5.25 0h6.5" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-hibernate-circle.svg b/src/Assets/IconV2/ic-hibernate-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 fill="#3B444C" fill-rule="evenodd" d="M12 22c5.523 0 10-4.477 10-10S17.523 2 12 2 2 6.477 2 12s4.477 10 10 10Zm3-7a5.975 5.975 0 0 0 3.807-1.363 7 7 0 1 1-8.445-8.445A6 6 0 0 0 15 15Z" clip-rule="evenodd"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-hibernate.svg b/src/Assets/IconV2/ic-hibernate.svg
@@ -14,6 +14,6 @@
   - limitations under the License.
   -->
 
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM15 15C16.4455 15 17.7716 14.4888 18.8074 13.6374C18.0702 16.7135 15.3021 19 12 19C8.13401 19 5 15.866 5 12C5 8.69784 7.2865 5.92973 10.3626 5.19253C9.51118 6.22836 9 7.55448 9 9C9 12.3137 11.6863 15 15 15Z" fill="#3B444C"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path fill="#3B444C" fill-rule="evenodd" d="M22 14.232A8.691 8.691 0 0 1 9.768 2C5.312 3.068 2 7.077 2 11.86 2 17.46 6.54 22 12.14 22c4.783 0 8.792-3.312 9.86-7.768Z" clip-rule="evenodd"/>
 </svg>
diff --git a/src/Assets/IconV2/ic-lego.svg b/src/Assets/IconV2/ic-lego.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.5 15v6m0-6-6-3m6 3 15-7.5M7.5 21l15-7.5v-6M7.5 21l-6-3v-6m0 0 3.393-1.697M22.5 7.5l-4.572-2.287m-5.535 1.34L9.52 7.99m.979 1.386c0 1.036-1.343 1.875-3 1.875s-3-.84-3-1.875c0-1.036 1.343-1.875 3-1.875s3 .84 3 1.875Zm7.5-3.75C18 6.661 16.657 7.5 15 7.5s-3-.84-3-1.875c0-1.036 1.343-1.875 3-1.875s3 .84 3 1.875Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-magnifying-glass.svg b/src/Assets/IconV2/ic-magnifying-glass.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="M16.443 16.444 21 21m-2.25-10.125a7.875 7.875 0 1 1-15.75 0 7.875 7.875 0 0 1 15.75 0Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-more-vertical.svg b/src/Assets/IconV2/ic-more-vertical.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 fill="#3B444C" d="M12 7a2 2 0 1 0 0-4 2 2 0 0 0 0 4Zm2 5a2 2 0 1 1-4 0 2 2 0 0 1 4 0Zm0 7a2 2 0 1 1-4 0 2 2 0 0 1 4 0Z"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-play-outline.svg b/src/Assets/IconV2/ic-play-outline.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="M20.639 11.36 7.14 3.111a.75.75 0 0 0-1.14.64v16.498a.75.75 0 0 0 1.141.64l13.498-8.25a.751.751 0 0 0 0-1.279Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-rocket-gear.svg b/src/Assets/IconV2/ic-rocket-gear.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.593 15.958C6.532 19.14 2.289 19.14 2.289 19.14s0-4.242 3.182-5.303m5.304 1.06-4.243-4.242m0 0 6.364-6.364c2.41-2.41 4.82-2.386 5.847-2.233a.747.747 0 0 1 .629.628c.153 1.028.176 3.438-2.233 5.848l-1.591 1.59m-9.016.531-3.93-.786a.75.75 0 0 1-.382-1.266l3.032-3.032a.75.75 0 0 1 .53-.22h6.053M17.5 17.4V17m0 .4a.383.383 0 0 1-.292-.136m.292.136a.378.378 0 0 0 .16-.036m.23-.364a.4.4 0 0 0-.094-.26m.094.26h-.39m.389 0a.405.405 0 0 1-.097.264M17.5 16.6c.118 0 .224.054.295.14m-.295-.14v.4m0-.4a.379.379 0 0 0-.153.032m-.236.368h.389m-.389 0c0-.108.042-.206.11-.279m-.11.279c0 .046.008.09.022.132m.662-.392L17.5 17m0 0-.292.264M17.5 17l-.28-.279m.28.279.292.264M17.5 17l-.367.132M17.5 17l-.153-.368M17.5 17l.16.364m-.452-.1a.402.402 0 0 1-.075-.132m.088-.41a.39.39 0 0 1 .126-.09m.445.632a.392.392 0 0 1-.131.1M21 18.847v-3.694a.306.306 0 0 0-.149-.261l-3.208-1.853a.285.285 0 0 0-.286 0l-3.208 1.853a.296.296 0 0 0-.149.261v3.694a.306.306 0 0 0 .149.261l3.208 1.854a.285.285 0 0 0 .286 0l3.208-1.854a.296.296 0 0 0 .149-.261Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-strategy-blue-green-color.svg b/src/Assets/IconV2/ic-strategy-blue-green-color.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path fill="#E9FBF4" d="M15.223 8.668a6.75 6.75 0 1 1-7.425 7.425"/>
+  <path stroke="#1DAD70" stroke-linejoin="round" stroke-width="1.5" d="M15.223 8.668a6.75 6.75 0 1 1-7.425 7.425" vector-effect="non-scaling-stroke"/>
+  <path stroke="#1DAD70" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m14.97 11.34 6 6m-7.687-3.187 6 6M10.47 15.84l6 6" vector-effect="non-scaling-stroke"/>
+  <path fill="#E5F2FF" stroke="#06C" stroke-width="1.5" d="M8.51 16.13a6.75 6.75 0 1 0 0-13.5 6.75 6.75 0 0 0 0 13.5Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-strategy-blue-green.svg b/src/Assets/IconV2/ic-strategy-blue-green.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="M15.223 8.668a6.75 6.75 0 0 1 4.06 11.485m0 0a6.75 6.75 0 0 1-11.485-4.06m11.485 4.06-6-6m1.688-2.812 6 6m-10.5-1.5 6 6M15.26 9.38a6.75 6.75 0 1 1-13.5 0 6.75 6.75 0 0 1 13.5 0Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-strategy-canary-color.svg b/src/Assets/IconV2/ic-strategy-canary-color.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path fill="#FFF5E5" stroke="#FFB549" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9.75 9.33V7.208c0-2.697 2.156-4.945 4.85-4.958a4.875 4.875 0 0 1 4.743 3.646L21.75 7.5 19.5 9v2.25a9 9 0 0 1-9 9H2.25a.75.75 0 0 1-.586-1.219l8.086-9.7Z" vector-effect="non-scaling-stroke"/>
+  <path stroke="#FFB549" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m12 12-6.875 8.25" vector-effect="non-scaling-stroke"/>
+  <path fill="#FFB549" d="M15.375 7.5a1.125 1.125 0 1 0 0-2.25 1.125 1.125 0 0 0 0 2.25Z"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-strategy-canary.svg b/src/Assets/IconV2/ic-strategy-canary.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-6.875 8.25M15 7v-.5M9.75 9.33V7.208c0-2.697 2.156-4.945 4.85-4.958a4.875 4.875 0 0 1 4.743 3.646L21.75 7.5 19.5 9v2.25a9 9 0 0 1-9 9H2.25a.75.75 0 0 1-.586-1.219l8.086-9.7Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-strategy-recreate-color.svg b/src/Assets/IconV2/ic-strategy-recreate-color.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="#E5F2FF" d="M12 21a9 9 0 1 0 0-18 9 9 0 0 0 0 18Z"/>
+  <path stroke="#06C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12 21a9 9 0 1 0 0-18 9 9 0 0 0 0 18Zm0 0v-9m6.364-6.364L5.636 18.364M18 6v12.708M15 9v11.487M9 15v5.487" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-strategy-recreate.svg b/src/Assets/IconV2/ic-strategy-recreate.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 21a9 9 0 1 0 0-18 9 9 0 0 0 0 18Zm0 0v-9m6.364-6.364L5.636 18.364M18 6v12.708M15 9v11.487M9 15v5.487" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-strategy-rolling-color.svg b/src/Assets/IconV2/ic-strategy-rolling-color.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path fill="#E5F2FF" d="M12 21a9 9 0 1 0 0-18 9 9 0 0 0 0 18Z"/>
+  <path fill="#E5F2FF" d="M12 3c1.657 0 3 4.031 3 9s-1.343 9-3 9"/>
+  <path fill="#E5F2FF" d="M21 12c0 1.657-4.031 3-9 3s-9-1.343-9-3"/>
+  <path stroke="#06C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M21 12a9 9 0 0 1-9 9m9-9a9 9 0 0 0-9-9m9 9c0 1.657-4.031 3-9 3s-9-1.343-9-3m9 9a9 9 0 0 1-9-9m9 9c1.657 0 3-4.031 3-9s-1.343-9-3-9m-9 9a9 9 0 0 1 9-9" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-strategy-rolling.svg b/src/Assets/IconV2/ic-strategy-rolling.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="M21 12a9 9 0 0 1-9 9m9-9a9 9 0 0 0-9-9m9 9c0 1.657-4.031 3-9 3s-9-1.343-9-3m9 9a9 9 0 0 1-9-9m9 9c1.657 0 3-4.031 3-9s-1.343-9-3-9m-9 9a9 9 0 0 1 9-9" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-sun.svg b/src/Assets/IconV2/ic-sun.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 3.786V2M6.192 6.192 4.929 4.929M3.786 12H2m4.192 5.808-1.263 1.263M12 20.214V22m5.808-4.192 1.263 1.263M20.214 12H22m-4.192-5.808 1.263-1.263M17 12a5 5 0 1 1-10 0 5 5 0 0 1 10 0Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-traffic-signal.svg b/src/Assets/IconV2/ic-traffic-signal.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="M18 6.75h2.25M18 14.25h2.25m-16.5-7.5H6m-2.25 7.5H6M6.75 3h10.5a.75.75 0 0 1 .75.75v16.5a.75.75 0 0 1-.75.75H6.75a.75.75 0 0 1-.75-.75V3.75A.75.75 0 0 1 6.75 3Zm7.5 5.25a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Zm0 7.5a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Common/Checkbox/Checkbox.scss b/src/Common/Checkbox/Checkbox.scss
@@ -51,6 +51,10 @@ $checkbox-hover-bg-image: url('./assets/ic-checkbox-hover.svg');
     background-image: url('./assets/ic-checkbox-selected.svg');
 }
 
+.form__checkbox.error:checked[value='CHECKED'] ~ .form__checkbox-container {
+    background-image: url('./assets/ic-checkbox-selected-error.svg');
+}
+
 .form__checkbox:checked[value='BULK_CHECKED'] ~ .form__checkbox-container {
     background-image: url('./assets/ic-bulk-check.svg');
 }
@@ -84,15 +88,19 @@ $checkbox-hover-bg-image: url('./assets/ic-checkbox-hover.svg');
             }
         }
 
-        .form__checkbox:checked[value='INTERMEDIATE']~.form__checkbox-container {
+        .form__checkbox:checked[value='INTERMEDIATE'] ~ .form__checkbox-container {
             background-image: url('./assets/dark/ic-checkbox-intermediate.svg');
         }
 
-        .form__checkbox:checked[value='CHECKED']~.form__checkbox-container {
+        .form__checkbox:checked[value='CHECKED'] ~ .form__checkbox-container {
             background-image: url('./assets/dark/ic-checkbox-selected.svg');
         }
 
-        .form__checkbox:checked[value='BULK_CHECKED']~.form__checkbox-container {
+        .form__checkbox.error:checked[value='CHECKED'] ~ .form__checkbox-container {
+            background-image: url('./assets/dark/ic-checkbox-selected-error.svg');
+        }
+
+        .form__checkbox:checked[value='BULK_CHECKED'] ~ .form__checkbox-container {
             background-image: url('./assets/dark/ic-bulk-check.svg');
         }
     }
diff --git a/src/Common/Checkbox/assets/dark/ic-checkbox-selected-error.svg b/src/Common/Checkbox/assets/dark/ic-checkbox-selected-error.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <rect width="18" height="18" x="3" y="3" fill="#FF5D60" rx="4"/>
+  <path stroke="#15161F" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m16.813 8.938-6.125 6.124L7.624 12" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Common/Checkbox/assets/ic-checkbox-selected-error.svg b/src/Common/Checkbox/assets/ic-checkbox-selected-error.svg
@@ -0,0 +1,20 @@
+<!--
+  - Copyright (c) 2024. Devtron Inc.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+  -->
+
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <rect width="18" height="18" x="3" y="3" fill="#F33E3E" rx="4"/>
+  <path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m16.813 8.938-6.125 6.124L7.624 12" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts
@@ -381,6 +381,7 @@ export const API_STATUS_CODES = {
     EXPECTATION_FAILED: 417,
     UNPROCESSABLE_ENTITY: 422,
     LOCKED: 423,
+    FAILED_DEPENDENCY: 424,
 }
 
 export enum SERVER_MODE {
diff --git a/src/Common/SortableTableHeaderCell/SortableTableHeaderCell.tsx b/src/Common/SortableTableHeaderCell/SortableTableHeaderCell.tsx
@@ -98,7 +98,7 @@ const SortableTableHeaderCell = ({
         <div className={`flex dc__content-space dc__gap-6 dc__position-rel ${isResizable ? 'w-100 h-100' : ''}`}>
             <button
                 type="button"
-                className={`dc__transparent p-0 cn-7 flex dc__content-start dc__gap-4 dc__select-text ${!isSortable ? 'cursor-default' : ''} dc__position-rel`}
+                className={`dc__transparent p-0 cn-7 flex dc__content-start dc__gap-4 dc__select-text fw-6 ${!isSortable ? 'cursor-default' : ''} dc__position-rel`}
                 onClick={isSortable ? triggerSorting : noop}
                 disabled={disabled}
                 tabIndex={disabled || !isSortable ? -1 : 0}
diff --git a/src/Common/Types.ts b/src/Common/Types.ts
@@ -29,6 +29,7 @@ import {
     ComponentLayoutType,
     StatusType,
     DocLinkProps,
+    DeploymentStrategyType,
 } from '../Shared'
 import {
     ACTION_STATE,
@@ -117,6 +118,7 @@ export interface CheckboxProps {
     onClick?: (event) => void
     id?: string
     dataTestId?: string
+    error?: boolean
     children?: ReactNode
 }
 
@@ -855,7 +857,7 @@ export interface AppEnvironment {
 }
 
 export interface Strategy {
-    deploymentTemplate: string
+    deploymentTemplate: DeploymentStrategyType
     config: any
     default?: boolean
 }
diff --git a/src/Pages/Applications/DevtronApps/Details/CDPipeline/services.ts b/src/Pages/Applications/DevtronApps/Details/CDPipeline/services.ts
@@ -73,6 +73,7 @@ export const triggerCDNode = ({
     abortControllerRef,
     skipIfHibernated,
     isRollbackTrigger = false,
+    strategy,
 }: TriggerCDNodeServiceProps) => {
     const areRuntimeParamsConfigured =
         runtimeParamsPayload && (stageType === DeploymentNodeType.POSTCD || stageType === DeploymentNodeType.PRECD)
@@ -85,6 +86,7 @@ export const triggerCDNode = ({
         isRollbackDeployment: isRollbackTrigger,
         ...(areRuntimeParamsConfigured && runtimeParamsPayload),
         ...(skipIfHibernated ? { skipIfHibernated: true } : {}),
+        ...(strategy ? { strategy } : {}),
     }
 
     if (deploymentWithConfig) {
diff --git a/src/Pages/Applications/DevtronApps/Details/CDPipeline/types.tsx b/src/Pages/Applications/DevtronApps/Details/CDPipeline/types.tsx
@@ -17,7 +17,7 @@
 import { BuildStageType, FormType } from '@Common/CIPipeline.Types'
 import { APIOptions, DeploymentAppTypes, DeploymentNodeType } from '@Common/Types'
 import { DeploymentStrategy } from '@Shared/Components'
-import { EnvListMinDTO, RuntimeParamsTriggerPayloadType } from '@Shared/types'
+import { DeploymentStrategyType, EnvListMinDTO, RuntimeParamsTriggerPayloadType } from '@Shared/types'
 import { STAGE_MAP } from '@Pages/index'
 
 interface ConfigSecretType {
@@ -136,6 +136,7 @@ export interface TriggerCDNodeServiceProps extends Pick<APIOptions, 'abortContro
      */
     runtimeParamsPayload?: RuntimeParamsTriggerPayloadType
     isRollbackTrigger?: boolean
+    strategy?: DeploymentStrategyType
 }
 
 export interface TriggerCDPipelinePayloadType
diff --git a/src/Shared/Components/Button/button.scss b/src/Shared/Components/Button/button.scss
@@ -148,7 +148,7 @@
             $active-bg-color: var(--B200);
 
             @include button-variant-styles($background, var(--B500), $border-color, $active-bg-color);
-            @include pseudo-states(var(--B100), $active-bg-color, var(--B300));
+            @include pseudo-states(var(--bg-hover), $active-bg-color, var(--B300));
         }
 
         &--negative {
@@ -183,7 +183,7 @@
             $active-bg-color: var(--N200);
 
             @include button-variant-styles($background, var(--N700), $border-color, $active-bg-color);
-            @include pseudo-states(var(--N100), $active-bg-color, var(--N300));
+            @include pseudo-states(var(--bg-hover), $active-bg-color, var(--N300));
         }
     }
 
@@ -229,7 +229,7 @@
     // Pseudo states for border-less button
     &__border-less {
         &--default {
-            @include pseudo-states(var(--B100), var(--B200));
+            @include pseudo-states(var(--bg-hover), var(--B200));
         }
 
         &--negative {
@@ -249,7 +249,7 @@
         }
 
         &--neutral {
-            @include pseudo-states(var(--N100), var(--N200));
+            @include pseudo-states(var(--bg-hover), var(--N200));
         }
 
         &--neutral-n0 {
diff --git a/src/Shared/Components/CICDHistory/types.tsx b/src/Shared/Components/CICDHistory/types.tsx
@@ -37,6 +37,7 @@ import {
     DeploymentStatusDetailsBreakdownDataType,
     DeploymentStatusDetailsType,
     DeploymentStatusTimelineType,
+    DeploymentStrategyType,
     GitTriggers,
     Node,
     NodeType,
@@ -736,8 +737,6 @@ export interface DeploymentHistory {
     runSource?: RunSourceType
 }
 
-type DeploymentStrategyType = 'CANARY' | 'ROLLING' | 'RECREATE' | 'BLUE_GREEN'
-
 export interface DeploymentStrategy {
     deploymentTemplate: DeploymentStrategyType
     config: any
diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx
diff --git a/src/Shared/Components/Icon/types.ts b/src/Shared/Components/Icon/types.ts
diff --git a/src/Shared/Components/LoadingCard.tsx b/src/Shared/Components/LoadingCard.tsx
diff --git a/src/Shared/Components/StatusComponent/AppStatus.tsx b/src/Shared/Components/StatusComponent/AppStatus.tsx
diff --git a/src/Shared/Components/StatusComponent/utils.ts b/src/Shared/Components/StatusComponent/utils.ts
diff --git a/src/Shared/Components/Switch/Switch.component.tsx b/src/Shared/Components/Switch/Switch.component.tsx
diff --git a/src/Shared/Components/Switch/types.ts b/src/Shared/Components/Switch/types.ts
diff --git a/src/Shared/Components/Switch/utils.ts b/src/Shared/Components/Switch/utils.ts
diff --git a/src/Shared/Components/index.ts b/src/Shared/Components/index.ts
diff --git a/src/Shared/types.ts b/src/Shared/types.ts
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.14.1-pre-7-beta-1",`
	`3`	`+ "version": "1.14.2-pre-1",`
`4`	`4`	`"description": "Supporting common component library",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"main": "dist/index.js",`