wco_email 0.1.1.108 → 0.1.1.109

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7074617480674045f74baf0320d4a084fa5e6a970e0ca056c7ee3e7ec9cad27
-  data.tar.gz: 13d493e3372b51b61c40598b3176e33f295a739d579419c24c65f2d95c5f803b
+  metadata.gz: bf68db3214927127e916c92d4ba9731a536fcf79c46544ad7f813f942ef2ce0c
+  data.tar.gz: 57f1a425c60ffffffa72b34088009f644bf4ec22c64c033afa0382a24588cefe
 SHA512:
-  metadata.gz: c8ae43c73f1f0f0526adbe678f63f0158747e69cfdb04156a6b205a9609b4d3cdce100853ad31634f318958e2ce901b9b6ec2363fdc2a3aa61598dde337957f9
-  data.tar.gz: cfee9bce05425bbe4a5ee7cd6ab0429cba4a1fb9b454875635953ba45bd9eaab556847c9f129f4744b56cc4b805762903f59b997b5bc49bb2e1cfb63a06ba083
+  metadata.gz: 600ddd832b8e29dc775e54bf58ce05ed5eb03277c349a6c693b9cee4d356cefd5f34c2c05f9f0ea3c93b4c0fb739aa8ca16c4f3d542e4b8a2565edf0b46f16de
+  data.tar.gz: f4deff878f1ceceb571a50574e01f2c6cb111733fed7404e96e662e86e9358732f01d5eaaf2c22342bb0fa627bc33b6469bb8963ab8a4c47cb5638eb227fa14c

data/app/controllers/wco_email/email_filters_controller.rb

@@ -5,39 +5,75 @@ class WcoEmail::EmailFiltersController < WcoEmail::ApplicationController
 
   def create
     authorize! :create, WcoEmail::EmailFilter
-    @email_filter = WcoEmail::EmailFilter.create params[:email_filter].permit!
-    if @email_filter.persisted?
+    @email_filter = WcoEmail::EmailFilter.new
+
+    ## conditions, skip_conditions aren't wired for aject yet.
+    (params[:email_filter][:actions_attributes]||[]).each do |_key, attrs|
+      type, id = attrs.delete(:aject).split(' ')
+      attrs[:aject_type] = type
+      attrs[:aject_id] = id
+    end
+
+    flag = @email_filter.update_attributes( params[:email_filter].permit! )
+
+    if flag
       flash[:notice] = 'Success'
+      redirect_to action: :show, id: @email_filter.id
     else
       flash[:alert] = "No luck: #{@email_filter.errors.full_messages.join(', ')}."
+      redirect_to request.referrer
     end
-    redirect_to action: 'new'
+
   end
 
   def destroy
-    @email_filter = WcoEmail::EmailFilter.find params[:id]
-    authorize! :destroy, @email_filter
-    flag = @email_filter.destroy
+    authorize! :destroy, WcoEmail::EmailFilter
+
+    if params[:id]
+      @email_filter = WcoEmail::EmailFilter.find params[:id]
+      flag = @email_filter.destroy
+    elsif params[:ids]
+      flag = WcoEmail::EmailFilter.find( params[:ids] ).map { |ef| ef.destroy }
+    end
+
     if flag
       flash[:notice] = 'Success'
     else
       flash[:alert] = 'Error'
     end
-    redirect_to action: 'index'
+    redirect_to request.referrer
   end
 
   def edit
     @email_filter = WcoEmail::EmailFilter.find params[:id]
     authorize! :edit, @email_filter
   end
+  def edit2
+    @email_filter = WcoEmail::EmailFilter.find( params[:id] )
+    authorize! :edit, @email_filter
+
+    @email_filter.conditions.build
+    @email_filter.skip_conditions.build
+    @email_filter.actions.build
+
+    @aject_options = {
+      'none' => [ [nil,nil] ],
+      'Wco::Tag' => Wco::Tag.all.map { |t| [t.slug, "Wco::Tag #{t.id}" ] },
+      'WcoEmail::EmailTemplate' => WcoEmail::EmailTemplate.all.map { |t| [ t.slug, "WcoEmail::EmailTemplate #{t.id}" ] },
+      'WcoEmail::EmailActionTemplate' => WcoEmail::EmailActionTemplate.all.map { |t| [ t.slug, "WcoEmail::EmailActionTemplate #{t.id}" ] },
+    }
+  end
+
 
   def index
     authorize! :index, WcoEmail::EmailFilter.new
     @email_filter  = WcoEmail::EmailFilter.new
-    @email_filters = WcoEmail::EmailFilter.all().includes( :email_template, :conversations )
+    @email_filters = WcoEmail::EmailFilter.all.includes( :email_template, :conversations )
 
     if params[:q]
       @email_filters = @email_filters.where( from_exact: /#{params[:q]}/i )
+    else
+      @email_filters = @email_filters.active
     end
 
     @email_filters = @email_filters.page( params[WcoEmail::EmailFilter::PAGE_PARAM_NAME]
@@ -52,27 +88,39 @@ class WcoEmail::EmailFiltersController < WcoEmail::ApplicationController
     @email_filter = WcoEmail::EmailFilter.new
     authorize! :new, @email_filter
 
-    @new_email_filter_condition = WcoEmail::EmailFilterCondition.new
+    @email_filter.conditions.build
+    @email_filter.skip_conditions.build
+    @email_filter.actions.build
+
+    @aject_options = {
+      'none' => [ [nil,nil] ],
+      'Wco::Tag' => Wco::Tag.all.map { |t| [t.slug, "Wco::Tag #{t.id}" ] },
+      'WcoEmail::EmailTemplate' => WcoEmail::EmailTemplate.all.map { |t| [ t.slug, "WcoEmail::EmailTemplate #{t.id}" ] },
+    }
   end
 
   def show
     @email_filter = WcoEmail::EmailFilter.find params[:id]
     authorize! :show, @email_filter
+    @conversations = @email_filter.conversations.page( params[WcoEmail::Conversation::PAGE_PARAM_NAME] ).per( current_profile.per_page )
   end
 
   def update
     @email_filter = WcoEmail::EmailFilter.find params[:id]
     authorize! :update, @email_filter
 
-    if params[:email_filter][:tag].blank?
-      params[:email_filter].delete :tag
+    ## conditions, skip_conditions aren't wired for aject yet.
+    (params[:email_filter][:actions_attributes]||[]).each do |_key, attrs|
+      type, id = attrs.delete(:aject).split(' ')
+      attrs[:aject_type] = type
+      attrs[:aject_id] = id
     end
 
     flag = @email_filter.update_attributes( params[:email_filter].permit! )
 
     if flag
       flash[:notice] = 'Success'
-      redirect_to action: 'index'
+      redirect_to request.referrer
     else
       flash[:alert] = "No luck: #{@email_filter.errors.full_messages.join(', ')}."
       redirect_to request.referrer
@@ -96,3 +144,37 @@ class WcoEmail::EmailFiltersController < WcoEmail::ApplicationController
 
 end
 
+
+
+
+
+
+=begin
+    params[:email_filter][:actions_attributes].each do |_key, attrs|
+      puts! attrs, 'attrs 1'
+
+      if '' == attrs[:kind] && '' == attrs[:aject]
+        next ## don't save new empty
+      end
+
+
+      if attrs[:id]
+        action = WcoEmail::EmailFilterAction.find attrs[:id]
+      else
+        action = WcoEmail::EmailFilterAction.new({ email_filter_id: params[:id] })
+      end
+
+      if '1' == attrs.delete( :_destroy )
+        action.destroy!
+      else
+        type, id = attrs.delete(:aject).split(' ')
+        attrs[:aject_type] = type
+        attrs[:aject_id] = id
+
+        puts! attrs, 'attrs 2'
+
+        action.update!(attrs.permit!)
+      end
+
+    end
+=end

data/app/controllers/wco_email/email_templates_controller.rb

@@ -1,22 +1,35 @@
 
-
 class WcoEmail::EmailTemplatesController < WcoEmail::ApplicationController
 
   def create
     authorize! :create, WcoEmail::EmailTemplate
-    @template = WcoEmail::EmailTemplate.create params[:template].permit!
-    if @template.persisted?
+
+    if params[:photo].present?
+      photo = Wco::Photo.create! params[:photo].permit!
+      params[:template][:photo_id] = photo.id
+    end
+
+    @tmpl = WcoEmail::EmailTemplate.create params[:template].permit!
+    if @tmpl.persisted?
       flash[:notice] = 'Success.'
+      if params[:template][:photo].present?
+        if @tmpl.photo.present?
+          @tmpl.photo.update(params[:template][:photo])
+        else
+          @tmpl.photo = Wco::Photo.create(params[:template][:photo])
+        end
+      end
+
     else
-      flash[:alert] = "Could not create an email template: #{@template.errors.full_messages.join(', ')}."
+      flash[:alert] = "Could not create an email template: #{@tmpl.errors.full_messages.join(', ')}."
     end
     redirect_to action: :index
   end
 
   def destroy
     authorize! :destroy, WcoEmail::EmailTemplate
-    @template = WcoEmail::EmailTemplate.where({ id: params[:id] }).first || WcoEmail::EmailTemplate.find_by({ slug: params[:id] })
-    if @template.destroy
+    @tmpl = WcoEmail::EmailTemplate.where({ id: params[:id] }).first || WcoEmail::EmailTemplate.find_by({ slug: params[:id] })
+    if @tmpl.destroy
       flash[:notice] = 'Success.'
     else
       flash[:alert] = 'Cannot destroy this template.'
@@ -27,6 +40,8 @@ class WcoEmail::EmailTemplatesController < WcoEmail::ApplicationController
   def edit
     @tmpl = @email_template = WcoEmail::EmailTemplate.where({ id: params[:id] }).first
     authorize! :edit, @tmpl
+
+    @photo = @tmpl.photo || @tmpl.build_photo
   end
 
   def iframe_src
@@ -74,8 +89,10 @@ class WcoEmail::EmailTemplatesController < WcoEmail::ApplicationController
   end
 
   def new
-    @new_email_template = WcoEmail::EmailTemplate.new
+    @tmpl = WcoEmail::EmailTemplate.new
     authorize! :new, WcoEmail::EmailTemplate
+
+    @photo = @tmpl.photo || @tmpl.build_photo
   end
 
   def show
@@ -104,13 +121,19 @@ class WcoEmail::EmailTemplatesController < WcoEmail::ApplicationController
   end
 
   def update
-    @template = WcoEmail::EmailTemplate.where({ id: params[:id] }).first
-    authorize! :update, @template
-    flag = @template.update_attributes( params[:template].permit! )
+    @tmpl = WcoEmail::EmailTemplate.where({ id: params[:id] }).first
+    authorize! :update, @tmpl
+
+    if params[:photo].present?
+      photo = Wco::Photo.create! params[:photo].permit!
+      params[:template][:photo_id] = photo.id
+    end
+
+    flag = @tmpl.update_attributes( params[:template].permit! )
     if flag
       flash[:notice] = 'Success.'
     else
-      flash[:alert] = "No luck. #{@template.errors.full_messages.join(', ')}"
+      flash[:alert] = "No luck. #{@tmpl.errors.full_messages.join(', ')}"
     end
     redirect_to action: :edit
   end

data/app/controllers/wco_email/messages_controller.rb

@@ -7,7 +7,7 @@ class WcoEmail::MessagesController < WcoEmail::ApplicationController
     @message = WcoEmail::Message.find params[:id]
 
     @client ||= Aws::S3::Client.new({
-      region:            ::S3_CREDENTIALS[:region_ses],
+      region:            ::S3_CREDENTIALS[:region_ses] || 'us-east-1',
       access_key_id:     ::S3_CREDENTIALS[:access_key_id_ses],
       secret_access_key: ::S3_CREDENTIALS[:secret_access_key_ses],
     })

data/app/views/wco_email/_main_header.haml

@@ -13,7 +13,7 @@
           = link_to '[+]', wco_email.new_message_stub_path
         %li= render '/wco_email/email_templates/header'
         %li= render '/wco_email/email_campaigns/header'
-        %li= render '/wco_email/email_filters/header'
+        %li= render '/wco_email/email_filters/main_header'
         %li= render '/wco_email/contexts/header'
         %li= render '/wco/unsubscribes/header'
 

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

@@ -5,6 +5,8 @@
       = link_to '[~]', edit_context_path(@ctx)
       Email Context `#{@ctx.subject}`
 
+
+
   .row
     .col-md-8
       %ul
@@ -13,6 +15,8 @@
           <b>Template:</b>           #{link_to @ctx.email_template.slug, email_template_path(@ctx.email_template), target: :_blank }
         %li <b>From:</b>             #{@ctx.from_email}
         %li <b>To Lead:</b>          #{link_to @ctx.lead.email, wco.lead_path(@ctx.lead)}
+        - if @ctx.rendered_subject.present?
+          %li <b>rendered_subject:</b> `#{@ctx.rendered_subject}`
         - if @ctx.reply_to_message
           %li <b>reply_to_message:</b> #{ link_to @ctx.reply_to_message, message_path(@ctx.reply_to_message), target: :_blank }
 

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

@@ -13,8 +13,12 @@
     = render '/wco/tags/index_chips', tags: @conversation.tags, config: { skip_checkbox: true }
 
   = render '/wco_email/conversations/tags_actions'
-  = render '/wco/leads/index',      leads: @conversation.leads
-  = render '/wco/leadsets/list', leadsets: @conversation.leadsets
+  .d-flex
+    %i.fa.fa-compress.collapse-expand#leads Leads (#{@conversation.leads.length}):
+    = render '/wco/leads/list',      leads: @conversation.leads
+  .d-flex
+    %i.fa.fa-compress.collapse-expand#leadsets Leadsets (#{@conversation.leadsets.length}):
+    = render '/wco/leadsets/list', leadsets: @conversation.leadsets
 
   - if @other_convs.present?
     %h5 Other convs:

data/app/views/wco_email/email_filter_actions/_form.haml

@@ -0,0 +1,34 @@
+
+.email-filter-actions--form
+
+  .d-flex
+    .field
+      %label [destroy]
+      = f.check_box :_destroy
+    .field
+      %label Kind
+      = f.select :kind, options_for_select( [[nil,nil]] + WcoEmail::EmailFilterAction::KINDS, selected: action.kind )
+    .field.flex-grow
+      %label aject
+      = f.select :aject, grouped_options_for_select( @aject_options, { selected: "#{action.aject_type} #{action.aject_id}" }), {}, { class: 'select2' }
+
+  -# .field
+  -#   %label Email Template
+  -#   = f.select :email_template_id, options_for_select(@email_templates_list, selected: action.email_template_id ), {}, { class: 'select2' }
+
+  -# .field
+  -#   %label Email Action Template (EAT)
+  -#   = f.select :email_action_template_id, options_for_select( @email_action_templates_list, selected: action.email_action_template_id ), {}, class: 'select2'
+
+  -# .field
+  -#   %label Office Action Template (OAT)
+  -#   = f.select :office_action_template_id, options_for_select( ::Wco::OfficeActionTemplate.list, selected: action.office_action_template_id ), {}, class: 'select2'
+
+  -# .field
+  -#   = f.label :tag
+  -#   = f.select :tag, options_for_select( @tags_list, selected: email_filter.tag_id ), {}, class: 'select2'
+
+  -# .field
+  -#   %label value ( not used? )
+  -#   = f.text_area :value
+

data/app/views/wco_email/email_filter_conditions/_form.haml

@@ -1,14 +1,18 @@
 
 .email-filter-conditions--form.descr
   .d-flex
+    .field
+      %label [destroy]
+      = f.check_box :_destroy
     .field
       %label Field
-      = f.select :field, options_for_select([[nil,nil]] + WcoEmail::EmailFilter::FIELD_OPTS, selected: cond.field )
+      = f.select :field, options_for_select([[nil,nil]] + WcoEmail::EmailFilterCondition::FIELD_OPTS, selected: cond.field )
     .field
-      %label Matchtype
-      = f.select :matchtype, options_for_select([[nil,nil]] + WcoEmail::EmailFilter::MATCHTYPE_OPTS, selected: cond.matchtype)
+      %label Operator
+      = f.select :operator, options_for_select([[nil,nil]] + WcoEmail::EmailFilterCondition::OPERATOR_OPTS, selected: cond.operator)
     .field
       %label Value
       = f.text_field :value, value: cond.value
-    [-]
-  -# .a= cond.inspect
+
+  -# .a= cond.inspect
+

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

@@ -56,21 +56,21 @@
           %label skip from regex
           = f.text_field :skip_from_regex
 
-      .col-12
-        Conditions:
-        %ul
-          - email_filter.conditions.each do |cond|
-            %li
-              = f.fields_for( :conditions ) do |f_cond|
-                = render '/wco_email/email_filter_conditions/form', cond: cond, f: f_cond
+      -# .col-12
+      -#   Conditions:
+      -#   %ul
+      -#     - email_filter.conditions.each do |cond|
+      -#       %li
+      -#         = f.fields_for( :conditions ) do |f_cond|
+      -#           = render '/wco_email/email_filter_conditions/form', cond: cond, f: f_cond
 
-      .col-12
-        skip conditions:
-        %ul
-          - email_filter.skip_conditions.each do |cond|
-            %li
-              = f.fields_for( :skip_conditions ) do |f_cond|
-                = render '/wco_email/email_filter_conditions/form', cond: cond, f: f_cond
+      -# .col-12
+      -#   skip conditions:
+      -#   %ul
+      -#     - email_filter.skip_conditions.each do |cond|
+      -#       %li
+      -#         = f.fields_for( :skip_conditions ) do |f_cond|
+      -#           = render '/wco_email/email_filter_conditions/form', cond: cond, f: f_cond
 
       .col-12
         .actions

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

@@ -8,32 +8,27 @@
   = form_for email_filter, url: url, as: :email_filter do |f|
 
     %p If
-    - f.fields_for( :email_filter_conditions ) do |f_cond|
-      = render '/wco_email/email_filter_conditions/form', f: f_cond
-    = form_for @new_email_filter_condition do |ff|
-      = render '/wco_email/email_filter_conditions/form', f: ff
+    = f.fields_for( :conditions ) do |f_cond|
+      = render '/wco_email/email_filter_conditions/form', f: f_cond, cond: f_cond.object
+
+    -# .d-flex
+    -#   %label add
+    -#   = form_for @new_email_filter_condition do |f_cond|
+    -#     = render '/wco_email/email_filter_conditions/form', f: f_cond, cond: f_cond.object
 
-    .d-flex [+]
     %p Skip
-    - email_filter.skip_conditions.each do |f_cond|
-      .d-flex
-        .field
-          %label Field
-          = f_cond.select :field, options_for_select(WcoEmail::EmailFilter::FIELD_OPTS, selected: f_cond.field)
-        .field
-          %label Matchtype
-          = f_cond.select :matchtype, options_for_select(WcoEmail::EmailFilter::MATCHTYPE_OPTS, selected: f_cond.matchtype)
-        .field
-          %label Value
-          = f_cond.text_field :value
-        [-]
-    .d-flex [+]
-    %p Then
-    .d-flex
-      %label OAT
-      = f.select :office_action_template, options_for_select(Wco::OfficeActionTemplate.list, selected: email_filter.office_action_template_id), {}, class: 'select2'
+    = f.fields_for( :skip_conditions ) do |f_cond|
+      = render '/wco_email/email_filter_conditions/form', f: f_cond, cond: f_cond.object
 
-    %p [perform]
+    -# .d-flex
+    -#   %label add
+    -#   = form_for @new_email_filter_condition do |f_cond|
+    -#     = render '/wco_email/email_filter_conditions/form', f: f_cond, cond: f_cond.object
+
+    %p Then
+    = f.fields_for( :actions ) do |f_action|
+      = render '/wco_email/email_filter_actions/form', f: f_action, action: f_action.object
 
     .actions
       = f.submit 'Go'
+

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

@@ -1,6 +1,9 @@
 
-= link_to "Email Filters (#{WcoEmail::EmailFilter.all.length})", email_filters_path
-= form_tag email_filters_path, method: :get do
-  = text_field_tag :q
-= link_to '[+]', new_email_filter_path
-= link_to '[+2]', new2_email_filter_path
+.email-filters--header
+  %h5.title.text-center
+    = link_to '[~]',          wco_email.edit_email_filter_path( @email_filter )
+     
+    = link_to '[~2]',          wco_email.edit2_email_filter_path( @email_filter )
+     
+    = link_to 'Email Filter', wco_email.email_filter_path( @email_filter )
+    `#{@email_filter.id}`

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

@@ -0,0 +1,6 @@
+
+= link_to "Email Filters (#{WcoEmail::EmailFilter.all.length})", email_filters_path
+= form_tag email_filters_path, method: :get do
+  = text_field_tag :q
+= link_to '[+]', new_email_filter_path
+= link_to '[+2]', new2_email_filter_path

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

@@ -0,0 +1,32 @@
+
+.email-filters--show
+  .row
+    .col-6
+
+      %hr
+      = email_filter.inspect
+
+    .col-6
+      %hr
+      <b>Conditions (#{email_filter.conditions.length}):</b>
+      %ul
+        - email_filter.conditions.each do |cond|
+          %li
+            = cond.to_s
+            .gray= cond.inspect
+
+      %hr
+      <b>Skip Conditions (#{email_filter.skip_conditions.length}):</b>
+      %ul
+        - email_filter.skip_conditions.each do |cond|
+          %li
+            = cond.to_s
+            .gray= cond.pretty_inspect
+
+      %hr
+      <b>Actions (#{email_filter.actions.length}):</b>
+      %ul
+        - email_filter.actions.each do |act|
+          %li
+            = act.to_s
+            .gray= act.pretty_inspect

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

@@ -1,20 +1,5 @@
 
 .emails-ns.email-filters-edit.maxwidth
-  .header
-    %h2.title Edit Email Filter
+  = render 'header'
   = render 'form', email_filter: @email_filter
-
-  %hr
-  <b>Conditions (#{@email_filter.conditions.length}):</b>
-  %ul
-    - @email_filter.conditions.each do |cond|
-      %li
-        = cond.inspect
-
-  %hr
-  <b>Skip Conditions (#{@email_filter.skip_conditions.length}):</b>
-  %ul
-    - @email_filter.skip_conditions.each do |cond|
-      %li
-        = cond.inspect
-
+  -# = render 'show', email_filter: @email_filter

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

@@ -0,0 +1,5 @@
+
+.emails-ns.email-filters-edit.maxwidth
+  = render 'header'
+  = render 'form2', email_filter: @email_filter
+  -# = render 'show',  email_filter: @email_filter

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

@@ -6,38 +6,52 @@
       = link_to '[+]', new_email_filter_path
       = link_to '[2+]', new2_email_filter_path
 
-  .maxwidth
-    %hr
-    %h5.title.collapse-expand#newEmailFilter New Email Filter
-    = render 'form', email_filter: @email_filter
-  %hr
+  -# .maxwidth
+  -#   %hr
+  -#   %h5.title.collapse-expand#newEmailFilter New Email Filter
+  -#   = render 'form', email_filter: @email_filter
+
+  .actions.d-flex
+    .a.mr-2= button_tag 'Delete', method: :delete, class: 'delete-btn'
+    = render 'wco/tags/actions', resource: 'Wco::Leadset'
+
 
+  %hr
   = paginate @email_filters, param_name: WcoEmail::EmailFilter::PAGE_PARAM_NAME, views_prefix: 'wco'
   %table.bordered
     %thead
       %tr
+        %th.select-all.nosort
+          = render '/wco/select_all'
         %th  
-        %th  
+        %th status
         %th n convs
+        %th to_s_full
         %th Match
         %th Skip
-        %th Action
-        %th Conditions
-        %th Skip Conditions
+        %th Kind
+        -# %th Conditions
+        -# %th Skip Conditions
 
     - @email_filters.each_with_index do |ef, idx|
 
       %tr
-        %td
+        %td.select-all
           .gray= idx+1
-          = check_box_tag 'checked'
+          = check_box_tag 'email_filter_ids[]', ef.id, nil, { class: 'i-sel' }
         %td
           .flex-row
             = link_to '[~]',    edit_email_filter_path(ef)
+            = link_to '[~2]',   edit2_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?' }
+          .gray.small= ef.id
+        %td.status
+          = ef.status
         %td.n-convs
           = ef.conversations.length
+        %td.to_s_full
+          %pre= ef.to_s_full
         %td.match
           - if ef.from_regex.present?
             .a <b>from_regex:</b> `#{ef.from_regex}`
@@ -66,10 +80,10 @@
           - if ef.kind == EF::KIND_REMOVE_TAG
             .a <b>#{EF::KIND_REMOVE_TAG}:</b> #{ef.tag&.slug}
 
-        %td.conditions
-          = ef.conditions.length
-        %td.skip-conditions
-          = ef.skip_conditions.length
+        -# %td.conditions
+        -#   = ef.conditions.length
+        -# %td.skip-conditions
+        -#   = ef.skip_conditions.length
 
   = paginate @email_filters, param_name: WcoEmail::EmailFilter::PAGE_PARAM_NAME, views_prefix: 'wco'
 

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

@@ -1,25 +1,29 @@
 
 .email-filters-show.maxwidth
-  .header
-    %h5.title Email Filter `#{@email_filter.id}`
+  = render 'header'
 
   %pre.descr
     = @email_filter.to_s_full
-  %h5 Conditions
-  %ul
-    - @email_filter.conditions.each do |cond|
-      %li= cond.to_s_full
-  %h5 Skip conditions
-  %ul
-    - @email_filter.skip_conditions.each do |item|
-      %li= item.to_s_full
-  %h5 Actions
-  %ul
-    - @email_filter.actions.each do |item|
-      %li= item.to_s_full
 
   %hr
-  %h5 Convs (#{@email_filter.conversations.length})
-  %ul
-    - @email_filter.conversations.each do |conv|
-      %li= link_to conv, conversation_path(conv)
+  %i.fa.fa-compress.collapse-expand#conversations Conversations (#{@conversations.length}):
+  .a
+    = paginate @conversations, param_name: WcoEmail::Conversation::PAGE_PARAM_NAME, views_prefix: 'wco'
+    %table.bordered.padded
+      %thead
+        %tr
+          %th leadsets
+          %th leads
+          %th convo
+      %tbody
+        - @conversations.each do |conv|
+          %tr
+            %td.leadsets
+              = conv.leadsets.map &:to_s
+            %td.leads
+              = conv.leads.map &:to_s
+            %td.convo
+              = link_to conv, conversation_path(conv)
+
+
+  = render 'show', email_filter: @email_filter

data/app/views/wco_email/email_templates/_form.haml

@@ -2,7 +2,7 @@
 - url = email_template.new_record? ? email_templates_path : email_template_path(email_template.id)
 
 .email-templates--form.container
-  = form_for email_template, as: :template, url: url do |f|
+  = form_for email_template, as: :template, url: url, :html => { :multipart => true } do |f|
     .actions
       = f.submit 'Save'
 
@@ -66,6 +66,19 @@
           = f.label :config_exe
           = f.text_area :config_exe
 
+    .row
+      .col-6
+        .field
+          %label photo
+
+          %p Current photo:
+          = image_tag @tmpl.photo.photo.url(:thumb)
+
+          = fields_for :photo, @photo do |p|
+            %p
+              %label photo
+              = p.file_field :photo
+
     .actions
       = f.submit 'Save'
 

data/app/views/wco_email/email_templates/_index.haml

@@ -11,6 +11,7 @@
       %thead
         %tr
           %th  
+          %th photo
           %th Slug
           %th Created
           %th Updated
@@ -22,6 +23,9 @@
               = link_to '[use]', wco_email.new_context_path({ email_template_id: tmpl.id })
               = link_to '[~]',   wco_email.edit_email_template_path({ id: tmpl })
               = button_to '[x]', wco_email.email_template_path({ id: tmpl }), method: :delete, :data => { :confirm => 'Are you sure?' }, form_class: 'inline'
+          %td.photo
+            - if tmpl.photo&.photo
+              = image_tag tmpl.photo.photo.url(:thumb)
           %td= link_to tmpl.slug, wco_email.email_template_path({ id: tmpl })
           %td= pp_date tmpl.created_at
           %td= pp_date tmpl.updated_at

data/app/views/wco_email/email_templates/edit.haml

@@ -1,5 +1,5 @@
 
 .email-templates-edit.maxwidth
   %h5
-    Edit email_template `#{link_to @email_template.slug, email_template_path( @email_template )}`
-  = render 'form', email_template: @email_template
+    Edit email_template `#{link_to @tmpl.slug, email_template_path( @tmpl )}`
+  = render 'form', email_template: @tmpl

data/app/views/wco_email/email_templates/new.haml

@@ -3,4 +3,4 @@
   .header
     %h2.title New Email Template
 
-  = render 'form', email_template: @new_email_template
+  = render 'form', email_template: @tmpl

data/app/views/wco_email/messages/show_iframe.haml

@@ -10,5 +10,5 @@
 
 = raw @message.part_html_sanitized
 
--# %hr{ style: 'border-top: 1px solid red;' }
--# %pre= @message.part_txt
+%hr{ style: 'border-top: 1px solid red;' }
+%pre= @message.part_txt

data/config/routes.rb

@@ -40,7 +40,9 @@ WcoEmail::Engine.routes.draw do
   post 'contexts/send_immediate/:id', to: 'contexts#send_immediate',   as: :send_context
   resources :contexts
 
-  get 'email_filters/new2', to: 'email_filters#new2', as: :new2_email_filter
+  get 'email_filters/new2',  to: 'email_filters#new2',  as: :new2_email_filter
+  get 'email_filters/:id/edit2', to: 'email_filters#edit2', as: :edit2_email_filter
+  delete 'email_filters',        to: '/wco_email/email_filters#destroy'
   resources :email_filters
   resources :email_filter_conditions
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.108
+  version: 0.1.1.109
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-01 00:00:00.000000000 Z
+date: 2026-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -417,11 +417,15 @@ files:
 - app/views/wco_email/email_campaigns/index.haml
 - app/views/wco_email/email_campaigns/new.haml
 - app/views/wco_email/email_campaigns/show.haml
+- app/views/wco_email/email_filter_actions/_form.haml
 - app/views/wco_email/email_filter_conditions/_form.haml
 - app/views/wco_email/email_filters/_form.haml
 - app/views/wco_email/email_filters/_form2.haml
 - app/views/wco_email/email_filters/_header.haml
+- app/views/wco_email/email_filters/_main_header.haml
+- app/views/wco_email/email_filters/_show.haml
 - app/views/wco_email/email_filters/edit.haml
+- app/views/wco_email/email_filters/edit2.haml
 - app/views/wco_email/email_filters/index.haml
 - app/views/wco_email/email_filters/new.haml
 - app/views/wco_email/email_filters/new2.haml