From b2b8d94617980db008b54017c0ea430bc1e746ad Mon Sep 17 00:00:00 2001
From: Mateusz Kwasniewski <kwasniewski.mateusz@gmail.com>
Date: Tue, 14 May 2024 09:24:54 +0200
Subject: [PATCH] feat: lifecycle column extracted (#7049)

---
 .../FeatureEnvironmentSeenCell.tsx            |  5 --
 .../FeatureLifecycleStageIcon.tsx             |  3 +-
 .../FeatureLifecycleTooltip.tsx               |  7 +-
 .../ProjectFeatureToggles.tsx                 | 68 ++++++++++++-------
 4 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/frontend/src/component/common/Table/cells/FeatureSeenCell/FeatureEnvironmentSeenCell.tsx b/frontend/src/component/common/Table/cells/FeatureSeenCell/FeatureEnvironmentSeenCell.tsx
index 1f23fb250a..f7a27284e0 100644
--- a/frontend/src/component/common/Table/cells/FeatureSeenCell/FeatureEnvironmentSeenCell.tsx
+++ b/frontend/src/component/common/Table/cells/FeatureSeenCell/FeatureEnvironmentSeenCell.tsx
@@ -53,11 +53,6 @@ export const FeatureLifecycleCell: VFC<IFeatureLifecycleProps> = ({
 
     return (
         <Box sx={{ display: 'flex', justifyContent: 'center' }}>
-            <FeatureEnvironmentSeen
-                featureLastSeen={feature.lastSeenAt || undefined}
-                environments={environments}
-                {...rest}
-            />
             <FeatureLifecycle
                 onArchive={onArchive}
                 onComplete={onComplete}
diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/FeatureLifecycleStageIcon.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/FeatureLifecycleStageIcon.tsx
index fc88d78821..e8d79886c0 100644
--- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/FeatureLifecycleStageIcon.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/FeatureLifecycleStageIcon.tsx
@@ -3,7 +3,6 @@ import { ReactComponent as InitialStageIcon } from 'assets/icons/stage-initial.s
 import { ReactComponent as PreLiveStageIcon } from 'assets/icons/stage-pre-live.svg';
 import { ReactComponent as LiveStageIcon } from 'assets/icons/stage-live.svg';
 import { ReactComponent as CompletedStageIcon } from 'assets/icons/stage-completed.svg';
-import { ReactComponent as CompletedDiscardedStageIcon } from 'assets/icons/stage-completed-discarded.svg';
 import { ReactComponent as ArchivedStageIcon } from 'assets/icons/stage-archived.svg';
 import type { LifecycleStage } from './LifecycleStage';
 
@@ -19,7 +18,7 @@ export const FeatureLifecycleStageIcon: FC<{ stage: LifecycleStage }> = ({
     } else if (stage.name === 'completed' && stage.status === 'kept') {
         return <CompletedStageIcon />;
     } else if (stage.name === 'completed' && stage.status === 'discarded') {
-        return <CompletedDiscardedStageIcon />;
+        return <CompletedStageIcon />;
     } else {
         return <InitialStageIcon />;
     }
diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/FeatureLifecycleTooltip.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/FeatureLifecycleTooltip.tsx
index 32d32317c9..f5126cdfac 100644
--- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/FeatureLifecycleTooltip.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureLifecycle/FeatureLifecycleTooltip.tsx
@@ -7,7 +7,6 @@ import { ReactComponent as InitialStageIcon } from 'assets/icons/stage-initial.s
 import { ReactComponent as PreLiveStageIcon } from 'assets/icons/stage-pre-live.svg';
 import { ReactComponent as LiveStageIcon } from 'assets/icons/stage-live.svg';
 import { ReactComponent as CompletedStageIcon } from 'assets/icons/stage-completed.svg';
-import { ReactComponent as CompletedDiscardedStageIcon } from 'assets/icons/stage-completed-discarded.svg';
 import { ReactComponent as ArchivedStageIcon } from 'assets/icons/stage-archived.svg';
 import CloudCircle from '@mui/icons-material/CloudCircle';
 import { ReactComponent as UsageRate } from 'assets/icons/usage-rate.svg';
@@ -184,11 +183,7 @@ const StageTimeline: FC<{
                 data-after-content='Completed'
                 active={stage.name === 'completed'}
             >
-                {stage.name === 'completed' && stage.status === 'discarded' ? (
-                    <CompletedDiscardedStageIcon />
-                ) : (
-                    <CompletedStageIcon />
-                )}
+                <CompletedStageIcon />
             </StageBox>
 
             <Line />
diff --git a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx
index d0d4bdc50c..181fa181ca 100644
--- a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx
+++ b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx
@@ -202,30 +202,9 @@ export const ProjectFeatureToggles = ({
                 id: 'lastSeenAt',
                 header: 'Last seen',
                 cell: ({ row: { original } }) => (
-                    <ConditionallyRender
-                        condition={featureLifecycleEnabled}
-                        show={
-                            <FeatureLifecycleCell
-                                feature={original}
-                                onComplete={() => {
-                                    setShowMarkCompletedDialogue({
-                                        featureId: original.name,
-                                        open: true,
-                                    });
-                                }}
-                                onUncomplete={refetch}
-                                onArchive={() =>
-                                    setFeatureArchiveState(original.name)
-                                }
-                                data-loading
-                            />
-                        }
-                        elseShow={
-                            <MemoizedFeatureEnvironmentSeenCell
-                                feature={original}
-                                data-loading
-                            />
-                        }
+                    <MemoizedFeatureEnvironmentSeenCell
+                        feature={original}
+                        data-loading
                     />
                 ),
                 size: 50,
@@ -234,6 +213,36 @@ export const ProjectFeatureToggles = ({
                     width: '1%',
                 },
             }),
+            ...(featureLifecycleEnabled
+                ? [
+                      columnHelper.accessor('lifecycle', {
+                          id: 'lifecycle',
+                          header: 'Lifecycle',
+                          cell: ({ row: { original } }) => (
+                              <FeatureLifecycleCell
+                                  feature={original}
+                                  onComplete={() => {
+                                      setShowMarkCompletedDialogue({
+                                          featureId: original.name,
+                                          open: true,
+                                      });
+                                  }}
+                                  onUncomplete={refetch}
+                                  onArchive={() =>
+                                      setFeatureArchiveState(original.name)
+                                  }
+                                  data-loading
+                              />
+                          ),
+                          enableSorting: false,
+                          size: 50,
+                          meta: {
+                              align: 'center',
+                              width: '1%',
+                          },
+                      }),
+                  ]
+                : []),
             ...environments.map((name: string) => {
                 const isChangeRequestEnabled = isChangeRequestConfigured(name);
 
@@ -314,6 +323,7 @@ export const ProjectFeatureToggles = ({
             tableState.favoritesFirst,
             refetch,
             isPlaceholder,
+            featureLifecycleEnabled,
         ],
     );
 
@@ -430,6 +440,16 @@ export const ProjectFeatureToggles = ({
                                         id: 'lastSeenAt',
                                         isVisible: columnVisibility.lastSeenAt,
                                     },
+                                    ...(featureLifecycleEnabled
+                                        ? [
+                                              {
+                                                  header: 'Lifecycle',
+                                                  id: 'lifecycle',
+                                                  isVisible:
+                                                      columnVisibility.lifecycle,
+                                              },
+                                          ]
+                                        : []),
                                     {
                                         id: 'divider',
                                     },