muba-posting 5.0.4 → 5.0.6

package/Posting.js

@@ -36,6 +36,7 @@ const MAX_PICTURES = { method: 'GET', url: '/controller/posting/max-pictures' };
 const COUNTRY_PHONE = { method: 'GET', url: '/controller/countries/{countryCode}/phones' };
 const LOAD_PENDING_CREATED = { method: 'GET', url: '/controller/ads/pending-created/posting' };
 const PAYMENT_ONLINE_ACTIVE = { method: 'GET', url: '/controller/payments-online/{countryCode}/active' };
+const UPLOADED_FILES_KEY = 'uploadedFiles';
 
 export default class Posting extends React.Component {
   constructor(props) {
@@ -307,8 +308,12 @@ export default class Posting extends React.Component {
       }
       const response = await this.props.request(this, CREATE_AD, ad);
       if (response.httpStatus === 200) {
+        let images = this.state.postingAd.images;
+        if (response[UPLOADED_FILES_KEY]) {
+          images = response[UPLOADED_FILES_KEY];
+        }
         await this.setState({
-          postingAd: { ...this.state.postingAd, id: response.id }
+          postingAd: { ...this.state.postingAd, images: images, id: response.id }
         })
       }
     }
@@ -402,7 +407,7 @@ export default class Posting extends React.Component {
       this._goToPage(Views.PREVIEW, null, response);
 
       const paymentOnlineActive = await this.props.request(this, PAYMENT_ONLINE_ACTIVE, { regionId: this.state.postingAd.region });
-      if (!this.businessId && paymentOnlineActive.value === 'true') {
+      if (!this.state.businessId && paymentOnlineActive.value === 'true') {
         this._goToPage(Views.PAYMENT_ONLINE);
       }
     }

package/Publish4.js

@@ -97,6 +97,10 @@ export default class Publish4 extends React.Component {
     });
   }
 
+  async imageExists(imageUrl) {
+    return fetch(imageUrl).then(response => response.status === 200);
+  }
+
   async deleteImage(itemId, index) {
     if (itemId) {
       if (!this.props.postingAd.deletedFiles) {
@@ -106,11 +110,14 @@ export default class Publish4 extends React.Component {
     }
 
     let imagesArray = [...this.state.images];
+    let imageSize = [...this.state.imageSize];
     imagesArray.splice(index, 1)
+    imageSize.splice(index, 1)
 
     await this.setState({
       allPhotosSelected: false,
-      images: imagesArray
+      images: imagesArray,
+      imageSize: imageSize
     });
 
     if (this.state.images.length >= 1) {
@@ -179,56 +186,60 @@ export default class Publish4 extends React.Component {
     }, 500);
   }
 
-  calculateImageSize = (image) => {
-    let imageSize = this.state.imageSize;
-    Image.getSize(image.uri, (width, height) => {
-      if (this.state.containerWidth !== 0 && this.state.containerHeight !== 0) {
-        const containerRatio = this.state.containerWidth / this.state.containerHeight;
-        const imageRatio = width / height;
+  calculateImageSize = async (image) => {
+    if (!image.uri.startsWith('https://') || await this.imageExists(image.uri)) {
+      let imageSize = this.state.imageSize;
+      Image.getSize(image.uri, (width, height) => {
+        if (this.state.containerWidth !== 0 && this.state.containerHeight !== 0) {
+          const containerRatio = this.state.containerWidth / this.state.containerHeight;
+          const imageRatio = width / height;
 
-        let finalWidth;
-        let finalHeight;
-        if (imageRatio > containerRatio) {
-          if (width > this.state.containerWidth) {
-            finalWidth = this.state.containerWidth;
-          } else {
-            finalWidth = width;
-          }
-          finalHeight = height * (finalWidth / width);
-        } else if (imageRatio < containerRatio) {
-          if (height > this.state.containerHeight) {
-            finalHeight = this.state.containerHeight;
+          let finalWidth;
+          let finalHeight;
+          if (imageRatio > containerRatio) {
+            if (width > this.state.containerWidth) {
+              finalWidth = this.state.containerWidth;
+            } else {
+              finalWidth = width;
+            }
+            finalHeight = height * (finalWidth / width);
+          } else if (imageRatio < containerRatio) {
+            if (height > this.state.containerHeight) {
+              finalHeight = this.state.containerHeight;
+            } else {
+              finalHeight = height;
+            }
+            finalWidth = width * (finalHeight / height);
           } else {
-            finalHeight = height;
+            if (width > this.state.containerWidth) {
+              finalWidth = this.state.containerWidth;
+              finalHeight = this.state.containerHeight;
+            } else {
+              finalWidth = width;
+              finalHeight = height;
+            }
           }
-          finalWidth = width * (finalHeight / height);
+          imageSize.push({
+            width: finalWidth,
+            height: finalHeight,
+            marginVertical: (this.state.containerHeight - finalHeight) / 2,
+            marginHorizontal: (this.state.containerWidth - finalWidth) / 2
+          });
         } else {
-          if (width > this.state.containerWidth) {
-            finalWidth = this.state.containerWidth;
-            finalHeight = this.state.containerHeight;
-          } else {
-            finalWidth = width;
-            finalHeight = height;
-          }
+          imageSize.push({
+            width: '100%',
+            height: '100%',
+            marginVertical: 0,
+            marginHorizontal: 0
+          })
         }
-        imageSize.push({
-          width: finalWidth,
-          height: finalHeight,
-          marginVertical: (this.state.containerHeight - finalHeight) / 2,
-          marginHorizontal: (this.state.containerWidth - finalWidth) / 2
+        this.setState({
+          imageSize: imageSize
         });
-      } else {
-        imageSize.push({
-          width: '100%',
-          height: '100%',
-          marginVertical: 0,
-          marginHorizontal: 0
-        })
-      }
-      this.setState({
-        imageSize: imageSize
       });
-    });
+    } else {
+      setTimeout(() => this.calculateImageSize(image), 500);
+    }
   }
 
   render() {

package/package.json

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