From ac8ed86347d184d780d7355ce611654675d9a340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nuno=20G=C3=B3is?= Date: Wed, 18 Jun 2025 14:38:32 +0100 Subject: [PATCH] chore: remove registerFrontendClient flag ws-swe1 [keep] --- .../application/ApplicationChart.tsx | 33 ++++--------------- frontend/src/interfaces/uiConfig.ts | 1 - .../frontend-api/frontend-api-service.ts | 6 +--- .../features/metrics/instance/metrics.test.ts | 8 +---- src/lib/features/metrics/instance/metrics.ts | 22 +++++-------- src/lib/types/experimental.ts | 5 --- src/server-dev.ts | 1 - .../e2e/api/admin/applications.e2e.test.ts | 1 - 8 files changed, 17 insertions(+), 60 deletions(-) diff --git a/frontend/src/component/application/ApplicationChart.tsx b/frontend/src/component/application/ApplicationChart.tsx index 3e2ee9323c..571feac4f1 100644 --- a/frontend/src/component/application/ApplicationChart.tsx +++ b/frontend/src/component/application/ApplicationChart.tsx @@ -2,7 +2,7 @@ import { Box, Divider, styled, Typography, useTheme } from '@mui/material'; import { ArcherContainer, ArcherElement } from 'react-archer'; import { useNavigate } from 'react-router-dom'; import type React from 'react'; -import { type FC, useLayoutEffect, useRef, useState } from 'react'; +import { useRef, useState, useLayoutEffect } from 'react'; import type { ApplicationOverviewEnvironmentSchema, ApplicationOverviewSchema, @@ -16,7 +16,6 @@ import WarningAmberRounded from '@mui/icons-material/WarningAmberRounded'; import { TimeAgo } from 'component/common/TimeAgo/TimeAgo'; import { usePlausibleTracker } from 'hooks/usePlausibleTracker'; import { getApplicationIssues } from './ApplicationIssues/ApplicationIssues.tsx'; -import { useUiFlag } from 'hooks/useUiFlag'; const StyledTable = styled('table')(({ theme }) => ({ fontSize: theme.fontSizes.smallerBody, @@ -141,7 +140,7 @@ const SuccessStatus = () => ( ); -const WarningStatus: FC<{ children?: React.ReactNode }> = ({ children }) => ( +const WarningStatus = ({ children }: { children?: React.ReactNode }) => ( ({ @@ -197,8 +196,6 @@ export const ApplicationChart = ({ data }: IApplicationChartProps) => { const { elementRef, width } = useElementWidth(); const navigate = useNavigate(); const theme = useTheme(); - const registerFrontendClientEnabled = useUiFlag('registerFrontendClient'); - const mode = getApplicationIssues(data); return ( @@ -296,23 +293,7 @@ export const ApplicationChart = ({ data }: IApplicationChartProps) => { {environment.instanceCount} - {!registerFrontendClientEnabled ? ( - - SDK: - - {environment.sdks.map( - (sdk) => ( -
- {sdk} -
- ), - )} - - - ) : null} - - {registerFrontendClientEnabled && - environment.backendSdks.length > 0 ? ( + {environment.backendSdks.length > 0 && ( Backend SDK: @@ -327,10 +308,10 @@ export const ApplicationChart = ({ data }: IApplicationChartProps) => { )} - ) : null} + )} - {registerFrontendClientEnabled && - environment.frontendSdks.length > 0 ? ( + {environment.frontendSdks.length > + 0 && ( Frontend SDK: @@ -345,7 +326,7 @@ export const ApplicationChart = ({ data }: IApplicationChartProps) => { )} - ) : null} + )} Last seen: diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index a96e647889..7017a35bf8 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -85,7 +85,6 @@ export type UiFlags = { showUserDeviceCount?: boolean; consumptionModel?: boolean; edgeObservability?: boolean; - registerFrontendClient?: boolean; customMetrics?: boolean; lifecycleMetrics?: boolean; createFlagDialogCache?: boolean; diff --git a/src/lib/features/frontend-api/frontend-api-service.ts b/src/lib/features/frontend-api/frontend-api-service.ts index cc17714ff6..2bb51f1d93 100644 --- a/src/lib/features/frontend-api/frontend-api-service.ts +++ b/src/lib/features/frontend-api/frontend-api-service.ts @@ -135,11 +135,7 @@ export class FrontendApiService { ip, ); - if ( - metrics.instanceId && - typeof sdkVersion === 'string' && - this.flagResolver.isEnabled('registerFrontendClient') - ) { + if (metrics.instanceId && typeof sdkVersion === 'string') { const client = { appName: metrics.appName, instanceId: metrics.instanceId, diff --git a/src/lib/features/metrics/instance/metrics.test.ts b/src/lib/features/metrics/instance/metrics.test.ts index 0f729d9cb8..a3935b1c1e 100644 --- a/src/lib/features/metrics/instance/metrics.test.ts +++ b/src/lib/features/metrics/instance/metrics.test.ts @@ -45,13 +45,7 @@ let services: IUnleashServices; let destroy: () => Promise; beforeAll(async () => { - const setup = await getSetup({ - experimental: { - flags: { - registerFrontendClient: true, - }, - }, - }); + const setup = await getSetup(); request = setup.request; stores = setup.stores; destroy = setup.destroy; diff --git a/src/lib/features/metrics/instance/metrics.ts b/src/lib/features/metrics/instance/metrics.ts index 649bdd12e8..9330e5a8aa 100644 --- a/src/lib/features/metrics/instance/metrics.ts +++ b/src/lib/features/metrics/instance/metrics.ts @@ -226,20 +226,14 @@ export default class ClientMetricsController extends Controller { app.sdkType === 'frontend' && typeof app.sdkVersion === 'string' ) { - if ( - this.flagResolver.isEnabled( - 'registerFrontendClient', - ) - ) { - this.clientInstanceService.registerFrontendClient({ - appName: app.appName, - instanceId: app.instanceId, - environment: app.environment, - sdkType: app.sdkType, - sdkVersion: app.sdkVersion, - projects: app.projects, - }); - } + this.clientInstanceService.registerFrontendClient({ + appName: app.appName, + instanceId: app.instanceId, + environment: app.environment, + sdkType: app.sdkType, + sdkVersion: app.sdkVersion, + projects: app.projects, + }); } else { promises.push( this.clientInstanceService.registerBackendClient( diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index 41111f6c4a..86a4002305 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -55,7 +55,6 @@ export type IFlagKey = | 'uniqueSdkTracking' | 'consumptionModel' | 'edgeObservability' - | 'registerFrontendClient' | 'reportUnknownFlags' | 'lastSeenBulkQuery' | 'lifecycleMetrics' @@ -264,10 +263,6 @@ const flags: IFlags = { process.env.EXPERIMENTAL_EDGE_OBSERVABILITY, false, ), - registerFrontendClient: parseEnvVarBoolean( - process.env.UNLEASH_EXPERIMENTAL_REGISTER_FRONTEND_CLIENT, - false, - ), reportUnknownFlags: parseEnvVarBoolean( process.env.UNLEASH_EXPERIMENTAL_REPORT_UNKNOWN_FLAGS, false, diff --git a/src/server-dev.ts b/src/server-dev.ts index 2d12dba8e5..84b49a608b 100644 --- a/src/server-dev.ts +++ b/src/server-dev.ts @@ -51,7 +51,6 @@ process.nextTick(async () => { deltaApi: true, uniqueSdkTracking: true, strictSchemaValidation: true, - registerFrontendClient: true, reportUnknownFlags: true, customMetrics: true, lifecycleMetrics: true, diff --git a/src/test/e2e/api/admin/applications.e2e.test.ts b/src/test/e2e/api/admin/applications.e2e.test.ts index 78e34a38da..12a70452a2 100644 --- a/src/test/e2e/api/admin/applications.e2e.test.ts +++ b/src/test/e2e/api/admin/applications.e2e.test.ts @@ -55,7 +55,6 @@ beforeAll(async () => { experimental: { flags: { strictSchemaValidation: true, - registerFrontendClient: true, }, }, },