Update ConfirmAddRepeatedOpeningHour component to use Date objects

and transform the date into the required strings inside.
danskernesdigitalebibliotek · Apr 26, 2024 · 45297fa · 45297fa
1 parent bd06203
commit 45297fa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/apps/opening-hours-editor/ConfirmAddRepeatedOpeningHour.tsx b/src/apps/opening-hours-editor/ConfirmAddRepeatedOpeningHour.tsx
@@ -1,21 +1,20 @@
 import React from "react";
 import { useText } from "../../core/utils/text";
 import { OpeningHoursCategoriesType } from "./types";
+import { getDateString, getWeekDayName } from "./helper";
 
 type ConfirmAddRepeatedOpeningHourType = {
-  startDateString: string;
-  weekDayName: string;
+  startDate: Date;
   category: OpeningHoursCategoriesType;
   startTime: string;
   endTime: string;
-  repeatedEndDate: string;
+  repeatedEndDate: Date;
   confirmSubmit: () => void;
   closeDialog: () => void;
 };
 
 const ConfirmAddRepeatedOpeningHour = ({
-  startDateString,
-  weekDayName,
+  startDate,
   category,
   startTime,
   endTime,
@@ -51,15 +50,15 @@ const ConfirmAddRepeatedOpeningHour = ({
           </tr>
           <tr>
             <td>{t("openingHoursEventFormStartDateText")}:</td>
-            <td>{startDateString}</td>
+            <td>{getDateString(startDate)}</td>
           </tr>
           <tr>
             <td>{t("openingHoursEventFormEndDateText")}:</td>
-            <td>{repeatedEndDate}</td>
+            <td>{getDateString(repeatedEndDate)}</td>
           </tr>
           <tr>
             <td>{t("openingHoursEventFormEveryWeekdayText")}:</td>
-            <td>{weekDayName}</td>
+            <td>{getWeekDayName(startDate)}</td>
           </tr>
         </tbody>
       </table>

diff --git a/src/apps/opening-hours-editor/EventForm.tsx b/src/apps/opening-hours-editor/EventForm.tsx
@@ -86,12 +86,11 @@ const EventForm: React.FC<EventFormProps> = ({
     if (repeatedEndDate) {
       openDialogWithContent(
         <ConfirmAddRepeatedOpeningHour
-          startDateString={startDateString}
-          weekDayName={weekDayName}
+          startDate={startDate}
           category={category}
           startTime={startTime}
           endTime={endTime}
-          repeatedEndDate={getDateString(new Date(repeatedEndDate))}
+          repeatedEndDate={new Date(repeatedEndDate)}
           confirmSubmit={() =>
             onSubmit(category, startTime, endTime, repeatedEndDate)
           }