muba-posting 4.1.27 → 4.1.29

package/Posting.js

@@ -65,6 +65,8 @@ export default class Posting extends React.Component {
       countryPhone: '',
       businessId: this.props.businessId,
       picturesUploaded: 0,
+      images: [],
+      params: null,
       postingAd: {
         transaction: null,
         adType: null,
@@ -298,8 +300,9 @@ export default class Posting extends React.Component {
 
     prevViews.unshift(this.state.view);
 
-    if (this.state.fullPosting && this.state.postingAd.town && Views.PUBLISH_6 !== this.state.view) {
+    if (this.state.fullPosting && this.state.postingAd.town && Views.PUBLISH_6 !== this.state.view && Views.PAYMENT_ONLINE !== view) {
       const ad = { ...this.state.postingAd };
+      console.log(ad)
       if (Views.PUBLISH_4 !== this.state.view) {
         delete ad.images;
       }
@@ -315,13 +318,6 @@ export default class Posting extends React.Component {
     await this._updateCurrentScreen(view, params);
   }
 
-  async _replacePage(view) {
-    if (view === Views.PUBLISH_2_B) {
-      await this.publish2bScreen.loadData();
-    }
-    await this._updateCurrentScreen(view);
-  }
-
   async _updateCurrentScreen(view, params) {
     switch (view) {
       case Views.PUBLISH_1:
@@ -331,28 +327,23 @@ export default class Posting extends React.Component {
         this.setState({ currentScreen: 2 });
         break;
       case Views.PUBLISH_2_B:
-        await this.publish2bScreen.loadData();
         this.setState({ currentScreen: 2 });
         break;
       case Views.PUBLISH_3:
-        await this.publish3Screen.refreshData();
         this.setState({ currentScreen: 3 });
         break;
       case Views.PUBLISH_4:
         this.setState({ currentScreen: 4 });
         break;
       case Views.PUBLISH_5:
-        await this.publish5Screen.refreshData();
         this.setState({ currentScreen: 5 });
         break;
       case Views.PUBLISH_6:
-        await this.publish6Screen.generateTitleDescription();
-        await this.publish6Screen.resetSubmitClicked();
         this.setState({ currentScreen: 6 });
         break;
       case Views.PREVIEW:
         if (params) {
-          await this.previewScreen.refreshData(params);
+          await this.setState({ params: params });
         }
         break;
       case Views.EDIT_SELECTOR:
@@ -403,7 +394,6 @@ export default class Posting extends React.Component {
       if (this.state.originView === Views.EDIT_SELECTOR) {
         this.setState({ isLoading: true });
         await this.loadAd();
-        this.editSelector.refresh();
         this._goToPage(Views.EDIT_SELECTOR);
       } else {
         this.props.navigation.goBack();
@@ -437,11 +427,10 @@ export default class Posting extends React.Component {
   }
 
   imageBrowserCallback = async (photos) => {
-    await this.setState({ showImageBrowser: false });
-
-    for (let photo of photos) {
-      this.publish4Screen.loadImage(photo);
-    }
+    this.setState({
+      showImageBrowser: false,
+      images: photos
+    });
   }
 
   getAd = async (id) => {
@@ -453,10 +442,10 @@ export default class Posting extends React.Component {
   }
 
   _savePicture = async (picture) => {
-    await this.setState({ showImageBrowser: false })
-    this.setState({ view: Views.PUBLISH_4 }, () => {
-      this.publish4Screen.loadImage(picture);
-    })
+    this.setState({
+      showImageBrowser: false,
+      images: [picture]
+    });
   }
 
   render() {
@@ -491,130 +480,152 @@ export default class Posting extends React.Component {
                   null
                 }
 
-                <Publish1 postingAd={this.state.postingAd}
-                  baseUrl={this.props.baseUrl}
-                  request={this.props.request}
-                  context={this.props.context}
-                  showLoading={() => this._showLoading()}
-                  hideLoading={() => this._hideLoading()}
-                  scroll={(ref) => this.scroll.scrollIntoView(ref)}
-                  fullPosting={this.state.fullPosting}
-                  goToPage={(view, editingStepOne) => this._goToPage(view, editingStepOne)}
-                  saveEditAd={() => this._saveEditAd()}
-                  showView={this.state.view === Views.PUBLISH_1}
-                  progressBarHeight={this.state.progressBarHeight}
-                  headerHeight={this.state.headerHeight} />
-
-                <Publish2 postingAd={this.state.postingAd}
-                  scroll={(ref) => this.scroll.scrollIntoView(ref)}
-                  saveEditAd={() => this._saveEditAd()}
-                  goToPage={(view) => this._goToPage(view)}
-                  replacePage={(view) => { this._replacePage(view); this.publish2bScreen.loadData() }}
-                  baseUrl={this.props.baseUrl}
-                  request={this.props.request}
-                  context={this.props.context}
-                  showLoading={() => this._showLoading()}
-                  hideLoading={() => this._hideLoading()}
-                  hereAppId={this.props.hereAppId} hereAppCode={this.props.hereAppCode}
-                  showView={this.state.view === Views.PUBLISH_2}
-                  fullPosting={this.state.fullPosting}
-                  progressBarHeight={this.state.progressBarHeight}
-                  headerHeight={this.state.headerHeight} />
-
-                <Publish2b ref={(view) => this.publish2bScreen = view}
-                  postingAd={this.state.postingAd}
-                  scroll={(ref) => this.scroll.scrollIntoView(ref)}
-                  saveEditAd={() => this._saveEditAd()}
-                  goToPage={(view) => this._goToPage(view)}
-                  replacePage={(view) => this._replacePage(view)}
-                  request={this.props.request}
-                  context={this.props.context}
-                  showLoading={() => this._showLoading()}
-                  hideLoading={() => this._hideLoading()}
-                  showView={this.state.view === Views.PUBLISH_2_B}
-                  fullPosting={this.state.fullPosting}
-                  progressBarHeight={this.state.progressBarHeight}
-                  headerHeight={this.state.headerHeight} />
-
-                <Publish3 ref={(view) => this.publish3Screen = view}
-                  postingAd={this.state.postingAd}
-                  editingStepOne={this.state.editingStepOne}
-                  scroll={(ref) => this.scroll.scrollIntoView(ref)}
-                  saveEditAd={() => this._saveEditAd()}
-                  goToPage={(view) => this._goToPage(view)}
-                  goBack={() => this.goBack()}
-                  request={this.props.request}
-                  context={this.props.context}
-                  showLoading={() => this._showLoading()}
-                  hideLoading={() => this._hideLoading()}
-                  showView={this.state.view === Views.PUBLISH_3}
-                  fullPosting={this.state.fullPosting}
-                  progressBarHeight={this.state.progressBarHeight}
-                  headerHeight={this.state.headerHeight} />
-
-                <Publish4 ref={(view) => this.publish4Screen = view}
-                  postingAd={this.state.postingAd}
-                  saveEditAd={() => this._saveEditAd()}
-                  goToPage={(view) => this._goToPage(view)}
-                  request={this.props.request}
-                  context={this.props.context}
-                  showLoading={() => this._showLoading()}
-                  hideLoading={() => this._hideLoading()}
-                  showView={this.state.view === Views.PUBLISH_4}
-                  fullPosting={this.state.fullPosting}
-                  progressBarHeight={this.state.progressBarHeight}
-                  headerHeight={this.state.headerHeight}
-                  openPictureSelector={() => this._openPictureSelector()}
-                  maxPictures={this.state.maxPictures} />
-
-                <Publish5 ref={(view) => this.publish5Screen = view}
-                  postingAd={this.state.postingAd}
-                  scroll={(ref) => this.scroll.scrollIntoView(ref)}
-                  saveEditAd={() => this._saveEditAd()}
-                  goToPage={(view) => this._goToPage(view)}
-                  request={this.props.request}
-                  context={this.props.context}
-                  showLoading={() => this._showLoading()}
-                  hideLoading={() => this._hideLoading()}
-                  showView={this.state.view === Views.PUBLISH_5}
-                  fullPosting={this.state.fullPosting}
-                  progressBarHeight={this.state.progressBarHeight}
-                  headerHeight={this.state.headerHeight} />
-
-                <Publish6 ref={(view) => this.publish6Screen = view}
-                  postingAd={this.state.postingAd}
-                  country={this.props.country}
-                  businessId={this.state.businessId}
-                  scroll={(ref) => this.scroll.scrollIntoView(ref)}
-                  saveEditAd={() => this._saveEditAd()}
-                  goToPage={(view, params) => this._goToPage(view, null, params)}
-                  request={this.props.request}
-                  context={this.props.context}
-                  showLoading={() => this._showLoading()}
-                  hideLoading={() => this._hideLoading()}
-                  showView={this.state.view === Views.PUBLISH_6}
-                  fullPosting={this.state.fullPosting}
-                  progressBarHeight={this.state.progressBarHeight}
-                  headerHeight={this.state.headerHeight} />
-
-                <Preview ref={(view) => this.previewScreen = view}
-                  postingAd={this.state.postingAd}
-                  country={this.props.country}
-                  goBack={() => this.goBack()}
-                  showLoading={() => this._showLoading()}
-                  hideLoading={() => this._hideLoading()}
-                  businessId={this.state.businessId}
-                  showView={this.state.view === Views.PREVIEW}
-                  progressBarHeight={this.state.progressBarHeight}
-                  request={this.props.request}
-                  headerHeight={this.state.headerHeight}
-                  highlight={() => this._goToPage(Views.PAYMENT_ONLINE)} />
-
-                <PostingEdit ref={(view) => this.editSelector = view}
-                  postingAd={this.state.postingAd}
-                  showView={this.state.view === Views.EDIT_SELECTOR}
-                  topBar={this.props.topBar}
-                  goToPage={(view) => this._goToPage(view)} />
+                {this.state.view === Views.PUBLISH_1 ?
+                  <Publish1 postingAd={this.state.postingAd}
+                    baseUrl={this.props.baseUrl}
+                    request={this.props.request}
+                    context={this.props.context}
+                    showLoading={() => this._showLoading()}
+                    hideLoading={() => this._hideLoading()}
+                    scroll={(ref) => this.scroll.scrollIntoView(ref)}
+                    fullPosting={this.state.fullPosting}
+                    goToPage={(view, editingStepOne) => this._goToPage(view, editingStepOne)}
+                    saveEditAd={() => this._saveEditAd()}
+                    progressBarHeight={this.state.progressBarHeight}
+                    headerHeight={this.state.headerHeight} />
+                  :
+                  null
+                }
+
+                {this.state.view === Views.PUBLISH_2 ?
+                  <Publish2 postingAd={this.state.postingAd}
+                    scroll={(ref) => this.scroll.scrollIntoView(ref)}
+                    saveEditAd={() => this._saveEditAd()}
+                    goToPage={(view) => this._goToPage(view)}
+                    replacePage={(view) => this._updateCurrentScreen(view)}
+                    baseUrl={this.props.baseUrl}
+                    request={this.props.request}
+                    context={this.props.context}
+                    showLoading={() => this._showLoading()}
+                    hideLoading={() => this._hideLoading()}
+                    hereAppId={this.props.hereAppId} hereAppCode={this.props.hereAppCode}
+                    fullPosting={this.state.fullPosting}
+                    progressBarHeight={this.state.progressBarHeight}
+                    headerHeight={this.state.headerHeight} />
+                  :
+                  null
+                }
+
+                {this.state.view === Views.PUBLISH_2_B ?
+                  <Publish2b postingAd={this.state.postingAd}
+                    scroll={(ref) => this.scroll.scrollIntoView(ref)}
+                    saveEditAd={() => this._saveEditAd()}
+                    goToPage={(view) => this._goToPage(view)}
+                    replacePage={(view) => this._updateCurrentScreen(view)}
+                    request={this.props.request}
+                    context={this.props.context}
+                    showLoading={() => this._showLoading()}
+                    hideLoading={() => this._hideLoading()}
+                    fullPosting={this.state.fullPosting}
+                    progressBarHeight={this.state.progressBarHeight}
+                    headerHeight={this.state.headerHeight} />
+                  :
+                  null
+                }
+
+                {this.state.view === Views.PUBLISH_3 ?
+                  <Publish3 postingAd={this.state.postingAd}
+                    editingStepOne={this.state.editingStepOne}
+                    scroll={(ref) => this.scroll.scrollIntoView(ref)}
+                    saveEditAd={() => this._saveEditAd()}
+                    goToPage={(view) => this._goToPage(view)}
+                    goBack={() => this.goBack()}
+                    request={this.props.request}
+                    context={this.props.context}
+                    showLoading={() => this._showLoading()}
+                    hideLoading={() => this._hideLoading()}
+                    fullPosting={this.state.fullPosting}
+                    progressBarHeight={this.state.progressBarHeight}
+                    headerHeight={this.state.headerHeight} />
+                  :
+                  null
+                }
+
+                {this.state.view === Views.PUBLISH_4 ?
+                  <Publish4 postingAd={this.state.postingAd}
+                    saveEditAd={() => this._saveEditAd()}
+                    goToPage={(view) => this._goToPage(view)}
+                    request={this.props.request}
+                    context={this.props.context}
+                    showLoading={() => this._showLoading()}
+                    hideLoading={() => this._hideLoading()}
+                    fullPosting={this.state.fullPosting}
+                    progressBarHeight={this.state.progressBarHeight}
+                    headerHeight={this.state.headerHeight}
+                    openPictureSelector={() => this._openPictureSelector()}
+                    maxPictures={this.state.maxPictures}
+                    images={this.state.images} />
+                  :
+                  null
+                }
+
+                {this.state.view === Views.PUBLISH_5 ?
+                  <Publish5 postingAd={this.state.postingAd}
+                    scroll={(ref) => this.scroll.scrollIntoView(ref)}
+                    saveEditAd={() => this._saveEditAd()}
+                    goToPage={(view) => this._goToPage(view)}
+                    request={this.props.request}
+                    context={this.props.context}
+                    showLoading={() => this._showLoading()}
+                    hideLoading={() => this._hideLoading()}
+                    fullPosting={this.state.fullPosting}
+                    progressBarHeight={this.state.progressBarHeight}
+                    headerHeight={this.state.headerHeight} />
+                  :
+                  null
+                }
+
+                {this.state.view === Views.PUBLISH_6 ?
+                  <Publish6 postingAd={this.state.postingAd}
+                    country={this.props.country}
+                    businessId={this.state.businessId}
+                    scroll={(ref) => this.scroll.scrollIntoView(ref)}
+                    saveEditAd={() => this._saveEditAd()}
+                    goToPage={(view, params) => this._goToPage(view, null, params)}
+                    request={this.props.request}
+                    context={this.props.context}
+                    showLoading={() => this._showLoading()}
+                    hideLoading={() => this._hideLoading()}
+                    fullPosting={this.state.fullPosting}
+                    progressBarHeight={this.state.progressBarHeight}
+                    headerHeight={this.state.headerHeight} />
+                  :
+                  null
+                }
+
+                {this.state.view === Views.PREVIEW ?
+                  <Preview postingAd={this.state.postingAd}
+                    country={this.props.country}
+                    goBack={() => this.goBack()}
+                    showLoading={() => this._showLoading()}
+                    hideLoading={() => this._hideLoading()}
+                    businessId={this.state.businessId}
+                    progressBarHeight={this.state.progressBarHeight}
+                    request={this.props.request}
+                    headerHeight={this.state.headerHeight}
+                    highlight={() => this._goToPage(Views.PAYMENT_ONLINE)}
+                    params={this.state.params} />
+                  :
+                  null
+                }
+
+                {this.state.view === Views.EDIT_SELECTOR ?
+                  <PostingEdit postingAd={this.state.postingAd}
+                    topBar={this.props.topBar}
+                    goToPage={(view) => this._goToPage(view)} />
+                  :
+                  null
+                }
 
                 {this.state.view === Views.PAYMENT_ONLINE ?
                   <PaymentOnlinePopup

package/PostingEdit.js

@@ -14,8 +14,14 @@ export default class PostingEdit extends React.Component {
     };
   }
 
+  componentDidMount = () => {
+    this.refresh();
+  }
+
   componentDidUpdate = (prevProps) => {
-    if (prevProps.postingAd.id !== this.props.postingAd.id) {
+    if (this.props.postingAd.images[0].id !== prevProps.postingAd.images[0].id
+      || this.props.postingAd.languages.filter(item => this.props.postingAd.languageId === item.language)[0].title !== prevProps.postingAd.languages.filter(item => prevProps.postingAd.languageId === item.language)[0].title
+      || this.props.postingAd.adTypeDetails.filter(detail => detail.value == "floorType").length !== prevProps.postingAd.adTypeDetails.filter(detail => detail.value == "floorType").length) {
       this.refresh();
     }
   }
@@ -37,7 +43,7 @@ export default class PostingEdit extends React.Component {
   render() {
     return (
       this.state.showFunctionalities != null ?
-        <View style={[commonStyles.body, this.props.showView ? '' : commonStyles.displayNone]}>
+        <View style={commonStyles.body}>
           <View style={[commonStyles.row]}>
             <Icon style={[commonStyles.h2, commonStyles.homeContentH2, commonStyles.titleIcon]} name="edit" />
             <Text style={[commonStyles.h2, commonStyles.homeContentH2]}>{strings('edit.whatEditing')}</Text>