Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Security Solution] Able to add Same Start Time and End Time in Schedule for Snooze Notifications of Rule #158565

Merged
merged 3 commits into from
Jun 8, 2023
Merged

[Security Solution] Able to add Same Start Time and End Time in Schedule for Snooze Notifications of Rule #158565

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e241b6
[Security Solution] Able to add Same Start Time and End Time in Sched…
gitstart May 26, 2023
b245607
Merge branch 'main' into ELS-120
kibanamachine Jun 5, 2023
a7bc3d5
Merge branch 'main' into ELS-120
XavierM Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions ...rs_actions_ui/public/application/sections/rules_list/components/rule_snooze/scheduler.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ const RuleSnoozeSchedulerPanel: React.FunctionComponent<PanelOpts> = ({
);
const selectEndDT = useCallback(
(date) => {
setEndDT(date);
setEndDT(date.add(1, 'minutes'));
setSelectingEndTime(true);
setSelectingEndDate(false);
},
Expand All @@ -210,8 +210,7 @@ const RuleSnoozeSchedulerPanel: React.FunctionComponent<PanelOpts> = ({
const onSelectFromInline = useCallback(
(date) => {
const dateAsMoment = moment(date);
const newDateAfterStart =
!startDT || dateAsMoment.isAfter(startDT) || dateAsMoment.isSame(startDT);
const newDateAfterStart = !startDT || dateAsMoment.isSameOrAfter(startDT);
const isEndDateTimeChange =
dateAsMoment.isSame(endDT, 'day') && !dateAsMoment.isSame(endDT, 'minute');
const isStartDateTimeChange =
Expand Down Expand Up @@ -309,7 +308,7 @@ const RuleSnoozeSchedulerPanel: React.FunctionComponent<PanelOpts> = ({
selected={endDT}
onChange={setEndDT}
minDate={startDT ?? minDate}
isInvalid={startDT?.isAfter(endDT)}
isInvalid={startDT?.isSameOrAfter(endDT)}
/>
}
/>
Expand Down Expand Up @@ -376,7 +375,7 @@ const RuleSnoozeSchedulerPanel: React.FunctionComponent<PanelOpts> = ({
<EuiButton
fill
fullWidth
disabled={!startDT || !endDT || startDT.isAfter(endDT) || startDT.isBefore(minDate)}
disabled={!startDT || !endDT || startDT.isSameOrAfter(endDT) || startDT.isBefore(minDate)}
onClick={onClickSaveSchedule}
isLoading={isLoading}
data-test-subj="scheduler-saveSchedule"
Expand Down