ish_manager 0.1.8.362 → 0.1.8.364

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 518ec08595116dd9e2af42564b776060b8caad35a8eb51d919df601a69fd961f
-  data.tar.gz: 8c7c6e16de624d283c1ae883b1382c83b5bd33c2b8824ad98fce0ccbd2b59ad4
+  metadata.gz: 43b6fa2d41aaca42dc7181d68f72e49a5fc9a76d4327894d55d6d0156f141cff
+  data.tar.gz: ea82d9eaf2c0e36a905224f1ee9800b9cfedfc5d5d4e351e5a85390314b95d71
 SHA512:
-  metadata.gz: 197844a71ef072f0b2fb1e36556f724418a10cd8c2e88acb6903deca03d0ad5f454b59e1221d1c1e6b75d961c00995facdfce712b65be0bf848f1030477bf45b
-  data.tar.gz: f7fd2550302b9161d4dfd1d774aec1aba08f0d441e4f45ec726ce6ab22c819a01b001fd3c55777426da4ef350b588d3e6f9fa3760c46439c292e03c33e41b0cd
+  metadata.gz: c90b40886b5eb082a6f52f33a289f2f36d177a2a8c718b905dccb95d770fea1e4ace19266af55cb886bd9d6412f6a9850a85856ee1962e77d4a99f8b6507034e
+  data.tar.gz: cbafecbe93220b787d6d28156992273f417fac83d1007e45fb0636bce92784f72c5909ef817faa9508703323feeb41eab98f2ad896cc2f5e333ccd89e462d325

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

@@ -22,6 +22,7 @@
 //= require_self
 //= require ish_manager/maps
 //= require ish_manager/email_contexts
+//= require ish_manager/email_conversations
 //= require ish_manager/email_templates
 //= require ish_manager/galleries
 
@@ -171,37 +172,6 @@ $(function () {
     $( $(".n-selected")[0] ).html( $("input[type='checkbox'].i-sel:checked").length )
   })
 
-  //
-  // email conversations
-  //
-  $("body.email_conversations-show a.preview").click(function(e) {
-    // logg(e, 'clicked')
-
-    if ($(this).data('expanded')) {
-      $(this).parent().find(".expand").html('')
-      $(this).parent().find(".my-actions").addClass('hide')
-      $(this).data('expanded', false)
-      return
-    }
-
-    const action_path = "/api/email_messages/" + $(this).data('id')
-
-    $.ajax({
-      url: action_path,
-      type: 'GET',
-      data: {
-        jwt_token: localStorage.getItem('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/javascripts/ish_manager/email_conversations.js

@@ -0,0 +1,19 @@
+
+$(document).ready(() => {
+
+  $("body.email_conversations-show a.preview").click(function(e) {
+    // logg(e, 'clicked')
+
+    if ($(this).data('expanded')) {
+      $(this).data('expanded', false)
+      $(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')
+    }
+
+  })
+
+})

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/controllers/ish_manager/email_contexts_controller.rb

@@ -79,8 +79,7 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
 
   def new
     authorize! :new, ::Ish::EmailContext
-    @template = Ish::EmailTemplate.where( slug: params[:template_slug] ).first
-    @template ||= Ish::EmailTemplate.where( id: params[:template_slug] ).first
+    @tmpl = @email_template = Ish::EmailTemplate.where( slug: params[:template_slug] ).first || Ish::EmailTemplate.where( id: params[:template_slug] ).first
     attrs = {}
     if @template
       attrs = @template.attributes.slice( :subject, :body, :from_email )

data/app/controllers/ish_manager/email_conversations_controller.rb

@@ -7,7 +7,7 @@ class ::IshManager::EmailConversationsController < IshManager::ApplicationContro
 
   def index
     authorize! :email_conversations_index, IshManager::Ability
-    @email_conversations = ::Office::EmailConversation.all.order_by( latest_date: :desc )
+    @email_conversations = ::Office::EmailConversation.all.order_by( latest_at: :desc )
   end
 
   def show

data/app/views/ish_manager/application/_alerts_notices.haml

@@ -1,18 +1,17 @@
 
-- if notice || alert
-  .row
-    .col-sm-12
-      - if notice
-        - if notice.class == Array
-          %ul.notice
-            - notice.map do |n|
-              %li= n
-        - else
-          %p.notice= notice
-      - if alert
-        - if alert.class == Array
-          %ul.alert
-            - alert.map do |n|
-              %li= n
-        - else
-          %p.alert= alert
+.row
+  .col-sm-12
+    - if notice
+      - if notice.class == Array
+        %ul.notice
+          - notice.map do |n|
+            %li= n
+      - else
+        %p.notice= notice
+    - if alert
+      - if alert.class == Array
+        %ul.alert
+          - alert.map do |n|
+            %li= n
+      - else
+        %p.alert= alert

data/app/views/ish_manager/application/_debug.haml

@@ -5,6 +5,4 @@
   %ul.browser-default
     %li= params.inspect
     %li Cached? #{Rails.application.config.action_controller.perform_caching} :: Cache key: #{@cache_key.inspect}
-    -# %li Layout: #{current_layout}
     %li= "Env: #{Rails.env}"
-    %li JWT: #{@jwt_token}

data/app/views/ish_manager/application/_main_footer.haml

@@ -1,4 +1,6 @@
 
+#Config{ data: { jwt_token: @jwt_token } }
+
 .manager--main-footer
   .container
 

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

@@ -12,8 +12,9 @@
         .field.field-template
           = f.label "Template"
           = f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || ctx.email_template_id ), {}, { class: 'select2' }
-          = link_to 'view', email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
-          = link_to '~', edit_email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
+          - if ctx.email_template_id
+            = link_to 'view', email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
+            = link_to '~', edit_email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
         -# .field
         -#   = f.label :slug
         -#   = f.text_field :slug

data/app/views/ish_manager/email_contexts/new.haml

@@ -1,3 +1,3 @@
 
 .email-contexts-new
-  = render 'ish_manager/email_contexts/form', template: @template, email_ctx: @email_ctx
+  = render 'ish_manager/email_contexts/form', ctx: @ctx

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'

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

@@ -38,24 +38,9 @@
     .bg-white
       = render :partial => "ish_manager/application/main_header_#{@current_profile.role_name}"
       .container.W0
-        - if notice || alert
-          .row
-            .col-sm-12
-              - if notice
-                - if notice.class == Array
-                  %ul.notice
-                    - notice.map do |n|
-                      %li= n
-                - else
-                  %p.notice= notice
-              - if alert
-                - if alert.class == Array
-                  %ul.alert
-                    - alert.map do |n|
-                      %li= n
-                - else
-                  %p.alert= alert
+        = render 'alerts_notices' if notice || alert
         = yield
+
     = render 'ish_manager/application/main_footer'
     = render 'analytics' if Rails.env.production?
 

data/app/views/layouts/ish_manager/application_fullwidth.haml

@@ -37,7 +37,7 @@
   %body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action], "application-fullwidth" ] }
 
     = render :partial => "ish_manager/application/main_header_#{@current_profile.role_name}"
-    = render 'alerts_notices'
+    = render 'alerts_notices' if notice || alert
     = yield
     = render 'ish_manager/application/main_footer'
     = render 'analytics' if Rails.env.production?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.362
+  version: 0.1.8.364
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -234,6 +234,7 @@ files:
 - app/assets/images/wait.gif
 - app/assets/javascripts/ish_manager/application.js
 - app/assets/javascripts/ish_manager/email_contexts.js
+- app/assets/javascripts/ish_manager/email_conversations.js
 - app/assets/javascripts/ish_manager/email_templates.js
 - app/assets/javascripts/ish_manager/galleries.js
 - app/assets/javascripts/ish_manager/maps.js