ish_manager 0.1.8.362 → 0.1.8.363

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 518ec08595116dd9e2af42564b776060b8caad35a8eb51d919df601a69fd961f
-  data.tar.gz: 8c7c6e16de624d283c1ae883b1382c83b5bd33c2b8824ad98fce0ccbd2b59ad4
+  metadata.gz: 373d942eedac08f101ace0d4fdf2ceeef4d192667ec8d89f20231468468cf534
+  data.tar.gz: 25e6af32445e2515ff734cd05e150a17fed1b0da2b6b38160fca594c28cbe9be
 SHA512:
-  metadata.gz: 197844a71ef072f0b2fb1e36556f724418a10cd8c2e88acb6903deca03d0ad5f454b59e1221d1c1e6b75d961c00995facdfce712b65be0bf848f1030477bf45b
-  data.tar.gz: f7fd2550302b9161d4dfd1d774aec1aba08f0d441e4f45ec726ce6ab22c819a01b001fd3c55777426da4ef350b588d3e6f9fa3760c46439c292e03c33e41b0cd
+  metadata.gz: 298335ad3aa05e7f72fd0cfe80d2326a82b6fe5423c5ea3c1000beded4dae63f66374db271d5b3cf19882d20ec49316614dd9ceb9d9b748c9aa142902ded11e5
+  data.tar.gz: 30786e197d6b80c49616f024b92458527c677e647c6a9314129bc8b00fd8bf83838246ad13f03ea094b035ced5ad500c2bf3ca48103998cfea9108cf5dfa01de

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,33 @@
+
+$(document).ready(() => {
+
+  $("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: $( $("#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/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

@@ -49,7 +49,7 @@
             .time= m.date&.strftime('%l:%M%P')
 
         .row-2
-          %a.preview{ href: "javascript: void(0)", data: { id: m.id.to_s } }
+          %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
 

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.363
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-03-15 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