muba-posting 4.1.11 → 4.1.12

package/Publish2b.js

@@ -66,26 +66,12 @@ export default class Publish2b extends React.Component {
     const town = this.props.postingAd.town;
 
     await this.loadRegions();
+    await this.loadCities(region, false);
+    await this.loadDistricts(city, false);
+    await this.loadTowns(district, false);
 
-    if (region !== null) {
-      await this.setState({ regionOptions: { ...this.state.regionOptions, selectedItem: region } });
-      await this.loadCities(region, false);
-    }
-
-    if (city !== null) {
-      await this.setState({ cityOptions: { ...this.state.cityOptions, selectedItem: city } })
-      await this.loadDistricts(city, false);
-    }
-
-    if (district !== null) {
-      await this.setState({ districtOptions: { ...this.state.districtOptions, selectedItem: district } })
-      await this.loadTowns(district, false);
-    }
-
-    if (town !== null) {
-      await this.setState({ townOptions: { ...this.state.townOptions, selectedItem: town } })
-      this.props.postingAd.town = town
-    }
+    await this.setState({ townOptions: { ...this.state.townOptions, selectedItem: town } })
+    this.props.postingAd.town = town
 
     this.props.hideLoading();
   }
@@ -114,31 +100,34 @@ export default class Publish2b extends React.Component {
       this.props.showLoading();
     }
 
+    await this.setState({ regionOptions: { ...this.state.regionOptions, selectedItem: value } });
     this.props.postingAd.region = value;
 
-    const responseJson = await this.props.request(this.props.context, GET_CITIES_FROM_REGION, {
-      regionId: this.props.postingAd.region
-    });
+    if (value !== null) {
+      const responseJson = await this.props.request(this.props.context, GET_CITIES_FROM_REGION, {
+        regionId: this.props.postingAd.region
+      });
 
-    if (responseJson.httpStatus === 200) {
-      var cityOptions = {
-        elements: [this.state.cityOptions.elements[0]],
-        selectedItem: null
-      };
+      if (responseJson.httpStatus === 200) {
+        var cityOptions = {
+          elements: [this.state.cityOptions.elements[0]],
+          selectedItem: null
+        };
 
-      responseJson.list.map((item) => {
-        cityOptions.elements.push(item);
-      });
+        responseJson.list.map((item) => {
+          cityOptions.elements.push(item);
+        });
 
-      await this.setState({
-        cityOptions: cityOptions,
-        districtOptions: { elements: [this.state.districtOptions.elements[0]], selectedItem: null },
-        townOptions: { elements: [this.state.townOptions.elements[0]], selectedItem: null }
-      });
+        await this.setState({
+          cityOptions: cityOptions,
+          districtOptions: { elements: [this.state.districtOptions.elements[0]], selectedItem: null },
+          townOptions: { elements: [this.state.townOptions.elements[0]], selectedItem: null }
+        });
 
-      this.props.postingAd.city = null;
-      this.props.postingAd.district = null;
-      this.props.postingAd.town = null;
+        this.props.postingAd.city = null;
+        this.props.postingAd.district = null;
+        this.props.postingAd.town = null;
+      }
     }
 
     if (showLoading) {
@@ -151,35 +140,38 @@ export default class Publish2b extends React.Component {
       this.props.showLoading();
     }
 
+    await this.setState({ cityOptions: { ...this.state.cityOptions, selectedItem: value } });
     this.props.postingAd.city = value;
 
-    const responseJson = await this.props.request(this.props.context, GET_DISTRICTS_FROM_CITY, {
-      cityId: this.props.postingAd.city
-    });
+    if (value != null) {
+      const responseJson = await this.props.request(this.props.context, GET_DISTRICTS_FROM_CITY, {
+        cityId: this.props.postingAd.city
+      });
 
-    if (responseJson.httpStatus === 200) {
-      let districtOptions = {
-        elements: [this.state.districtOptions.elements[0]],
-        selectedItem: null
-      };
+      if (responseJson.httpStatus === 200) {
+        let districtOptions = {
+          elements: [this.state.districtOptions.elements[0]],
+          selectedItem: null
+        };
 
-      responseJson.list.map((item) => {
-        districtOptions.elements.push(item);
-      });
+        responseJson.list.map((item) => {
+          districtOptions.elements.push(item);
+        });
 
-      if (responseJson.list.length == 1) {
-        districtOptions.selectedItem = responseJson.list[0].value;
-      }
+        if (responseJson.list.length == 1) {
+          districtOptions.selectedItem = responseJson.list[0].value;
+        }
 
-      await this.setState({ districtOptions: districtOptions });
-      this.props.postingAd.district = null;
-      this.props.postingAd.town = null;
+        await this.setState({ districtOptions: districtOptions });
+        this.props.postingAd.district = null;
+        this.props.postingAd.town = null;
 
-      if (responseJson.list.length == 1) {
-        this.inputSelectDistrict?.onSubmitValidate();
-        await this.loadTowns(districtOptions.selectedItem);
-      } else {
-        await this.setState({ townOptions: { elements: [this.state.townOptions.elements[0]], selectedItem: null } });
+        if (responseJson.list.length == 1) {
+          this.inputSelectDistrict?.onSubmitValidate();
+          await this.loadTowns(districtOptions.selectedItem);
+        } else {
+          await this.setState({ townOptions: { elements: [this.state.townOptions.elements[0]], selectedItem: null } });
+        }
       }
     }
 
@@ -193,31 +185,34 @@ export default class Publish2b extends React.Component {
       this.props.showLoading();
     }
 
+    await this.setState({ districtOptions: { ...this.state.districtOptions, selectedItem: value } })
     this.props.postingAd.district = value;
 
-    const responseJson = await this.props.request(this.props.context, GET_TOWNS_FROM_DISTRICT, {
-      districtId: this.props.postingAd.district
-    });
+    if (value != null) {
+      const responseJson = await this.props.request(this.props.context, GET_TOWNS_FROM_DISTRICT, {
+        districtId: this.props.postingAd.district
+      });
 
-    if (responseJson.httpStatus === 200) {
-      var townOptions = {
-        elements: [this.state.townOptions.elements[0]],
-        selectedItem: null
-      };
+      if (responseJson.httpStatus === 200) {
+        var townOptions = {
+          elements: [this.state.townOptions.elements[0]],
+          selectedItem: null
+        };
 
-      responseJson.list.map((item) => {
-        townOptions.elements.push(item);
-      });
+        responseJson.list.map((item) => {
+          townOptions.elements.push(item);
+        });
 
-      if (responseJson.list.length == 1) {
-        townOptions.selectedItem = responseJson.list[0].value;
-        this.props.postingAd.town = townOptions.selectedItem;
-      }
+        if (responseJson.list.length == 1) {
+          townOptions.selectedItem = responseJson.list[0].value;
+          this.props.postingAd.town = townOptions.selectedItem;
+        }
 
-      await this.setState({ townOptions: townOptions });
+        await this.setState({ townOptions: townOptions });
 
-      if (responseJson.list.length == 1) {
-        this.inputSelectTown?.onSubmitValidate();
+        if (responseJson.list.length == 1) {
+          this.inputSelectTown?.onSubmitValidate();
+        }
       }
     }
 

package/package.json

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