From 4932ae05398d0b2eec7196fd4a078e5a164b2e65 Mon Sep 17 00:00:00 2001 From: "gitar-bot[bot]" <159877585+gitar-bot[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 11:04:00 +0200 Subject: [PATCH] [Gitar] Cleaning up stale feature flag: increaseUnleashWidth with value true (#6724) Co-authored-by: Gitar Bot Co-authored-by: sjaanus --- .../MainLayout/DraftBanner/DraftBanner.tsx | 41 +------------------ .../layout/MainLayout/MainLayout.tsx | 6 +-- frontend/src/component/menu/Header/Header.tsx | 30 +------------- 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, 5 insertions(+), 80 deletions(-) diff --git a/frontend/src/component/layout/MainLayout/DraftBanner/DraftBanner.tsx b/frontend/src/component/layout/MainLayout/DraftBanner/DraftBanner.tsx index ec6fd33cad..0dfe4dca6d 100644 --- a/frontend/src/component/layout/MainLayout/DraftBanner/DraftBanner.tsx +++ b/frontend/src/component/layout/MainLayout/DraftBanner/DraftBanner.tsx @@ -6,45 +6,18 @@ import { usePendingChangeRequests } from 'hooks/api/getters/usePendingChangeRequ import type { ChangeRequestType } from 'component/changeRequest/changeRequest.types'; import { changesCount } from 'component/changeRequest/changesCount'; import { Sticky } from 'component/common/Sticky/Sticky'; -import { useUiFlag } from 'hooks/useUiFlag'; interface IDraftBannerProps { project: string; } -const StyledNormalDraftBannerContentWrapper = styled(Box)(({ theme }) => ({ - display: 'flex', - alignItems: 'center', - padding: theme.spacing(1, 0), - [theme.breakpoints.down('lg')]: { - padding: theme.spacing(1, 2), - }, -})); - -const StyledSpaciousDraftBannerContentWrapper = styled(Box)(({ theme }) => ({ +const StyledDraftBannerContentWrapper = styled(Box)(({ theme }) => ({ display: 'flex', alignItems: 'center', padding: theme.spacing(1, 0), })); -const StyledNormalDraftBanner = styled(Box)(({ theme }) => ({ - width: '1250px', - marginLeft: 'auto', - marginRight: 'auto', - [theme.breakpoints.down('lg')]: { - width: '1024px', - }, - [theme.breakpoints.down(1024)]: { - width: '100%', - marginLeft: 0, - marginRight: 0, - }, - [theme.breakpoints.down('sm')]: { - minWidth: '100%', - }, -})); - -const StyledSpaciousDraftBanner = styled(Box)(({ theme }) => ({ +const StyledDraftBanner = styled(Box)(({ theme }) => ({ maxWidth: '1512px', paddingLeft: theme.spacing(2), paddingRight: theme.spacing(2), @@ -81,16 +54,6 @@ const DraftBannerContent: FC<{ }[changeRequests[0].state as 'Draft' | 'In review' | 'Approved'] : ''; - const increaseUnleashWidth = useUiFlag('increaseUnleashWidth'); - - const StyledDraftBanner = increaseUnleashWidth - ? StyledSpaciousDraftBanner - : StyledNormalDraftBanner; - - const StyledDraftBannerContentWrapper = increaseUnleashWidth - ? StyledSpaciousDraftBannerContentWrapper - : StyledNormalDraftBannerContentWrapper; - return ( diff --git a/frontend/src/component/layout/MainLayout/MainLayout.tsx b/frontend/src/component/layout/MainLayout/MainLayout.tsx index 92aae63b85..6012fa7174 100644 --- a/frontend/src/component/layout/MainLayout/MainLayout.tsx +++ b/frontend/src/component/layout/MainLayout/MainLayout.tsx @@ -14,7 +14,6 @@ import { ConditionallyRender } from 'component/common/ConditionallyRender/Condit import { useChangeRequestsEnabled } from 'hooks/useChangeRequestsEnabled'; import { DraftBanner } from './DraftBanner/DraftBanner'; import { ThemeMode } from 'component/common/ThemeMode/ThemeMode'; -import { useUiFlag } from 'hooks/useUiFlag'; interface IMainLayoutProps { children: ReactNode; @@ -101,11 +100,8 @@ export const MainLayout = forwardRef( const { isChangeRequestConfiguredInAnyEnv } = useChangeRequestsEnabled( projectId || '', ); - const increaseUnleashWidth = useUiFlag('increaseUnleashWidth'); - const StyledMainLayoutContent = increaseUnleashWidth - ? SpaciousMainLayoutContent - : MainLayoutContent; + const StyledMainLayoutContent = SpaciousMainLayoutContent; return ( <> diff --git a/frontend/src/component/menu/Header/Header.tsx b/frontend/src/component/menu/Header/Header.tsx index 5f8e8c0f68..885633b11f 100644 --- a/frontend/src/component/menu/Header/Header.tsx +++ b/frontend/src/component/menu/Header/Header.tsx @@ -4,7 +4,6 @@ import { useTheme } from '@mui/material/styles'; import { Link } from 'react-router-dom'; import { AppBar, - Container, IconButton, Tooltip, styled, @@ -39,15 +38,7 @@ import InviteLinkButton from './InviteLink/InviteLinkButton/InviteLinkButton'; import { useUiFlag } from 'hooks/useUiFlag'; import { Badge } from '../../common/Badge/Badge'; -const StyledHeader = styled(AppBar)(({ theme }) => ({ - backgroundColor: theme.palette.background.paper, - padding: theme.spacing(1), - boxShadow: 'none', - position: 'relative', - zIndex: 300, -})); - -const StyledSpaciousHeader = styled(AppBar)(({ theme }) => ({ +const HeaderComponent = styled(AppBar)(({ theme }) => ({ backgroundColor: theme.palette.background.paper, padding: theme.spacing(1), boxShadow: 'none', @@ -69,20 +60,13 @@ const StyledSpaciousHeader = styled(AppBar)(({ theme }) => ({ margin: '0 auto', })); -const SpaciousStyledContainer = styled(Box)(() => ({ +const ContainerComponent = styled(Box)(() => ({ display: 'flex', alignItems: 'center', width: '100%', '&&&': { padding: 0 }, })); -const StyledContainer = styled(Container)(() => ({ - display: 'flex', - alignItems: 'center', - maxWidth: 1280, - '&&&': { padding: 0 }, -})); - const StyledUserContainer = styled('div')({ marginLeft: 'auto', display: 'flex', @@ -173,8 +157,6 @@ const Header: VFC = () => { const toggleDrawer = () => setOpenDrawer((prev) => !prev); const onAdminClose = () => setAdminRef(null); const onConfigureClose = () => setConfigRef(null); - - const increaseUnleashWidth = useUiFlag('increaseUnleashWidth'); const celebatoryUnleash = useUiFlag('celebrateUnleash'); const insightsDashboard = useUiFlag('executiveDashboardUI'); @@ -191,14 +173,6 @@ const Header: VFC = () => { adminRoutes, }; - const HeaderComponent = increaseUnleashWidth - ? StyledSpaciousHeader - : StyledHeader; - - const ContainerComponent = increaseUnleashWidth - ? SpaciousStyledContainer - : StyledContainer; - if (smallScreen) { return ( diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index 45858b9c12..9f822d7067 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -65,7 +65,6 @@ export type UiFlags = { signals?: boolean; automatedActions?: boolean; celebrateUnleash?: boolean; - increaseUnleashWidth?: boolean; featureSearchFeedback?: Variant; enableLicense?: boolean; newStrategyConfigurationFeedback?: boolean; diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap index b8f7002185..3fef41519b 100644 --- a/src/lib/__snapshots__/create-config.test.ts.snap +++ b/src/lib/__snapshots__/create-config.test.ts.snap @@ -118,7 +118,6 @@ exports[`should create default config 1`] = ` "globalFrontendApiCache": false, "googleAuthEnabled": false, "inMemoryScheduledChangeRequests": false, - "increaseUnleashWidth": false, "maintenanceMode": false, "messageBanner": { "enabled": false, diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index c5ca64bca1..21b9eff133 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -30,7 +30,6 @@ export type IFlagKey = | 'signals' | 'automatedActions' | 'celebrateUnleash' - | 'increaseUnleashWidth' | 'featureSearchFeedback' | 'featureSearchFeedbackPosting' | 'newStrategyConfigurationFeedback' @@ -146,10 +145,6 @@ const flags: IFlags = { process.env.UNLEASH_EXPERIMENTAL_CELEBRATE_UNLEASH, false, ), - increaseUnleashWidth: parseEnvVarBoolean( - process.env.UNLEASH_EXPERIMENTAL_INCREASE_UNLEASH_WIDTH, - false, - ), featureSearchFeedback: { name: 'withText', enabled: parseEnvVarBoolean( diff --git a/src/server-dev.ts b/src/server-dev.ts index cfe42e8fe2..10a4d6dee6 100644 --- a/src/server-dev.ts +++ b/src/server-dev.ts @@ -43,7 +43,6 @@ process.nextTick(async () => { stripClientHeadersOn304: true, stripHeadersOnAPI: true, celebrateUnleash: true, - increaseUnleashWidth: true, newStrategyConfigurationFeedback: true, featureSearchFeedbackPosting: true, executiveDashboard: true,