wco_models 3.1.0.175 → 3.1.0.177

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a05466d095355ec09936c5f72861b3292b272866d603196be5ace081f657c978
-  data.tar.gz: 00af6f41df7a96e17cab793b68b2fb5f4cedf6f84582c956ea1924ee3c0a42d6
+  metadata.gz: 4eaa4ae791b0efb894e267ee640a2559d8cf3a0aec9e9c2b46ef28d19610d069
+  data.tar.gz: aba7e8635f3edc53fdaea60ce8739e9488215bd702309a23b8f3cc69708e9dda
 SHA512:
-  metadata.gz: b5d501169a2186a206ce0ff1cad4875bf6fd0bf1bb3cd90aa1ee93c6f33f55e30f974c63a6a268c19f5237d464385098e18aa6c9adbd3b950d32551960c22403
-  data.tar.gz: e3095c492065d542c85b29c93e54bce2bd0b7d6d653c6adbed89e9f230a57254c8155f39a7daefcfc2bb594c2a3fab4fb5b65cb1cd705332ba35b2d9c26eb797
+  metadata.gz: e242a74a1154595834d349d86f4b0475219439ee17e9762a257c7f40fa8761fb61cc3ef73e164045d6b2b7a7525756ac67a1d0f266943eb4ed27292b489aecef
+  data.tar.gz: 665b22dbd49c9fa79d24e0f349a6a30f639bfd7dec0db48a3e69758ae0e0984e14ceada8d33c39c6fe5ec98156f9884bd336472e2163828b001d8e0731bf24a4

data/app/assets/stylesheets/wco/{utils.scss → main.scss}

@@ -166,6 +166,13 @@ textarea.monospace {
   margin: auto;
 }
 
+.main-header {
+  .active,
+  ._ {
+    border-bottom: 2px solid red;
+  }
+}
+
 .mini {
   font-size: 0.75em;
 }

data/app/mailers/wco_email/application_mailer.rb

@@ -71,7 +71,8 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
 
     @ctx.update({
       rendered_str: rendered_str,
-      subject: rendered_subject,
+      sent_at:      Time.now,
+      subject:      rendered_subject,
     })
 
     mail( from:    @ctx.from_email,

data/app/models/wco_email/conversation.rb

@@ -33,6 +33,48 @@ class WcoEmail::Conversation
 
   belongs_to :filter, class_name: 'WcoEmail::EmailFilter', inverse_of: :conversations, optional: true
 
+  def self.load_conversations_messages_tag_by_params_and_profile params, current_profile
+    @conversations = WcoEmail::Conversation.all
+
+    if params[:tagname]
+      @tag = Wco::Tag.find_by slug: params[:tagname]
+      @conversations = @conversations.where( :tag_ids.in => [ @tag.id ] )
+    end
+    if params[:tagname_not]
+      @tag_not = Wco::Tag.find_by slug: params[:tagname_not]
+      @conversations = @conversations.where( :tag_ids.nin => [ @tag_not.id ] )
+    end
+
+    if params[:subject].present?
+      @conversations = @conversations.where({ subject: /.*#{params[:subject]}.*/i })
+    end
+
+    if params[:from_email].present?
+      @conversations = @conversations.where({ from_emails: /.*#{params[:from_email]}.*/i })
+    end
+
+    if params[:lead_id].present?
+      @conversations = @conversations.where( lead_ids: params[:lead_id] )
+    end
+
+    @conversations = @conversations.where(
+      ).includes( :leads, :messages, :tags
+      ).order_by( latest_at: :desc
+      ).page( params[:conv_page] ).per( current_profile.per_page )
+
+    conversation_ids = @conversations.map &:id
+    messages = WcoEmail::Message.where(
+      :conversation_id.in => conversation_ids,
+      read_at: nil,
+    )
+    @messages_hash = {}
+    messages.map do |msg|
+      @messages_hash[msg.id.to_s] = msg
+    end
+
+    return [ @conversations, @messages_hash, @tag ]
+  end
+
   def cache_key
     "#{self.class.name} #{id.to_s} #{updated_at}"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.175
+  version: 3.1.0.177
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-24 00:00:00.000000000 Z
+date: 2024-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ahoy_matey
@@ -421,11 +421,11 @@ files:
 - app/assets/stylesheets/wco/conversations.scss
 - app/assets/stylesheets/wco/galleries.scss
 - app/assets/stylesheets/wco/leads_leadsets.scss
+- app/assets/stylesheets/wco/main.scss
 - app/assets/stylesheets/wco/office_action_templates.scss
 - app/assets/stylesheets/wco/pagination.scss
 - app/assets/stylesheets/wco/photos.scss
 - app/assets/stylesheets/wco/sitemaps.scss
-- app/assets/stylesheets/wco/utils.scss
 - app/assets/stylesheets/wco/videos.scss
 - app/controllers/wco/api/leads_controller.rb
 - app/controllers/wco/api/obfuscated_redirects_controller.rb