wco_email 0.1.1.33 → 0.1.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78fb2701aceae49be8e71f766e2230de18fdae793ee34d281e8d0f654de7547c
-  data.tar.gz: 6818673a5cadaef98218df37c829f4f1fb9e0ca93d04381ea7ca9519548fd170
+  metadata.gz: bec07a4e4ca2d021905fd82003f9447d7f502ca047da8421d259ef927354c64e
+  data.tar.gz: 1c420fefd28598ca53af3806ae1d4bb8975e2f5a9ab472eeffb8ba692896cc7a
 SHA512:
-  metadata.gz: 725603d48b9c7fefbc9e9d4b2d42c4643e203d0cc2cde8356c4b79e3c6fc3d94e6f99ac12632d6bcdb401827d7607dff930f1921a9eaeffab1585ea85cfc1069
-  data.tar.gz: dfb45143933acb188bcc45f5d80831a2a0f4d07087d340d0b1596f87793d0976dd78b1193f63b8f1d22d8ef51ad369d30905dce96873376160240b1efef2a4b0
+  metadata.gz: 9b88fd7946cec4223d98d83b70e5a3158ecbd28382a2dddc0658f48e60b9cb548065d279944f8d6b7a04568c66edf78c1cce679244370072dddc0d187d77878a
+  data.tar.gz: 6433e52a9e9d25ff43f1e46201ec2b10752bc2c0b5a9cf2fd24d7a6b02a75c1fd2ba469dc54843b2d7aec851257113b1c832d95faefa8599c34d1ffc5d4d41a7

data/app/controllers/wco_email/application_controller.rb

@@ -1,4 +1,6 @@
 
+EF = WcoEmail::EmailFilter
+
 class WcoEmail::ApplicationController < Wco::ApplicationController
   # before_action :set_lists
   layout 'wco_email/application'

data/app/controllers/wco_email/email_filters_controller.rb

@@ -34,7 +34,7 @@ class WcoEmail::EmailFiltersController < WcoEmail::ApplicationController
   def index
     authorize! :index, WcoEmail::EmailFilter.new
     @email_filter  = WcoEmail::EmailFilter.new
-    @email_filters = WcoEmail::EmailFilter.all # .page( params[WcoEmail::EmailFilter::PAGE_PARAM_NAME] ).per( current_profile.per_page )
+    @email_filters = WcoEmail::EmailFilter.all.includes( :email_template, :conversations )
   end
 
   def new
@@ -42,6 +42,11 @@ class WcoEmail::EmailFiltersController < WcoEmail::ApplicationController
     authorize! :new, @email_filter
   end
 
+  def show
+    @email_filter = WcoEmail::EmailFilter.find params[:id]
+    authorize! :show, @email_filter
+  end
+
   def update
     @email_filter = WcoEmail::EmailFilter.find params[:id]
     authorize! :update, @email_filter

data/app/views/wco_email/email_filters/index.haml

@@ -18,15 +18,10 @@
       %tr
         %th  
         %th  
-        %th From Regex
-        %th From Exact
-        %th Subject Regex
-        %th Subject Exact
-        %th Body Exact
-        %th Kind
-        %th Respond with <br />Email Template
-        %th Email Action <br />(template)
-        %th Tag
+        %th n convs
+        %th Match
+        %th Action
+
     - @email_filters.each_with_index do |ef, idx|
 
       %tr
@@ -34,19 +29,34 @@
           .gray= idx+1
           = check_box_tag 'checked'
         %td
-          = link_to '[~]', edit_email_filter_path(ef)
-          .inline-block= button_to '[x]', email_filter_path(ef), method: :delete, data: { confirm: 'Are you sure?' }
-        %td
-          `#{ef.from_regex}`
-        %td
-          `#{ef.from_exact}`
-        %td= ef.subject_regex
-        %td= ef.subject_exact
-        %td= ef.body_exact
-        %td= ef.kind
-        %td= ef.email_template&.slug
-        %td= ef.email_action_template&.slug
-        %td= ef.tag&.slug
+          .flex-row
+            = link_to '[~]',    edit_email_filter_path(ef)
+            = link_to '[view]', email_filter_path(ef)
+            .inline-block= button_to '[x]', email_filter_path(ef), method: :delete, data: { confirm: 'Are you sure?' }
+        %td.n-convs
+          = ef.conversations.length
+        %td.match
+          - if ef.from_regex.present?
+            .a <b>from_regex:</b> `#{ef.from_regex}`
+          - if ef.from_exact.present?
+            .a <b>from_exact:</b> `#{ef.from_exact}`
+          - if ef.subject_regex.present?
+            .a <b>subject_regex:</b> `#{ef.subject_regex}`
+          - if ef.subject_exact.present?
+            .a <b>subject_exact:</b> `#{ef.subject_exact}`
+          - if ef.body_exact.present?
+            .a <b>body_exact:</b> `#{ef.body_exact}`
+
+        %td.action
+          - if ef.kind == EF::KIND_AUTORESPOND_TMPL
+            .a <b>#{EF::KIND_AUTORESPOND_TMPL}:</b> #{ef.email_template&.slug}
+          - if ef.kind == EF::KIND_AUTORESPOND_EACT
+            .a <b>#{EF::KIND_AUTORESPOND_EACT}:</b> #{ef.email_action_template&.slug}
+          - if ef.kind == EF::KIND_ADD_TAG
+            .a <b>#{EF::KIND_ADD_TAG}:</b> #{ef.tag&.slug}
+          - if ef.kind == EF::KIND_REMOVE_TAG
+            .a <b>#{EF::KIND_REMOVE_TAG}:</b> #{ef.tag&.slug}
+
   -# = paginate @email_filters, param_name: WcoEmail::EmailFilter::PAGE_PARAM_NAME, views_prefix: 'wco'
 
 

data/app/views/wco_email/email_filters/show.haml

@@ -0,0 +1,9 @@
+
+.email-filters-show.maxwidth
+  .header
+    %h5.title Email Filter `#{@email_filter.id}`
+
+  %h5 Convs (#{@email_filter.conversations.length})
+  %ul
+    - @email_filter.conversations.each do |conv|
+      %li= link_to conv, email_conversation_path(conv)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.33
+  version: 0.1.1.35
 platform: ruby
 authors:
 - Victor Pudeyev
@@ -400,6 +400,7 @@ files:
 - app/views/wco_email/email_filters/edit.haml
 - app/views/wco_email/email_filters/index.haml
 - app/views/wco_email/email_filters/new.haml
+- app/views/wco_email/email_filters/show.haml
 - app/views/wco_email/email_templates/_form.haml
 - app/views/wco_email/email_templates/_form_mini.haml
 - app/views/wco_email/email_templates/_form_reply_mini.haml