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
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export function OpportunityDetailsDisplay({ opportunity }: Props) {
const isEventType = opp.volunteerType === VolunteerStateTypeType.EVENTS;

const mainCommunication = formatLanguagesByPurpose(opp.languages, LangPurpose.GENERAL, t);
const residentsSpeak = formatLanguagesByPurpose(opp.languages, LangPurpose.RECIPIENT, t);
const residentsSpeak = formatLanguagesByPurpose(opp.languages, [LangPurpose.RECIPIENT, LangPurpose.TRANSLATION], t);
const schedule = formatAvailability(opp.availability, t);
const activities = extractOptionTitles(opp.activities, lang);
const skills = extractOptionTitles(opp.skills, lang);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,22 +89,28 @@ export function OpportunityDetailsEdit({ opportunity, onCancel }: Props) {
}));

const generalLangs = opp.languages.filter((l) => l.purpose === LangPurpose.GENERAL);
const recipientLangs = opp.languages.filter((l) => l.purpose === LangPurpose.RECIPIENT);
const seenResidents = new Set<number>();
const residentsLangs = opp.languages.filter((l) => {
if (l.purpose !== LangPurpose.RECIPIENT && l.purpose !== LangPurpose.TRANSLATION) return false;
if (seenResidents.has(l.id)) return false;
seenResidents.add(l.id);
return true;
});

const schema = createOpportunityDetailsSchema(t);
const {
control,
handleSubmit,
reset,
formState: { errors, isDirty, isValid },
formState: { errors, isValid },
} = useForm<OpportunityDetailsFormData>({
resolver: zodResolver(schema),
mode: "onChange",
defaultValues: {
description: opp.description ?? "",
numberOfVolunteers: String(opp.numberOfVolunteers ?? ""),
mainCommunication: languagesToFormValues(generalLangs, t),
residentsSpeak: languagesToFormValues(recipientLangs, t),
residentsSpeak: languagesToFormValues(residentsLangs, t),
availability: isEventType ? undefined : apiToFormAvailability(opp.availability),
eventDate: null,
eventTime: "",
Expand Down Expand Up @@ -324,7 +330,7 @@ export function OpportunityDetailsEdit({ opportunity, onCancel }: Props) {
onClick={handleSubmit(onSubmit)}
width="auto"
padding="var(--volunteer-profile-section-card-header-button-padding)"
disabled={!isDirty || !isValid}
disabled={!isValid}
/>
</FormButtonRow>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,25 @@ import { LanguageObject } from "@/types";
import { TFunction } from "i18next";
import { ApiLanguage, Lang, LangPurpose, OptionById } from "need4deed-sdk";

export function formatLanguagesByPurpose(languages: ApiLanguage[], purpose: LangPurpose, t: TFunction): string {
const filtered = languages.filter((lang) => lang.purpose === purpose);
export function formatLanguagesByPurpose(
languages: ApiLanguage[],
purposes: LangPurpose | LangPurpose[],
t: TFunction,
): string {
const purposeSet = new Set(Array.isArray(purposes) ? purposes : [purposes]);
const seen = new Set<number>();
const filtered = languages.filter((lang) => {
if (!lang.purpose || !purposeSet.has(lang.purpose)) return false;
if (seen.has(lang.id)) return false;
seen.add(lang.id);
return true;
});
if (filtered.length === 0) return EMPTY_PLACEHOLDER_VALUE;
return filtered
.map((lang) => {
const key = `languageNames.${lang.title.toLowerCase()}`;
const translated = t(key);
const hasTranslation = translated !== key;
return hasTranslation ? translated : lang.title;
return translated !== key ? translated : lang.title;
})
.join(", ");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,17 @@ const languageObjectSchema = z.object({
level: z.union([z.nativeEnum(LanguageLevel), z.literal("")]),
});

const languagesValidator = (t: (key: string) => string) =>
z.array(languageObjectSchema).superRefine((languages, ctx) => {
const hasCompleteRow = languages.some((lang) => lang.language !== "");
if (!hasCompleteRow) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: t(`${i18nPrefix}.languageRequired`),
});
}
});

export const createOpportunityDetailsSchema = (t: (key: string) => string) =>
z.object({
description: z
.string()
.min(1, t(`${i18nPrefix}.descriptionRequired`))
.max(MAX_DESCRIPTION_LENGTH, t(`${i18nPrefix}.descriptionTooLong`)),
numberOfVolunteers: z.string().refine((val) => val !== "" && val !== "0", {
message: t(`${i18nPrefix}.numberOfVolunteersRequired`),
}),
mainCommunication: languagesValidator(t),
residentsSpeak: languagesValidator(t),
description: z.string().max(MAX_DESCRIPTION_LENGTH, t(`${i18nPrefix}.descriptionTooLong`)),
numberOfVolunteers: z.string(),
mainCommunication: z.array(languageObjectSchema),
residentsSpeak: z.array(languageObjectSchema),
availability: z.custom<Availability>().nullable().optional(),
eventDate: z.date().nullable().optional(),
eventTime: z.string().optional(),
activities: z.array(z.string()).min(1, t(`${i18nPrefix}.activitiesRequired`)),
activities: z.array(z.string()),
skills: z.array(z.string()),
});

Expand Down
Loading