SBERDOMA-906 add available settlement types

open-condo-software · Jul 30, 2021 · 2ca6cc2 · 2ca6cc2
1 parent 9b1b195
commit 2ca6cc2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/apps/condo/domains/property/components/BasePropertyForm/index.tsx b/apps/condo/domains/property/components/BasePropertyForm/index.tsx
@@ -11,8 +11,7 @@ import { PropertyPanels } from '../panels'
 import Prompt from '@condo/domains/common/components/Prompt'
 import { AddressMeta } from '@condo/domains/common/utils/addressApi/AddressMeta'
 import { useState } from 'react'
-import { validHouseTypes } from '@condo/domains/property/constants/property'
-import { get } from 'lodash'
+import { validHouseTypes, validSettlementTypes } from '@condo/domains/property/constants/property'
 
 interface IOrganization {
     id: string
@@ -109,10 +108,11 @@ const BasePropertyForm: React.FC<IPropertyFormProps> = (props) => {
                                         <AddressSuggestionsSearchInput
                                             onSelect={(_, option) => {
                                                 const address = JSON.parse(option.key) as AddressMeta
-                                                if (address.data.settlement_type) {
-                                                    setAddressValidatorError(UnsupportedPropertyErrorMsg.replace('{propertyType}', address.data.settlement_type))
+                                                console.log(address.data)
+                                                if (!validSettlementTypes.includes(address.data.settlement_type_full)) {
+                                                    setAddressValidatorError(UnsupportedPropertyErrorMsg.replace('{propertyType}', address.data.settlement_type_full))
                                                 }
-                                                else if (!validHouseTypes.includes(address.data.house_type)) {
+                                                else if (!validHouseTypes.includes(address.data.house_type_full)) {
                                                     setAddressValidatorError(AddressValidationErrorMsg)
                                                 }
                                                 else if (AddressValidationErrorMsg) setAddressValidatorError(null)

diff --git a/apps/condo/domains/property/constants/property.ts b/apps/condo/domains/property/constants/property.ts
@@ -1,7 +1,8 @@
 import { AddressMeta } from '@condo/domains/common/utils/addressApi/AddressMeta'
 
 // "д" - "дом" or "к" - "корпус"
-const validHouseTypes: AddressMeta['data']['house_type'][] = ['д', 'к', 'стр']
+const validHouseTypes: AddressMeta['data']['house_type_full'][] = ['дом', 'корпус', 'строение']
+const validSettlementTypes: AddressMeta['data']['settlement_type_full'][] = ['село', 'поселок городского типа']
 
 const buildingEmptyMapJson = {
     'dv': 1,
@@ -313,4 +314,5 @@ export {
     buildingAddressMetaJson,
     notValidBuildingMapJson,
     validHouseTypes,
+    validSettlementTypes,
 }