wco_email 0.1.1.56 → 0.1.1.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dacc43b17405240a295645fd09cf8c7b2a6dddf02d6b426515456b6842c9000b
-  data.tar.gz: fcc3e0d85e4af73a72e61b7c813bef7ca5679c5ad7775fbdf76b209dfa37ccd0
+  metadata.gz: 067ceadf61d8c83f7357fa0e64851fb56633e41edab0e3e25f3ad2eea7120e36
+  data.tar.gz: 47d9f2042d9fe87c10adba5554d0688857f60f152286e9d90766c3416f1b0b55
 SHA512:
-  metadata.gz: 5982f30ee24dba548600ab58a16f462ed90adece8e98c33a18c2966e7e7d1a68d139ca9ac278d5ee64d4ac8e6e6baef9a841a6982d8a26435e1626932379143b
-  data.tar.gz: d279db94f758a39e160e3ee61c29cfe8f50f86d2bb2591cdfe9985561f913db10a68975c8fca25bed6024891b8e5b6f9b2a43b24e94609ee7944394abad9d4db
+  metadata.gz: 9b8beec1612551154590926440f93a3a7a333b7762ff331d335370273b95d83439eca10847140e6632dbb729122da928e408d2f948831881e7396b3c40c86322
+  data.tar.gz: 26645d72c64b9bbf8a76c0b4836beb895b514a88f44aef695a0f4c77ebe97e4d54edfbc1c9b8cfa1cd2f33d80eb04b6d70a5d83ef85eb3cda9b61e093bb83735

data/app/controllers/wco_email/application_controller.rb

@@ -1,15 +1,4 @@
 
-EC   ||= WcoEmail::Conversation
-EF   ||= WcoEmail::EmailFilter
-EM   ||= WcoEmail::Message
-ET   ||= WcoEmail::EmailTemplate
-MS   ||= WcoEmail::MessageStub
-EMS  ||= MS
-OA   ||= Wco::OfficeAction
-OAT  ||= Wco::OfficeActionTemplate
-OATT ||= Wco::OfficeActionTemplateTie
-Sch  ||= WcoEmail::EmailAction
-
 class WcoEmail::ApplicationController < Wco::ApplicationController
 
   layout 'wco_email/application'

data/app/controllers/wco_email/conversations_controller.rb

@@ -52,11 +52,21 @@ class WcoEmail::ConversationsController < WcoEmail::ApplicationController
       @conversations = @conversations.where( lead_ids: params[:lead_id] )
     end
 
-    @conversations = @conversations.order_by( latest_at: :desc
-      ).includes( :leads, :messages
-      ).page( params[:conv_page]
-      ).per( current_profile.per_page
-      )
+    @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_hash = {}
+    messages = WcoEmail::Message.where(
+      :conversation_id.in => conversation_ids,
+      read_at: nil,
+    )
+    messages.map do |msg|
+      @messages_hash[msg.id.to_s] = msg
+    end
   end
 
   ## merge conv1 into conv2, and delete conv1
@@ -102,15 +112,15 @@ class WcoEmail::ConversationsController < WcoEmail::ApplicationController
 
     @conversation.messages.unread.update_all({ read_at: Time.now })
 
-    @other_convs = WcoEmail::Message.where( :message_id.in => @messages.map( &:in_reply_to_id )
-      ).where( :conversation_id.ne => @conversation.id
-      ).map( &:conversation_id ).uniq
-    other_convs_by_subj = WcoEmail::Conversation.where( subject: @conversation.subject
-      ).where( :conversation_id.ne => @conversation.id
-      ).map( &:id )
-    if @other_convs.present?
-      @other_convs = WcoEmail::Conversation.find( @other_convs + other_convs_by_subj )
-    end
+    # @other_convs = WcoEmail::Message.where( :message_id.in => @messages.map( &:in_reply_to_id )
+    #   ).where( :conversation_id.ne => @conversation.id
+    #   ).map( &:conversation_id ).uniq
+    # other_convs_by_subj = WcoEmail::Conversation.where( subject: @conversation.subject
+    #   ).where( :conversation_id.ne => @conversation.id
+    #   ).map( &:id )
+    # if @other_convs.present? || other_convs_by_subj.present?
+    #   @other_convs = WcoEmail::Conversation.find( @other_convs + other_convs_by_subj )
+    # end
   end
 
   def update

data/app/views/wco_email/_sidebar.haml

@@ -4,8 +4,7 @@
     - @tags.each do |tag|
       %li
         = link_to tag.slug, conversations_in_path( tag.slug )
-        -# (#{tag.conversations.unread.length}, #{tag.conversations.length})
-        (#{tag.conversations.unread.length})
+        <b>#{tag.conversations.unread.length}</b>
         (#{tag.conversations.length})
         = link_to "not", conversations_not_in_path( tag.slug )
 

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

@@ -15,5 +15,4 @@
 
   = render '/wco/paginate', resource: @conversations, param_name: :conv_page
   = render '/wco_email/conversations/table', convs: @conversations
-
   = render '/wco/paginate', resource: @conversations, param_name: :conv_page

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

@@ -13,14 +13,13 @@
     - @conversation.leads.each do |lead|
       .Chip= link_to lead.email, wco.lead_path( lead )
 
-
-  - if @other_convs.present?
-    - @other_convs.each do |conv|
-      .d-flex
-        = button_to "Merge", merge_conversations_path( @conversation, conv ), data: { confirm: 'Are you sure?' }
-        = conv.subject
-        (#{conv.messages.length})
-        %span.gray.mini= conv.id
+  -# - if @other_convs.present?
+  -#   - @other_convs.each do |conv|
+  -#     .d-flex
+  -#       = button_to "Merge", merge_conversations_path( @conversation, conv ), data: { confirm: 'Are you sure?' }
+  -#       = conv.subject
+  -#       (#{conv.messages.length})
+  -#       %span.gray.mini= conv.id
 
 
   %ul.m-0.p-0

metadata

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