wco_email 0.1.1.80 → 0.1.1.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c75364c487acb06734974d75ed8b1ec8e3c2f170e770b0c03f6c9589cf6ee4a
-  data.tar.gz: 9358b7cabd07fc5d0ccf675216fce4f1a1acf329d81eca41cd6845380a8d5445
+  metadata.gz: 25aa0ee19f524e32baf66b2d9c6a3d0d8309d4d3d152a2ce0b18ff312fc71507
+  data.tar.gz: 7cd5659cdf4fab3c45bf4afd6ebfa62b099874fe3edaefdf66baf8227e5aac05
 SHA512:
-  metadata.gz: e88f5abb24e1d5eb216db6596235cb230e179c2c3a6894f195c4fcf6924d11c69b657e5312f577c8f328bea99a1b1c1766fdfac2d8f68719b00738f31a782893
-  data.tar.gz: 9c8de2194ce44663dcc887b5cfa0ce3d943adb29146adbd6d43619a3ce76ebcf10cbc71d17cd3de913087f65577f189cf016bf234eba86520d77c01c126c6605
+  metadata.gz: 8e78e8dda9333d121c654eac15815c4da7d5187300a36a8753391bc2fad347fb067daa7bfa8e02d2d5adf6461e17e732f15fadb0085163143692794c8e2521c0
+  data.tar.gz: b9891c94d3cc5ec4fae1527d9dab6191301c7b203009ac25195ec429059a876b0ac6518caec9fdbc8937badcddd1ff6688047ca8cf652f9c9ff08f876ff3f57e

data/app/controllers/wco_email/api/conversations_controller.rb

@@ -0,0 +1,10 @@
+
+class WcoEmail::Api::ConversationsController < WcoEmail::ApiController
+
+  def index
+    authorize! :index, WcoEmail::Conversation
+    @conversations, @messages, @tag = WcoEmail::Conversation.load_conversations_messages_tag_by_params_and_profile( params, current_profile )
+  end
+
+end
+

data/app/controllers/wco_email/api_controller.rb

@@ -30,6 +30,10 @@ class WcoEmail::ApiController < ActionController::Base
     end
   end
 
+  def current_profile
+    Wco::Profile.find_by email: current_user.email
+  end
+
   def decode_jwt
     if Rails.env.test?
       sign_in User.find_by({ email: 'victor@wasya.co' })

data/app/controllers/wco_email/conversations_controller.rb

@@ -29,44 +29,7 @@ class WcoEmail::ConversationsController < WcoEmail::ApplicationController
 
   def index
     authorize! :index, WcoEmail::Conversation
-    @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_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
+    @conversations, @messages, @tag = WcoEmail::Conversation.load_conversations_messages_tag_by_params_and_profile( params, current_profile )
   end
 
   ## merge conv1 into conv2, and delete conv1

data/app/controllers/wco_email/email_filters_controller.rb

@@ -34,7 +34,14 @@ class WcoEmail::EmailFiltersController < WcoEmail::ApplicationController
   def index
     authorize! :index, WcoEmail::EmailFilter.new
     @email_filter  = WcoEmail::EmailFilter.new
-    @email_filters = WcoEmail::EmailFilter.all.includes( :email_template, :conversations )
+    @email_filters = WcoEmail::EmailFilter.all().includes( :email_template, :conversations )
+
+    if params[:q]
+      @email_filters = @email_filters.where( from_exact: /#{params[:q]}/i )
+    end
+
+    @email_filters = @email_filters.page( params[WcoEmail::EmailFilter::PAGE_PARAM_NAME]
+      ).per( current_profile.per_page )
   end
 
   def new

data/app/views/wco_email/api/conversations/index.json.jbuilder

@@ -0,0 +1,4 @@
+
+json.conversations @conversations
+json.messages @messages
+json.tag @tag

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

@@ -12,8 +12,8 @@
     = render 'form', email_filter: @email_filter
   %hr
 
-  -# = paginate @email_filters, param_name: WcoEmail::EmailFilter::PAGE_PARAM_NAME, views_prefix: 'wco'
-  %table.bordered.data-table
+  = paginate @email_filters, param_name: WcoEmail::EmailFilter::PAGE_PARAM_NAME, views_prefix: 'wco'
+  %table.bordered
     %thead
       %tr
         %th  
@@ -64,6 +64,6 @@
           - if ef.kind == EF::KIND_REMOVE_TAG
             .a <b>#{EF::KIND_REMOVE_TAG}:</b> #{ef.tag&.slug}
 
-  -# = paginate @email_filters, param_name: WcoEmail::EmailFilter::PAGE_PARAM_NAME, views_prefix: 'wco'
+  = paginate @email_filters, param_name: WcoEmail::EmailFilter::PAGE_PARAM_NAME, views_prefix: 'wco'
 
 

data/config/routes.rb

@@ -7,6 +7,8 @@ WcoEmail::Engine.routes.draw do
   get 'tinymce',   to: 'application#tinymce', as: :application_tinymce
 
   get 'api/contexts/summary', to: '/wco_email/api/contexts#summary'
+  get 'api/conversations', to: '/wco_email/api/conversations#index'
+  get 'api/tags/:tagname/conversations', to: '/wco_email/api/conversations#index'
 
   get  'conversations/in/:tagname',         to: '/wco_email/conversations#index', as: :conversations_in
   get  'conversations/not-in/:tagname_not', to: '/wco_email/conversations#index', as: :conversations_not_in

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.80
+  version: 0.1.1.82
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-24 00:00:00.000000000 Z
+date: 2024-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -310,6 +310,7 @@ files:
 - app/assets/stylesheets/wco_email/messages.scss
 - app/assets/stylesheets/wco_email/tags.scss
 - app/controllers/wco_email/api/contexts_controller.rb
+- app/controllers/wco_email/api/conversations_controller.rb
 - app/controllers/wco_email/api_controller.rb
 - app/controllers/wco_email/application_controller.rb
 - app/controllers/wco_email/contexts_controller.rb
@@ -368,6 +369,7 @@ files:
 - app/views/wco_email/_main_header.haml
 - app/views/wco_email/_sidebar.haml
 - app/views/wco_email/api/contexts/summary.json.jbuilder
+- app/views/wco_email/api/conversations/index.json.jbuilder
 - app/views/wco_email/contexts/_form.haml
 - app/views/wco_email/contexts/_form_reply.haml
 - app/views/wco_email/contexts/_header.haml