wco_email 0.1.1.74 → 0.1.1.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eadb96571c35fc50347f3428795c5d34627b9b8475411a3854b5d06d5558e27e
-  data.tar.gz: 05eece40857e365fdc985dc2a4e58cd8eb736ec7cb955d8967567446ac13c910
+  metadata.gz: 5020bf6b347667ed27584fb369875c2f767f8cd623b713b10a2c20de7904b8ca
+  data.tar.gz: 8dfaa34af1c86637f08df5eaa79d8c7c22ce348fc4c0a6e8779aaa4452628fed
 SHA512:
-  metadata.gz: 187a5b65817946e8cf779ef9e286529913fc96fefe6b9a97d51d49cba77e4f8a645201321bd38732fd7cdf2dc574a1dc5e1bfc00bbbad1c99fca5a76f1ebc227
-  data.tar.gz: 8e12a1b02d952a9c0a86781c3e0ba91a5e9d8a15f43c9ed7b816c3b3c2522346777031835fc81cb1dccf891455a4644d1360e5284d0fd57a66371ba5fd754d4e
+  metadata.gz: '0905199d8188ca35b6323dad6ee02484a75c2b49e41fe5f08c32393e2ea820bf34bb59098f412ba2dfb456a558398c90831efee61c1ecea415403fac23c79c4f'
+  data.tar.gz: 4f0b75eb2cd293c009e99a474db98d47d9ed27bbc5176ef643d40ad20797d551f52ccf2e7e15a415f0cdf7e53cb284998a986f5c5fc7b9cadbf6415a247e5bf3

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

@@ -68,6 +68,42 @@ $(".add-tag-btn").click(function(e) {
 
 })
 
+
+$(".office-action-templates-perform-btn").click(function(e) {
+  if ( !confirm('Are you sure?') ) { return; }
+
+  const jwt_token = $("#Config").data('jwt-token')
+  const action_path = $(this).data('url')
+  const oat_id = $("select[name='office_action_template']").val()
+  const out = []
+
+  $( $("input[type='checkbox'].i-sel:checked") ).each( idx => {
+    let val = $($("input[type='checkbox'].i-sel:checked")[idx]).val()
+    out.push(val)
+  })
+
+  let data = {
+    conversation_ids: out,
+    jwt_token: jwt_token,
+    id: oat_id,
+  }
+  $.ajax({
+    url: action_path,
+    type: 'POST',
+    data: data,
+    success: e => {
+      logg((e||{}).responseText, 'Ok')
+      location.reload()
+    },
+    error: e => {
+      logg((e||{}).responseText, 'Err')
+      location.reload()
+    },
+  })
+
+})
+
+
 $(".remove-tag-btn").click(function(e) {
   if ( !confirm('Are you sure?') ) { return; }
 

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

@@ -4,8 +4,13 @@
 **/
 
 .application--sidebar {
+  // border-right: 1px solid red;
   min-width: 200px;
-  border-right: 1px solid red;
+
+}
+
+.btn {
+  border: 2px solid gray;
 }
 
 iframe.email-template-iframe {

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

@@ -18,3 +18,13 @@ th.select-all {
 th.tags {
   width: 200px;
 }
+
+.conversations--tags-actions {
+  display: flex;
+  align-items: baseline;
+
+  h5 {
+    font-size: 1em;
+    padding-right: 0.5em;
+  }
+}

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

@@ -0,0 +1,6 @@
+
+ul.Logs {
+  > li {
+    margin-left: 0.4em;
+  }
+}

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

@@ -6,16 +6,21 @@
 }
 
 .Meta {
+  > ul {
+    list-style-type: none;
+  }
   ul {
     margin: 0;
     padding: 0;
-    list-style-type: none;
+  }
+}
 
-    li {
+.messages--meta {
+  > ul {
+    > li {
       border-left: 3px solid var(--wco-color-2);
       padding-left: 0.5em;
       margin-bottom: 0.5em;
     }
-
   }
 }

data/app/controllers/wco_email/conversations_controller.rb

@@ -152,9 +152,10 @@ class WcoEmail::ConversationsController < WcoEmail::ApplicationController
   end
 
   def set_lists
-    @tags       = Wco::Tag.all
     @email_templates_list = [ [nil, nil] ] + WcoEmail::EmailTemplate.all.map { |tmpl| [ tmpl.slug, tmpl.id ] }
     @leads_list = Wco::Lead.list
+    @office_action_templates_list = Wco::OfficeActionTemplate.list
+    @tags       = Wco::Tag.all
     @tags_list  = Wco::Tag.list
   end
 

data/app/controllers/wco_email/message_stubs_controller.rb

@@ -4,8 +4,20 @@ class WcoEmail::MessageStubsController < WcoEmail::ApplicationController
   def churn
     @stub = WcoEmail::MessageStub.find params[:id]
     authorize! :churn, @stub
-    WcoEmail::MessageIntakeJob.perform_async( @stub.id.to_s )
-    flash_notice "Schedueld to churn 1 stub."
+
+    # WcoEmail::MessageIntakeJob.perform_async( @stub.id.to_s )
+    begin
+      @stub.do_process
+    rescue => err
+      @stub.update({ status: WcoEmail::MessageStub::STATUS_FAILED })
+      puts! err, "WcoEmail::MessageIntakeJob error"
+      ::ExceptionNotifier.notify_exception(
+        err,
+        data: { stub: @stub }
+      )
+    end
+
+    flash_notice "Churned 1 stub."
     redirect_to request.referrer
   end
 

data/app/controllers/wco_email/messages_controller.rb

@@ -5,6 +5,17 @@ class WcoEmail::MessagesController < WcoEmail::ApplicationController
 
   def show
     @message = WcoEmail::Message.find params[:id]
+
+    @client ||= Aws::S3::Client.new({
+      region:            ::S3_CREDENTIALS[:region_ses],
+      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
 

data/app/views/wco_email/conversations/{_actions.haml → _tags_actions.haml}

@@ -1,6 +1,7 @@
 
 
-.bordered.inline-block.mb-2
+.conversations--tags-actions.bordered.inline-block.mb-2
+  %h5 Add/Remove Tag
   .d-inline-block
     = select_tag :emailtag, options_for_select(@tags_list), class: 'select2'
   = check_box_tag :is_move

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

@@ -3,6 +3,8 @@
   = render 'wco_email/sidebar'
 
 .conversations-index
+  = render '/wco_email/conversations/search'
+
   .header
     %h5.title
       - if @tag
@@ -10,8 +12,9 @@
       - if @tag_not
         Tag-not `#{@tag_not}`
       (#{@conversations.length})
-    = render '/wco_email/conversations/search'
-  = render '/wco_email/conversations/actions'
+
+  = render '/wco_email/conversations/tags_actions'
+  = render '/wco/office_actions/actions'
 
   = render '/wco/paginate', resource: @conversations, param_name: :conv_page
   = render '/wco_email/conversations/table', convs: @conversations

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

@@ -12,15 +12,12 @@
     %span.gray.mini= @conversation.id
 
   = render '/wco/tags/index_chips', tags: @conversation.tags
-
-  = render '/wco_email/conversations/actions'
-
-  .Leads.mb-2
-    .d-inline <b>Leads:</b>
-    - @conversation.leads.each do |lead|
-      .Chip= link_to lead.email, wco.lead_path( lead )
+  = render '/wco_email/conversations/tags_actions'
+  = render '/wco/leads/index_chips',    leads: @conversation.leads
+  = render '/wco/leadsets/index_chips', leadsets: @conversation.leadsets
 
   - if @other_convs.present?
+    %h5 Other convs:
     - @other_convs.each do |conv|
       .d-flex
         = button_to "Merge", merge_conversations_path( @conversation, conv ), data: { confirm: 'Are you sure?' }

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

@@ -1,15 +1,19 @@
 
-.d-inline-block.Meta
-  %i.fa.fa-compress.collapse-expand
+.d-inline-block
+  %i.fa.fa-compress.collapse-expand#messageMeta
     Meta
-  .messages--meta.flex-row{ style: 'display: none' }
+  .Meta.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}
+      %li
+        <b>logs:</b>
+        %ul.Logs
+          - message.logs.each do |log|
+            %li= log
     %ul
       %li
         <b>date:</b> #{message.date}
@@ -19,6 +23,10 @@
         <b>message_id:</b> #{message.message_id}
       %li
         <b>object_key:</b> #{message.object_key}
+      %li
+        <b>Stub:</b>
+        #{message.stub.id}
+        .d-inline-block= button_to 'reprocess', churn_message_stub_path(message.stub)
       %li <b>in_reply_to_id:</b> #{message.in_reply_to_id}
       %li
         <b>n_images:</b> #{message.photos.length}

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

@@ -1,5 +1,5 @@
 
-.messages-show
+.messages-show.maxwidth
   %h5
     Message
     <b>Subject:</b>
@@ -10,4 +10,8 @@
   %iframe.message-iframe{ src: message_iframe_path(@message) }
   = render '/wco_email/contexts/form_reply', lead_id: @message.lead_id, message: @message, ctx: WcoEmail::Context.new({ from_email: @message.to&.downcase, subject: @message.subject, email_template_id: ET.find_by( slug: 'blank').id })
 
+  = @message.inspect
+  %hr
+  %pre
+    = raw @the_mail.body.decoded
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.74
+  version: 0.1.1.76
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -306,6 +306,7 @@ files:
 - app/assets/stylesheets/wco_email/application.scss
 - app/assets/stylesheets/wco_email/contexts.scss
 - app/assets/stylesheets/wco_email/conversations.scss
+- app/assets/stylesheets/wco_email/logs.scss
 - app/assets/stylesheets/wco_email/messages.scss
 - app/assets/stylesheets/wco_email/tags.scss
 - app/controllers/wco_email/api_controller.rb
@@ -376,9 +377,9 @@ files:
 - app/views/wco_email/contexts/show_iframe.haml
 - app/views/wco_email/contexts/summary.csv.erb
 - app/views/wco_email/contexts/summary.haml
-- app/views/wco_email/conversations/_actions.haml
 - app/views/wco_email/conversations/_form.haml
 - app/views/wco_email/conversations/_search.haml
+- app/views/wco_email/conversations/_tags_actions.haml
 - app/views/wco_email/conversations/edit.haml
 - app/views/wco_email/conversations/index.haml
 - app/views/wco_email/conversations/show.haml