wco_email 0.1.1.27 → 0.1.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35252cf2e1f40bddca28aee1d91db68f7323f2f0285b316d0eb0a1c39f96eafd
-  data.tar.gz: 74864a8f2de923fa0bd533011e3e56cdf91fae8e6778dbce04f99e3e76996093
+  metadata.gz: e2500dced19f77d14d09ee053b480da60b57367f7886601335648755ee6dd469
+  data.tar.gz: 123bc96615a05149351d12ec506d942e0aa67f77ea60c9640f8999e778e294a4
 SHA512:
-  metadata.gz: 618f52745f4b92250b95bba5065ba945966db6a718a8fb09022b12b9c3def9213854c162805d35ed5efeb4b6eabf08dc88edecefb9b1a68b5124fa512ec7036d
-  data.tar.gz: 776427c271c8631acddaa491dee932a738b3344633a417cea00d2567774f534b472519c48a4b570b4d9660af122eaca64fa60ed805c452a0ecd9b3cd8539d2e9
+  metadata.gz: 212b7600cafb1edac351981ce893346c1aa249ebb6cbdd62398f37b33d2705f4d16be508fdaf91277ec5decf6a75f9fa1732a82c695017a10794ca1a1bd092df
+  data.tar.gz: 663ab4c1ea2b13a8ce5cab672823d7c206dd4ac80b76062420fe4e40ab6bfcebdd63afb8a0eb3437df5538bb47d48a4c735f2415533687c78e34acd8d485cf9a

data/app/assets/javascript/wco_email/conversations.js

@@ -101,6 +101,7 @@ $(".add-tag-btn").click(function(e) {
     },
     error: e => {
       logg((e||{}).responseText, 'Err')
+      location.reload()
     },
   })
 
@@ -133,6 +134,7 @@ $(".remove-tag-btn").click(function(e) {
     },
     error: e => {
       logg((e||{}).responseText, 'Err')
+      location.reload()
     },
   })
 

data/app/assets/stylesheets/wco_email/conversations.scss

@@ -14,3 +14,6 @@ th.select-all {
   }
 }
 
+th.tags {
+  width: 200px;
+}

data/app/controllers/wco_email/application_controller.rb

@@ -1,6 +1,6 @@
 
 class WcoEmail::ApplicationController < Wco::ApplicationController
-  before_action :set_lists
+  # before_action :set_lists
   layout 'wco_email/application'
 
 

data/app/controllers/wco_email/conversations_controller.rb

@@ -4,48 +4,35 @@ class WcoEmail::ConversationsController < WcoEmail::ApplicationController
   # layout 'wco_email/mailbox'
 
   before_action :set_lists
+  before_action :find_convs_tags, only: %i| addtag rmtag |
 
   ## many tags to many convs
   def addtag
     authorize! :addtag, WcoEmail::Conversation
-    # convs = WcoEmail::Conversation.where({ :id.in => params[:ids].split(",") })
-    convs = WcoEmail::Conversation.find( params[:ids] )
-    tags  = Wco::Tag.where({ :slug.in => params[:slug].split(",") })
-    if tags.blank?
-      tags  = Wco::Tag.where({ :id.in => params[:slug].split(",") })
-    end
+
     inbox = Wco::Tag.inbox
-    outs = convs.map do |conv|
-      conv.tags.push tags
+    outs = @convs.map do |conv|
+      conv.tags.push @tags
       conv.tags.delete( inbox ) if params[:is_move]
       conv.save
     end
     flash_notice "Outcomes: #{outs}"
-    redirect_to request.referrer || root_path
-  end
 
-  # def delete
-  #   authorize! :delete, WcoEmail::Conversation
-  #   convs = WcoEmail::Conversation.find params[:ids]
-  #   outs = convs.map do |conv|
-  #     conv.add_tag( WpTag::TRASH )
-  #     conv.remove_tag( WpTag::INBOX )
-  #   end
-  #   flash[:notice] = "outcome: #{outs}"
-  #   render json: { status: :ok }
-  # end
+    render json: { status: 'ok' }
+    # redirect_to request.referrer # || root_path
+  end
 
   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 ] )
+      @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 ] )
+      @tag_not = Wco::Tag.find_by slug: params[:tagname_not]
+      @conversations = @conversations.where( :tag_ids.nin => [ @tag_not.id ] )
     end
 
     if params[:subject].present?
@@ -84,15 +71,18 @@ class WcoEmail::ConversationsController < WcoEmail::ApplicationController
     redirect_to action: :show, id: conv2.id
   end
 
-  #
   def rmtag
     authorize! :addtag, WcoEmail::Conversation
-    convs = WcoEmail::Conversation.find params[:ids]
-    outs = convs.map do |conv|
-      conv.remove_tag( params[:emailtag] )
+
+    outs = @convs.map do |conv|
+      @tags.map do |tag|
+        conv.tags.delete( tag )
+      end
+      conv.save
     end
-    flash[:notice] = "outcome: #{outs}"
-    redirect_to request.referrer
+    flash_notice "Outcomes: #{outs}"
+    render json: { status: 'ok' }
+    # redirect_to request.referrer || root_path
   end
 
   def show
@@ -118,6 +108,14 @@ class WcoEmail::ConversationsController < WcoEmail::ApplicationController
   ##
   private
 
+  def find_convs_tags
+    @convs = WcoEmail::Conversation.find params[:ids]
+    @tags  = Wco::Tag.where({ :slug.in => params[:slug].split(",") })
+    if @tags.blank?
+      @tags  = Wco::Tag.where({ :id.in => params[:slug].split(",") })
+    end
+  end
+
   def set_lists
     @tags       = Wco::Tag.all
     @email_templates_list = [ [nil, nil] ] + WcoEmail::EmailTemplate.all.map { |tmpl| [ tmpl.slug, tmpl.id ] }
@@ -127,3 +125,5 @@ class WcoEmail::ConversationsController < WcoEmail::ApplicationController
 
 end
 
+
+

data/app/views/layouts/wco_email/application.haml

@@ -44,6 +44,9 @@
 
     = render "/wco/main_header"
     = render "/wco_email/main_header"
+
+
+    -# notice #{notice.inspect} alert #{alert.inspect}
     = render '/wco/alerts_notices' if notice || alert
     %hr
 

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

@@ -10,7 +10,8 @@
     %i.material-icons refresh
     refresh
   .bordered.inline-block
-    = select_tag :emailtag, options_for_select(@tags_list)
+    .d-inline-block
+      = select_tag :emailtag, options_for_select(@tags_list), class: 'select2'
     = check_box_tag :is_move
     %label move?
     %a.btn.add-tag-btn{ href: "javascript: void(0)", data: { url: conversations_addtag_path } }

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

@@ -4,10 +4,14 @@
 
 .conversations-index
 
+  %h5
+    - if @tag
+      Tag `#{@tag}`
+    - if @tag_not
+      Tag-not `#{@tag_not}`
   = render '/wco_email/conversations/actions'
 
   = render '/wco/paginate', resource: @conversations, param_name: :conv_page
-
   %table.bordered
     %tr
       %th.select-all.nosort
@@ -16,6 +20,7 @@
           .n-selected -
       %th.leads leads
       %th.subject subject, preview
+      %th.tags Tags
       %th.latest-at latest_at
     - @conversations.each_with_index do |conv, idx|
       %tr
@@ -35,9 +40,11 @@
             = link_to conv.subject, email_conversation_path(conv)
           <b>(#{conv.messages.length})</b>
           %span.gray= conv.preview
+        %td.tags.mini
+          - conv.tags.each do |tag|
+            .mb-1
+              .Chip= tag.slug
         %td.latest-at
           = pp_date conv.latest_at
           = pp_time conv.latest_at
-
-
   = render '/wco/paginate', resource: @conversations, param_name: :conv_page

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

@@ -26,7 +26,9 @@
             = link_to sch.lead.email, wco.lead_path(sch.lead)
           %td.tmpl
             = render '/wco_email/email_templates/show_cell', tmpl: sch.tmpl.email_template
-          %td= sch.perform_at.in_time_zone
+          %td
+            = pp_date sch.perform_at.in_time_zone
+            = pp_time sch.perform_at.in_time_zone
 
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.27
+  version: 0.1.1.29
 platform: ruby
 authors:
 - Victor Pudeyev