diff --git a/frontend/src/component/project/Project/CreateProject/NewCreateProjectForm/CreateProjectDialog.tsx b/frontend/src/component/project/Project/CreateProject/NewCreateProjectForm/CreateProjectDialog.tsx index 26f2ff9ff7..01d619f10b 100644 --- a/frontend/src/component/project/Project/CreateProject/NewCreateProjectForm/CreateProjectDialog.tsx +++ b/frontend/src/component/project/Project/CreateProject/NewCreateProjectForm/CreateProjectDialog.tsx @@ -27,7 +27,6 @@ import { useStickinessOptions } from 'hooks/useStickinessOptions'; import { ChangeRequestTableConfigButton } from './ConfigButtons/ChangeRequestTableConfigButton'; import { StyledDefinitionList } from './CreateProjectDialog.styles'; import { ProjectIcon } from 'component/common/ProjectIcon/ProjectIcon'; -import { useUiFlag } from '../../../../../hooks/useUiFlag'; interface ICreateProjectDialogProps { open: boolean; @@ -119,7 +118,6 @@ export const CreateProjectDialog = ({ const { setToastData, setToastApiError } = useToast(); const navigate = useNavigate(); const { trackEvent } = usePlausibleTracker(); - const onboardingUIEnabled = useUiFlag('onboardingUI'); const { projectName, projectDesc, @@ -192,11 +190,9 @@ export const CreateProjectDialog = ({ trackEvent('project-mode', { props: { mode: projectMode, action: 'added' }, }); - if (onboardingUIEnabled) { - trackEvent('onboarding', { - props: { eventType: 'onboarding-started' }, - }); - } + trackEvent('onboarding', { + props: { eventType: 'onboarding-started' }, + }); } catch (error: unknown) { setToastApiError(formatUnknownError(error)); } diff --git a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.test.tsx b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.test.tsx index 03a2e4ccee..9575cb28fd 100644 --- a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.test.tsx +++ b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.test.tsx @@ -28,7 +28,6 @@ const setupApi = () => { testServerRoute(server, '/api/admin/ui-config', { flags: { flagCreator: true, - onboardingUI: true, }, }); testServerRoute(server, '/api/admin/tags', { diff --git a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx index 14b74c6156..3cca886e56 100644 --- a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx +++ b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx @@ -89,7 +89,6 @@ export const ProjectFeatureToggles = ({ environments, }: IPaginatedProjectFeatureTogglesProps) => { const { trackEvent } = usePlausibleTracker(); - const onboardingUIEnabled = useUiFlag('onboardingUI'); const projectId = useRequiredPathParam('projectId'); const { project } = useProjectOverview(projectId); const [connectSdkOpen, setConnectSdkOpen] = useState(false); @@ -152,12 +151,9 @@ export const ProjectFeatureToggles = ({ >(`onboarding-state:v1-${projectId}`, 'hide-setup'); const notOnboarding = - !onboardingUIEnabled || - (onboardingUIEnabled && - project.onboardingStatus.status === 'onboarded') || + project.onboardingStatus.status === 'onboarded' || onboardingFlow === 'closed'; const isOnboarding = - onboardingUIEnabled && project.onboardingStatus.status !== 'onboarded' && onboardingFlow === 'visible'; const noFeaturesExistInProject = project.featureTypeCounts?.length === 0; diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index 83dceb9877..175fe29725 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -86,7 +86,6 @@ export type UiFlags = { manyStrategiesPagination?: boolean; enableLegacyVariants?: boolean; flagCreator?: boolean; - onboardingUI?: boolean; purchaseAdditionalEnvironments?: boolean; unleashAI?: boolean; releasePlans?: boolean; diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index 8dc220f4e2..853bb37c64 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -47,7 +47,6 @@ export type IFlagKey = | 'enableLegacyVariants' | 'extendedMetrics' | 'removeUnsafeInlineStyleSrc' - | 'onboardingUI' | 'projectRoleAssignment' | 'purchaseAdditionalEnvironments' | 'originMiddlewareRequestLogging' @@ -237,10 +236,6 @@ const flags: IFlags = { process.env.UNLEASH_EXPERIMENTAL_REMOVE_UNSAFE_INLINE_STYLE_SRC, false, ), - onboardingUI: parseEnvVarBoolean( - process.env.UNLEASH_EXPERIMENTAL_ONBOARDING_UI, - false, - ), projectRoleAssignment: parseEnvVarBoolean( process.env.UNLEASH_EXPERIMENTAL_PROJECT_ROLE_ASSIGNMENT, false, diff --git a/src/server-dev.ts b/src/server-dev.ts index df20b74723..1b0d7b0eb7 100644 --- a/src/server-dev.ts +++ b/src/server-dev.ts @@ -48,7 +48,6 @@ process.nextTick(async () => { manyStrategiesPagination: true, enableLegacyVariants: false, extendedMetrics: true, - onboardingUI: true, purchaseAdditionalEnvironments: true, originMiddlewareRequestLogging: true, unleashAI: true,