ish_manager 0.1.8.372 → 0.1.8.373

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4d5e787e74562c8e5aced449985e808514117d71edef066f66564cbf6b20e63
-  data.tar.gz: a4feab7fd1f3a1142252c00533d5a2cd4c1072212b3657d9595f218de72a6c93
+  metadata.gz: 3520e812ccca2471e7fe71ead1f055303fec0da31efc52ae9f04aff94d80417b
+  data.tar.gz: a104b9335d5eb91a3bf2dbdd6c436bd89d98d91941ca74c6f429c55e362918b0
 SHA512:
-  metadata.gz: eeaecbf344bd5501e3a1a07d1bcdcf20d3ffdda78eb1a20a2a1febd623dd588a6aead655c679b3fc5ee18e272bfcc27ed47ba31f1b03afa62ecfbb1eb678e16f
-  data.tar.gz: 376ec631efc2707d860a09279803d601ca7401202ce18f903a866c76520eb4aa3ebc090af2c5db77435432fb18b2d097222e1b8bc2d89263533ce545708808b1
+  metadata.gz: 10f48c22702c4b201fc3e9e969a5c12386e5483d0bcf926fa08edd948f29affd3f27e6bd6934ee17790bd2d41fcc167d7c809115fa2d170da5ece07c0822f3f0
+  data.tar.gz: 00716b9b403598d743672c793b2004e16681ab6749cea0bd2c866f08243af596181139b4850c0b7f44f85614bc18e35f111041f4d58e75beb7e959a956e30c61

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,12 @@ 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.all
+    end
   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
+      All (#{Office::EmailConversation.all.length})
+    = link_to email_conversations_in_emailtag_path(WpTag::EMAILTAG_TRASH) do
+      Trash (#{Office::EmailConversation.in_emailtag(WpTag::EMAILTAG_TRASH).length})
+
+    Selected: #{params[:slug] || 'all' }
 
   .actions
 

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.373
 platform: ruby
 authors:
 - piousbox