From 62da8f49742c282908dfbaaf9c5a5bada3ab896d Mon Sep 17 00:00:00 2001
From: Ildar Kamalov <ik@adguard.com>
Date: Fri, 8 Sep 2023 13:23:00 +0300
Subject: [PATCH] Pull request: merge schedule
Updates #6177
Squashed commit of the following:
commit 2f8e4164d40af338d9e4664d5c9ea0aab7113e26
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Sep 8 10:09:32 2023 +0300
client: merge schedule
---
.../Filters/Services/ScheduleForm/Modal.js | 31 +++++--------------
1 file changed, 8 insertions(+), 23 deletions(-)
diff --git a/client/src/components/Filters/Services/ScheduleForm/Modal.js b/client/src/components/Filters/Services/ScheduleForm/Modal.js
index 429db9be..806146f9 100644
--- a/client/src/components/Filters/Services/ScheduleForm/Modal.js
+++ b/client/src/components/Filters/Services/ScheduleForm/Modal.js
@@ -72,31 +72,16 @@ export const Modal = ({
const onFormSubmit = (e) => {
e.preventDefault();
- if (currentDay) {
- const newSchedule = schedule;
+ const newSchedule = schedule;
- Array.from(days).forEach((day) => {
- newSchedule[day] = {
- start: startTime,
- end: endTime,
- };
- });
-
- onSubmit(newSchedule);
- } else {
- const newSchedule = {
- time_zone: timezone,
+ Array.from(days).forEach((day) => {
+ newSchedule[day] = {
+ start: startTime,
+ end: endTime,
};
+ });
- Array.from(days).forEach((day) => {
- newSchedule[day] = {
- start: startTime,
- end: endTime,
- };
- });
-
- onSubmit(newSchedule);
- }
+ onSubmit(newSchedule);
};
return (
@@ -133,7 +118,7 @@ export const Modal = ({
>
{getShortDayName(t, day)}
</button>
- )) }
+ ))}
</div>
<div className="schedule__time-wrap">