diff --git a/frontend/src/component/layout/MainLayout/MainLayoutEventTimeline.tsx b/frontend/src/component/layout/MainLayout/MainLayoutEventTimeline.tsx index e50ebe81d212..fd32cf7cd6cc 100644 --- a/frontend/src/component/layout/MainLayout/MainLayoutEventTimeline.tsx +++ b/frontend/src/component/layout/MainLayout/MainLayoutEventTimeline.tsx @@ -3,7 +3,6 @@ import { ConditionallyRender } from 'component/common/ConditionallyRender/Condit import { EventTimeline } from 'component/events/EventTimeline/EventTimeline'; import { useEventTimelineContext } from 'component/events/EventTimeline/EventTimelineContext'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; -import { useUiFlag } from 'hooks/useUiFlag'; import { useEffect, useState } from 'react'; const StyledEventTimelineSlider = styled(Box)(({ theme }) => ({ @@ -21,10 +20,9 @@ const StyledEventTimelineWrapper = styled(Box)(({ theme }) => ({ export const MainLayoutEventTimeline = () => { const { isOss } = useUiConfig(); const { open: showTimeline } = useEventTimelineContext(); - const eventTimelineEnabled = useUiFlag('eventTimeline') && !isOss(); const [isInitialLoad, setIsInitialLoad] = useState(true); - const open = showTimeline && eventTimelineEnabled; + const open = showTimeline && !isOss(); useEffect(() => { setIsInitialLoad(false); diff --git a/frontend/src/component/layout/MainLayout/NavigationSidebar/NewInUnleash/NewInUnleash.tsx b/frontend/src/component/layout/MainLayout/NavigationSidebar/NewInUnleash/NewInUnleash.tsx index d07b601d139e..bfdb849f4cf4 100644 --- a/frontend/src/component/layout/MainLayout/NavigationSidebar/NewInUnleash/NewInUnleash.tsx +++ b/frontend/src/component/layout/MainLayout/NavigationSidebar/NewInUnleash/NewInUnleash.tsx @@ -104,7 +104,6 @@ export const NewInUnleash = ({ ); const { isOss, isEnterprise } = useUiConfig(); const signalsEnabled = useUiFlag('signals'); - const eventTimelineEnabled = useUiFlag('eventTimeline'); const { setHighlighted } = useEventTimelineContext(); @@ -159,7 +158,7 @@ export const NewInUnleash = ({ }, docsLink: 'https://docs.getunleash.io/reference/events#event-timeline', - show: !isOss() && eventTimelineEnabled, + show: !isOss(), longDescription: ( <>

@@ -174,7 +173,6 @@ export const NewInUnleash = ({

), - beta: true, }, ]; diff --git a/frontend/src/component/menu/Header/HeaderEventTimelineButton.tsx b/frontend/src/component/menu/Header/HeaderEventTimelineButton.tsx index d40ad42fea81..9340c166db69 100644 --- a/frontend/src/component/menu/Header/HeaderEventTimelineButton.tsx +++ b/frontend/src/component/menu/Header/HeaderEventTimelineButton.tsx @@ -3,7 +3,6 @@ import LinearScaleIcon from '@mui/icons-material/LinearScale'; import { useEventTimelineContext } from 'component/events/EventTimeline/EventTimelineContext'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; import { usePlausibleTracker } from 'hooks/usePlausibleTracker'; -import { useUiFlag } from 'hooks/useUiFlag'; const StyledHeaderEventTimelineButton = styled(IconButton, { shouldForwardProp: (prop) => prop !== 'highlighted', @@ -34,14 +33,13 @@ const StyledHeaderEventTimelineButton = styled(IconButton, { export const HeaderEventTimelineButton = () => { const { trackEvent } = usePlausibleTracker(); const { isOss } = useUiConfig(); - const eventTimeline = useUiFlag('eventTimeline') && !isOss(); const { open: showTimeline, setOpen: setShowTimeline, highlighted, } = useEventTimelineContext(); - if (!eventTimeline) return null; + if (isOss()) return null; return ( { - const { label, text: summary } = - this.msgFormatter.format(event); + return events.map((event) => { + const { label, text: summary } = this.msgFormatter.format(event); - return { - ...event, - label, - summary, - }; - }); - } - return events; + return { + ...event, + label, + summary, + }; + }); } maybeAnonymiseEvents(events: IEvent[]): IEvent[] { diff --git a/src/lib/openapi/spec/event-schema.ts b/src/lib/openapi/spec/event-schema.ts index 78f8640e51c9..fe33fbe732e1 100644 --- a/src/lib/openapi/spec/event-schema.ts +++ b/src/lib/openapi/spec/event-schema.ts @@ -95,14 +95,12 @@ export const eventSchema = { label: { type: 'string', nullable: true, - description: - '**[Experimental]** The concise, human-readable name of the event.', + description: 'The concise, human-readable name of the event.', }, summary: { type: 'string', nullable: true, - description: - '**[Experimental]** A markdown-formatted summary of the event.', + description: 'A markdown-formatted summary of the event.', }, }, components: { diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index fc3802849086..13bad2bb6ea9 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -51,7 +51,6 @@ export type IFlagKey = | 'removeUnsafeInlineStyleSrc' | 'onboardingUI' | 'projectRoleAssignment' - | 'eventTimeline' | 'personalDashboardUI' | 'trackLifecycleMetrics' | 'purchaseAdditionalEnvironments' @@ -263,10 +262,6 @@ const flags: IFlags = { process.env.UNLEASH_EXPERIMENTAL_PROJECT_ROLE_ASSIGNMENT, false, ), - eventTimeline: parseEnvVarBoolean( - process.env.UNLEASH_EXPERIMENTAL_EVENT_TIMELINE, - false, - ), personalDashboardUI: parseEnvVarBoolean( process.env.UNLEASH_EXPERIMENTAL_PERSONAL_DASHBOARD_UI, false,