Merge pull request #1017 from mailpoet/rerender-newsletter

Rerender newsletter [MAILPOET-675]

assets/js/src/form/fields/selection.jsx

@@ -180,6 +180,7 @@ define([
         <select
           id={ this.props.field.id || this.props.field.name }
           ref="select"
+          disabled={this.props.field.disabled}
           data-placeholder={ this.props.field.placeholder }
           multiple={ this.props.field.multiple }
           defaultValue={ this.getSelectedValues() }

assets/js/src/newsletters/listings/standard.jsx

@@ -97,6 +97,17 @@ const bulk_actions = [
   },
 ];
 
+const confirmEdit = (newsletter) => {
+  if(
+    !newsletter.queue
+    || newsletter.status != 'sending'
+    || newsletter.queue.status !== null
+    || window.confirm(MailPoet.I18n.t('confirmEdit'))
+  ) {
+    window.location.href = `?page=mailpoet-newsletter-editor&id=${ newsletter.id }`;
+  }
+};
+
 let newsletter_actions = [
   {
     name: 'view',
@@ -110,13 +121,8 @@ let newsletter_actions = [
   },
   {
     name: 'edit',
-    link: function (newsletter) {
-      return (
-        <a href={ `?page=mailpoet-newsletter-editor&id=${ newsletter.id }` }>
-          {MailPoet.I18n.t('edit')}
-        </a>
-      );
-    },
+    label: MailPoet.I18n.t('edit'),
+    onClick: confirmEdit,
   },
   {
     name: 'duplicate',
@@ -172,7 +178,8 @@ const NewsletterListStandard = React.createClass({
           <strong>
             <a
               className="row-title"
-              href={ `?page=mailpoet-newsletter-editor&id=${ newsletter.id }` }
+              href="javascript:;"
+              onClick={() => confirmEdit(newsletter)}
             >{ newsletter.queue.newsletter_rendered_subject || newsletter.subject }</a>
           </strong>
           { actions }

assets/js/src/newsletters/send.jsx

@@ -168,6 +168,40 @@ define(
         }
         return false;
       },
+      handleResume: function (e) {
+        e.preventDefault();
+        if(!this.isValid()) {
+          jQuery('#mailpoet_newsletter').parsley().validate();
+        } else {
+          this._save(e).done(() => {
+            this.setState({ loading: true });
+          }).done(() => {
+            MailPoet.Ajax.post({
+              api_version: window.mailpoet_api_version,
+              endpoint: 'sendingQueue',
+              action: 'resume',
+              data: {
+                newsletter_id: this.state.item.id,
+              },
+            }).done(() => {
+              this.context.router.push(`/${ this.state.item.type || '' }`);
+              MailPoet.Notice.success(
+                MailPoet.I18n.t('newsletterSendingHasBeenResumed')
+              );
+            }).fail((response) => {
+              if (response.errors.length > 0) {
+                MailPoet.Notice.error(
+                  response.errors.map((error) => { return error.message; }),
+                  { scroll: true }
+                );
+              }
+            });
+          }).fail(this._showError).always(() => {
+            this.setState({ loading: false });
+          });
+        }
+        return false;
+      },
       handleSave: function (e) {
         e.preventDefault();
 
@@ -193,6 +227,7 @@ define(
       },
       _save: function () {
         const data = this.state.item;
+        data.queue = undefined;
         this.setState({ loading: true });
 
         // Store only properties that can be changed on this page
@@ -234,6 +269,15 @@ define(
         return true;
       },
       render: function () {
+        const isPaused = this.state.item.status == 'sending'
+          && this.state.item.queue
+          && this.state.item.queue.status == 'paused';
+        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>
@@ -242,20 +286,29 @@ define(
 
             <Form
               id="mailpoet_newsletter"
-              fields={ this.state.fields }
+              fields={ fields }
               item={ this.state.item }
               loading={ this.state.loading }
               onChange={this.handleFormChange}
               onSubmit={this.handleSave}
             >
               <p className="submit">
-                <input
+                {
+                  isPaused ?
+                  <input
+                  className="button button-primary"
+                  type="button"
+                  onClick={ this.handleResume }
+                  value={MailPoet.I18n.t('resume')} />
+                  :
+                  <input
                   className="button button-primary"
                   type="button"
                   onClick={ this.handleSend }
                   value={MailPoet.I18n.t('send')}
                   {...this.getSendButtonOptions()}
                   />
+                }
                 &nbsp;
                 <input
                   className="button button-secondary"

assets/js/src/newsletters/send/standard.jsx

@@ -155,6 +155,7 @@ define(
             name={this.getFieldName()}
             value={this.getDisplayDate(this.props.value)}
             readOnly={ true }
+            disabled={this.props.disabled}
             onChange={this.onChange}
             ref="dateInput"
             {...this.props.validation} />
@@ -180,6 +181,7 @@ define(
           <select
             name={this.props.name || 'time'}
             value={this.props.value}
+            disabled={this.props.disabled}
             onChange={this.props.onChange}
             {...this.props.validation}
           >
@@ -235,11 +237,13 @@ define(
               onChange={this.handleChange}
               displayFormat={dateDisplayFormat}
               storageFormat={dateStorageFormat}
+              disabled={this.props.disabled}
               validation={this.props.dateValidation}/>
             <TimeSelect
               name="time"
               value={this.state.time}
               onChange={this.handleChange}
+              disabled={this.props.disabled}
               validation={this.props.timeValidation} />
           </span>
         );
@@ -292,6 +296,7 @@ define(
                 name="scheduledAt"
                 value={this._getCurrentValue().scheduledAt}
                 onChange={this.handleValueChange}
+                disabled={this.props.field.disabled}
                 dateValidation={this.getDateValidation()} />
               &nbsp;
               <span>
@@ -300,7 +305,6 @@ define(
             </span>
           );
         }
-
         return (
           <div>
             <input
@@ -308,6 +312,7 @@ define(
               type="checkbox"
               value="1"
               checked={this.isScheduled()}
+              disabled={this.props.field.disabled}
               name="isScheduled"
               onChange={this.handleCheckboxChange} />