wco_models 3.1.0.119 → 3.1.0.121

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84a55005e82008356086a46abe9724464700fd8da3deec33ce95c037b23dbfb1
-  data.tar.gz: 27deb4e92af7e8b2290e31e9ddeb49b7c49d12a5ec921e3c59bee4d5300a80c1
+  metadata.gz: 5ce1ab3e778ce161e0d3d32a2d946e8dcc53f2e5a43635927f0924a1ec36d8f5
+  data.tar.gz: 49266cc292198d736cbfa903fdf84952eb5a415733d9c64ea37d2eb8fe3a699a
 SHA512:
-  metadata.gz: 86eaa4a03449ff4fe29b2400a44e49f3ee32579f218a9f9792347f95fcafa7cf73bbd1f6aa82cef7e6925bf2b9189c16d52f357b653ab75b89777b8590733d91
-  data.tar.gz: c92ab51c0c823c44ff2f6e632bcb029d68478b1116c80c63650343656fa8b114ffd13260eb57e45c2606a7d6a33497a54ac47eff472e70757d094a2ef61cfc78
+  metadata.gz: 1b4b3d211b5bd2d3c0736a10a288c25caa093fbd17400de58e5b368565fa8b533e512ba6b2b8801709b558d72c773efac365634465a04b1be480b7c1caced67f
+  data.tar.gz: 07e425171c41bf69498dcfec734279ddbfbf660ee0602f58989dbb80c862d3019bce1c0f575c87a1dbc10e8a712813d183e6efe722298986c20b10a2314a9a0d

data/app/mailers/wco_email/application_mailer.rb

@@ -56,7 +56,7 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
     mail( from:    @ctx.from_email,
           to:      @ctx.to_email,
           cc:      @ctx.cc,
-          bcc:     "poxlovi+sent@gmail.com",
+          bcc:     "infostreamer+sent@yahoo.com",
           subject: ERB.new( @ctx.subject ).result( @ctx.get_binding ),
           body:    rendered_str,
           content_type: "text/html" )

data/app/models/wco_email/conversation.rb

@@ -26,14 +26,15 @@ class WcoEmail::Conversation
   field :preview, default: ''
 
   has_many :messages,             class_name: '::WcoEmail::Message'
-  # default_scope ->{ includes(:messages) }
 
   has_and_belongs_to_many :tags,  class_name: 'Wco::Tag', index: true
   has_and_belongs_to_many :leads, class_name: 'Wco::Lead', index: true
 
   belongs_to :filter, class_name: 'WcoEmail::EmailFilter', inverse_of: :conversations, optional: true
 
-
+  def cache_key
+    "#{self.class.name} #{id.to_s} #{updated_at}"
+  end
 
   def to_s
     "#{subject} (#{messages.length})"

data/app/models/wco_email/message.rb

@@ -26,8 +26,10 @@ class WcoEmail::Message
   field :subject
 
   field :part_html
+
   field :read_at, type: DateTime
   index({ read_at: -1 })
+  scope :unread, ->{ where( read_at: nil ) }
 
   def part_html_sanitized
     doc = Nokogiri::HTML part_html
@@ -235,7 +237,7 @@ class WcoEmail::Message
     end
   end
 
-  scope :unread, ->{ where( read_at: nil ) }
+
 
 end
 ::Msg = WcoEmail::Message

data/app/views/wco/tags/_chips.haml

@@ -0,0 +1,6 @@
+
+- cache cache_key do
+  .tags--chips
+    - tags.each do |tag|
+      .mb-1
+        .Chip{ data: { tag: { id: tag.id.to_s } } }= tag.slug

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

@@ -27,20 +27,21 @@
           - else
             = link_to conv.subject, wco_email.conversation_path(conv)
           <b>#{conv.messages.unread.length}</b> (#{conv.messages.length})
-          - conv.messages.unread.each do |msg|
-            .border-bottom
-              .gray= msg.preview_str
-              = render '/wco_email/contexts/form_reply_mini', 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 })
-          - if conv.messages.unread.blank?
-            - msg = conv.messages.last
-            .border-bottom
-              .gray= msg.preview_str
-              = render '/wco_email/contexts/form_reply_mini', 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 })
+
+          .gray= conv.preview
+
+          -# - conv.messages.unread.each do |msg|
+          -#   .border-bottom
+          -#     .gray= msg.preview_str
+          -#     = render '/wco_email/contexts/form_reply_mini', 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 })
+          -# - if conv.messages.unread.blank?
+          -#   - msg = conv.messages.last
+          -#   .border-bottom
+          -#     .gray= msg.preview_str
+          -#     = render '/wco_email/contexts/form_reply_mini', 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 })
 
         %td.tags.mini
-          - conv.tags.each do |tag|
-            .mb-1
-              .Chip= tag.slug
+          = render '/wco/tags/chips', tags: conv.tags, cache_key: conv.cache_key
         %td.latest-at
           = pp_date conv.latest_at
           = pp_time conv.latest_at

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.119
+  version: 3.1.0.121
 platform: ruby
 authors:
 - Victor Pudeyev
@@ -583,6 +583,7 @@ files:
 - app/views/wco/sites/edit.haml
 - app/views/wco/sites/index.haml
 - app/views/wco/sites/new.haml
+- app/views/wco/tags/_chips.haml
 - app/views/wco/tags/_form.haml
 - app/views/wco/tags/_header.haml
 - app/views/wco/tags/_index.haml