From 38b47698066805cda6b9a73a5772edd7f4ab719e Mon Sep 17 00:00:00 2001
From: vjrj <vjrj@ourproject.org>
Date: Fri, 2 Mar 2018 12:53:03 +0100
Subject: [PATCH] Added subscriptions cancel

---
 imports/ui/components/SelectionMap/SelectionMap.js   |  2 +-
 .../SubscriptionEditor/SubscriptionEditor.js         |  1 +
 .../ui/pages/FireSubscription/FireSubscription.js    | 12 ++++++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/imports/ui/components/SelectionMap/SelectionMap.js b/imports/ui/components/SelectionMap/SelectionMap.js
index d56ee95..2908c39 100644
--- a/imports/ui/components/SelectionMap/SelectionMap.js
+++ b/imports/ui/components/SelectionMap/SelectionMap.js
@@ -244,7 +244,7 @@ class SelectionMap extends Component {
                           bsStyle="warning"
                           onClick={event => this.onSndBtn(event)}
                       >
-                        {this.props.sndBtn}
+                        {this.props.sndBtn.match(/^fa-/) ? <i className={`fa ${this.props.sndBtn}`} /> : this.props.sndBtn }
                       </Button>
                     }
                       <Button
diff --git a/imports/ui/components/SubscriptionEditor/SubscriptionEditor.js b/imports/ui/components/SubscriptionEditor/SubscriptionEditor.js
index 4654189..c7ce5af 100644
--- a/imports/ui/components/SubscriptionEditor/SubscriptionEditor.js
+++ b/imports/ui/components/SubscriptionEditor/SubscriptionEditor.js
@@ -68,6 +68,7 @@ class SubscriptionEditor extends React.Component {
           zoom={this.state.zoom}
           distance={doc.distance}
           focusInput={focus}
+          history={this.props.history}
           disableFstBtn={this.state.disableFstBtn}
           subsBtn={isEdit ? t('Actualizar') : t(isAnyMobile ? 'Suscribirme a este radio' : 'Suscribirme a fuegos en este radio')}
           onSubs={state => this.onSubs(state)}
diff --git a/imports/ui/pages/FireSubscription/FireSubscription.js b/imports/ui/pages/FireSubscription/FireSubscription.js
index 9329d59..9fc9611 100644
--- a/imports/ui/pages/FireSubscription/FireSubscription.js
+++ b/imports/ui/pages/FireSubscription/FireSubscription.js
@@ -20,10 +20,7 @@ class FireSubscription extends React.Component {
       zoom: this.props.zoom,
       distance: this.props.distance
     };
-    /* if (props.location) {
-      console.log(props.location.state);
-    }
-    console.log(this.state); */
+    this.onCancel = this.onCancel.bind(this);
   }
 
   componentDidMount() {
@@ -62,6 +59,10 @@ class FireSubscription extends React.Component {
     this.props.onSubs(value);
   }
 
+  onCancel() {
+    this.props.history.push('/subscriptions');
+  }
+
   centerOnUserLocation(value) {
     this.setState({ center: value.center });
   }
@@ -103,6 +104,8 @@ class FireSubscription extends React.Component {
             distance={this.state.distance}
             fstBtn={this.props.subsBtn}
             onFstBtn={state => this.onSubs(state)}
+            sndBtn="fa-times"
+            onSndBtn={this.onCancel}
             onSelection={state => this.onSelection(state)}
             action={action.add}
             disableFstBtn={this.props.disableFstBtn}
@@ -119,6 +122,7 @@ FireSubscription.propTypes = {
   focusInput: PropTypes.bool.isRequired,
   subsBtn: PropTypes.string.isRequired,
   onSubs: PropTypes.func.isRequired,
+  history: PropTypes.object.isRequired,
   disableFstBtn: PropTypes.bool.isRequired
 };