junte/assessment-model
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/assessment-model.git synced 2026-06-30 12:55:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

allowing for additional goal types to be submitted

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2025-07-31 14:55:19 +01:00
parent 6162f2e8b5
commit 2a7c05141d
2 changed files with 100 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/app/portfolio/[slug]/components/FormSchema.tsx
View file

@ -8,18 +8,34 @@ export const baseFormSchema = z.object({
export type BaseFormValues = z.infer<typeof baseFormSchema>;
export const RemoteAssessmentFormSchema = baseFormSchema.extend({
scenario: z.string().min(1),
goal: z.string().min(1),
goalValue: z.string().min(1),
housingType: z.string().min(1),
addressLineOne: z.string().min(1),
postcode: z.string().min(1),
uprn: z.number().min(1, "UPRN must be a valid number"),
valuation: z.number().min(1, "Valuation must be a valid number"),
propertyType: z.string().nullable(),
builtForm: z.string().nullable(),
});
export const RemoteAssessmentFormSchema = baseFormSchema
.extend({
scenario: z.string().min(1),
goal: z.string().min(1),
// goalValue: z.string().min(1),
goalValue: z.string().optional(),
budget: z.number().optional(),
housingType: z.string().min(1),
addressLineOne: z.string().min(1),
postcode: z.string().min(1),
uprn: z.number().min(1, "UPRN must be a valid number"),
valuation: z.number().min(1, "Valuation must be a valid number"),
propertyType: z.string().nullable(),
builtForm: z.string().nullable(),
})
.refine((data) => data.goal !== "Increasing EPC" || !!data.goalValue, {
path: ["goalValue"],
message: "Target EPC Rating is required when goal is Increasing EPC",
})
.refine(
(data) =>
data.goal === "Increasing EPC" ||
(typeof data.budget === "number" && data.budget > 0),
{
path: ["budget"],
message: "Budget is required for this goal",
}
);
export type RemoteAssessmentFormValues = z.infer<
typeof RemoteAssessmentFormSchema

101
src/app/portfolio/[slug]/components/RemoteAssessmentModal.tsx
View file

@ -121,7 +121,12 @@ const selectGoalOptions = [
{
label: "Reduce energy consumption",
value: "Reduce energy consumption",
disabled: true,
disabled: false,
},
{
label: "Reduce CO2 emissions",
value: "Reduce CO2 emissions",
disabled: false,
},
];
@ -357,6 +362,11 @@ function useCreateRemoteAssessment({
async function triggerEngine(data: RemoteAssessmentFormValues) {
try {
// Goal value should not be missing at this point
if (!data.goalValue) {
throw new Error("Goal value is required");
}
const triggerBody: EngineTriggerBody = {
scenario_id: scenarioId === "__new__" ? null : scenarioId,
portfolio_id: portfolioId,
@ -461,10 +471,11 @@ export default function RemoteAssessmentModal({
housingType: "",
goal: "",
goalValue: "",
budget: undefined,
addressLineOne: "",
postcode: "",
uprn: undefined, // Must match expected type
valuation: undefined, // Must match expected type
uprn: undefined,
valuation: undefined,
propertyType: null,
builtForm: null,
measures: measuresList,
@ -474,6 +485,7 @@ export default function RemoteAssessmentModal({
const { isValid, isSubmitting } = formState;
const measures = form.watch("measures");
const goal = form.watch("goal");
const {
handleSubmit: triggerAssessment,
@ -657,32 +669,63 @@ export default function RemoteAssessmentModal({
)}
/>
{/* Goal Value */}
<FormField
control={form.control}
name="goalValue"
render={({ field }) => (
<FormItem>
<FormLabel className="text-gray-800">
Goal Value
</FormLabel>
<FormControl>
{selectedScenario === NEW_SENTINEL ? (
<SelectDropdown
options={goalValueOptions}
selectedOption={field.value}
onSelectOption={(opt) =>
field.onChange(opt.value)
}
/>
) : (
<Input value={field.value} disabled />
)}
</FormControl>
<FormMessage className="text-brandbrown" />
</FormItem>
)}
/>
{goal &&
(goal === "Increasing EPC" ? (
<FormField
control={form.control}
name="goalValue"
render={({ field }) => (
<FormItem>
<FormLabel className="text-gray-800">
Target EPC Rating
</FormLabel>
<FormControl>
{selectedScenario === NEW_SENTINEL ? (
<SelectDropdown
options={goalValueOptions}
selectedOption={field.value || ""}
onSelectOption={(opt) =>
field.onChange(opt.value)
}
/>
) : (
<Input value={field.value} disabled />
)}
</FormControl>
<FormMessage className="text-brandbrown" />
</FormItem>
)}
/>
) : (
<FormField
control={form.control}
name="budget"
render={({ field }) => (
<FormItem>
<FormLabel className="text-gray-800">
Budget (£)
</FormLabel>
<FormControl>
<Input
type="number"
placeholder="Enter budget"
{...field}
value={field.value ?? ""}
onChange={(e) =>
field.onChange(
e.target.value === ""
? undefined
: Number(e.target.value)
)
}
className="border-brandbrown focus-visible:ring-brandbrown focus-visible:border-brandbrown"
/>
</FormControl>
<FormMessage className="text-brandbrown" />
</FormItem>
)}
/>
))}
</div>
</>
)}