Skip to content

Commit c56fa85

Browse files
committed
removed custom hook and use usetranslation instead
1 parent ae038ba commit c56fa85

File tree

3 files changed

+10
-43
lines changed

3 files changed

+10
-43
lines changed

web/src/components/Incidents/AlertsChart/AlertsChart.tsx

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,9 @@ import { useDispatch, useSelector } from 'react-redux';
2626
import { setAlertsAreLoading } from '../../../actions/observe';
2727
import { MonitoringState } from '../../../reducers/observe';
2828
import { IncidentsTooltip } from '../IncidentsTooltip';
29-
import {
30-
createAlertsChartBars,
31-
generateDateArray,
32-
generateAlertsDateArray,
33-
useLanguageFromStorage,
34-
} from '../utils';
29+
import { createAlertsChartBars, generateDateArray, generateAlertsDateArray } from '../utils';
3530
import { dateTimeFormatter } from '../../console/utils/datetime';
31+
import { useTranslation } from 'react-i18next';
3632

3733
const AlertsChart = ({ theme }: { theme: 'light' | 'dark' }) => {
3834
const dispatch = useDispatch();
@@ -50,8 +46,7 @@ const AlertsChart = ({ theme }: { theme: 'light' | 'dark' }) => {
5046
const incidentGroupId = useSelector((state: MonitoringState) =>
5147
state.plugins.mcp.getIn(['incidentsData', 'groupId']),
5248
);
53-
const lang = useLanguageFromStorage();
54-
49+
const { i18n } = useTranslation();
5550
// Use dynamic date range based on actual alerts data instead of fixed chartDays
5651
const dateValues = useMemo(() => {
5752
if (!Array.isArray(alertsData) || alertsData.length === 0) {
@@ -120,11 +115,11 @@ const AlertsChart = ({ theme }: { theme: 'light' | 'dark' }) => {
120115
if (datum.nodata) {
121116
return null;
122117
}
123-
const startDate = dateTimeFormatter(lang).format(new Date(datum.y0));
118+
const startDate = dateTimeFormatter(i18n.language).format(new Date(datum.y0));
124119
const endDate =
125120
datum.alertstate === 'firing'
126121
? '---'
127-
: dateTimeFormatter(lang).format(new Date(datum.y));
122+
: dateTimeFormatter(i18n.language).format(new Date(datum.y));
128123
return `Alert Severity: ${datum.severity}
129124
Alert Name: ${datum.name ? datum.name : '---'}
130125
Namespace: ${datum.namespace ? datum.namespace : '---'}

web/src/components/Incidents/IncidentsChart/IncidentsChart.tsx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,9 @@ import { MonitoringState } from '../../../reducers/observe';
2929
import '../incidents-styles.css';
3030
import { IncidentsTooltip } from '../IncidentsTooltip';
3131
import { Incident } from '../model';
32-
import {
33-
createIncidentsChartBars,
34-
generateDateArray,
35-
updateBrowserUrl,
36-
useLanguageFromStorage,
37-
} from '../utils';
32+
import { createIncidentsChartBars, generateDateArray, updateBrowserUrl } from '../utils';
3833
import { dateTimeFormatter } from '../../console/utils/datetime';
34+
import { useTranslation } from 'react-i18next';
3935

4036
const IncidentsChart = ({
4137
incidentsData,
@@ -56,7 +52,7 @@ const IncidentsChart = ({
5652
state.plugins.mcp.getIn(['incidentsData', 'incidentsActiveFilters']),
5753
);
5854
const selectedGroupId = incidentsActiveFilters.groupId?.[0] ?? null;
59-
const lang = useLanguageFromStorage();
55+
const { i18n } = useTranslation();
6056

6157
const chartData = useMemo(() => {
6258
if (!Array.isArray(incidentsData) || incidentsData.length === 0) return [];
@@ -139,11 +135,11 @@ const IncidentsChart = ({
139135
if (datum.nodata) {
140136
return null;
141137
}
142-
const startDate = dateTimeFormatter(lang).format(new Date(datum.y0));
138+
const startDate = dateTimeFormatter(i18n.language).format(new Date(datum.y0));
143139
const endDate =
144140
datum.alertstate === 'firing'
145141
? '---'
146-
: dateTimeFormatter(lang).format(new Date(datum.y));
142+
: dateTimeFormatter(i18n.language).format(new Date(datum.y));
147143
return `Severity: ${datum.name}
148144
Component: ${datum.componentList?.join(', ')}
149145
Incident ID:

web/src/components/Incidents/utils.ts

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import {
1616
SpanDates,
1717
Timestamps,
1818
} from './model';
19-
import { useState, useEffect } from 'react';
2019

2120
function consolidateAndMergeIntervals(data: Incident, dateArray: SpanDates) {
2221
const severityRank = { 2: 2, 1: 1, 0: 0 };
@@ -689,26 +688,3 @@ export const getFilterKey = (categoryName: string): string => {
689688
}
690689
return categoryName.toLowerCase();
691690
};
692-
693-
const LAST_LANGUAGE_LOCAL_STORAGE_KEY = 'bridge/last-language';
694-
695-
export const getLastLanguage = (): string =>
696-
localStorage.getItem(LAST_LANGUAGE_LOCAL_STORAGE_KEY) || navigator.language || 'en-US';
697-
698-
export const useLanguageFromStorage = () => {
699-
const [lang, setLang] = useState(getLastLanguage());
700-
701-
useEffect(() => {
702-
const handleStorageChange = (e: StorageEvent) => {
703-
if (e.key === LAST_LANGUAGE_LOCAL_STORAGE_KEY) {
704-
setLang(e.newValue || getLastLanguage());
705-
}
706-
};
707-
window.addEventListener('storage', handleStorageChange);
708-
return () => {
709-
window.removeEventListener('storage', handleStorageChange);
710-
};
711-
}, []);
712-
713-
return lang;
714-
};

0 commit comments

Comments
 (0)