From 8ae78236d2d06316d5261ae45d6eb9fadb537197 Mon Sep 17 00:00:00 2001 From: Mateusz Kwasniewski Date: Tue, 7 May 2024 13:58:56 +0200 Subject: [PATCH] chore: remove project overview refactor flag (#6897) --- .../cells/FeatureSeenCell/LastSeenTooltip.tsx | 9 +-- .../src/component/project/Project/Project.tsx | 37 ++-------- .../project/Project/ProjectOverview.tsx | 67 ------------------- frontend/src/interfaces/uiConfig.ts | 1 - .../__snapshots__/create-config.test.ts.snap | 1 - src/lib/types/experimental.ts | 5 -- src/server-dev.ts | 1 - 7 files changed, 8 insertions(+), 113 deletions(-) diff --git a/frontend/src/component/common/Table/cells/FeatureSeenCell/LastSeenTooltip.tsx b/frontend/src/component/common/Table/cells/FeatureSeenCell/LastSeenTooltip.tsx index daa4f8e8f3..81e941a165 100644 --- a/frontend/src/component/common/Table/cells/FeatureSeenCell/LastSeenTooltip.tsx +++ b/frontend/src/component/common/Table/cells/FeatureSeenCell/LastSeenTooltip.tsx @@ -4,7 +4,6 @@ import type { ILastSeenEnvironments } from 'interfaces/featureToggle'; import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; import { useLastSeenColors } from 'component/feature/FeatureView/FeatureEnvironmentSeen/useLastSeenColors'; import { LastSeenProgress } from './LastSeenProgress/LastSeenProgress'; -import { useUiFlag } from 'hooks/useUiFlag'; const StyledDescription = styled( 'div', @@ -75,7 +74,6 @@ export const LastSeenTooltip = ({ ...rest }: ILastSeenTooltipProps) => { const getColor = useLastSeenColors(); - const projectOverviewRefactor = useUiFlag('projectOverviewRefactor'); const [, defaultTextColor] = getColor(); const environmentsHaveLastSeen = environments?.some((environment) => Boolean(environment.lastSeenAt), @@ -134,12 +132,7 @@ export const LastSeenTooltip = ({ } /> - - } - /> + ))} diff --git a/frontend/src/component/project/Project/Project.tsx b/frontend/src/component/project/Project/Project.tsx index a976f9523f..07fbb9c377 100644 --- a/frontend/src/component/project/Project/Project.tsx +++ b/frontend/src/component/project/Project/Project.tsx @@ -38,12 +38,10 @@ import { ImportModal } from './Import/ImportModal'; import { IMPORT_BUTTON } from 'utils/testIds'; import { EnterpriseBadge } from 'component/common/EnterpriseBadge/EnterpriseBadge'; import { Badge } from 'component/common/Badge/Badge'; -import { ProjectDoraMetrics } from './ProjectDoraMetrics/ProjectDoraMetrics'; import type { UiFlags } from 'interfaces/uiConfig'; import { HiddenProjectIconWithTooltip } from './HiddenProjectIconWithTooltip/HiddenProjectIconWithTooltip'; import { ChangeRequestPlausibleProvider } from 'component/changeRequest/ChangeRequestContext'; import { ProjectApplications } from '../ProjectApplications/ProjectApplications'; -import { useUiFlag } from 'hooks/useUiFlag'; import { ProjectInsights } from './ProjectInsights/ProjectInsights'; const StyledBadge = styled(Badge)(({ theme }) => ({ @@ -78,8 +76,6 @@ export const Project = () => { const projectName = project?.name || projectId; const { favorite, unfavorite } = useFavoriteProjectsApi(); - const projectOverviewRefactor = useUiFlag('projectOverviewRefactor'); - const [showDelDialog, setShowDelDialog] = useState(false); const [ @@ -93,16 +89,12 @@ export const Project = () => { path: basePath, name: 'overview', }, - ...(projectOverviewRefactor - ? [ - { - title: 'Insights', - path: `${basePath}/insights`, - name: 'insights', - new: true, - }, - ] - : []), + { + title: 'Insights', + path: `${basePath}/insights`, + name: 'insights', + new: true, + }, { title: 'Health', path: `${basePath}/health`, @@ -119,16 +111,6 @@ export const Project = () => { name: 'change-request', isEnterprise: true, }, - ...(!projectOverviewRefactor - ? [ - { - title: 'Metrics', - path: `${basePath}/metrics`, - name: 'dora', - isEnterprise: true, - }, - ] - : []), { title: 'Applications', path: `${basePath}/applications`, @@ -319,9 +301,7 @@ export const Project = () => { /> } /> } /> - {Boolean(projectOverviewRefactor) && ( - } /> - )} + } /> } /> { } /> } /> - {Boolean(!projectOverviewRefactor) && ( - } /> - )} } /> } /> diff --git a/frontend/src/component/project/Project/ProjectOverview.tsx b/frontend/src/component/project/Project/ProjectOverview.tsx index e579bd52f0..218c13c864 100644 --- a/frontend/src/component/project/Project/ProjectOverview.tsx +++ b/frontend/src/component/project/Project/ProjectOverview.tsx @@ -1,17 +1,13 @@ import { type FC, useEffect } from 'react'; import { Box, styled } from '@mui/material'; -import ProjectInfo from './ProjectInfo/ProjectInfo'; import { useRequiredPathParam } from 'hooks/useRequiredPathParam'; -import { ProjectStats } from './ProjectStats/ProjectStats'; import { ProjectFeatureToggles } from './PaginatedProjectFeatureToggles/ProjectFeatureToggles'; import useProjectOverview, { useProjectOverviewNameOrId, } from 'hooks/api/getters/useProjectOverview/useProjectOverview'; import { usePageTitle } from 'hooks/usePageTitle'; import { useLastViewedProject } from 'hooks/useLastViewedProject'; -import { useUiFlag } from 'hooks/useUiFlag'; import { ProjectOverviewChangeRequests } from './ProjectOverviewChangeRequests'; -import { OldProjectFeatureToggles } from './PaginatedProjectFeatureToggles/OldProjectFeatureToggles'; const refreshInterval = 15 * 1000; @@ -38,69 +34,6 @@ const StyledContentContainer = styled(Box)(({ theme }) => ({ const ProjectOverview: FC<{ storageKey?: string; -}> = ({ storageKey = 'project-overview-v2' }) => { - const projectOverviewRefactor = useUiFlag('projectOverviewRefactor'); - - if (projectOverviewRefactor) { - return ; - } else { - return ; - } -}; - -const OldProjectOverview: FC<{ - storageKey?: string; -}> = ({ storageKey = 'project-overview-v2' }) => { - const projectId = useRequiredPathParam('projectId'); - const projectName = useProjectOverviewNameOrId(projectId); - const { project } = useProjectOverview(projectId, { - refreshInterval, - }); - usePageTitle(`Project overview – ${projectName}`); - const { setLastViewed } = useLastViewedProject(); - useEffect(() => { - setLastViewed(projectId); - }, [projectId, setLastViewed]); - - const { - members, - featureTypeCounts, - health, - description, - environments, - stats, - } = project; - - return ( - - - - - - - - environment.environment, - )} - refreshInterval={refreshInterval} - storageKey={storageKey} - /> - - - - ); -}; - -const NewProjectOverview: FC<{ - storageKey?: string; }> = ({ storageKey = 'project-overview-v2' }) => { const projectId = useRequiredPathParam('projectId'); const projectName = useProjectOverviewNameOrId(projectId); diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index c84a8a514b..0b7b0d6bd3 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -75,7 +75,6 @@ export type UiFlags = { featureSearchFeedbackPosting?: boolean; userAccessUIEnabled?: boolean; outdatedSdksBanner?: boolean; - projectOverviewRefactor?: string; displayTrafficDataUsage?: boolean; disableShowContextFieldSelectionValues?: boolean; projectOverviewRefactorFeedback?: boolean; diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap index c67b884c95..9ee96f098d 100644 --- a/src/lib/__snapshots__/create-config.test.ts.snap +++ b/src/lib/__snapshots__/create-config.test.ts.snap @@ -136,7 +136,6 @@ exports[`should create default config 1`] = ` "parseProjectFromSession": false, "personalAccessTokensKillSwitch": false, "projectListFilterMyProjects": false, - "projectOverviewRefactor": false, "projectOverviewRefactorFeedback": false, "projectsListNewCards": false, "queryMissingTokens": false, diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index d867f6eadd..f7753d257e 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -51,7 +51,6 @@ export type IFlagKey = | 'responseTimeMetricsFix' | 'scimApi' | 'displayEdgeBanner' - | 'projectOverviewRefactor' | 'disableShowContextFieldSelectionValues' | 'projectOverviewRefactorFeedback' | 'featureLifecycle' @@ -251,10 +250,6 @@ const flags: IFlags = { process.env.UNLEASH_EXPERIMENTAL_RESPONSE_TIME_METRICS_FIX, false, ), - projectOverviewRefactor: parseEnvVarBoolean( - process.env.UNLEASH_EXPERIMENTAL_PROJECT_OVERVIEW_REFACTOR, - false, - ), disableShowContextFieldSelectionValues: parseEnvVarBoolean( process.env .UNLEASH_EXPERIMENTAL_DISABLE_SHOW_CONTEXT_FIELD_SELECTION_VALUES, diff --git a/src/server-dev.ts b/src/server-dev.ts index c85feb24e0..58f781649d 100644 --- a/src/server-dev.ts +++ b/src/server-dev.ts @@ -47,7 +47,6 @@ process.nextTick(async () => { executiveDashboardUI: true, userAccessUIEnabled: true, outdatedSdksBanner: true, - projectOverviewRefactor: true, disableShowContextFieldSelectionValues: false, projectOverviewRefactorFeedback: true, featureLifecycle: true,