From c3f67f56bfbf2c6c627e35912979c10c391f8fec Mon Sep 17 00:00:00 2001
From: Eduardo Espadeiro <eduardo.espadeiro@freiheit.com>
Date: Tue, 28 Jan 2025 09:28:31 +0000
Subject: [PATCH] fix: skipped envs with cancel deployments (#2223)

Deploying and canceling deployments for a group wasn't taking into
account environments that should be skipped.

Ref: SRX-3I6YKY
---
 .../components/ReleaseDialog/ReleaseDialog.tsx |  3 ++-
 .../__snapshots__/ReleaseDialog.test.tsx.snap  | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/services/frontend-service/src/ui/components/ReleaseDialog/ReleaseDialog.tsx b/services/frontend-service/src/ui/components/ReleaseDialog/ReleaseDialog.tsx
index c8041857f..3651c8d0c 100644
--- a/services/frontend-service/src/ui/components/ReleaseDialog/ReleaseDialog.tsx
+++ b/services/frontend-service/src/ui/components/ReleaseDialog/ReleaseDialog.tsx
@@ -475,7 +475,8 @@ export const EnvironmentGroupLane: React.FC<{
                 action.action.deploy.environment === env.name
         )
     );
-    const alreadyPlanned = envsWithoutPlannedDeployments.length === 0;
+    const alreadyPlanned =
+        envsWithoutPlannedDeployments.filter((env) => release.environments.includes(env.name)).length === 0;
 
     const createEnvGroupLock = React.useCallback(() => {
         environmentGroup.environments.forEach((environment) => {
diff --git a/services/frontend-service/src/ui/components/ReleaseDialog/__snapshots__/ReleaseDialog.test.tsx.snap b/services/frontend-service/src/ui/components/ReleaseDialog/__snapshots__/ReleaseDialog.test.tsx.snap
index ffd613182..20d538e8f 100644
--- a/services/frontend-service/src/ui/components/ReleaseDialog/__snapshots__/ReleaseDialog.test.tsx.snap
+++ b/services/frontend-service/src/ui/components/ReleaseDialog/__snapshots__/ReleaseDialog.test.tsx.snap
@@ -119,8 +119,8 @@ exports[`Release Dialog Renders the environment locks normal release 1`] = `
                         class="first-two"
                       >
                         <button
-                          aria-label="Deploy & Lock"
-                          class="mdc-button button-main env-card-deploy-btn mdc-button--unelevated"
+                          aria-label="Cancel Deploy & Lock"
+                          class="mdc-button button-main env-card-deploy-btn mdc-button--unelevated deploy-button-cancel"
                         >
                           <div
                             class="mdc-button__ripple"
@@ -128,7 +128,7 @@ exports[`Release Dialog Renders the environment locks normal release 1`] = `
                           <span
                             class="mdc-button__label"
                           >
-                            Deploy & Lock
+                            Cancel Deploy & Lock
                           </span>
                         </button>
                         <button
@@ -431,8 +431,8 @@ exports[`Release Dialog Renders the environment locks normal release with deploy
                         class="first-two"
                       >
                         <button
-                          aria-label="Deploy & Lock"
-                          class="mdc-button button-main env-card-deploy-btn mdc-button--unelevated"
+                          aria-label="Cancel Deploy & Lock"
+                          class="mdc-button button-main env-card-deploy-btn mdc-button--unelevated deploy-button-cancel"
                         >
                           <div
                             class="mdc-button__ripple"
@@ -440,7 +440,7 @@ exports[`Release Dialog Renders the environment locks normal release with deploy
                           <span
                             class="mdc-button__label"
                           >
-                            Deploy & Lock
+                            Cancel Deploy & Lock
                           </span>
                         </button>
                         <button
@@ -743,8 +743,8 @@ exports[`Release Dialog Renders the environment locks two envs release 1`] = `
                         class="first-two"
                       >
                         <button
-                          aria-label="Deploy & Lock"
-                          class="mdc-button button-main env-card-deploy-btn mdc-button--unelevated"
+                          aria-label="Cancel Deploy & Lock"
+                          class="mdc-button button-main env-card-deploy-btn mdc-button--unelevated deploy-button-cancel"
                         >
                           <div
                             class="mdc-button__ripple"
@@ -752,7 +752,7 @@ exports[`Release Dialog Renders the environment locks two envs release 1`] = `
                           <span
                             class="mdc-button__label"
                           >
-                            Deploy & Lock
+                            Cancel Deploy & Lock
                           </span>
                         </button>
                         <button