Merge pull request #208 from mailpoet/listing_tests

Listings

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

@@ -20,7 +20,17 @@ function(
       this.loadCachedItems();
       this.setupSelect2();
     },
-    componentDidUpdate: function() {
+    componentDidUpdate: function(prevProps, prevState) {
+      if(
+        (this.props.item !== undefined && prevProps.item !== undefined)
+        && (this.props.item.id !== prevProps.item.id)
+      ) {
+        jQuery('#'+this.refs.select.id).select2(
+          'val',
+          this.props.item[this.props.field.name]
+        );
+      }
+
       this.setupSelect2();
     },
     setupSelect2: function() {
@@ -54,6 +64,11 @@ function(
     loadCachedItems: function() {
       if(typeof(window['mailpoet_'+this.props.field.endpoint]) !== 'undefined') {
         var items = window['mailpoet_'+this.props.field.endpoint];
+
+        if(this.props.field['filter'] !== undefined) {
+          items = items.filter(this.props.field.filter);
+        }
+
         this.setState({
           items: items
         });
@@ -76,9 +91,6 @@ function(
       return true;
     },
     render: function() {
-      if(this.state.items.length === 0) {
-        return false;
-      } else {
       var options = this.state.items.map(function(item, index) {
         return (
           <option
@@ -107,7 +119,6 @@ function(
         >{ options }</select>
       );
     }
-    }
   });
 
   return Selection;

assets/js/src/form/form.jsx

@@ -88,7 +88,7 @@ define(
         }).done(function(response) {
           this.setState({ loading: false });
 
-          if(response === true) {
+          if(response.result === true) {
             if(this.props.onSuccess !== undefined) {
               this.props.onSuccess()
             } else {
@@ -101,10 +101,10 @@ define(
               this.props.messages['created']();
             }
           } else {
-            if(response === false) {
+            if(response.result === false) {
-              // unknown error occurred
+              if(response.errors.length > 0) {
-            } else {
+                this.setState({ errors: response.errors });
-              this.setState({ errors: response });
+              }
             }
           }
         }.bind(this));
@@ -121,6 +121,7 @@ define(
         return true;
       },
       render: function() {
+        if(this.state.errors !== undefined) {
           var errors = this.state.errors.map(function(error, index) {
             return (
               <p key={ 'error-'+index } className="mailpoet_error">
@@ -128,6 +129,7 @@ define(
               </p>
             );
           });
+        }
 
         var formClasses = classNames(
           'mailpoet_form',

assets/js/src/listing/bulk_actions.jsx

@@ -15,8 +15,7 @@ function(
       this.setState({
         action: e.target.value,
         extra: false
-      });
+      }, function() {
-
         var action = this.getSelectedAction();
 
         // action on select callback
@@ -25,6 +24,7 @@ function(
             extra: action.onSelect(e)
           });
         }
+      }.bind(this));
     },
     handleApplyAction: function(e) {
       e.preventDefault();

assets/js/src/newsletters/send.jsx

@@ -34,7 +34,10 @@ define(
         placeholder: "Select a list",
         id: "mailpoet_segments",
         endpoint: "segments",
-        multiple: true
+        multiple: true,
+        filter: function(segment) {
+          return !!(!segment.deleted_at);
+        }
       },
       {
         name: 'sender',

assets/js/src/subscribers/form.jsx

@@ -37,6 +37,17 @@ define(
           'subscribed': 'Subscribed',
           'unsubscribed': 'Unsubscribed'
         }
+      },
+      {
+        name: 'segments',
+        label: 'Lists',
+        type: 'selection',
+        placeholder: "Select a list",
+        endpoint: "segments",
+        multiple: true,
+        filter: function(segment) {
+          return !!(!segment.deleted_at);
+        }
       }
     ];
 

assets/js/src/subscribers/list.jsx

@@ -101,7 +101,10 @@ const bulk_actions = [
     onSelect: function() {
       let field = {
         id: 'move_to_segment',
-        endpoint: 'segments'
+        endpoint: 'segments',
+        filter: function(segment) {
+          return !!(!segment.deleted_at);
+        }
       };
 
       return (
@@ -127,7 +130,10 @@ const bulk_actions = [
     onSelect: function() {
       let field = {
         id: 'add_to_segment',
-        endpoint: 'segments'
+        endpoint: 'segments',
+        filter: function(segment) {
+          return !!(!segment.deleted_at);
+        }
       };
 
       return (

lib/Config/Menu.php

@@ -156,7 +156,7 @@ class Menu {
 
     $data = array(
       'settings' => $settings,
-      'segments' => Segment::findArray(),
+      'segments' => Segment::getPublished()->findArray(),
       'pages' => Pages::getAll(),
       'flags' => $flags,
       'charsets' => Charsets::getAll(),
@@ -230,7 +230,7 @@ class Menu {
     $data = array(
       'form' => $form,
       'pages' => Pages::getAll(),
-      'segments' => Segment::findArray(),
+      'segments' => Segment::getPublished()->findArray(),
       'styles' => FormRenderer::getStyles($form),
       'date_types' => Block\Date::getDateTypes(),
       'date_formats' => Block\Date::getDateFormats()

lib/Form/Widget.php

@@ -72,7 +72,7 @@ class Widget extends \WP_Widget {
     $selected_form = isset($instance['form']) ? (int)($instance['form']) : 0;
 
     // get forms list
-    $forms = Form::whereNull('deleted_at')->orderByAsc('name')->findArray();
+    $forms = Form::getPublished()->orderByAsc('name')->findArray();
     ?><p>
       <label for="<?php $this->get_field_id( 'title' ) ?>"><?php _e( 'Title:' ); ?></label>
       <input
@@ -94,12 +94,10 @@ class Widget extends \WP_Widget {
       </select>
     </p>
     <p>
-      <a href="javascript:;" class="mailpoet_form_new"><?php _e("Create a new form"); ?></a>
+      <a href="javascript:;" onClick="createSubscriptionForm()" class="mailpoet_form_new"><?php _e("Create a new form"); ?></a>
     </p>
     <script type="text/javascript">
-    jQuery(function($) {
+    function createSubscriptionForm() {
-      $(function() {
-        $('.mailpoet_form_new').on('click', function() {
         MailPoet.Ajax.post({
           endpoint: 'forms',
           action: 'create'
@@ -108,9 +106,8 @@ class Widget extends \WP_Widget {
             window.location = response;
           }
         });
-        });
+        return false;
-      });
+    }
-    });
     </script>
     <?php
   }
@@ -134,7 +131,7 @@ class Widget extends \WP_Widget {
     );
 
     // get form
-    $form = Form::whereNull('deleted_at')->findOne($instance['form']);
+    $form = Form::getPublished()->findOne($instance['form']);
 
     // if the form was not found, return nothing.
     if($form === false) {

lib/Models/Form.php

@@ -54,12 +54,12 @@ class Form extends Model {
       array(
         'name' => 'all',
         'label' => __('All'),
-        'count' => Form::whereNull('deleted_at')->count()
+        'count' => Form::getPublished()->count()
       ),
       array(
         'name' => 'trash',
         'label' => __('Trash'),
-        'count' => Form::whereNotNull('deleted_at')->count()
+        'count' => Form::getTrashed()->count()
       )
     );
   }

lib/Models/Model.php

@@ -90,4 +90,12 @@ class Model extends \Sudzy\ValidModel {
     }, $searchCriteria);
     return $orm->having_raw(implode(' ' . $searchCondition . ' ', $havingFields), array_values($havingValues));
   }
+
+  static function getPublished() {
+    return static::whereNull('deleted_at');
+  }
+
+  static function getTrashed() {
+    return static::whereNotNull('deleted_at');
+  }
 }

lib/Models/Newsletter.php

@@ -106,12 +106,12 @@ class Newsletter extends Model {
       array(
         'name' => 'all',
         'label' => __('All'),
-        'count' => Newsletter::whereNull('deleted_at')->count()
+        'count' => Newsletter::getPublished()->count()
       ),
       array(
         'name' => 'trash',
         'label' => __('Trash'),
-        'count' => Newsletter::whereNotNull('deleted_at')->count()
+        'count' => Newsletter::getTrashed()->count()
       )
     );
   }

lib/Models/Segment.php

@@ -68,7 +68,7 @@ class Segment extends Model {
   }
 
   static function search($orm, $search = '') {
-    return $orm->where_like('name', '%'.$search.'%');
+    return $orm->whereLike('name', '%'.$search.'%');
   }
 
   static function groups() {
@@ -76,12 +76,12 @@ class Segment extends Model {
       array(
         'name' => 'all',
         'label' => __('All'),
-        'count' => Segment::whereNull('deleted_at')->count()
+        'count' => Segment::getPublished()->count()
       ),
       array(
         'name' => 'trash',
         'label' => __('Trash'),
-        'count' => Segment::whereNotNull('deleted_at')->count()
+        'count' => Segment::getTrashed()->count()
       )
     );
   }

lib/Models/Subscriber.php

@@ -90,7 +90,7 @@ class Subscriber extends Model {
       array(
         'name' => 'all',
         'label' => __('All'),
-        'count' => Subscriber::whereNull('deleted_at')->count()
+        'count' => Subscriber::getPublished()->count()
       ),
       array(
         'name' => 'subscribed',
@@ -110,7 +110,7 @@ class Subscriber extends Model {
       array(
         'name' => 'trash',
         'label' => __('Trash'),
-        'count' => Subscriber::whereNotNull('deleted_at')->count()
+        'count' => Subscriber::getTrashed()->count()
       )
     );
   }

lib/Router/Newsletters.php

@@ -33,7 +33,6 @@ class Newsletters {
       }, $segments);
       $newsletter['options'] = $options;
 
-
       wp_send_json($newsletter);
     }
   }
@@ -54,9 +53,16 @@ class Newsletters {
       unset($data['options']);
     }
 
+    $errors = array();
+    $result = false;
+
     $newsletter = Newsletter::createOrUpdate($data);
 
-    if($newsletter->id) {
+    if($newsletter !== false && !$newsletter->id()) {
+      $errors = $newsletter->getValidationErrors();
+    } else {
+      $result = true;
+
       if(!empty($segment_ids)) {
         NewsletterSegment::where('newsletter_id', $newsletter->id)
           ->deleteMany();
@@ -89,8 +95,10 @@ class Newsletters {
         }
       }
     }
-
+    wp_send_json(array(
-    wp_send_json(($newsletter->id !== false));
+      'result' => $result,
+      'errors' => $errors
+    ));
   }
 
   function delete($data = array()) {

lib/Router/Segments.php

@@ -71,13 +71,20 @@ class Segments {
   }
 
   function save($data = array()) {
-    $result = Segment::createOrUpdate($data);
+    $errors = array();
+    $result = false;
 
-    if($result !== true) {
+    $segment = Segment::createOrUpdate($data);
-      wp_send_json($result);
+
+    if($segment !== false && !$segment->id()) {
+      $errors = $segment->getValidationErrors();
     } else {
-      wp_send_json(true);
+      $result = true;
     }
+    wp_send_json(array(
+      'result' => $result,
+      'errors' => $errors
+    ));
   }
 
   function restore($id) {

lib/Router/Subscribers.php

@@ -21,7 +21,14 @@ class Subscribers {
     if($subscriber === false) {
       wp_send_json(false);
     } else {
-      wp_send_json($subscriber->asArray());
+      $segments = $subscriber->segments()->findArray();
+
+      $subscriber = $subscriber->asArray();
+      $subscriber['segments'] = array_map(function($segment) {
+        return $segment['id'];
+      }, $segments);
+
+      wp_send_json($subscriber);
     }
   }
 
@@ -58,18 +65,40 @@ class Subscribers {
   }
 
   function save($data = array()) {
+    $errors = array();
     $result = false;
+    $segments = false;
+
+    if(array_key_exists('segments', $data)) {
+      $segments = $data['segments'];
+      unset($data['segments']);
+    }
 
     $subscriber = Subscriber::createOrUpdate($data);
 
     if($subscriber !== false && !$subscriber->id()) {
-      $result = array(
+      $errors = $subscriber->getValidationErrors();
-        'errors' => $subscriber->getValidationErrors()
-      );
     } else {
       $result = true;
+
+      if($segments !== false) {
+        SubscriberSegment::where('subscriber_id', $subscriber->id)
+          ->deleteMany();
+
+        if(!empty($segments)) {
+          foreach($segments as $segment_id) {
+            $relation = SubscriberSegment::create();
+            $relation->segment_id = $segment_id;
+            $relation->subscriber_id = $subscriber->id;
+            $relation->save();
           }
-    wp_send_json($result);
+        }
+      }
+    }
+    wp_send_json(array(
+      'result' => $result,
+      'errors' => $errors
+    ));
   }
 
   function subscribe($data = array()) {