muba-posting 9.0.3 → 9.0.5

package/Publish2b.js

@@ -53,21 +53,44 @@ export default class Publish2b extends React.Component {
   }
 
   loadData = async () => {
-    const region = this.props.postingAd.region;
-    const city = this.props.postingAd.city;
-    const district = this.props.postingAd.district;
-    const town = this.props.postingAd.town;
-
-    await this.loadRegions();
-    await this.loadCities(region);
-    await this.loadDistricts(city);
-    await this.loadTowns(district);
-
-    await this.setState({ townOptions: { ...this.state.townOptions, selectedItem: town } })
-    this.props.postingAd.town = town
+    const { region, city, district, town } = this.props.postingAd;
+
+    this.setState({
+      regionOptions: {
+        elements: [this.state.regionOptions.elements[0], ...this.state.locationsList.map(({ subList, ...rest }) => ({ ...rest }))],
+        selectedItem: region
+      }
+    });
+
+    if (region != null) {
+      this.setState({
+        cityOptions: {
+          elements: [this.state.cityOptions.elements[0], ...this.state.locationsList.filter(r => r.value === region)[0].subList.map(({ subList, ...rest }) => ({ ...rest }))],
+          selectedItem: city
+        }
+      });
+    }
+
+    if (city != null) {
+      this.setState({
+        districtOptions: {
+          elements: [this.state.districtOptions.elements[0], ...this.state.locationsList.filter(r => r.value === region)[0].subList.filter(c => c.value === city)[0].subList.map(({ subList, ...rest }) => ({ ...rest }))],
+          selectedItem: district
+        }
+      });
+    }
+
+    if (district != null) {
+      this.setState({
+        townOptions: {
+          elements: [this.state.townOptions.elements[0], ...this.state.locationsList.filter(r => r.value === region)[0].subList.filter(c => c.value === city)[0].subList.filter(d => d.value === district)[0].subList],
+          selectedItem: town
+        }
+      });
+    }
   }
 
-  async loadRegions() {
+  loadRegions() {
     if (this.state.regionOptions.elements.length <= 1) {
       const regionOptions = {
         elements: [this.state.regionOptions.elements[0], ...this.state.locationsList.map(({ subList, ...rest }) => ({ ...rest }))],
@@ -78,8 +101,8 @@ export default class Publish2b extends React.Component {
     }
   }
 
-  async loadCities(value) {
-    await this.setState({ regionOptions: { ...this.state.regionOptions, selectedItem: value } });
+  loadCities(value) {
+    this.setState({ regionOptions: { ...this.state.regionOptions, selectedItem: value } });
     this.props.postingAd.region = value;
 
     if (value != null) {
@@ -89,7 +112,7 @@ export default class Publish2b extends React.Component {
         selectedItem: null
       }
 
-      await this.setState({
+      this.setState({
         cityOptions: cityOptions,
         districtOptions: { elements: [this.state.districtOptions.elements[0]], selectedItem: null },
         townOptions: { elements: [this.state.townOptions.elements[0]], selectedItem: null }
@@ -101,8 +124,8 @@ export default class Publish2b extends React.Component {
     }
   }
 
-  async loadDistricts(value) {
-    await this.setState({ cityOptions: { ...this.state.cityOptions, selectedItem: value } });
+  loadDistricts(value) {
+    this.setState({ cityOptions: { ...this.state.cityOptions, selectedItem: value } });
     this.props.postingAd.city = value;
 
     if (value != null) {
@@ -116,21 +139,22 @@ export default class Publish2b extends React.Component {
         districtOptions.selectedItem = city.subList[0].value;
       }
 
-      await this.setState({ districtOptions: districtOptions });
-      this.props.postingAd.district = null;
-      this.props.postingAd.town = null;
+      this.setState({ districtOptions: districtOptions }, async () => {
+        this.props.postingAd.district = null;
+        this.props.postingAd.town = null;
 
-      if (city.subList.length == 1) {
-        this.inputSelectDistrict?.onSubmitValidate();
-        await this.loadTowns(districtOptions.selectedItem);
-      } else {
-        await this.setState({ townOptions: { elements: [this.state.townOptions.elements[0]], selectedItem: null } });
-      }
+        if (city.subList.length == 1) {
+          this.inputSelectDistrict?.onSubmitValidate();
+          this.loadTowns(districtOptions.selectedItem);
+        } else {
+          this.setState({ townOptions: { elements: [this.state.townOptions.elements[0]], selectedItem: null } });
+        }
+      });
     }
   }
 
-  async loadTowns(value) {
-    await this.setState({ districtOptions: { ...this.state.districtOptions, selectedItem: value } })
+  loadTowns(value) {
+    this.setState({ districtOptions: { ...this.state.districtOptions, selectedItem: value } })
     this.props.postingAd.district = value;
 
     if (value != null) {
@@ -145,11 +169,11 @@ export default class Publish2b extends React.Component {
         this.props.postingAd.town = townOptions.selectedItem;
       }
 
-      await this.setState({ townOptions: townOptions });
-
-      if (district.subList.length == 1) {
-        this.inputSelectTown?.onSubmitValidate();
-      }
+      this.setState({ townOptions: townOptions }, () => {
+        if (district.subList.length == 1) {
+          this.inputSelectTown?.onSubmitValidate();
+        }
+      });
     }
   }
 
@@ -173,10 +197,10 @@ export default class Publish2b extends React.Component {
           errorCity: !responseCheckZone.correctCity
         })
 
-        if (!responseCheckZone.correctCity){
+        if (!responseCheckZone.correctCity) {
           this.popupNoZone.show();
         } else {
-          this.props.goToPage(Views.PAYMENT_ONLINE, false, {onlyShowCreateBusiness: true});
+          this.props.goToPage(Views.PAYMENT_ONLINE, false, { onlyShowCreateBusiness: true });
         }
       }
     }
@@ -219,7 +243,8 @@ export default class Publish2b extends React.Component {
             <InputText value={this.state.address}
               label={strings('setup.adress')}
               labelStyle={commonStyles.progressbarField}
-              required={false}
+              required={true}
+              scroll={(ref) => this.props.scroll(ref)}
               onChangeText={(text) => this.onChangeAddress(text)}
               textContainerStyle={commonStyles.inputContainer}
               disabled={!this.props.allowedToModify.address || this.props.postingAd.promotionId != null}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muba-posting",
-  "version": "9.0.3",
+  "version": "9.0.5",
   "description": "Posting",
   "main": "Posting.js",
   "scripts": {