muba-posting 4.0.3 → 4.0.6

package/Posting.js

@@ -54,7 +54,7 @@ export default class Posting extends React.Component {
       prevViews: [],
       currentScreen: 1,
       fontLoaded: false,
-      isLoading: true,
+      isLoading: false,
       showImageBrowser: false,
       headerHeight: 0,
       progressBarHeight: 0,
@@ -159,7 +159,7 @@ export default class Posting extends React.Component {
     ]);
     this.setState({ fontLoaded: true });
 
-    this.loadData();
+    this.popupPermissions.open();
   }
 
   refresh = () => {
@@ -182,8 +182,7 @@ export default class Posting extends React.Component {
     });
   }
 
-  loadData = async () => {
-    const canPublish = await this.popupPermissions.open();
+  loadData = async (canPublish) => {
     if (canPublish) {
       const resultJson = await this.props.request(this, GET_COUNTRY_PHONE);
       if (resultJson.success) {
@@ -205,6 +204,7 @@ export default class Posting extends React.Component {
       }
       BackHandler.addEventListener('hardwareBackPress', this.goBack);
     } else {
+      this.goBack();
       await this.setState({ isLoading: false });
     }
   }
@@ -217,7 +217,9 @@ export default class Posting extends React.Component {
         originView: this.props.adId ? Views.EDIT_SELECTOR : Views.PUBLISH_1,
         prevViews: [],
         currentScreen: 1
-      }, this.loadData);
+      }, () => {
+        this.popupPermissions.open();
+      });
     }
   }
 
@@ -398,14 +400,19 @@ export default class Posting extends React.Component {
     }
   }
 
-  _showLoading() {
+  async _showLoading() {
     this.setState({ isLoading: true });
   }
 
-  _hideLoading() {
+  async _hideLoading() {
+    await this.sleep(500);
     this.setState({ isLoading: false });
   }
 
+  sleep = (ms) => {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  }
+
   _openPictureSelector() {
     this.setState({ showImageBrowser: true })
   }
@@ -447,7 +454,7 @@ export default class Posting extends React.Component {
             :
             null}
 
-          <PopupPermissions ref={(element) => this.popupPermissions = element} camera={true} mediaLibrary={true} message={strings('setup.permissionsMessage')} goBack={this.goBack} />
+          <PopupPermissions ref={(element) => this.popupPermissions = element} camera={true} mediaLibrary={true} message={strings('setup.permissionsMessage')} onClose={this.loadData} />
 
           {this.state.fontLoaded ?
             <View style={[this.props.containerStyle, this.state.showImageBrowser ? commonStyles.displayNone : '']}>

package/Publish1.js

@@ -23,26 +23,30 @@ export default class Publish1 extends React.Component {
     };
   }
 
-  async componentDidMount() {
-    this.props.showLoading();
-    const responseJson = await this.props.request(this.props.context, GET_CATEGORIES, {
-      userEmail: this.props.postingAd.userEmail
-    });
-
-    if (responseJson.success) {
-      this.jsonCategories = responseJson.categoryList;
-      this.props.postingAd.category = this.props.postingAd.category != null ? this.props.postingAd.category : this.jsonCategories[0].value;
-      this.props.postingAd.subCategory = this.props.postingAd.subCategory != null ? this.props.postingAd.subCategory : this.jsonCategories[0].subCategoryList[0].value;
-
-      await this.setState({
-        transactionOptions: { elements: this.jsonCategories.map(jsonCategory => { return { label: jsonCategory.label, value: jsonCategory.value } }), selectedItem: this.props.postingAd.category },
-        typeBienOptions: { elements: this.getSubCategories(this.props.postingAd.category), selectedItem: this.props.postingAd.subCategory }
-      })
+  componentDidUpdate = async (prevProps) => {
+    if (!prevProps.showView && this.props.showView && !this.state.viewLoaded) {
+      this.props.showLoading();
+      this.setState({
+        viewLoaded: true
+      });
+
+      const responseJson = await this.props.request(this.props.context, GET_CATEGORIES, {
+        userEmail: this.props.postingAd.userEmail
+      });
+
+      if (responseJson.success) {
+        this.jsonCategories = responseJson.categoryList;
+        this.props.postingAd.category = this.props.postingAd.category != null ? this.props.postingAd.category : this.jsonCategories[0].value;
+        this.props.postingAd.subCategory = this.props.postingAd.subCategory != null ? this.props.postingAd.subCategory : this.jsonCategories[0].subCategoryList[0].value;
+
+        await this.setState({
+          transactionOptions: { elements: this.jsonCategories.map(jsonCategory => { return { label: jsonCategory.label, value: jsonCategory.value } }), selectedItem: this.props.postingAd.category },
+          typeBienOptions: { elements: this.getSubCategories(this.props.postingAd.category), selectedItem: this.props.postingAd.subCategory }
+        })
+      }
+      this.props.hideLoading();
     }
-    this.props.hideLoading();
-  }
 
-  componentDidUpdate = (prevProps) => {
     const componentsHeight = this.props.headerHeight + this.props.progressBarHeight;
     const minHeight = window.height - componentsHeight;
     if (this.state.minHeight != minHeight) {

package/Publish2.js

@@ -34,7 +34,6 @@ export default class Publish2 extends React.Component {
       });
     }
     if (!prevProps.showView && this.props.showView && !this.state.viewLoaded) {
-      this.props.showLoading();
       this.setState({
         viewLoaded: true
       });
@@ -54,7 +53,6 @@ export default class Publish2 extends React.Component {
   }
 
   async validateLocation() {
-    this.props.showLoading();
     let validateLocation = false;
 
     this._changeMapLocation(await this.map.getPosition());
@@ -98,8 +96,6 @@ export default class Publish2 extends React.Component {
       }
     }
 
-    this.props.hideLoading();
-
     return validateLocation;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muba-posting",
-  "version": "4.0.3",
+  "version": "4.0.6",
   "description": "Posting",
   "main": "Posting.js",
   "scripts": {
@@ -24,7 +24,7 @@
     "muba-font": "4",
     "muba-i18n": "4",
     "muba-input-select": "4",
-    "muba-input-text": "4.1.1",
+    "muba-input-text": "4.1.2",
     "muba-loading-cursor": "4",
     "muba-map": "4",
     "muba-output-text": "4",