ish_manager 0.1.8.372 → 0.1.8.374

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4d5e787e74562c8e5aced449985e808514117d71edef066f66564cbf6b20e63
-  data.tar.gz: a4feab7fd1f3a1142252c00533d5a2cd4c1072212b3657d9595f218de72a6c93
+  metadata.gz: 39b64d928f290a56cb8566d6e3e41883fbdffa45342900d55cc86d2ac650b01f
+  data.tar.gz: f6c64a2bf55a68bfe3ececa0d03ae3b89761db23b29fcb0ebcf1a5fc445b4eec
 SHA512:
-  metadata.gz: eeaecbf344bd5501e3a1a07d1bcdcf20d3ffdda78eb1a20a2a1febd623dd588a6aead655c679b3fc5ee18e272bfcc27ed47ba31f1b03afa62ecfbb1eb678e16f
-  data.tar.gz: 376ec631efc2707d860a09279803d601ca7401202ce18f903a866c76520eb4aa3ebc090af2c5db77435432fb18b2d097222e1b8bc2d89263533ce545708808b1
+  metadata.gz: 1b871f0b6e1c35d5dae63efbd7c92f940bfb4cca42e0d0fa132448276db4789594d8644d94ac92f09a4f9d75001c34eac080de100eebf0147a15880df9f29214
+  data.tar.gz: 726aded514ecd4998a7be06d37488afa6688020fe4f28d1b3feb5dfcaa3f31ae7e00f1580225ccbb404123f7e16d909dc422a6148b1e32fca6c0c69a6d3fe5cc

data/app/assets/javascripts/ish_manager/application.js

@@ -129,34 +129,6 @@ $(function () {
     $( $(".n-selected")[0] ).html( $("input[type='checkbox'].i-sel:checked").length )
   })
 
-  $(".delete-btn").click(function(e) {
-    const jwt_token = $("#Config").data('jwt-token')
-    const action_path = $(this).data('url')
-    const out = []
-
-    $( $("input[type='checkbox'].i-sel:checked") ).each( idx => {
-      let val = $($("input[type='checkbox'].i-sel:checked")[idx]).val()
-      out.push(val)
-    })
-
-    $.ajax({
-      url: action_path,
-      type: 'DELETE',
-      data: {
-        ids: out,
-        jwt_token: jwt_token,
-      },
-      success: e => {
-        logg((e||{}).responseText, 'deleted Ok')
-        location.reload()
-      },
-      error: e => {
-        logg((e||{}).responseText, 'deleted Err')
-      },
-    })
-
-  })
-
   $(".select-all input[type='checkbox']").change((e) => {
     const count = $("input[type='checkbox'].i-sel:checked").length
     const new_state = count ? false : true // all will be checked?

data/app/assets/javascripts/ish_manager/email_conversations.js

@@ -16,4 +16,33 @@ $(document).ready(() => {
 
   })
 
+
+  $(".delete-btn").click(function(e) {
+    const jwt_token = $("#Config").data('jwt-token')
+    const action_path = $(this).data('url')
+    const out = []
+
+    $( $("input[type='checkbox'].i-sel:checked") ).each( idx => {
+      let val = $($("input[type='checkbox'].i-sel:checked")[idx]).val()
+      out.push(val)
+    })
+
+    $.ajax({
+      url: action_path,
+      type: 'DELETE',
+      data: {
+        ids: out,
+        jwt_token: jwt_token,
+      },
+      success: e => {
+        logg((e||{}).responseText, 'deleted Ok')
+        location.reload()
+      },
+      error: e => {
+        logg((e||{}).responseText, 'deleted Err')
+      },
+    })
+
+  })
+
 })

data/app/assets/stylesheets/ish_manager/email_conversations.scss

@@ -138,6 +138,12 @@
     }
   }
 
+  .second-header {
+    a {
+      margin: 0 1em;
+    }
+  }
+
   .select-all.chip {
     display: flex;
     border: 1px solid cyan;

data/app/controllers/ish_manager/email_conversations_controller.rb

@@ -7,7 +7,13 @@ class ::IshManager::EmailConversationsController < IshManager::ApplicationContro
 
   def index
     authorize! :email_conversations_index, IshManager::Ability
-    @email_conversations = ::Office::EmailConversation.in_inbox
+
+    if params[:slug]
+      @email_conversations = ::Office::EmailConversation.in_emailtag( params[:slug] )
+    else
+      @email_conversations = ::Office::EmailConversation.in_no_trash
+    end
+    @email_conversations = @email_conversations.order_by( latest_at: :desc )
   end
 
   def show

data/app/views/ish_manager/email_conversations/index.haml

@@ -1,9 +1,16 @@
 
 .email-conversations-index
 
-  .header
+  .second-header
     %i.material-icons mail
-    Inbox (#{Office::EmailConversation.in_inbox.length})
+    = link_to email_conversations_in_emailtag_path(WpTag::EMAILTAG_INBOX) do
+      Inbox (#{Office::EmailConversation.in_inbox.length})
+    = link_to email_conversations_path do
+      Archived (#{Office::EmailConversation.in_no_trash.length})
+    = link_to email_conversations_in_emailtag_path(WpTag::EMAILTAG_TRASH) do
+      Trash (#{Office::EmailConversation.in_emailtag(WpTag::EMAILTAG_TRASH).length})
+
+    Selected: #{params[:slug] || 'archived' }
 
   .actions
 

data/app/views/ish_manager/email_conversations/show.haml

@@ -10,6 +10,11 @@
     #{@email_conversation.subject}
     (#{@email_conversation.email_messages.all.count})
 
+  .tags.max-width
+    Tags:
+    = @email_conversation.wp_term_ids
+    = @email_conversation.tags.map(&:name).join(", ")
+
   .leads.max-width
     Leads (#{@email_conversation.leads.length}):
     %ul
@@ -30,7 +35,6 @@
           .gray= msg.id
 
           .chip.from
-            -# = msg.from
             = lead.email
 
           .relative

data/config/routes.rb

@@ -63,8 +63,9 @@ IshManager::Engine.routes.draw do
   get 'email_messages/stripped/:id', to: 'email_messages#show_stripped', as: :email_message_stripped
   resources :email_messages
 
-  get 'email_conversations', to: 'email_conversations#index'
-  get 'email_conversations/:id', to: 'email_conversations#show', as: :email_conversation
+  get 'email_conversations',                   to: 'email_conversations#index'
+  get 'email_conversations/in_emailtag/:slug', to: 'email_conversations#index', as: :email_conversations_in_emailtag
+  get 'email_conversations/show/:id',          to: 'email_conversations#show', as: :email_conversation
 
   get  'email_contexts/for_lead/:lead_id',       to: 'email_contexts#index', as: :email_contexts_for_lead
   get  'email_contexts/iframe_src/:id',          to: 'email_contexts#iframe_src', as: :email_context_iframe

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.372
+  version: 0.1.8.374
 platform: ruby
 authors:
 - piousbox