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
14 changes: 7 additions & 7 deletions src/components/Dashboard/NewOpportunity/NewOpportunity.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {
} from "@/components/Dashboard/Profile/sections/VolunteerProfile/hooks";
import { createMapping } from "@/components/Dashboard/Profile/sections/VolunteerProfile/mappingUtils";
import {
createOpportunityDetailsSchema,
OpportunityDetailsFormData,
createNewOpportunityDetailsSchema,
NewOpportunityDetailsFormData,
} from "@/components/Dashboard/Profile/sections/OpportunityDetails/opportunityDetailsSchema";
import { AccompanyingDetailsEdit } from "@/components/Dashboard/Profile/sections/AccompanyingDetails/AccompanyingDetailsEdit";
import { FormDetails } from "@/components/Dashboard/Profile/sections/shared/styles";
Expand Down Expand Up @@ -131,7 +131,7 @@ function toOptionItems(ids: string[], apiItems: ApiLanguageOption[]): OptionItem
});
}

function availabilityToTimeslots(availability: OpportunityDetailsFormData["availability"]): [number, string][] {
function availabilityToTimeslots(availability: NewOpportunityDetailsFormData["availability"]): [number, string][] {
return (availability ?? []).flatMap(({ weekday, timeSlots }) =>
timeSlots
.filter((ts) => ts.selected)
Expand All @@ -144,7 +144,7 @@ function availabilityToTimeslots(availability: OpportunityDetailsFormData["avail

function buildCreatePayload(
headerData: HeaderFormData,
detailsData: OpportunityDetailsFormData,
detailsData: NewOpportunityDetailsFormData,
accompData: AccompanyingDetailsFormData | null,
apiLanguages: ApiLanguageOption[],
apiActivities: ApiLanguageOption[],
Expand Down Expand Up @@ -225,7 +225,7 @@ function OpportunityDetailsFields({
const {
control,
formState: { errors },
} = useFormContext<OpportunityDetailsFormData>();
} = useFormContext<NewOpportunityDetailsFormData>();

const activityMapping = createMapping(apiActivities);
const skillMapping = createMapping(apiSkills);
Expand Down Expand Up @@ -461,8 +461,8 @@ export function NewOpportunity() {
const isEvent = selectedType === VolunteerStateTypeType.EVENTS;

// Opportunity details form
const detailsMethods = useForm<OpportunityDetailsFormData>({
resolver: zodResolver(createOpportunityDetailsSchema(t)),
const detailsMethods = useForm<NewOpportunityDetailsFormData>({
resolver: zodResolver(createNewOpportunityDetailsSchema(t)),
mode: "onChange",
defaultValues: {
description: "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,8 @@ export const createOpportunityDetailsSchema = (t: (key: string) => string) =>
});

export type OpportunityDetailsFormData = z.infer<ReturnType<typeof createOpportunityDetailsSchema>>;

export const createNewOpportunityDetailsSchema = (t: (key: string) => string) =>
createOpportunityDetailsSchema(t).omit({ title: true });

export type NewOpportunityDetailsFormData = z.infer<ReturnType<typeof createNewOpportunityDetailsSchema>>;
Loading