wco_email 0.1.1.52 → 0.1.1.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28a0e3f46a3cccd5b9607d7aae2cf8d921844838d900b8e47c84a5d721b0d2e3
-  data.tar.gz: e9243eb7d0d9c2435055ad3daf015e98c14989e45bd9aaf0f62dea339f31732e
+  metadata.gz: 0f6ede374892e4ee2d1d74b9493abbc3b723786f53da7e5009db344cb075f481
+  data.tar.gz: b5850a2cab796944d3beb0f5b654fd3fd6388868bc655464c90fcc892996d831
 SHA512:
-  metadata.gz: 33db1149aaf32bc64860eb202e42319291908d3b74cf53530d392cf061d6af88db55d3ca5dd3df4a6cdf85df13f984ea5e5d1122eac956634adea0e23ad03840
-  data.tar.gz: b40ea4db0555ec9717990ff0cdc1ffc297e3679cfc723b7cf21878cb1d286d818004c7de384df1c153ae6db1bc65f159dcb970ca4c9a18d0198654ab49f5f2d3
+  metadata.gz: ebc21b5cd1660e3132b27cb64ca994971cdd3b06beb5ea1ee5fef0b53e5afe1f40a3fe88c3699c57f4c29d0dba53e523a28eefc4dae707a72e352fa7b3c2a51c
+  data.tar.gz: 5147c26369314cf73e8085a2135fdd901e2b3975805d66500ecbadcc6c2ffb36c17f217b8dc43063720adbae17583dfa37294919e0b3f58e815f2459cc94e42a

data/app/assets/javascript/wco_email/application.js

@@ -5,6 +5,11 @@
 //= require ./conversations
 //
 
+function resizeIframe(obj) {
+  obj.style.height = '100px';
+  obj.style.height = obj.contentWindow.document.documentElement.scrollHeight + 10 + 'px';
+}
+
 $(function () {
 
 

data/app/assets/stylesheets/wco_email/application.scss

@@ -18,8 +18,8 @@ iframe.email-template-iframe {
 
 iframe.message-iframe {
   width: 100%;
-  height: 100%;
-  min-height: 80vh;
+  // height: 100%;
+  // min-height: 80vh;
 }
 
 

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

@@ -14,39 +14,6 @@
   = render '/wco_email/conversations/actions'
 
   = render '/wco/paginate', resource: @conversations, param_name: :conv_page
-  %table.bordered
-    %tr
-      %th.select-all.nosort
-        .a
-          = check_box_tag :select_all
-          .n-selected -
-      %th.leads leads
-      %th.subject subject, preview
-      %th.tags Tags
-      %th.latest-at latest_at
-    - @conversations.each_with_index do |conv, idx|
-      %tr
-        %td.select-all
-          .gray= idx+1
-          = check_box_tag 'conversation_ids[]', conv.id.to_s, nil, { class: 'i-sel' }
-        %td.leads.mini
-          -# - conv.from_emails.each do |from|
-          -#   = link_to from, wco.lead_path( from )
-          -# %hr
-          - conv.leads.each do |lead|
-            = link_to lead.email, wco.lead_path( lead )
-        %td.subject
-          - if conv.unread?
-            <b>#{link_to conv.subject, conversation_path(conv)}</b>
-          - else
-            = link_to conv.subject, conversation_path(conv)
-          <b>(#{conv.messages.length})</b>
-          %span.gray= conv.preview
-        %td.tags.mini
-          - conv.tags.each do |tag|
-            .mb-1
-              .Chip= tag.slug
-        %td.latest-at
-          = pp_date conv.latest_at
-          = pp_time conv.latest_at
+  = render '/wco_email/conversations/table', convs: @conversations
+
   = render '/wco/paginate', resource: @conversations, param_name: :conv_page

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

@@ -27,6 +27,9 @@
     - @conversation.messages.each do |msg|
       %li
         = render '/wco_email/messages/meta', message: msg
-        %iframe.message-iframe{ src: message_iframe_path(msg) }
+        = link_to '[expand]', message_iframe_path(msg, expand_history: true), target: "iframe_#{msg.id}"
+        = link_to '[collapse]', message_iframe_path(msg), target: "iframe_#{msg.id}"
+        %iframe.message-iframe{ src: message_iframe_path(msg), id: "iframe_#{msg.id}", name: "iframe_#{msg.id}", onload: "resizeIframe(this)" }
 
-        = render '/wco_email/contexts/form_reply', lead_id: msg.lead_id, message: msg, ctx: WcoEmail::Context.new({ from_email: msg.to&.downcase, subject: msg.subject, email_template_id: ET.find_by( slug: 'blank').id })
+  - msg = @conversation.messages.last
+  = render '/wco_email/contexts/form_reply', lead_id: msg.lead_id, message: msg, ctx: WcoEmail::Context.new({ from_email: msg.to&.downcase, subject: msg.subject, email_template_id: ET.find_by( slug: 'blank').id })

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

@@ -32,7 +32,7 @@
           = f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || email_filter.email_template_id ), {}, { class: 'select2' }
         .field
           = f.label :email_action_template
-          = f.select :email_action_template, options_for_select( @email_action_templates_list, selected: email_filter.email_action_template ), {}, class: 'select2'
+          = f.select :email_action_template, options_for_select( @email_action_templates_list, selected: email_filter.email_action_template_id ), {}, class: 'select2'
         .field
           = f.label :tag
           = f.select :tag, options_for_select( @tags_list, selected: email_filter.tag_id ), {}, class: 'select2'

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

@@ -1,32 +1,36 @@
 
-.messages--meta.flex-row
-  %ul
-    %li <b>froms:</b> #{message.froms}
-    %li <b>tos:</b> #{message.tos}
-    %li <b>ccs:</b> #{message.ccs}
-    %li <b>bccs:</b> #{message.bccs}
-    %li <b>logs:</b> #{message.logs}
-  %ul
-    %li
-      <b>date:</b> #{message.date}
-    %li
-      <b>id:</b> #{link_to message.id, message_path(message)}
-    %li
-      <b>message_id:</b> #{message.message_id}
-    %li
-      <b>object_key:</b> #{message.object_key}
-    %li <b>in_reply_to_id:</b> #{message.in_reply_to_id}
-    %li
-      <b>n_images:</b> #{message.photos.length}
-      %br
-      - message.photos.each do |photo|
-        = link_to photo.photo.url(:original), target: :_blank do
-          %span.bordered.p-0= image_tag( photo.photo.url(:mini) )
-          = photo.photo.original_filename
-    %li
-      <b>n_assets:</b> #{message.assets.length}
-      - if !message.assets.blank?
-        %ol
-          - message.assets.each do |asset|
-            %li
-              = link_to asset.filename, asset.object.url(:original), target: :_blank
+.d-inline-block
+  .collapse-expand{ id: "meta_#{message.id}" }
+    Meta
+  .messages--meta.flex-row{ style: 'display: none' }
+
+    %ul
+      %li <b>froms:</b> #{message.froms}
+      %li <b>tos:</b> #{message.tos}
+      %li <b>ccs:</b> #{message.ccs}
+      %li <b>bccs:</b> #{message.bccs}
+      %li <b>logs:</b> #{message.logs}
+    %ul
+      %li
+        <b>date:</b> #{message.date}
+      %li
+        <b>id:</b> #{link_to message.id, message_path(message)}
+      %li
+        <b>message_id:</b> #{message.message_id}
+      %li
+        <b>object_key:</b> #{message.object_key}
+      %li <b>in_reply_to_id:</b> #{message.in_reply_to_id}
+      %li
+        <b>n_images:</b> #{message.photos.length}
+        %br
+        - message.photos.each do |photo|
+          = link_to photo.photo.url(:original), target: :_blank do
+            %span.bordered.p-0= image_tag( photo.photo.url(:mini) )
+            = photo.photo.original_filename
+      %li
+        <b>n_assets:</b> #{message.assets.length}
+        - if !message.assets.blank?
+          %ol
+            - message.assets.each do |asset|
+              %li
+                = link_to asset.filename, asset.object.url(:original), target: :_blank

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

@@ -1,5 +1,14 @@
 
+- if params[:expand_history] == 'true'
+  -# ;
+- else
+  :css
+    blockquote {
+      display: none;
+    }
+
 
 = 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/lib/tasks/wco_email_tasks.rake

@@ -172,7 +172,6 @@ namespace :wco_email do
         unsub = WcoEmail::Unsubscribe.where({ lead_id: ctx.lead_id, template_id: ctx.email_template_id }).first
         if unsub
           puts! 'This user is unsubscribed; the context cannot be sent.' if DEBUG
-          # Office::AdminMessage.create({ message: "Lead `#{ctx.lead.full_name}` [mailto:#{ctx.lead.email}] has already unsubscribed from template `#{Ish::EmailTemplate.find( ctx.email_template_id ).slug}` ." })
           email_action_template_ids = WcoEmail::EmailActionTemplate.where({ email_template_id: ctx.email_template_id }).map(&:id)
           schs = WcoEmail::EmailAction.active.where({
             lead_id: ctx.lead_id,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.52
+  version: 0.1.1.54
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3