fix: clear deposit on save and continue (#5598)

Author: ludtkemorgan

api/src/decorators/validate-listing-deposit.decorator.ts

@@ -35,28 +35,23 @@ export class DepositValueConstraint implements ValidatorConstraintInterface {
       return true;
     }
 
-    // Verify if both fields are either filled or empty
-    const areRangeFieldsInvalid =
-      (this.isFieldEmpty(depositMin) && !this.isFieldEmpty(depositMax)) ||
-      (!this.isFieldEmpty(depositMin) && this.isFieldEmpty(depositMax));
-
     if (value === DepositTypeEnum.fixedDeposit) {
-      return (
-        this.isFieldEmpty(depositMin) &&
-        this.isFieldEmpty(depositMax) &&
-        !this.isFieldEmpty(depositValue)
-      );
+      return this.isFieldEmpty(depositMin) && this.isFieldEmpty(depositMax);
+    }
+    if (value === DepositTypeEnum.depositRange) {
+      return this.isFieldEmpty(depositValue);
     }
 
-    return this.isFieldEmpty(depositValue) && !areRangeFieldsInvalid;
+    // If no Deposit type is selected then validate that it's either just depositValue or just the range values
+    return (
+      this.isFieldEmpty(depositValue) ||
+      (this.isFieldEmpty(depositMin) && this.isFieldEmpty(depositMax))
+    );
   }
   defaultMessage(args?: ValidationArguments): string {
     const value = args.value as DepositTypeEnum;
-    const { listingType } = args.object as Listing;
 
-    if (!listingType || listingType === ListingTypeEnum.regulated) {
-      return 'The "depositMin" and "depositMax" fields must be filled';
-    } else if (value === DepositTypeEnum.fixedDeposit) {
+    if (value === DepositTypeEnum.fixedDeposit) {
       return 'When deposit is of type "fixedDeposit" the "depositValue" must be filled and the "depositMin"|"depositMax" fields must be null';
     }
     return 'When deposit is of type "depositRange" the "depositMin" and "depositMax" fields must be filled and "depositValue" must be null';

sites/partners/src/components/listings/PaperListingForm/sections/AdditionalFees.tsx

@@ -13,6 +13,7 @@ import {
 import SectionWithGrid from "../../../shared/SectionWithGrid"
 import styles from "../ListingForm.module.scss"
 import { GridRow } from "@bloom-housing/ui-seeds/src/layout/Grid"
+import { ListingContext } from "../../ListingContext"
 
 type AdditionalFeesProps = {
   existingUtilities: ListingUtilities
@@ -22,6 +23,7 @@ type AdditionalFeesProps = {
 const AdditionalFees = (props: AdditionalFeesProps) => {
   const formMethods = useFormContext()
   const { doJurisdictionsHaveFeatureFlagOn } = useContext(AuthContext)
+  const listing = useContext(ListingContext)
   // eslint-disable-next-line @typescript-eslint/unbound-method
   const { register, watch, errors, clearErrors, setValue } = formMethods
 
@@ -57,6 +59,14 @@ const AdditionalFees = (props: AdditionalFeesProps) => {
     }
   }, [enableUtilitiesIncluded, setValue])
 
+  // After submitting the deposit max, min, and value can be removed via AdditionalMetadataFormatter.
+  // On a save and continue flow the values need to be updated in the form
+  useEffect(() => {
+    setValue("depositMax", listing?.depositMax)
+    setValue("depositMin", listing?.depositMin)
+    setValue("depositValue", listing?.depositValue)
+  }, [listing?.depositMax, listing?.depositMin, listing?.depositValue, setValue])
+
   const showAsNonRegulated =
     enableNonRegulatedListings && listingType === EnumListingListingType.nonRegulated