From 5fa13aba0e7acad756c2baf661c163d36137bc92 Mon Sep 17 00:00:00 2001
From: Mateusz Kwasniewski <kwasniewski.mateusz@gmail.com>
Date: Mon, 17 Apr 2023 11:21:52 +0200
Subject: [PATCH] feat: remove project overview flags (#3532)

---
 .../src/component/project/Project/Project.tsx | 37 -------------------
 .../Project/ProjectInfo/ProjectInfo.tsx       | 27 --------------
 .../project/Project/ProjectOverview.tsx       |  5 +--
 .../__snapshots__/create-config.test.ts.snap  |  4 --
 src/lib/services/project-service.ts           | 28 ++++++--------
 src/lib/types/experimental.ts                 |  5 ---
 src/server-dev.ts                             |  1 -
 7 files changed, 13 insertions(+), 94 deletions(-)

diff --git a/frontend/src/component/project/Project/Project.tsx b/frontend/src/component/project/Project/Project.tsx
index ce02a943d8..626e32b447 100644
--- a/frontend/src/component/project/Project/Project.tsx
+++ b/frontend/src/component/project/Project/Project.tsx
@@ -195,43 +195,6 @@ export const Project = () => {
                             />
                         </StyledDiv>
                     </StyledTopRow>
-                    <ConditionallyRender
-                        condition={
-                            !Boolean(uiConfig?.flags?.newProjectOverview)
-                        }
-                        // TODO: !!! Remove entire block when removing feature flag!
-                        show={() => (
-                            <StyledColumn>
-                                <StyledProjectTitle>
-                                    <div>
-                                        <ConditionallyRender
-                                            condition={Boolean(
-                                                project.description
-                                            )}
-                                            show={
-                                                <StyledDiv>
-                                                    <StyledTitle data-loading>
-                                                        Description:&nbsp;
-                                                    </StyledTitle>
-                                                    <StyledText data-loading>
-                                                        {project.description}
-                                                    </StyledText>
-                                                </StyledDiv>
-                                            }
-                                        />
-                                        <StyledDiv>
-                                            <StyledTitle data-loading>
-                                                projectId:&nbsp;
-                                            </StyledTitle>
-                                            <StyledText data-loading>
-                                                {projectId}
-                                            </StyledText>
-                                        </StyledDiv>
-                                    </div>
-                                </StyledProjectTitle>
-                            </StyledColumn>
-                        )}
-                    />
                 </StyledInnerContainer>
 
                 <StyledSeparator />
diff --git a/frontend/src/component/project/Project/ProjectInfo/ProjectInfo.tsx b/frontend/src/component/project/Project/ProjectInfo/ProjectInfo.tsx
index 077c48b252..e8ab9a33c2 100644
--- a/frontend/src/component/project/Project/ProjectInfo/ProjectInfo.tsx
+++ b/frontend/src/component/project/Project/ProjectInfo/ProjectInfo.tsx
@@ -60,33 +60,6 @@ const ProjectInfo = ({
         (!showChangeRequestsWidget && !showProjectMembersWidget) ||
         (isSmallScreen && showChangeRequestsWidget && showProjectMembersWidget);
 
-    if (!Boolean(uiConfig?.flags.newProjectOverview)) {
-        return (
-            <aside>
-                <Box
-                    sx={{
-                        display: 'grid',
-                        gridTemplateColumns:
-                            'repeat(auto-fit, minmax(225px, 1fr))',
-                        gap: theme => theme.spacing(2),
-                        paddingBottom: theme => theme.spacing(2),
-                    }}
-                >
-                    <LegacyHealthWidget projectId={id} health={health} />
-                    <ConditionallyRender
-                        condition={showProjectMembersWidget}
-                        show={
-                            <LegacyProjectMembersWidget
-                                projectId={id}
-                                memberCount={memberCount}
-                            />
-                        }
-                    />
-                </Box>
-            </aside>
-        );
-    }
-
     return (
         <aside>
             <StyledProjectInfoSidebarContainer
diff --git a/frontend/src/component/project/Project/ProjectOverview.tsx b/frontend/src/component/project/Project/ProjectOverview.tsx
index 7eff1fb1d2..912496330d 100644
--- a/frontend/src/component/project/Project/ProjectOverview.tsx
+++ b/frontend/src/component/project/Project/ProjectOverview.tsx
@@ -60,10 +60,7 @@ const ProjectOverview = () => {
                 stats={stats}
             />
             <StyledContentContainer>
-                <ConditionallyRender
-                    condition={Boolean(uiConfig?.flags.newProjectOverview)}
-                    show={<ProjectStats stats={project.stats} />}
-                />
+                <ProjectStats stats={project.stats} />
                 <StyledProjectToggles>
                     <ProjectFeatureToggles
                         features={features}
diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap
index b57b47fc03..1cd75cdb24 100644
--- a/src/lib/__snapshots__/create-config.test.ts.snap
+++ b/src/lib/__snapshots__/create-config.test.ts.snap
@@ -86,10 +86,8 @@ exports[`should create default config 1`] = `
       "optimal304Differ": false,
       "personalAccessTokensKillSwitch": false,
       "proPlanAutoCharge": false,
-      "projectMode": false,
       "projectScopedSegments": false,
       "projectScopedStickiness": false,
-      "projectStatusApi": false,
       "responseTimeWithAppNameKillSwitch": false,
       "strictSchemaValidation": false,
     },
@@ -115,10 +113,8 @@ exports[`should create default config 1`] = `
       "optimal304Differ": false,
       "personalAccessTokensKillSwitch": false,
       "proPlanAutoCharge": false,
-      "projectMode": false,
       "projectScopedSegments": false,
       "projectScopedStickiness": false,
-      "projectStatusApi": false,
       "responseTimeWithAppNameKillSwitch": false,
       "strictSchemaValidation": false,
     },
diff --git a/src/lib/services/project-service.ts b/src/lib/services/project-service.ts
index 2dfc01fa25..a50d5ed4b3 100644
--- a/src/lib/services/project-service.ts
+++ b/src/lib/services/project-service.ts
@@ -666,24 +666,20 @@ export default class ProjectService {
     }
 
     async statusJob(): Promise<void> {
-        if (this.flagResolver.isEnabled('projectStatusApi')) {
-            const projects = await this.store.getAll();
+        const projects = await this.store.getAll();
 
-            const statusUpdates = await Promise.all(
-                projects.map((project) => this.getStatusUpdates(project.id)),
-            );
+        const statusUpdates = await Promise.all(
+            projects.map((project) => this.getStatusUpdates(project.id)),
+        );
 
-            await Promise.all(
-                statusUpdates.map((statusUpdate) => {
-                    return this.projectStatsStore.updateProjectStats(
-                        statusUpdate.projectId,
-                        statusUpdate.updates,
-                    );
-                }),
-            );
-        } else {
-            this.logger.info('Project status API is disabled');
-        }
+        await Promise.all(
+            statusUpdates.map((statusUpdate) => {
+                return this.projectStatsStore.updateProjectStats(
+                    statusUpdate.projectId,
+                    statusUpdate.updates,
+                );
+            }),
+        );
     }
 
     async getStatusUpdates(projectId: string): Promise<ICalculateStatus> {
diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts
index cde338c6d3..1a295db68d 100644
--- a/src/lib/types/experimental.ts
+++ b/src/lib/types/experimental.ts
@@ -10,10 +10,6 @@ const flags = {
         process.env.UNLEASH_EXPERIMENTAL_EMBED_PROXY,
         true,
     ),
-    projectStatusApi: parseEnvVarBoolean(
-        process.env.UNLEASH_EXPERIMENTAL_PROJECT_STATUS_API,
-        false,
-    ),
     newProjectOverview: parseEnvVarBoolean(
         process.env.NEW_PROJECT_OVERVIEW,
         false,
@@ -67,7 +63,6 @@ const flags = {
         process.env.PROJECT_SCOPED_STICKINESS,
         false,
     ),
-    projectMode: parseEnvVarBoolean(process.env.PROJECT_MODE, false),
     personalAccessTokensKillSwitch: parseEnvVarBoolean(
         process.env.UNLEASH_PAT_KILL_SWITCH,
         false,
diff --git a/src/server-dev.ts b/src/server-dev.ts
index 1224ffed3d..cd87485fb0 100644
--- a/src/server-dev.ts
+++ b/src/server-dev.ts
@@ -40,7 +40,6 @@ process.nextTick(async () => {
                         responseTimeWithAppNameKillSwitch: false,
                         newProjectOverview: true,
                         bulkOperations: true,
-                        projectStatusApi: true,
                         projectScopedSegments: true,
                         projectScopedStickiness: true,
                         optimal304: true,