wco_email 0.1.1.81 → 0.1.1.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb4cda304553c3ccdc232709927e68ce17be6511d0bb26df1fa7880f8a4974b8
-  data.tar.gz: 9de4dd2f1c693a4cfe1e814d6925cb496c6edc3e253561a61411ba0ed9bf3d69
+  metadata.gz: 719582a97ebd0fd983baed326967e48df5c08662ab874f95ec29bb3c54f8e336
+  data.tar.gz: 49e79e9b494639ebe800d3fc23913d0d3d8629972b7a5e5bffd1ef18400b1849
 SHA512:
-  metadata.gz: 20216f0274fbce9ffb1fcdc554db12b9034e9e3f0c74a83f6da2d1872504e9ab9c2f8de6077cbd997bb9230b94d0dee40f643cb281c1283ee045fb7eaa801279
-  data.tar.gz: 283b1a319bec4a25a2642c3cbb73a60d0b383287cdfe41cf32974fa41b5d5a6a35cb02b4f4982fee7eeaa9e4e4f793773e9f36bbbfe2adb194d5e76ac8419a78
+  metadata.gz: ce5caa2b693a76232ba3da967722e32bbfbc7ec974365dc813d3e0bf3ce200cf4f55788c637fc3c702515f34fe0d72ef76a9528a86acc8d22375525e529f0676
+  data.tar.gz: af953710ceb0829f19d0d2200ae33f717405ab997e082bf04b97ec503d026d0ee80a3f79ffe88d8721262e07e77360577c34a869b66ba7e0db96cc84c6a97bee

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/contexts_controller.rb

@@ -46,23 +46,24 @@ class WcoEmail::ContextsController < WcoEmail::ApplicationController
 
   def index
     authorize! :index, WcoEmail::Context
-    @ctxs = WcoEmail::Context.where(
-      :send_at.ne => nil,
-      sent_at:       nil,
-    ).order_by( sent_at: :desc, send_at: :desc
-    ).page( params[:ctxs_page]
-    ).per( current_profile.per_page )
-
+    @ctxs = WcoEmail::Context.all
     if params[:lead_id]
       @lead = Lead.find params[:lead_id]
       @ctxs = @ctxs.where( lead_id: @lead.id )
+    end
+
+    if 'true' == params[:sent]
+      @ctxs = @ctxs.where( :sent_at.ne => nil )
+    elsif 'false' == params[:sent]
+      @ctxs = @ctxs.where( sent_at: nil )
     else
-      if my_truthy? params[:sent]
-        @ctxs = @ctxs.or({ :sent_at.ne => nil }, { :unsubscribed_at.ne => nil })
-      else
-        @ctxs = @ctxs.where( sent_at: nil, unsubscribed_at: nil )
-      end
+      ## default, show notsent.
+      @ctxs = @ctxs.where( :sent_at.ne => nil )
     end
+
+    @ctxs = @ctxs.order_by( sent_at: :desc, send_at: :desc
+      ).page( params[:ctxs_page]
+      ).per( current_profile.per_page )
   end
 
   def new

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/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/contexts/_header.haml

@@ -2,16 +2,11 @@
 - ctxs = @ctxs || WcoEmail::Context.all
 
 .a
-  = link_to contexts_path({ sent: false }) do
-    Email Contexts (#{ctxs.length})
-    - if @lead
-      For lead #{@lead.email}
-- if my_truthy? params[:sent]
-  = link_to '[notsent]', contexts_path({ sent: false })
-  <b>sent</b>
-- else
-  <b>notsent</b>
-  = link_to '[sent]', contexts_path({ sent: true })
+  Email Contexts (#{ctxs.length})
+  - if @lead
+    For lead #{@lead.email}
+  = link_to '[notsent]', contexts_path({ sent: false }), class: "#{'false' == params[:sent] ? 'active' : ''}"
+  = link_to '[sent]', contexts_path({ sent: true }), class: "#{'true' == params[:sent] ? 'active' : ''}"
 = form_tag contexts_path, method: :get do
   = text_field_tag :q
 = link_to '[+]', new_context_path

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

@@ -7,7 +7,7 @@
   .W0
     = render 'wco/paginate', resource: @ctxs, param_name: :ctxs_page, views_prefix: :wco
 
-    %table.bordered.data-table
+    %table.bordered
       %thead
         %tr
           %th.actions
@@ -39,11 +39,13 @@
                 = ctx.subject ? ctx.subject : "t| #{ctx.tmpl.subject}"
             %td= ctx.email_template.slug
             %td.send_at.padded
-              .datetime
+              .datetime.p-1
                 .date= pp_date ctx.send_at
                 .time= pp_time ctx.send_at
             %td
-              .datetime.padded= pp_date ctx.sent_at
+              .datetime.p-1
+                .date= pp_date ctx.sent_at
+                .time= pp_time ctx.sent_at
             %td
               .datetime.padded= pp_date ctx.unsubscribed_at
 

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.81
+  version: 0.1.1.83
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-29 00:00:00.000000000 Z
+date: 2024-09-17 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