mirror of
https://github.com/Unleash/unleash.git
synced 2025-08-23 13:46:45 +02:00
task: removed Edge specific banner
This commit is contained in:
parent
2cb9ceaa72
commit
ce026cf2e2
@ -19,7 +19,6 @@ import { styled } from '@mui/material';
|
|||||||
import { InitialRedirect } from './InitialRedirect';
|
import { InitialRedirect } from './InitialRedirect';
|
||||||
import { InternalBanners } from './banners/internalBanners/InternalBanners';
|
import { InternalBanners } from './banners/internalBanners/InternalBanners';
|
||||||
import { ExternalBanners } from './banners/externalBanners/ExternalBanners';
|
import { ExternalBanners } from './banners/externalBanners/ExternalBanners';
|
||||||
import { EdgeUpgradeBanner } from './banners/EdgeUpgradeBanner/EdgeUpgradeBanner';
|
|
||||||
import { LicenseBanner } from './banners/internalBanners/LicenseBanner';
|
import { LicenseBanner } from './banners/internalBanners/LicenseBanner';
|
||||||
import { Demo } from './demo/Demo';
|
import { Demo } from './demo/Demo';
|
||||||
import { OutdatedSdksBanner } from './banners/OutdatedSdksBanner/OutdatedSdksBanner';
|
import { OutdatedSdksBanner } from './banners/OutdatedSdksBanner/OutdatedSdksBanner';
|
||||||
@ -70,7 +69,6 @@ export const App = () => {
|
|||||||
<LicenseBanner />
|
<LicenseBanner />
|
||||||
<ExternalBanners />
|
<ExternalBanners />
|
||||||
<InternalBanners />
|
<InternalBanners />
|
||||||
<EdgeUpgradeBanner />
|
|
||||||
<ConditionallyRender
|
<ConditionallyRender
|
||||||
condition={outdatedSdksBannerEnabled}
|
condition={outdatedSdksBannerEnabled}
|
||||||
show={<OutdatedSdksBanner />}
|
show={<OutdatedSdksBanner />}
|
||||||
|
@ -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 (
|
|
||||||
<>
|
|
||||||
<ConditionallyRender
|
|
||||||
condition={displayUpgradeEdgeBanner}
|
|
||||||
show={<Banner key={'upgradeEdge'} banner={upgradeEdgeBanner} />}
|
|
||||||
/>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
};
|
|
@ -70,7 +70,6 @@ export type UiFlags = {
|
|||||||
adminTokenKillSwitch?: boolean;
|
adminTokenKillSwitch?: boolean;
|
||||||
executiveDashboardUI?: boolean;
|
executiveDashboardUI?: boolean;
|
||||||
feedbackComments?: Variant;
|
feedbackComments?: Variant;
|
||||||
displayUpgradeEdgeBanner?: boolean;
|
|
||||||
showInactiveUsers?: boolean;
|
showInactiveUsers?: boolean;
|
||||||
featureSearchFeedbackPosting?: boolean;
|
featureSearchFeedbackPosting?: boolean;
|
||||||
userAccessUIEnabled?: boolean;
|
userAccessUIEnabled?: boolean;
|
||||||
|
@ -89,7 +89,6 @@ exports[`should create default config 1`] = `
|
|||||||
"disablePublishUnannouncedEvents": false,
|
"disablePublishUnannouncedEvents": false,
|
||||||
"disableShowContextFieldSelectionValues": false,
|
"disableShowContextFieldSelectionValues": false,
|
||||||
"disableUpdateMaxRevisionId": false,
|
"disableUpdateMaxRevisionId": false,
|
||||||
"displayEdgeBanner": false,
|
|
||||||
"displayTrafficDataUsage": false,
|
"displayTrafficDataUsage": false,
|
||||||
"edgeBulkMetrics": false,
|
"edgeBulkMetrics": false,
|
||||||
"embedProxy": true,
|
"embedProxy": true,
|
||||||
|
@ -56,45 +56,3 @@ test('should get ui config', async () => {
|
|||||||
expect(body.segmentValuesLimit).toEqual(DEFAULT_SEGMENT_VALUES_LIMIT);
|
expect(body.segmentValuesLimit).toEqual(DEFAULT_SEGMENT_VALUES_LIMIT);
|
||||||
expect(body.strategySegmentsLimit).toEqual(DEFAULT_STRATEGY_SEGMENTS_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);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
@ -152,9 +152,6 @@ class ConfigController extends Controller {
|
|||||||
const flags = {
|
const flags = {
|
||||||
...this.config.ui.flags,
|
...this.config.ui.flags,
|
||||||
...expFlags,
|
...expFlags,
|
||||||
displayUpgradeEdgeBanner:
|
|
||||||
usesOldEdge ||
|
|
||||||
this.config.flagResolver.isEnabled('displayEdgeBanner'),
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const response: UiConfigSchema = {
|
const response: UiConfigSchema = {
|
||||||
|
@ -49,7 +49,6 @@ export type IFlagKey =
|
|||||||
| 'outdatedSdksBanner'
|
| 'outdatedSdksBanner'
|
||||||
| 'responseTimeMetricsFix'
|
| 'responseTimeMetricsFix'
|
||||||
| 'scimApi'
|
| 'scimApi'
|
||||||
| 'displayEdgeBanner'
|
|
||||||
| 'globalFrontendApiCache'
|
| 'globalFrontendApiCache'
|
||||||
| 'returnGlobalFrontendApiCache'
|
| 'returnGlobalFrontendApiCache'
|
||||||
| 'projectOverviewRefactor'
|
| 'projectOverviewRefactor'
|
||||||
@ -246,10 +245,6 @@ const flags: IFlags = {
|
|||||||
process.env.UNLEASH_EXPERIMENTAL_SCIM_API,
|
process.env.UNLEASH_EXPERIMENTAL_SCIM_API,
|
||||||
false,
|
false,
|
||||||
),
|
),
|
||||||
displayEdgeBanner: parseEnvVarBoolean(
|
|
||||||
process.env.UNLEASH_EXPERIMENTAL_DISPLAY_EDGE_BANNER,
|
|
||||||
false,
|
|
||||||
),
|
|
||||||
responseTimeMetricsFix: parseEnvVarBoolean(
|
responseTimeMetricsFix: parseEnvVarBoolean(
|
||||||
process.env.UNLEASH_EXPERIMENTAL_RESPONSE_TIME_METRICS_FIX,
|
process.env.UNLEASH_EXPERIMENTAL_RESPONSE_TIME_METRICS_FIX,
|
||||||
false,
|
false,
|
||||||
|
Loading…
Reference in New Issue
Block a user