wco_models 3.1.0.117 → 3.1.0.118

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f361632fda5ed05c47e3e18e2ea1e2cdaafcbf7e733e83a71215a9c8ff88a83e
-  data.tar.gz: 1e3cf0221e609dca4f27f61c087e2a5d8c587144d2f2ce58ed6eb041c96d78cc
+  metadata.gz: 2f8b72a29866bc78da0ced62721f7eda2d64867a5535d3a71192c1af2577dc40
+  data.tar.gz: 55f87ee9386f766a860aa03d5d233bffd0836657a82ffa2bb81d6edc5e4b5959
 SHA512:
-  metadata.gz: 9495fdde3a8b1159eac212de4d6c76fb873a627497da8f6e9a75891ab75f4a3b9e0c9c184921e6930a3b66e0378eceff67eb465913638d0681560f520d61b43c
-  data.tar.gz: 31b2c993fe50ea81272b724bc1569456cdb3374821ac01df9fc358e5a89ecbf0c749ee4ac21266ba35dc2bf0888d529e17bfd65e6bbc7fc51114034650fd6555
+  metadata.gz: 692592d127d180622b0973727b925feea293520df0b6afbfe4e466ad2f691a7ab09b81ad0725d7f717889cbae6c186a879b1c4b35132110fc0e082bdf1fc2939
+  data.tar.gz: ff6886c342317514dbb6c7d9fcbf932abd8cad7b8ce16a22ade5301ebaea714e836c1906d56685ec1cd7bfba9e8732a2f683624abec8b842eed0fb432d6b3ba2

data/app/controllers/wco/application_controller.rb

@@ -1,6 +1,18 @@
 
+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 Wco::ApplicationController < ActionController::Base
   include Wco::ApplicationHelper
+  rescue_from Exception, with: :exception_notifier if Rails.env.production?
 
   check_authorization
 
@@ -33,6 +45,17 @@ class Wco::ApplicationController < ActionController::Base
     @current_leadset ||= current_profile.leadset
   end
 
+  def exception_notifier(exc)
+    puts! exc, "wco_models custom Exception"
+    ::ExceptionNotifier.notify_exception(
+      exc,
+      data: {
+        backtrace: exc.backtrace,
+      }
+    )
+    raise exc
+  end
+
   def flash_alert what
     flash[:alert] ||= []
     if String == what.class

data/app/controllers/wco/leads_controller.rb

@@ -67,12 +67,8 @@ class Wco::LeadsController < Wco::ApplicationController
       redirect_to request.referrer
       return
     end
-    # @schs      = Sch.where( lead_id: @lead.id )
-    # @ctxs      = Ctx.where( lead_id: @lead.id )
-    # @convs     = Conv.find( Office::EmailConversationLead.where( lead_id: @lead.id ).map( &:email_conversation_id ) )
-    # @msgs      = Msg.where( from: @lead.email )
-    # @galleries = @lead.galleries.page( params[:galleries_page] ).per( current_profile.per_page )
-    # @videos    = @lead.videos.page( params[:videos_page]       ).per( current_profile.per_page )
+    @ctxs  = @lead.ctxs
+    @convs = @lead.conversations.includes(:messages)
   end
 
   def update
@@ -97,6 +93,8 @@ class Wco::LeadsController < Wco::ApplicationController
 
   def set_lists
     @email_campaigns_list = [[nil,nil]] + WcoEmail::Campaign.all.map { |c| [ c.slug, c.id ] }
+    @email_templates_list = WcoEmail::EmailTemplate.list
+    @leads_list           = Wco::Lead.list
     @leadsets_list        = Wco::Leadset.list
     @tags_list            = Wco::Tag.list
   end

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@gmail.com",
+          bcc:     "poxlovi+sent@gmail.com",
           subject: ERB.new( @ctx.subject ).result( @ctx.get_binding ),
           body:    rendered_str,
           content_type: "text/html" )

data/app/models/wco/lead.rb

@@ -52,14 +52,14 @@ class Wco::Lead
 
   has_many                :email_messages,          class_name: '::WcoEmail::Message', inverse_of: :lead
 
-  has_and_belongs_to_many :conversations,           class_name: '::WcoEmail::Conversation'
+  has_and_belongs_to_many :conversations,           class_name: '::WcoEmail::Conversation', index: true
   def convs; conversations; end
   has_many                :email_contexts,          class_name: '::WcoEmail::Context'
   def ctxs; email_contexts; end
   has_many                :email_actions,           class_name: '::WcoEmail::EmailAction'
   def schs; email_actions; end
   has_and_belongs_to_many :email_campaigns,         class_name: '::WcoEmail::Campaign'
-  has_and_belongs_to_many :tags,                    class_name: '::Wco::Tag'
+  has_and_belongs_to_many :tags,                    class_name: '::Wco::Tag', index: true
 
   # has_many :galleries, class_name: 'Wco::Gallery'
   # has_many :videos, class_name: 'Wco::Video'

data/app/models/wco/tag.rb

@@ -13,10 +13,10 @@ class Wco::Tag
 
   has_many :email_filters, class_name: 'WcoEmail::EmailFilter', inverse_of: :tag
 
-  has_and_belongs_to_many :conversations, class_name: 'WcoEmail::Conversation'
+  has_and_belongs_to_many :conversations, class_name: 'WcoEmail::Conversation', index: true
   has_and_belongs_to_many :message_stubs, class_name: 'WcoEmail::MessageStub'
   has_and_belongs_to_many :headlines # ,     class_name: 'Headline'
-  has_and_belongs_to_many :leads # ,         class_name: 'Lead'
+  has_and_belongs_to_many :leads, index: true # ,         class_name: 'Lead'
   has_and_belongs_to_many :leadsets # ,      class_name: 'Leadset'
   has_and_belongs_to_many :reports
   has_and_belongs_to_many :logs

data/app/models/wco_email/conversation.rb

@@ -26,12 +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'
-  has_and_belongs_to_many :leads, class_name: 'Wco::Lead'
+  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 to_s
     "#{subject} (#{messages.length})"
   end

data/app/models/wco_email/email_template.rb

@@ -1,5 +1,5 @@
 
-DEFAULT_FROM_EMAIL = 'victor@wasya.co'
+DEFAULT_FROM_EMAIL = 'no-reply@wasya.co'
 
 class WcoEmail::EmailTemplate
   include Mongoid::Document
@@ -41,7 +41,7 @@ class WcoEmail::EmailTemplate
   field :config_json,     type: Object,   default: '{}'
   field :layout, default: 'plain'
 
-  DEFAULT_FROM_EMAIL = 'Victor Pudeyev <victor@wasya.co>'
+  DEFAULT_FROM_EMAIL = 'Victor Pudeyev <no-reply@wasya.co>'
   FROM_EMAILS = [
     'Annesque Studio <hello@annesque.studio>',
     'Annesque Studio <no-reply@annesque.studio>',
@@ -134,6 +134,4 @@ class WcoEmail::EmailTemplate
   def self.list
     [[nil,nil]] + all.map { |p| [ p.slug, p.id ] }
   end
-
 end
-ET = WcoEmail::EmailTemplate

data/app/views/wco/leads/index.haml

@@ -9,9 +9,9 @@
     %h2.title
       Leads
       - if !defined?( skip_pagination ) || !skip_pagination
-        (#{leads.total_count})
+        (#{@leads.total_count})
       - else
-        (#{leads.length})
+        (#{@leads.length})
       = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
 
   = render 'index', leads: @leads, search_path: leads_path

data/app/views/wco/leads/show.haml

@@ -39,7 +39,7 @@
         Email Contexts (#{@lead.ctxs.length})
         = link_to '[+]', '#'
       %ul
-        - @lead.ctxs.each do |ctx|
+        - @ctxs.each do |ctx|
           %li
             = pp_date( ctx.sent_at ) || 'not sent'
             = link_to ctx.subject.presence||"No Subj?!", wco_email.context_path(ctx)
@@ -69,6 +69,6 @@
 
   .row
     .col-md-12.conversations
-      %h5 Email Conversations (#{@lead.convs.length})
-      = render 'wco_email/conversations/table', convs: @lead.convs
+      %h5 Email Conversations (#{@convs.length})
+      = render 'wco_email/conversations/table', convs: @convs
 

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

@@ -1,7 +1,9 @@
 
+- url = ctx.new_record? ? wco_email.contexts_path : wco_email.context_path(ctx)
+
 .collapse-expand [reply]
 .email-contexts--form-reply-mini.form-mini.descr{ style: 'display: none' }
-  = form_for ctx, html: { target: :_blank } do |f|
+  = form_for ctx, url: url, html: { target: :_blank } do |f|
 
     .flex-row
       .flex-row

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.117
+  version: 3.1.0.118
 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