From 6731c8d1517f8fae66f095d18528e3e1b62e801b Mon Sep 17 00:00:00 2001
From: Kasper Birch <kasperbirch1@gmail.com>
Date: Thu, 25 Apr 2024 14:16:01 +0200
Subject: [PATCH] Remove unnecessary checkboxes for repeated opening hours

Instead, we give the label a more descriptive title.
---
 src/apps/opening-hours-editor/EventForm.tsx   | 31 +++----------------
 .../OpeningHoursEditor.dev.tsx                |  9 ++----
 .../OpeningHoursEditor.entry.tsx              |  1 -
 3 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/src/apps/opening-hours-editor/EventForm.tsx b/src/apps/opening-hours-editor/EventForm.tsx
index 6c4116f952..ad1c0a7384 100644
--- a/src/apps/opening-hours-editor/EventForm.tsx
+++ b/src/apps/opening-hours-editor/EventForm.tsx
@@ -180,37 +180,14 @@ const EventForm: React.FC<EventFormProps> = ({
                 htmlFor="event-form-repeated"
               >
                 {t("openingHoursEventFormRepeatedText", {
-                  placeholders: { "@startDate": startDateString }
+                  placeholders: {
+                    "@startDate": startDateString,
+                    "@weekDayName": weekDayName
+                  }
                 })}
               </label>
             </div>
 
-            <div className="opening-hours-editor-form__checkbox">
-              <input
-                id="event-form-weekly"
-                data-cy="opening-hours-editor-form-week-day"
-                type="checkbox"
-                checked={isRepeated}
-                disabled={!isRepeated}
-              />
-              <label className="" htmlFor="event-form-weekly">
-                {t("openingHoursEventFormWeklyText")}
-              </label>
-            </div>
-
-            <div className="opening-hours-editor-form__checkbox">
-              <input
-                id="event-form-week-day"
-                data-cy="opening-hours-editor-form-week-day"
-                type="checkbox"
-                checked={isRepeated}
-                disabled={!isRepeated}
-              />
-              <label className="" htmlFor="event-form-week-day">
-                {weekDayName}
-              </label>
-            </div>
-
             <label
               className="opening-hours-editor-form__label"
               htmlFor="event-form-end-date"
diff --git a/src/apps/opening-hours-editor/OpeningHoursEditor.dev.tsx b/src/apps/opening-hours-editor/OpeningHoursEditor.dev.tsx
index 8f31538efa..312254bb62 100644
--- a/src/apps/opening-hours-editor/OpeningHoursEditor.dev.tsx
+++ b/src/apps/opening-hours-editor/OpeningHoursEditor.dev.tsx
@@ -57,15 +57,10 @@ export default {
     },
     openingHoursEventFormRepeatedText: {
       name: "Opening hours event form repeated",
-      defaultValue: "Repeat opening hour from @startDate",
-      control: { type: "text" }
-    },
-    openingHoursEventFormWeklyText: {
-      name: "Opening hours event form weekly",
-      defaultValue: "Weekly",
+      defaultValue:
+        "Repeat opening hour weekly every @weekDayName from @startDate",
       control: { type: "text" }
     },
-
     openingHoursEventFormEndDateText: {
       name: "Opening hours event to end date",
       defaultValue: "End date",
diff --git a/src/apps/opening-hours-editor/OpeningHoursEditor.entry.tsx b/src/apps/opening-hours-editor/OpeningHoursEditor.entry.tsx
index 17cc5e8230..0eeac71a52 100644
--- a/src/apps/opening-hours-editor/OpeningHoursEditor.entry.tsx
+++ b/src/apps/opening-hours-editor/OpeningHoursEditor.entry.tsx
@@ -14,7 +14,6 @@ interface OpeningHoursEditorEntryTextProps {
   openingHoursEventFormEndTimeText: string;
   openingHoursEventFormSubmitText: string;
   openingHoursEventFormRepeatedText: string;
-  openingHoursEventFormWeklyText: string;
   openingHoursEventFormEndDateText: string;
   openingHoursEventFormEveryWeekdayText: string;
   openingHoursEventFormStartDateText: string;