From f6e85171d9e409121e76b136557ab42bbf645482 Mon Sep 17 00:00:00 2001
From: Mateusz Kwasniewski <kwasniewski.mateusz@gmail.com>
Date: Wed, 8 May 2024 14:16:10 +0200
Subject: [PATCH] feat: completed stage lists all environments (#7007)

---
 .../FeatureLifecycleTooltip.tsx               | 19 ++++++++++++++-----
 .../populateCurrentStage.test.ts              |  6 +++++-
 .../FeatureLifecycle/populateCurrentStage.ts  |  4 +---
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/FeatureLifecycleTooltip.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/FeatureLifecycleTooltip.tsx
index 70765edf96..2e2bde2113 100644
--- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/FeatureLifecycleTooltip.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/FeatureLifecycleTooltip.tsx
@@ -315,8 +315,8 @@ const SafeToArchive: FC<{
                     mb: 1,
                 }}
             >
-                We haven’t seen this feature flag in production for at least two
-                days. It’s likely that it’s safe to archive this flag.
+                We haven’t seen this feature flag in any environment for at
+                least two days. It’s likely that it’s safe to archive this flag.
             </InfoText>
             <Box
                 sx={{
@@ -362,8 +362,18 @@ const ActivelyUsed: FC<{
             }}
         >
             This feature has been successfully completed, but we are still
-            seeing usage in production. Clean up the feature flag from your code
-            before archiving it:
+            seeing usage. Clean up the feature flag from your code before
+            archiving it:
+        </InfoText>
+        {children}
+        <InfoText
+            sx={{
+                mt: 1,
+                mb: 1,
+            }}
+        >
+            If you think this feature was completed too early you can revert to
+            the live stage:
         </InfoText>
         <PermissionButton
             color='inherit'
@@ -376,7 +386,6 @@ const ActivelyUsed: FC<{
         >
             Revert to live
         </PermissionButton>
-        {children}
     </>
 );
 
diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/populateCurrentStage.test.ts b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/populateCurrentStage.test.ts
index f8bc32879f..366f7b0506 100644
--- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/populateCurrentStage.test.ts
+++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/populateCurrentStage.test.ts
@@ -58,12 +58,16 @@ describe('populateCurrentStage', () => {
             lifecycle: { stage: 'completed', enteredStageAt },
             environments: [
                 { name: 'prod', type: 'production', lastSeenAt: '2022-08-01' },
+                { name: 'dev', type: 'development', lastSeenAt: '2022-08-01' },
             ],
         } as IFeatureToggle;
         const expected = {
             name: 'completed',
             status: 'kept',
-            environments: [{ name: 'prod', lastSeenAt: '2022-08-01' }],
+            environments: [
+                { name: 'prod', lastSeenAt: '2022-08-01' },
+                { name: 'dev', lastSeenAt: '2022-08-01' },
+            ],
             enteredStageAt,
         };
         const result = populateCurrentStage(feature);
diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/populateCurrentStage.ts b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/populateCurrentStage.ts
index 451d54fd93..fd33662f95 100644
--- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/populateCurrentStage.ts
+++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/populateCurrentStage.ts
@@ -40,9 +40,7 @@ export const populateCurrentStage = (
             return {
                 name: 'completed',
                 status: 'kept',
-                environments: getFilteredEnvironments(
-                    (type) => type === 'production',
-                ),
+                environments: getFilteredEnvironments(() => true),
                 enteredStageAt,
             };
         case 'archived':