ish_manager 0.1.8.363 → 0.1.8.365

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 373d942eedac08f101ace0d4fdf2ceeef4d192667ec8d89f20231468468cf534
-  data.tar.gz: 25e6af32445e2515ff734cd05e150a17fed1b0da2b6b38160fca594c28cbe9be
+  metadata.gz: e590476cd088614cb747164c20d26c56df98e60f7f5a45fc5f0b471164163dca
+  data.tar.gz: 175834838ed586c7755c4fc7e7bdedb6ce025657a28dcbed55fce6c23fd15f20
 SHA512:
-  metadata.gz: 298335ad3aa05e7f72fd0cfe80d2326a82b6fe5423c5ea3c1000beded4dae63f66374db271d5b3cf19882d20ec49316614dd9ceb9d9b748c9aa142902ded11e5
-  data.tar.gz: 30786e197d6b80c49616f024b92458527c677e647c6a9314129bc8b00fd8bf83838246ad13f03ea094b035ced5ad500c2bf3ca48103998cfea9108cf5dfa01de
+  metadata.gz: a0620126cac070a29ed666c9fd6b44620baf2fdf1065e32b46cd05d5226de73fdaf5d01f8b9655df315f9b9652e1682e179bb9afe710a0c2b398b9faf39c85b2
+  data.tar.gz: 7e8904f16e0cb5889a6689f277c71ccb8c6bd1511f51130195cd17bce0bd5bd5a7b11e65fa2be322e0be19dadceadd76dfdbea7264ac6d43108dac9085e96c0a

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

@@ -130,8 +130,7 @@ $(function () {
   })
 
   $(".delete-btn").click(function(e) {
-    logg(e, 'deleting...')
-
+    const jwt_token = $("#Config").data('jwt-token')
     const action_path = $(this).data('url')
     const out = []
 
@@ -139,14 +138,13 @@ $(function () {
       let val = $($("input[type='checkbox'].i-sel:checked")[idx]).val()
       out.push(val)
     })
-    logg(out, 'out')
 
     $.ajax({
       url: action_path,
       type: 'DELETE',
       data: {
         ids: out,
-        jwt_token: localStorage.getItem('jwt_token'),
+        jwt_token: jwt_token,
       },
       success: e => {
         logg((e||{}).responseText, 'deleted Ok')

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

@@ -5,29 +5,15 @@ $(document).ready(() => {
     // logg(e, 'clicked')
 
     if ($(this).data('expanded')) {
-      $(this).parent().find(".expand").html('')
-      $(this).parent().find(".my-actions").addClass('hide')
       $(this).data('expanded', false)
-      return
+      $(this).parent().find(".my-actions").addClass('hide')
+      $(this).parent().find("iframe").css('display', 'none')
+    } else {
+      $(this).data('expanded', true)
+      $(this).parent().find(".my-actions").removeClass('hide')
+      $(this).parent().find("iframe").css('display', 'block')
     }
 
-    const action_path = "/api/email_messages/" + $(this).data('id')
-
-    $.ajax({
-      url: action_path,
-      type: 'GET',
-      data: {
-        jwt_token: $( $("#Config")[0] ).data('jwt-token'),
-      },
-      success: e => {
-        $(this).parent().find(".expand").html(e.item.part_html)
-        $(this).parent().find(".my-actions").removeClass('hide')
-        $(this).data('expanded', true)
-      },
-      error: e => {
-        logg((e||{}).responseText, 'cannot get email_message')
-      },
-    })
   })
 
 })

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

@@ -184,6 +184,7 @@ table.dataTable {
   padding: .8em;
 }
 
+
 /* F */
 
 .flex-row {
@@ -216,6 +217,10 @@ table.dataTable {
 .hide, .hidden {
   display: none !important;
 }
+.hide-expand {
+  display: none;
+  position: absolute;
+}
 
 /* I */
 img.img-400 {

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

@@ -103,6 +103,18 @@
         display: flex;
         justify-content: space-between;
       }
+
+      .row-2 {
+        iframe {
+          border: 2px solid yellow;
+
+          width: 100%;
+          min-height: 500px;
+          height: 80vh;
+          display: none;
+        }
+      }
+
     }
   }
 

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

@@ -1,4 +1,10 @@
 
+.scheduled-email-actions--form {
+  display: none;
+  position: absolute;
+  min-width: 250px;
+}
+
 .scheduled-emails-new {
 
 

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

@@ -22,15 +22,15 @@
 
 
   .messages.max-width
-    - @email_messages.each do |m|
-      - lead = m.lead || Lead.new(email: 'NO LEAD!', id: 'no lead')
+    - @email_messages.each do |msg|
+      - lead = msg.lead || Lead.new(email: 'NO LEAD!', id: 'no lead')
 
       .item
         .row-1
-          .gray= m.id
+          .gray= msg.id
 
           .chip.from
-            -# = m.from
+            -# = msg.from
             = lead.email
 
           .relative
@@ -45,13 +45,14 @@
             = render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
 
           .datetime
-            .date= m.date&.strftime('%Y-%m-%d')
-            .time= m.date&.strftime('%l:%M%P')
+            .date= msg.date&.strftime('%Y-%m-%d')
+            .time= msg.date&.strftime('%l:%M%P')
 
         .row-2
-          %a.preview{ href: 'javascript:void(0)', data: { id: m.id.to_s } }
-            = (ActionView::Base.full_sanitizer.sanitize( m.part_html )||'<no-info>')[0..300]
-          .expand
+
+          - link_label = (ActionView::Base.full_sanitizer.sanitize( msg.part_html )||'<no-info>')[0..200]
+          = link_to link_label, ishapi.email_message_path(msg, jwt_token: @jwt_token ), target: msg.message_id, class: 'preview'
+          %iframe{ name: msg.message_id }
 
           .my-actions.hide
             = render 'ish_manager/email_templates/form_reply_2_mini'

data/app/views/ish_manager/scheduled_email_actions/_form.haml

@@ -6,21 +6,21 @@
 - sch_a = scheduled_email_action
 - url = sch_a.new_record? ? scheduled_email_actions_path : scheduled_email_action_path(sch_a.id)
 
+.scheduled-email-actions--form
+  = form_for scheduled_email_action, url: url, html: { class: "form-mini" } do |f|
+    .header
+      %h5.title Schedule an email action
 
-= form_for scheduled_email_action, url: url, html: { class: "form-mini" } do |f|
-  .header
-    %h5.title Schedule an email action
+    .field
+      %label Lead
+      = select_tag :lead_id, options_for_select( @leads_list, selected: sch_a[:lead_id]||params[:lead_id] ), class: 'select2'
+    .field
+      %label State
+      = f.select :state, options_for_select(::Office::ScheduledEmailAction::STATES, selected: sch_a.state ), class: 'select2'
+    %br
+    .field
+      %label Email Action
+      = select_tag :email_action_id, options_for_select( @email_actions_list, selected: sch_a[:email_action_id] ), class: 'select2'
 
-  .field
-    %label Lead
-    = select_tag :lead_id, options_for_select( @leads_list, selected: sch_a[:lead_id]||params[:lead_id] ), class: 'select2'
-  .field
-    %label State
-    = f.select :state, options_for_select(::Office::ScheduledEmailAction::STATES, selected: sch_a.state ), class: 'select2'
-  %br
-  .field
-    %label Email Action
-    = select_tag :email_action_id, options_for_select( @email_actions_list, selected: sch_a[:email_action_id] ), class: 'select2'
-
-  .actions
-    = submit_tag 'Schedule'
+    .actions
+      = submit_tag 'Schedule'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.363
+  version: 0.1.8.365
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails