wco_email 0.1.1.117 → 0.1.1.118

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec62edaefde7f02c66548edb5178e5a178c97aa11f570dbcd26e8b0252a25a8f
-  data.tar.gz: 186a42fa6d54d069c10216a3976949ef487381d8b1b21282c388482f1bacb58c
+  metadata.gz: 92ad474046091dfd7141e80a9271656b9242723d79794d7be5f1a38a7456934a
+  data.tar.gz: 7cbc4eb3a83e02bb63b82da434be6896d9ff48c4cf4fded2f411bcfd9c0c1f9c
 SHA512:
-  metadata.gz: '09eb81d24cedae7fd885149f1cb5ed455b8436665ce1058c91541aaafc04e8041bceb470bfa30c5ae87a7d0cc051e57fb1243f9bb6a211a658ad77b3a19a2ebc'
-  data.tar.gz: f0c32984b659fbf98700562df9beabfc5e291d5366cb8c1ec750b46729de307f7835743b3d8baa193b7f8f415cc49a3358609380d07b184588571be05465ed41
+  metadata.gz: 3996c80beead70714683394593f675af0adf25dcceaae6c6295c2558bbe5e15d5a204efdec71b78f000fb4b32bf5d909f79c7532e32f21f5d28fb794f8b2a272
+  data.tar.gz: 77f684c826db4188459a1970cdd4ecda98e34932256bc0cf7b4464f357e68e9ac74b48a60c4a50bad326c18061ef0ef91a6436853eed8f956801e71ed1c4c1db

data/app/controllers/wco_email/messages_controller.rb

@@ -4,19 +4,14 @@ class WcoEmail::MessagesController < WcoEmail::ApplicationController
   before_action :set_lists, except: %i| show_iframe |
 
   def show
+    @client ||= Aws::S3::Client.new(::SES_S3_CREDENTIALS)
     @message = WcoEmail::Message.find params[:id]
+    authorize! :show, @message
 
-    @client ||= Aws::S3::Client.new({
-      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],
-    })
     stub     = @message.stub
     raw      = @client.get_object( bucket: stub.bucket, key: stub.object_key ).body.read
     raw      = raw.encode('utf-8', invalid: :replace, undef: :replace, replace: '_' )
     @the_mail = Mail.new( raw )
-
-    authorize! :show, @message
   end
 
   def show_iframe

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

@@ -3,8 +3,8 @@
 -# only change the subject
 -#
 
-= form_for conversation do |f|
-  .d-flex
-    %label Subj
-    = f.text_field :subject, class: 'w-100'
-    = f.submit '~>'
+= form_for conversation, html: { class: 'd-flex flex-grow' } do |f|
+
+  %label Subj
+  = f.text_field :subject, class: 'w-100 flex-grow'
+  = f.submit '~>'

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

@@ -5,20 +5,24 @@
 .conversations-list
   = check_box_tag 'conversation_ids[]', @conversation.id.to_s, true, { class: 'i-sel', disabled: true }
 .conversations-show.maxwidth
-  = render '/wco_email/conversations/form_mini', conversation: @conversation
 
-  %h5
+
+  .d-flex
+    = render '/wco_email/conversations/form_mini', conversation: @conversation
     <b>(#{@messages.length})</b>
     %span.gray.mini= @conversation.id
+  .d-flex
     = render '/wco/tags/index_chips', tags: @conversation.tags, config: { skip_checkbox: true }
-
-  = render '/wco_email/conversations/tags_actions'
+    = render '/wco_email/conversations/tags_actions'
   .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
+  .d-flex
+    %i.fa.fa-compress.collapse-expand#filters Filters (#{@conversation.filters.length}):
+    = render '/wco_email/email_filters/list', filters: @conversation.filters
 
   - if @other_convs.present?
     %h5 Other convs:

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

@@ -10,9 +10,9 @@
     .field
       %label Operator
       = f.select :operator, options_for_select([[nil,nil]] + WcoEmail::EmailFilterCondition::OPERATOR_OPTS, selected: cond.operator)
-    .field
+    .field.d-flex.w-100
       %label Value
-      = f.text_field :value, value: cond.value
+      = f.text_field :value, value: cond.value, class: 'flex-grow'
 
   -# .a= cond.inspect
 

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

@@ -7,27 +7,21 @@
 .email-filters--from.maxwidth
   = form_for email_filter, url: url, as: :email_filter do |f|
 
-    %p If
-    = 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
+    %label.collapse-expand#if_ <> If (any)
+    %ol
+      = f.fields_for( :conditions ) do |f_cond|
+        %li= render '/wco_email/email_filter_conditions/form', f: f_cond, cond: f_cond.object
+    .c
 
-    %p Skip
+    %label.collapse-expand#skip_ <> Skip (any)
     = f.fields_for( :skip_conditions ) do |f_cond|
       = render '/wco_email/email_filter_conditions/form', f: f_cond, cond: f_cond.object
+    .c
 
-    -# .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
+    %label.collapse-expand#then_ <> Then
     = f.fields_for( :actions ) do |f_action|
       = render '/wco_email/email_filter_actions/form', f: f_action, action: f_action.object
+    .c
 
     .actions
       = f.submit 'Go'

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

@@ -0,0 +1,4 @@
+
+%ul.email-filters--list
+  - filters.each do |f|
+    %li= link_to f.to_s, wco_email.email_filter_path(f)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.117
+  version: 0.1.1.118
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-29 00:00:00.000000000 Z
+date: 2026-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -428,6 +428,7 @@ files:
 - 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/_list.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