Skip to content

Commit 069403d

Browse files
committed
fix(condo): DOMA-4857 check for initial address at property update form
1 parent 98e9acb commit 069403d

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

apps/condo/domains/property/components/BasePropertyForm/index.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ const BasePropertyForm: React.FC<IPropertyFormProps> = (props) => {
5858

5959
const { isSmall } = useLayoutContext()
6060
const { addressApi } = useAddressApi()
61-
const { action, initialValues, organization } = props
61+
const { action, initialValues, organization, address } = props
6262

6363
const organizationId = get(organization, 'id')
6464
const [addressValidatorError, setAddressValidatorError] = useState<string | null>(null)
@@ -94,7 +94,9 @@ const BasePropertyForm: React.FC<IPropertyFormProps> = (props) => {
9494
}, [initialValues])
9595

9696
const { requiredValidator, numberValidator, maxLengthValidator } = useValidations()
97-
const { addressValidator, yearOfConstructionValidator } = usePropertyValidations({ organizationId, addressValidatorError })
97+
const { addressValidator, yearOfConstructionValidator } = usePropertyValidations({
98+
organizationId, addressValidatorError, address,
99+
})
98100

99101
const validations = {
100102
address: [requiredValidator, addressValidator],

apps/condo/domains/property/hooks/usePropertyValidations.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import dayjs from 'dayjs'
55
import isEmpty from 'lodash/isEmpty'
66
import { Property } from '@condo/domains/property/utils/clientSchema'
77

8-
export const usePropertyValidations = ({ organizationId, addressValidatorError }) => {
8+
export const usePropertyValidations = ({ organizationId, addressValidatorError, address }) => {
99
const intl = useIntl()
1010
const SamePropertyErrorMsg = intl.formatMessage({ id: 'pages.condo.property.warning.modal.SamePropertyErrorMsg' })
1111
const WrongYearErrorMsg = intl.formatMessage({ id: 'pages.condo.property.form.YearValidationError' })
@@ -19,6 +19,7 @@ export const usePropertyValidations = ({ organizationId, addressValidatorError }
1919
const addressValidator: Rule = useMemo(() => ({
2020
validator: async (_, value) => {
2121
if (isEmpty(value)) return Promise.resolve()
22+
if (!isEmpty(address) && address === value) return Promise.resolve()
2223
if (addressValidatorError) return Promise.reject(addressValidatorError)
2324

2425
const { data: { objs } } = await refetch({
@@ -33,7 +34,7 @@ export const usePropertyValidations = ({ organizationId, addressValidatorError }
3334
}
3435
return Promise.resolve()
3536
},
36-
}), [addressValidatorError, SamePropertyErrorMsg, refetch, organizationId])
37+
}), [addressValidatorError, SamePropertyErrorMsg, refetch, organizationId, address])
3738

3839
const yearOfConstructionValidator: Rule = useMemo(() => ({
3940
validator: (_, value) => {

0 commit comments

Comments
 (0)