From 09ed3d4fa679bf5233db3c1e59038040a0290ccc Mon Sep 17 00:00:00 2001
From: Amine Ben hammou <amine@mailpoet.com>
Date: Thu, 17 Aug 2017 12:16:40 +0000
Subject: [PATCH] refactoring the code

---
 assets/js/src/form/fields/selection.jsx     |  7 +------
 assets/js/src/newsletters/send.jsx          | 11 +++++++----
 assets/js/src/newsletters/send/standard.jsx | 10 ++--------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/assets/js/src/form/fields/selection.jsx b/assets/js/src/form/fields/selection.jsx
index 709d2e6051..f405a9dc3b 100644
--- a/assets/js/src/form/fields/selection.jsx
+++ b/assets/js/src/form/fields/selection.jsx
@@ -101,11 +101,6 @@ define([
       }
       return null;
     },
-    isDisabled: function () {
-      return this.props.item.status == 'sending'
-          && this.props.item.queue
-          && this.props.item.queue.status == 'paused';
-    },
     loadCachedItems: function () {
       if(typeof(window['mailpoet_'+this.props.field.endpoint]) !== 'undefined') {
         let items = window['mailpoet_'+this.props.field.endpoint];
@@ -185,7 +180,7 @@ define([
         <select
           id={ this.props.field.id || this.props.field.name }
           ref="select"
-          disabled={this.isDisabled()}
+          disabled={this.props.field.disabled}
           data-placeholder={ this.props.field.placeholder }
           multiple={ this.props.field.multiple }
           defaultValue={ this.getSelectedValues() }
diff --git a/assets/js/src/newsletters/send.jsx b/assets/js/src/newsletters/send.jsx
index 9eed051622..0fabe19ecc 100644
--- a/assets/js/src/newsletters/send.jsx
+++ b/assets/js/src/newsletters/send.jsx
@@ -253,9 +253,12 @@ define(
         const isPaused = this.state.item.status == 'sending'
           && this.state.item.queue
           && this.state.item.queue.status == 'paused';
-        // const fields = (!isPaused)
-        //   ? this.state.fields
-        //   : this.state.fields.filter(field => field.name != 'segments' && field.name != 'options');
+        const fields = this.state.fields.map((field) => {
+          if (field.name == 'segments' || field.name == 'options') {
+            field.disabled = isPaused;
+          }
+          return field;
+        });
         return (
           <div>
             <h1>{MailPoet.I18n.t('finalNewsletterStep')}</h1>
@@ -264,7 +267,7 @@ define(
 
             <Form
               id="mailpoet_newsletter"
-              fields={ this.state.fields }
+              fields={ fields }
               item={ this.state.item }
               loading={ this.state.loading }
               onChange={this.handleFormChange}
diff --git a/assets/js/src/newsletters/send/standard.jsx b/assets/js/src/newsletters/send/standard.jsx
index d44684fa5e..706b35a00c 100644
--- a/assets/js/src/newsletters/send/standard.jsx
+++ b/assets/js/src/newsletters/send/standard.jsx
@@ -286,11 +286,6 @@ define(
           'data-parsley-errors-container': '#mailpoet_scheduling',
         };
       },
-      isDisabled: function () {
-        return this.props.item.status == 'sending'
-          && this.props.item.queue
-          && this.props.item.queue.status == 'paused';
-      },
       render: function () {
         let schedulingOptions;
 
@@ -301,7 +296,7 @@ define(
                 name="scheduledAt"
                 value={this._getCurrentValue().scheduledAt}
                 onChange={this.handleValueChange}
-                disabled={this.isDisabled()}
+                disabled={this.props.field.disabled}
                 dateValidation={this.getDateValidation()} />
               &nbsp;
               <span>
@@ -310,7 +305,6 @@ define(
             </span>
           );
         }
-
         return (
           <div>
             <input
@@ -318,7 +312,7 @@ define(
               type="checkbox"
               value="1"
               checked={this.isScheduled()}
-              disabled={this.isDisabled()}
+              disabled={this.props.field.disabled}
               name="isScheduled"
               onChange={this.handleCheckboxChange} />