diff --git a/x-pack/solutions/observability/plugins/slo/public/components/slo/slo_badges/slo_value_badge.tsx b/x-pack/solutions/observability/plugins/slo/public/components/slo/slo_badges/slo_value_badge.tsx index d896f9c3f9503..0dd7f293f3988 100644 --- a/x-pack/solutions/observability/plugins/slo/public/components/slo/slo_badges/slo_value_badge.tsx +++ b/x-pack/solutions/observability/plugins/slo/public/components/slo/slo_badges/slo_value_badge.tsx @@ -5,7 +5,7 @@ * 2.0. */ -import React, { useMemo } from 'react'; +import React from 'react'; import { EuiBadge, EuiFlexItem, EuiSkeletonText, EuiToolTip } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { SLOWithSummaryResponse } from '@kbn/slo-schema'; @@ -23,15 +23,13 @@ export function SloValueBadge({ slo, isLoading }: SloStatusProps) { const { uiSettings } = useKibana().services; const percentFormat = uiSettings.get('format:percent:defaultPattern'); - const badgeDisplayText = useMemo(() => { - return i18n.translate('xpack.slo.sloStatusBadge.sloObjectiveValue', { - defaultMessage: '{value} / {objective} (Objective)', - values: { - value: hasNoData ? '-' : numeral(slo.summary.sliValue).format(percentFormat), - objective: numeral(slo.objective.target).format(percentFormat), - }, - }); - }, [slo, percentFormat, hasNoData]); + const badgeDisplayText = i18n.translate('xpack.slo.sloStatusBadge.sloObjectiveValue', { + defaultMessage: '{value} ({objective} objective)', + values: { + value: hasNoData ? '-' : numeral(slo.summary.sliValue).format(percentFormat), + objective: numeral(slo.objective.target).format(percentFormat), + }, + }); if (isLoading || !slo) { return ; diff --git a/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/definition.tsx b/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/definition/definition.tsx similarity index 96% rename from x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/definition.tsx rename to x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/definition/definition.tsx index d5e2404c09d78..8eb2613b6a235 100644 --- a/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/definition.tsx +++ b/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/definition/definition.tsx @@ -23,10 +23,10 @@ import { toDurationLabel, toIndicatorTypeLabel, } from '../../../../utils/slo/labels'; -import { ApmIndicatorOverview } from './apm_indicator_overview'; -import { DisplayQuery } from './display_query'; +import { ApmIndicatorOverview } from '../overview/apm_indicator_overview'; +import { DisplayQuery } from '../overview/display_query'; import { DefinitionItem } from './definition_item'; -import { SyntheticsIndicatorOverview } from './synthetics_indicator_overview'; +import { SyntheticsIndicatorOverview } from '../overview/synthetics_indicator_overview'; export interface Props { slo: SLOWithSummaryResponse; diff --git a/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/definition_item.tsx b/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/definition/definition_item.tsx similarity index 100% rename from x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/definition_item.tsx rename to x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/definition/definition_item.tsx diff --git a/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/apm_indicator_overview.tsx b/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/apm_indicator_overview.tsx index da5bed130d0ac..68fec1204dbcf 100644 --- a/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/apm_indicator_overview.tsx +++ b/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/apm_indicator_overview.tsx @@ -16,7 +16,7 @@ import { import React from 'react'; import { useKibana } from '../../../../hooks/use_kibana'; import { convertSliApmParamsToApmAppDeeplinkUrl } from '../../../../utils/slo/convert_sli_apm_params_to_apm_app_deeplink_url'; -import { DefinitionItem } from './definition_item'; +import { DefinitionItem } from '../definition/definition_item'; interface Props { slo: SLOWithSummaryResponse; diff --git a/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/overview.stories.tsx b/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/overview.stories.tsx index 555023e9f6780..7f7d1f671c48e 100644 --- a/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/overview.stories.tsx +++ b/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/overview.stories.tsx @@ -10,7 +10,7 @@ import { ComponentStory } from '@storybook/react'; import { KibanaReactStorybookDecorator } from '../../../../utils/kibana_react.storybook_decorator'; import { buildSlo } from '../../../../data/slo/slo'; -import { Definition as Component, Props } from './definition'; +import { Definition as Component, Props } from '../definition/definition'; export default { component: Component, diff --git a/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/synthetics_indicator_overview.tsx b/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/synthetics_indicator_overview.tsx index 8a6db3491d779..9bb7c55e2d767 100644 --- a/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/synthetics_indicator_overview.tsx +++ b/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/overview/synthetics_indicator_overview.tsx @@ -14,7 +14,7 @@ import { syntheticsMonitorLocationQueryLocatorID, } from '@kbn/observability-plugin/common'; import { useKibana } from '../../../../hooks/use_kibana'; -import { DefinitionItem } from './definition_item'; +import { DefinitionItem } from '../definition/definition_item'; interface Props { slo: SLOWithSummaryResponse; diff --git a/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/slo_details.tsx b/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/slo_details.tsx index 82feb8dec84bb..252ab0372e977 100644 --- a/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/slo_details.tsx +++ b/x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/slo_details.tsx @@ -13,7 +13,7 @@ import { BurnRatePanel } from './burn_rate_panel/burn_rate_panel'; import { EventsChartPanel } from './events_chart_panel/events_chart_panel'; import { HistoricalDataCharts } from './historical_data_charts'; import { SLODetailsHistory } from './history/slo_details_history'; -import { Definition } from './overview/definition'; +import { Definition } from './definition/definition'; import { SloDetailsAlerts } from './slo_detail_alerts'; import { SloHealthCallout } from './slo_health_callout'; import { SloRemoteCallout } from './slo_remote_callout';