Merge pull request #201 from alanconway/time-text

COO-1622: fix: The time text are wrong in Timepicker

Author: openshift-merge-bot[bot]

web/locales/en/plugin__troubleshooting-panel-console-plugin.json

@@ -20,8 +20,6 @@
   "Include data from this time range": "Include data from this time range",
   "Korrel8r Error": "Korrel8r Error",
   "Last": "Last",
-  "Last {{count}} {{unit}}_one": "Last {{count}} {{unit}}_one",
-  "Last {{count}} {{unit}}_other": "Last {{count}} {{unit}}_other",
   "Logging Plugin Disabled": "Logging Plugin Disabled",
   "Neighbours": "Neighbours",
   "Neighbours or Goal search": "Neighbours or Goal search",

web/src/components/Korrel8rPanel.tsx

@@ -30,14 +30,7 @@ import { usePluginAvailable } from '../hooks/usePluginAvailable';
 import { getGoalsGraph, getNeighborsGraph } from '../korrel8r-client';
 import * as api from '../korrel8r/client';
 import * as korrel8r from '../korrel8r/types';
-import {
-  defaultSearch,
-  Result,
-  Search,
-  SearchType,
-  setResult as setResultAction,
-  setSearch as setSearchAction,
-} from '../redux-actions';
+import { defaultSearch, Result, Search, SearchType, setResult, setSearch } from '../redux-actions';
 import { State } from '../redux-reducers';
 import * as time from '../time';
 import { AdvancedSearchForm } from './AdvancedSearchForm';
@@ -74,7 +67,7 @@ export default function Korrel8rPanel() {
     if (initialized.current) return; // Run once on mount
     initialized.current = true;
     if (!search?.queryStr && locationQuery) {
-      dispatch(setSearchAction({ ...defaultSearch, queryStr: locationQuery.toString() }));
+      dispatch(setSearch({ ...defaultSearch, queryStr: locationQuery.toString() }));
     }
   }, [search?.queryStr, locationQuery, dispatch]);
 
@@ -90,7 +83,7 @@ export default function Korrel8rPanel() {
     };
     let cancelled = false;
     const onResult = (newResult: Result) => {
-      if (!cancelled) dispatch(setResultAction(newResult));
+      if (!cancelled) dispatch(setResult(newResult));
     };
     const fetch =
       search.searchType === SearchType.Goal
@@ -115,7 +108,7 @@ export default function Korrel8rPanel() {
 
   // Dispatch a new search.
   // The SetSearch reducer clears result, triggering the fetch effect.
-  const doSearch = React.useCallback((s: Search) => dispatch(setSearchAction(s)), [dispatch]);
+  const doSearch = React.useCallback((s: Search) => dispatch(setSearch(s)), [dispatch]);
 
   return (
     <>

web/src/components/TimeRangeDropdown.tsx

@@ -48,7 +48,7 @@ const formatDate = (d: Date): string =>
 
 const labelFromPeriod = (period: time.Period, t: TFunction): string => {
   if (period instanceof time.Duration) {
-    return t('Last {{count}} {{unit}}', { count: period.count, unit: period.unit.name });
+    return `${t('Last')} ${period.count} ${t(period.unit.name)}`;
   }
   if (period instanceof time.Range) {
     return `${formatDate(period.start)}–${formatDate(period.end)}`;
@@ -221,7 +221,7 @@ export const TimeRangeDropdown: React.FC<TimeRangeDropdownProps> = ({
               isSelected={key === selectedKey}
               onClick={() => onChange(optPeriod)}
             >
-              {t('Last {{count}} {{unit}}', { count: optPeriod.count, unit: optPeriod.unit.name })}
+              {labelFromPeriod(optPeriod, t)}
             </DropdownItem>
           ))}
           <Divider />