Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions public/locales/de/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -1029,6 +1029,7 @@
"refugeeNumber": "Geflüchtetennummer",
"refugeeName": "Name des Geflüchteten",
"languageToTranslate": "Zu übersetzende Sprache",
"refugeeLanguage": "Flüchtlingssprache",
"cancel": "Abbrechen",
"saveChanges": "Änderungen speichern",
"saveSuccess": "Begleitdetails erfolgreich aktualisiert",
Expand Down
1 change: 1 addition & 0 deletions public/locales/en/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -1028,6 +1028,7 @@
"refugeeNumber": "Refugee number",
"refugeeName": "Refugee name",
"languageToTranslate": "Language to translate",
"refugeeLanguage": "Refugee language",
"cancel": "Cancel",
"saveChanges": "Save changes",
"saveSuccess": "Accompanying details updated successfully",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export const AccompanyingDetails = forwardRef<EditableSectionRef, Props>(functio
appointmentTime: values.appointmentTime || undefined,
refugeeNumber: values.refugeeNumber,
refugeeName: values.refugeeName,
languagesToTranslate: values.languageToTranslate ? [values.languageToTranslate] : [],
languagesToTranslate: values.languagesToTranslate ?? [],
},
},
{
Expand All @@ -104,7 +104,7 @@ export const AccompanyingDetails = forwardRef<EditableSectionRef, Props>(functio
);
}

const languageLabel = keyToLabel[formValues.languageToTranslate || ""] || formValues.languageToTranslate || "";
const languageLabel = (formValues.languagesToTranslate ?? []).map((id) => keyToLabel[id] || id).join(", ");

return (
<FormProvider {...methods}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,10 @@ export const AccompanyingDetailsDisplay = ({ values, languageLabel }: Props) =>

<EditableField
mode="display"
type="radio-list"
label={t("dashboard.opportunityProfile.accompanyingDetails.languageToTranslate")}
type="text"
label={t("dashboard.opportunityProfile.accompanyingDetails.refugeeLanguage")}
value={languageLabel}
setValue={() => {}}
options={[]}
/>
</Details>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,7 @@ export const AccompanyingDetailsEdit = ({
/>
{errors.appointmentTime && (
<ErrorText>
{t(
`dashboard.opportunityProfile.accompanyingDetails.validation.${errors.appointmentTime.message}`,
)}
{t(`dashboard.opportunityProfile.accompanyingDetails.validation.${errors.appointmentTime.message}`)}
</ErrorText>
)}
</TimeInputWrapper>
Expand Down Expand Up @@ -139,20 +137,24 @@ export const AccompanyingDetailsEdit = ({
/>

<Controller
name="languageToTranslate"
name="languagesToTranslate"
control={control}
render={({ field }: { field: ControllerRenderProps<AccompanyingDetailsFormData, "languageToTranslate"> }) => (
render={({
field,
}: {
field: ControllerRenderProps<AccompanyingDetailsFormData, "languagesToTranslate">;
}) => (
<EditableField
mode="edit"
type="radio-list"
label={t("dashboard.opportunityProfile.accompanyingDetails.languageToTranslate")}
value={keyToLabel[field.value || ""] || field.value || ""}
type="checkbox-list"
label={t("dashboard.opportunityProfile.accompanyingDetails.refugeeLanguage")}
value={(field.value ?? []).map((id) => keyToLabel[id] || id)}
setValue={(value) => {
const label = Array.isArray(value) ? value[0] : value;
field.onChange(labelToKey[label] || label);
const labels = Array.isArray(value) ? value : [value];
field.onChange(labels.map((label) => labelToKey[label] || label));
}}
options={languageOptions}
errorMessage={errors.languageToTranslate?.message}
errorMessage={errors.languagesToTranslate?.message}
/>
)}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const accompanyingDetailsSchema = z.object({
}),
refugeeNumber: z.string().optional(),
refugeeName: z.string().optional(),
languageToTranslate: z.string().optional(),
languagesToTranslate: z.array(z.string()).optional(),
});

export type AccompanyingDetailsFormData = z.infer<typeof accompanyingDetailsSchema>;
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ export const getInitialFormValues = (
appointmentTime: parseTime(details?.appointmentTime),
refugeeNumber: details?.refugeeNumber || "",
refugeeName: details?.refugeeName || "",
languageToTranslate: details?.languageToTranslate?.toString() ?? "",
languagesToTranslate: details?.languageToTranslate !== undefined ? [details.languageToTranslate.toString()] : [],
});
Loading