diff --git a/frontend/src/component/application/ApplicationChart.tsx b/frontend/src/component/application/ApplicationChart.tsx index 3e2ee9323c..7517270ae5 100644 --- a/frontend/src/component/application/ApplicationChart.tsx +++ b/frontend/src/component/application/ApplicationChart.tsx @@ -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, @@ -197,7 +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); @@ -296,23 +294,8 @@ 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: @@ -329,8 +312,7 @@ export const ApplicationChart = ({ data }: IApplicationChartProps) => { ) : null} - {registerFrontendClientEnabled && - environment.frontendSdks.length > 0 ? ( + {environment.frontendSdks.length > 0 ? ( Frontend SDK: diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index b5b5aef6fd..0151e0c45a 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -88,7 +88,6 @@ export type UiFlags = { edgeObservability?: boolean; addEditStrategy?: boolean; cleanupReminder?: boolean; - registerFrontendClient?: boolean; featureLinks?: boolean; projectLinkTemplates?: boolean; }; diff --git a/src/lib/features/frontend-api/frontend-api-service.ts b/src/lib/features/frontend-api/frontend-api-service.ts index 09581f9dee..da39a1d8ca 100644 --- a/src/lib/features/frontend-api/frontend-api-service.ts +++ b/src/lib/features/frontend-api/frontend-api-service.ts @@ -137,8 +137,7 @@ export class FrontendApiService { if ( metrics.instanceId && - typeof sdkVersion === 'string' && - this.flagResolver.isEnabled('registerFrontendClient') + typeof sdkVersion === 'string' ) { const client = { appName: metrics.appName, diff --git a/src/lib/features/metrics/instance/metrics.test.ts b/src/lib/features/metrics/instance/metrics.test.ts index 69c7690010..75f0deb630 100644 --- a/src/lib/features/metrics/instance/metrics.test.ts +++ b/src/lib/features/metrics/instance/metrics.test.ts @@ -46,9 +46,7 @@ let destroy: () => Promise; beforeAll(async () => { const setup = await getSetup({ experimental: { - flags: { - registerFrontendClient: true, - }, + flags: {}, }, }); request = setup.request; diff --git a/src/lib/features/metrics/instance/metrics.ts b/src/lib/features/metrics/instance/metrics.ts index 2a402dc01f..99456032c3 100644 --- a/src/lib/features/metrics/instance/metrics.ts +++ b/src/lib/features/metrics/instance/metrics.ts @@ -228,20 +228,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, + 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 d7c0eb36a8..9a2218ed39 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -59,7 +59,6 @@ export type IFlagKey = | 'addEditStrategy' | 'cleanupReminder' | 'removeInactiveApplications' - | 'registerFrontendClient' | 'featureLinks' | 'projectLinkTemplates' | 'reportUnknownFlags' @@ -283,10 +282,6 @@ const flags: IFlags = { process.env.UNLEASH_EXPERIMENTAL_REMOVE_INACTIVE_APPLICATIONS, false, ), - registerFrontendClient: parseEnvVarBoolean( - process.env.UNLEASH_EXPERIMENTAL_REGISTER_FRONTEND_CLIENT, - false, - ), featureLinks: parseEnvVarBoolean( process.env.UNLEASH_EXPERIMENTAL_FEATURE_LINKS, false, diff --git a/src/server-dev.ts b/src/server-dev.ts index 1e84296ecb..42baba4302 100644 --- a/src/server-dev.ts +++ b/src/server-dev.ts @@ -53,7 +53,6 @@ process.nextTick(async () => { addEditStrategy: true, cleanupReminder: true, strictSchemaValidation: true, - registerFrontendClient: true, featureLinks: true, projectLinkTemplates: true, reportUnknownFlags: true, diff --git a/src/test/e2e/api/admin/applications.e2e.test.ts b/src/test/e2e/api/admin/applications.e2e.test.ts index 2f32f7a026..861190c90f 100644 --- a/src/test/e2e/api/admin/applications.e2e.test.ts +++ b/src/test/e2e/api/admin/applications.e2e.test.ts @@ -54,7 +54,6 @@ beforeAll(async () => { experimental: { flags: { strictSchemaValidation: true, - registerFrontendClient: true, }, }, },