refactor: make form mode explicit

Author: stampaaaron

apps/frontend/src/components/questionnaire/calendar/EntryCalendar.tsx

@@ -8,7 +8,7 @@ import { QuestionnaireEntry } from "./QuestionnaireEntry";
 import { components } from "../../../api.gen";
 import { EntityForm, EntryFormValues } from "./EntryForm";
 import { useEffect, useState } from "react";
-import { format, i18n } from "../../../stores/i18n";
+import { format } from "../../../stores/i18n";
 import { useStore } from "@nanostores/react";
 import { EventImpl } from "@fullcalendar/core/internal";
 import styles from "./EntryCalendar.module.css";
@@ -51,11 +51,6 @@ export type EntryCalendarProps = {
   onAddLanguage: (value: string) => Promise<number>;
 };
 
-const messages = i18n("entryCalendar", {
-  actionAdd: "Add",
-  actionUpdate: "Update",
-});
-
 export function EntryCalendar({
   entries,
   gaps,
@@ -69,8 +64,6 @@ export function EntryCalendar({
   onAddLanguage,
 }: EntryCalendarProps) {
   const theme = useMantineTheme();
-
-  const t = useStore(messages);
   const { time } = useStore(format);
 
   const { fullscreen, admin } = useStore($layout);
@@ -191,7 +184,7 @@ export function EntryCalendar({
             carers={carers}
             languages={languages}
             templates={templates}
-            actionLabel={entryDraft?.id ? t.actionUpdate : t.actionAdd}
+            mode={entryDraft?.id ? "update" : "create"}
           />
         )}
       </Modal>

apps/frontend/src/components/questionnaire/calendar/EntryForm.tsx

@@ -25,6 +25,8 @@ const messages = i18n("entityForm", {
   actionAddLanguage: "Add language",
   actionAddRecurringRule: "Add recurring rule",
   actionDelete: "Delete",
+  actionAdd: "Add",
+  actionUpdate: "Update",
   labelCarer: "Carer",
   labelLanguage: "Language",
   labelRecurringRulePrefix: "Recurs every",
@@ -41,13 +43,13 @@ type EntityFormProps = {
   carers: components["schemas"]["CarerResponseDto"][];
   languages: components["schemas"]["LanguageResponseDto"][];
   templates: components["schemas"]["EntryTemplateDto"][];
-  actionLabel: string;
   onSave: (entity: EntryFormValues) => void;
   entry: Partial<EntryFormValues>;
+  mode: "create" | "update";
   onDelete?: () => void;
 };
 
-export function EntityForm({ onSave, onDelete, onAddCarer, onAddLanguage, actionLabel, entry, carers, languages, templates }: EntityFormProps) {
+export function EntityForm({ onSave, onDelete, onAddCarer, onAddLanguage, entry, carers, languages, templates, mode }: EntityFormProps) {
   const isUpdateForm = !!onDelete;
 
   const t = useStore(messages);
@@ -56,7 +58,7 @@ export function EntityForm({ onSave, onDelete, onAddCarer, onAddLanguage, action
       startedAt: "",
       endedAt: "",
       carer: -1,
-      weekday: isUpdateForm ? 0 : [],
+      weekday: mode === "update" ? 0 : [],
       entryLanguages: [{ ratio: 100 }],
     },
     validate: {
@@ -197,7 +199,7 @@ export function EntityForm({ onSave, onDelete, onAddCarer, onAddLanguage, action
               {t.actionDelete}
             </Button>
           )}
-          <Button type="submit">{actionLabel}</Button>
+          <Button type="submit">{mode === "update" ? t.actionUpdate : t.actionAdd}</Button>
         </Group>
       </Stack>
     </form>