fix/added default shed filling (#543)

moira-alert · Sep 26, 2024 · 971eea1 · 971eea1
1 parent 4cdc8bd
commit 971eea1
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 21 deletions.
diff --git a/src/Components/DateAndTimeMenu/DateAndTimeMenu.less b/src/Components/DateAndTimeMenu/DateAndTimeMenu.less
@@ -13,3 +13,7 @@
         cursor: pointer;
     }
 }
+
+.input-container {
+    display: inline-flex;
+}
diff --git a/src/Components/DateAndTimeMenu/DateAndTimeMenu.tsx b/src/Components/DateAndTimeMenu/DateAndTimeMenu.tsx
@@ -22,6 +22,8 @@ interface IDateAndTimeMenuProps {
     validateDateAndTime?: (inputValue: string) => Nullable<ValidationInfo>;
 }
 
+const dateInputMask = "9999/99/99 99:99:99";
+
 export const DateAndTimeMenu: FC<IDateAndTimeMenuProps> = ({
     date,
     setDate,
@@ -54,18 +56,20 @@ export const DateAndTimeMenu: FC<IDateAndTimeMenuProps> = ({
     return (
         <RenderLayer onClickOutside={closeMenu} onFocusOutside={closeMenu} active={isMenuOpen}>
             <div ref={containerEl}>
-                <ValidationWrapperV1
-                    validationInfo={validateDateAndTime && validateDateAndTime(inputValue)}
-                >
-                    <Input
-                        width={160}
-                        mask={"9999/99/99 99:99:99"}
-                        onFocus={closeMenu}
-                        value={inputValue}
-                        onValueChange={handleValueChange}
-                    />
-                </ValidationWrapperV1>
-                <CalendarIcon className={cn("calendar-icon")} onClick={openMenu} />
+                <div className={cn("input-container")}>
+                    <ValidationWrapperV1
+                        validationInfo={validateDateAndTime && validateDateAndTime(inputValue)}
+                    >
+                        <Input
+                            width={160}
+                            mask={dateInputMask}
+                            onFocus={closeMenu}
+                            value={inputValue}
+                            onValueChange={handleValueChange}
+                        />
+                    </ValidationWrapperV1>
+                    <CalendarIcon className={cn("calendar-icon")} onClick={openMenu} />
+                </div>
                 {isMenuOpen && (
                     <DropdownContainer
                         offsetY={5}

diff --git a/src/Components/Tabs/Tabs.less b/src/Components/Tabs/Tabs.less
@@ -1,5 +1,5 @@
-@import '~styles/variables.less';
-@import '~styles/mixins.less';
+@import "~styles/variables.less";
+@import "~styles/mixins.less";
 
 .header {
     margin-top: -9px;

diff --git a/src/Components/TriggerInfo/Components/EventListTab/EventListTab.tsx b/src/Components/TriggerInfo/Components/EventListTab/EventListTab.tsx
@@ -106,7 +106,7 @@ export const EventListTab: FC<IEventListTabProps> = ({ triggerName }) => {
                             <div style={{ paddingTop: 20 }}>
                                 <Paging
                                     caption="Next page"
-                                    activePage={page}
+                                    activePage={+page}
                                     pagesCount={pageCount}
                                     onPageChange={setPage}
                                     withoutNavigationHint

diff --git a/src/Components/TriggerInfo/Components/ScheduleView.tsx b/src/Components/TriggerInfo/Components/ScheduleView.tsx
@@ -1,11 +1,12 @@
 import React from "react";
-import { Schedule } from "../../../Domain/Schedule";
+import { defaultSchedule, Schedule } from "../../../Domain/Schedule";
 import { format, addMinutes, startOfDay } from "date-fns";
 import { getUTCDate } from "../../../helpers/DateUtil";
 
 export function ScheduleView(props: { data: Schedule }): React.ReactElement {
     const { data } = props;
-    const { days, startOffset, endOffset, tzOffset } = data;
+    const { startOffset, endOffset, tzOffset } = data;
+    const { days } = defaultSchedule(data);
 
     const startTime = format(addMinutes(startOfDay(getUTCDate()), startOffset), "HH:mm");
 

diff --git a/src/Domain/Schedule.ts b/src/Domain/Schedule.ts
@@ -39,13 +39,18 @@ export function createSchedule(days: DaysOfWeek[]): Schedule {
     };
 }
 
-export const defaultSchedule = (schedule: Schedule | undefined) => {
+export const defaultSchedule = (schedule?: Schedule): Schedule => {
+    const existingDays = schedule?.days?.map((day) => day.name) || [];
+
     return {
         startOffset: schedule?.startOffset || 0,
         endOffset: schedule?.endOffset || 1439,
         tzOffset: schedule?.tzOffset || new Date().getTimezoneOffset(),
-        days:
-            schedule?.days ||
-            Object.values(DaysOfWeek).map((day) => ({ name: day, enabled: false })),
+        days: WholeWeek.map((day) => ({
+            name: day,
+            enabled:
+                (schedule?.days.find((d) => d.name === day)?.enabled ?? false) &&
+                existingDays.includes(day),
+        })),
     };
 };