Skip to content

Commit 4ce5c96

Browse files
committed
feat(RHINENG-20424): fixed a label bug
1 parent bc505b1 commit 4ce5c96

File tree

2 files changed

+30
-33
lines changed

2 files changed

+30
-33
lines changed

web/src/components/Incidents/IncidentsPage.tsx

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -405,30 +405,37 @@ const IncidentsPage = () => {
405405
</ToolbarItem>
406406
</ToolbarGroup>
407407
<ToolbarItem align={{ default: 'alignEnd' }}>
408-
<Select
409-
id="time-range-select"
410-
isOpen={daysFilterIsExpanded}
411-
selected={incidentsActiveFilters.days[0]}
412-
onSelect={onSelect}
413-
onOpenChange={(isOpen) => setDaysFilterIsExpanded(isOpen)}
414-
toggle={(toggleRef) => (
415-
<MenuToggle
416-
ref={toggleRef}
417-
onClick={onToggleClick}
418-
isExpanded={daysFilterIsExpanded}
408+
<Stack>
409+
<StackItem>
410+
<span>Time range</span>
411+
</StackItem>
412+
<StackItem>
413+
<Select
414+
id="time-range-select"
415+
isOpen={daysFilterIsExpanded}
416+
selected={incidentsActiveFilters.days[0]}
417+
onSelect={onSelect}
418+
onOpenChange={(isOpen) => setDaysFilterIsExpanded(isOpen)}
419+
toggle={(toggleRef) => (
420+
<MenuToggle
421+
ref={toggleRef}
422+
onClick={onToggleClick}
423+
isExpanded={daysFilterIsExpanded}
424+
>
425+
{`Last ${incidentsActiveFilters.days[0]}`}
426+
</MenuToggle>
427+
)}
428+
shouldFocusToggleOnSelect
419429
>
420-
{incidentsActiveFilters.days[0]}
421-
</MenuToggle>
422-
)}
423-
shouldFocusToggleOnSelect
424-
>
425-
<SelectList>
426-
<SelectOption value="1 day">{t('1 day')}</SelectOption>
427-
<SelectOption value="3 days">{t('3 days')}</SelectOption>
428-
<SelectOption value="7 days">{t('7 days')}</SelectOption>
429-
<SelectOption value="15 days">{t('15 days')}</SelectOption>
430-
</SelectList>
431-
</Select>
430+
<SelectList>
431+
<SelectOption value="1 day">{t('Last 1 day')}</SelectOption>
432+
<SelectOption value="3 days">{t('Last 3 days')}</SelectOption>
433+
<SelectOption value="7 days">{t('Last 7 days')}</SelectOption>
434+
<SelectOption value="15 days">{t('Last 15 days')}</SelectOption>
435+
</SelectList>
436+
</Select>
437+
</StackItem>
438+
</Stack>
432439
</ToolbarItem>
433440
</ToolbarContent>
434441
</Toolbar>

web/src/components/Incidents/utils.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -377,16 +377,6 @@ export const onDeleteIncidentFilterChip = (
377377
},
378378
}),
379379
);
380-
} else {
381-
setFilters(
382-
setIncidentsActiveFilters({
383-
incidentsActiveFilters: {
384-
severity: [],
385-
days: ['7 days'],
386-
state: [],
387-
},
388-
}),
389-
);
390380
}
391381
};
392382

0 commit comments

Comments
 (0)