From ce026cf2e2606789cbfb1f519433eb6f6e98b952 Mon Sep 17 00:00:00 2001 From: Christopher Kolstad Date: Fri, 19 Apr 2024 12:13:04 +0200 Subject: [PATCH] task: removed Edge specific banner --- frontend/src/component/App.tsx | 2 - .../EdgeUpgradeBanner/EdgeUpgradeBanner.tsx | 22 ---------- frontend/src/interfaces/uiConfig.ts | 1 - .../__snapshots__/create-config.test.ts.snap | 1 - src/lib/routes/admin-api/config.test.ts | 42 ------------------- src/lib/routes/admin-api/config.ts | 3 -- src/lib/types/experimental.ts | 5 --- 7 files changed, 76 deletions(-) delete mode 100644 frontend/src/component/banners/EdgeUpgradeBanner/EdgeUpgradeBanner.tsx diff --git a/frontend/src/component/App.tsx b/frontend/src/component/App.tsx index a180312165..0084d28498 100644 --- a/frontend/src/component/App.tsx +++ b/frontend/src/component/App.tsx @@ -19,7 +19,6 @@ import { styled } from '@mui/material'; import { InitialRedirect } from './InitialRedirect'; import { InternalBanners } from './banners/internalBanners/InternalBanners'; import { ExternalBanners } from './banners/externalBanners/ExternalBanners'; -import { EdgeUpgradeBanner } from './banners/EdgeUpgradeBanner/EdgeUpgradeBanner'; import { LicenseBanner } from './banners/internalBanners/LicenseBanner'; import { Demo } from './demo/Demo'; import { OutdatedSdksBanner } from './banners/OutdatedSdksBanner/OutdatedSdksBanner'; @@ -70,7 +69,6 @@ export const App = () => { - } diff --git a/frontend/src/component/banners/EdgeUpgradeBanner/EdgeUpgradeBanner.tsx b/frontend/src/component/banners/EdgeUpgradeBanner/EdgeUpgradeBanner.tsx deleted file mode 100644 index cf132250c1..0000000000 --- a/frontend/src/component/banners/EdgeUpgradeBanner/EdgeUpgradeBanner.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import { useUiFlag } from 'hooks/useUiFlag'; -import { ConditionallyRender } from '../../common/ConditionallyRender/ConditionallyRender'; -import { Banner } from '../Banner/Banner'; -import type { IBanner } from '../../../interfaces/banner'; - -export const EdgeUpgradeBanner = () => { - const displayUpgradeEdgeBanner = useUiFlag('displayUpgradeEdgeBanner'); - const upgradeEdgeBanner: IBanner = { - message: `We noticed that an outdated Edge version is connected to this Unleash instance. To ensure you continue to receive metrics, we recommend upgrading to v17.0.0 or later.`, - link: 'https://github.com/Unleash/unleash-edge', - linkText: 'Get latest', - variant: 'warning', - }; - return ( - <> - } - /> - - ); -}; diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index c63f4422af..f239b0ea7f 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -70,7 +70,6 @@ export type UiFlags = { adminTokenKillSwitch?: boolean; executiveDashboardUI?: boolean; feedbackComments?: Variant; - displayUpgradeEdgeBanner?: boolean; showInactiveUsers?: boolean; featureSearchFeedbackPosting?: boolean; userAccessUIEnabled?: boolean; diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap index e7e6de0c20..145a366440 100644 --- a/src/lib/__snapshots__/create-config.test.ts.snap +++ b/src/lib/__snapshots__/create-config.test.ts.snap @@ -89,7 +89,6 @@ exports[`should create default config 1`] = ` "disablePublishUnannouncedEvents": false, "disableShowContextFieldSelectionValues": false, "disableUpdateMaxRevisionId": false, - "displayEdgeBanner": false, "displayTrafficDataUsage": false, "edgeBulkMetrics": false, "embedProxy": true, diff --git a/src/lib/routes/admin-api/config.test.ts b/src/lib/routes/admin-api/config.test.ts index 6ac6a13f9c..364712cf8e 100644 --- a/src/lib/routes/admin-api/config.test.ts +++ b/src/lib/routes/admin-api/config.test.ts @@ -56,45 +56,3 @@ test('should get ui config', async () => { expect(body.segmentValuesLimit).toEqual(DEFAULT_SEGMENT_VALUES_LIMIT); expect(body.strategySegmentsLimit).toEqual(DEFAULT_STRATEGY_SEGMENTS_LIMIT); }); - -describe('displayUpgradeEdgeBanner', () => { - test('ui config should have displayUpgradeEdgeBanner to be set if an instance using edge has been seen', async () => { - await stores.clientInstanceStore.insert({ - appName: 'my-app', - instanceId: 'some-instance', - sdkVersion: 'unleash-edge:16.0.0', - }); - const { body } = await request - .get(`${base}/api/admin/ui-config`) - .expect('Content-Type', /json/) - .expect(200); - expect(body.flags).toBeTruthy(); - expect(body.flags.displayUpgradeEdgeBanner).toBeTruthy(); - }); - test('ui config should not get displayUpgradeEdgeBanner flag if edge >= 17.0.0 has been seen', async () => { - await stores.clientInstanceStore.insert({ - appName: 'my-app', - instanceId: 'some-instance', - sdkVersion: 'unleash-edge:17.1.0', - }); - const { body } = await request - .get(`${base}/api/admin/ui-config`) - .expect('Content-Type', /json/) - .expect(200); - expect(body.flags).toBeTruthy(); - expect(body.flags.displayUpgradeEdgeBanner).toEqual(false); - }); - test('ui config should not get displayUpgradeEdgeBanner flag if java-client has been seen', async () => { - await stores.clientInstanceStore.insert({ - appName: 'my-app', - instanceId: 'some-instance', - sdkVersion: 'unleash-client-java:9.1.0', - }); - const { body } = await request - .get(`${base}/api/admin/ui-config`) - .expect('Content-Type', /json/) - .expect(200); - expect(body.flags).toBeTruthy(); - expect(body.flags.displayUpgradeEdgeBanner).toEqual(false); - }); -}); diff --git a/src/lib/routes/admin-api/config.ts b/src/lib/routes/admin-api/config.ts index c7eef8d322..32f2f0c5b7 100644 --- a/src/lib/routes/admin-api/config.ts +++ b/src/lib/routes/admin-api/config.ts @@ -152,9 +152,6 @@ class ConfigController extends Controller { const flags = { ...this.config.ui.flags, ...expFlags, - displayUpgradeEdgeBanner: - usesOldEdge || - this.config.flagResolver.isEnabled('displayEdgeBanner'), }; const response: UiConfigSchema = { diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index c5be30ed30..2635f1197a 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -49,7 +49,6 @@ export type IFlagKey = | 'outdatedSdksBanner' | 'responseTimeMetricsFix' | 'scimApi' - | 'displayEdgeBanner' | 'globalFrontendApiCache' | 'returnGlobalFrontendApiCache' | 'projectOverviewRefactor' @@ -246,10 +245,6 @@ const flags: IFlags = { process.env.UNLEASH_EXPERIMENTAL_SCIM_API, false, ), - displayEdgeBanner: parseEnvVarBoolean( - process.env.UNLEASH_EXPERIMENTAL_DISPLAY_EDGE_BANNER, - false, - ), responseTimeMetricsFix: parseEnvVarBoolean( process.env.UNLEASH_EXPERIMENTAL_RESPONSE_TIME_METRICS_FIX, false,