wco_email 0.1.1.40 → 0.1.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47368100e817e5ef832785bd306770d27d89e26e8f29340c8169afa7d87685dc
-  data.tar.gz: 11533cfb7d1d6e4f80ab1c1506388af0b352a5df45e92f9c1388b47b7f6c8d0b
+  metadata.gz: 16bd727a333da209b9d653313bfac3c6b112ca87c0a03f514dc6c7beeba0c767
+  data.tar.gz: 05bd0bf61431eab3448adcb2c514f54017d9b5a29067bbd239c00651e7ab420c
 SHA512:
-  metadata.gz: b6f0201e0db85a6f2694142bfcec4e0f642a3e0655f17256788b3ee71f3ce605b2a4d73f2af88f982f0af18502688b31d8d5ee2af83af2ac7ac637b15843f335
-  data.tar.gz: 879697c41150bce31d475c66b20ff807ab4c50fcba104d03c4d6c4203c958f086bf0e2b5b7467842f6c238689511067db9081ded1851afe02823361574dbd5af
+  metadata.gz: 95e46edb2a134e7646ab381d1120ea14cb3c11bf87af4eea11d235c8901e318cdfc98c7c675469a5139e8e30017072976771fd55380233caaae99c68884dca2f
+  data.tar.gz: a9f82e64f99c55c13b0501b0027bcfd33eeb619c932fbcab7078c030fbf25920f5ac957f74a3ebeaba30349bb5f8fed4f33dbe1d206588248e2fbf5f6d196bb4

data/app/controllers/wco_email/application_controller.rb

@@ -1,13 +1,14 @@
 
-EC  = WcoEmail::Conversation
-EF  = WcoEmail::EmailFilter
-EM  = WcoEmail::Message
-ET  = WcoEmail::EmailTemplate
-MS  = WcoEmail::MessageStub
-EMS = MS
-OA  = Wco::OfficeAction
-OAT = Wco::OfficeActionTemplate
-Sch = WcoEmail::EmailAction
+EC   ||= WcoEmail::Conversation
+EF   ||= WcoEmail::EmailFilter
+EM   ||= WcoEmail::Message
+ET   ||= WcoEmail::EmailTemplate
+MS   ||= WcoEmail::MessageStub
+EMS  ||= MS
+OA   ||= Wco::OfficeAction
+OAT  ||= Wco::OfficeActionTemplate
+OATT ||= Wco::OfficeActionTemplateTie
+Sch  ||= WcoEmail::EmailAction
 
 class WcoEmail::ApplicationController < Wco::ApplicationController
   # before_action :set_lists

data/app/controllers/wco_email/contexts_controller.rb

@@ -44,18 +44,6 @@ class WcoEmail::ContextsController < WcoEmail::ApplicationController
     authorize! :edit, @ctx
   end
 
-  def iframe_src
-    @ctx = @email_context = WcoEmail::Context.find params[:id]
-    authorize! :iframe_src, @ctx
-
-    @tmpl        = @email_template = @ctx.email_template
-    @tmpl_config = OpenStruct.new JSON.parse( @ctx.tmpl[:config_json] )
-    @lead        = @ctx.lead
-    @body        = @ctx.body
-
-    render layout: false
-  end
-
   def index
     authorize! :index, WcoEmail::Context
     @ctxs = WcoEmail::Context.all.order_by( sent_at: :desc, send_at: :desc
@@ -113,6 +101,20 @@ class WcoEmail::ContextsController < WcoEmail::ApplicationController
     authorize! :show, @ctx
   end
 
+  def show_iframe
+    @ctx = @email_context = WcoEmail::Context.find params[:id]
+    authorize! :iframe_src, @ctx
+
+    @tmpl        = @email_template = @ctx.email_template
+    @tmpl_config = OpenStruct.new JSON.parse( @ctx.tmpl[:config_json] )
+    @lead        = @ctx.lead
+    @body        = @ctx.body
+
+    @renderer = WcoEmail::ApplicationMailer.renderer ctx: @ctx
+
+    render layout: false
+  end
+
   def summary
     authorize! :summary, WcoEmail::Context
     @results = WcoEmail::Context.summary

data/app/controllers/wco_email/email_templates_controller.rb

@@ -87,28 +87,19 @@ class WcoEmail::EmailTemplatesController < WcoEmail::ApplicationController
   end
 
   def show_iframe
-    @tmpl   = WcoEmail::EmailTemplate.where({ id: params[:id] }).first
+    @tmpl   = WcoEmail::EmailTemplate.where({     id: params[:id] }).first
     @tmpl ||= WcoEmail::EmailTemplate.find_by({ slug: params[:id] })
     authorize! :show, @tmpl
 
-    @lead        = Wco::Lead.find_by({ email: 'poxlovi@gmail.com' })
-    @ctx         = WcoEmail::Context.new({ email_template: @tmpl, lead: @lead, body: "Lorem Ipsum..." })
-    @tmpl_config = OpenStruct.new JSON.parse( @ctx.tmpl[:config_json] )
-
-    @utm_tracking_str = {
-      'cid'          => @ctx.lead_id,
-      'utm_campaign' => @ctx.tmpl.slug,
-      'utm_medium'   => 'email',
-      'utm_source'   => @ctx.tmpl.slug,
-    }.map { |k, v| "#{k}=#{v}" }.join("&")
-
-    @unsubscribe_url = WcoEmail::Engine.routes.url_helpers.unsubscribes_url({
-      template_id: @ctx.tmpl.id,
-      lead_id:     @lead.id,
-      token:       @lead.unsubscribe_token,
-      host:        Rails.application.routes.default_url_options[:host],
+    @ctx = WcoEmail::Context.new({
+      email_template: @tmpl,
+      lead:           Wco::Lead.find_by({ email: 'poxlovi@gmail.com' }),
     })
 
+    @renderer = WcoEmail::ApplicationMailer.renderer ctx: @ctx
+    # @rendered_str = renderer.render_to_string("/wco_email/email_templates/_#{@ctx.tmpl.layout}")
+    # @rendered_str = renderer.render_to_string( inline: @ctx.body )
+
     render layout: false
   end
 
@@ -124,9 +115,4 @@ class WcoEmail::EmailTemplatesController < WcoEmail::ApplicationController
     redirect_to action: :edit
   end
 
-  ##
-  ## private
-  ##
-  private
-
 end

data/app/views/wco_email/contexts/_form.haml

@@ -27,7 +27,7 @@
 
     .flex-row
       = f.label :reply_to_message
-      = f.select :reply_to_message_id, options_for_select([[ ctx.reply_to_message, ctx.reply_to_message_id ]], selected: ctx.reply_to_message_id), {}, class: 'w-100'
+      = f.select :reply_to_message_id, options_for_select([[ ctx.reply_to_message&.preview_str, ctx.reply_to_message_id ]], selected: ctx.reply_to_message_id), {}, class: 'w-100'
 
 
     .tab-labels.flex-row
@@ -41,7 +41,9 @@
         - if ctx.new_record?
           New record...
         - else
-          %iframe{ src: context_iframe_path(ctx), width: '100%', height: '100%' }
+          %iframe{ src: context_iframe_path(ctx.id), width: '100%', height: '100%' }
+    .gray.mini= link_to context_iframe_path(ctx.id), context_iframe_path(ctx.id), target: :_blank
+
 
 
     .actions

data/app/views/wco_email/contexts/_form_reply.haml

@@ -17,6 +17,8 @@
     .flex-row
       %label Subject
       = f.text_field :subject, class: 'w-100'
+    .field
+      = f.text_area :body, class: 'tinymce'
     .flex-row
       .flex-row
         %label Respond inline?

data/app/views/wco_email/contexts/show.haml

@@ -28,8 +28,6 @@
   .maxwidth
     - if @ctx.sent_at
       = raw @ctx.rendered_str
-      -# = @ctx.tmpl
 
     - else
-      -# = link_to 'i-src', context_iframe_path(@ctx), target: :_blank
       %iframe.h-500px{ src: context_iframe_path(@ctx), width: '100%', height: '100%' }

data/app/views/wco_email/contexts/show_iframe.haml

@@ -0,0 +1,3 @@
+
+= render "/wco_email/email_layouts/#{@tmpl.layout}"
+

data/app/views/wco_email/conversations/_search.haml

@@ -2,12 +2,10 @@
 
 .conversations--search.Card
   .inline-block
-    = form_tag email_conversations_path do
-      %label Search from_email
+    = form_tag conversations_path, method: :get do
+      %b Search
+      %label from_email
       = text_field_tag :from_email, params[:from_email]
-      -# = submit_tag '>'
-      -# .inline-block
-      -#   = form_tag email_conversations_path do
       %label by subject
       = text_field_tag :subject, params[:subject]
       = submit_tag '>'

data/app/views/wco_email/conversations/index.haml

@@ -3,13 +3,14 @@
   = render 'wco_email/sidebar'
 
 .conversations-index
-
-  %h5
-    - if @tag
-      Tag `#{@tag}`
-    - if @tag_not
-      Tag-not `#{@tag_not}`
-    (#{@conversations.length})
+  .header
+    %h5.title
+      - if @tag
+        Tag `#{@tag}`
+      - if @tag_not
+        Tag-not `#{@tag_not}`
+      (#{@conversations.length})
+    = render '/wco_email/conversations/search'
   = render '/wco_email/conversations/actions'
 
   = render '/wco/paginate', resource: @conversations, param_name: :conv_page

data/app/views/wco_email/email_layouts/_plain.haml

@@ -0,0 +1,18 @@
+
+-# %ul
+-#   %li= @lead.inspect
+-#   %li= @ctx.tmpl.inspect
+-#   %li= @ctx.reply_to_message.inspect
+-#   %li= @renderer.inspect
+
+= @renderer.render( inline: @ctx.body )
+
+-# = @ctx.utm_tracking_str
+-# = @ctx.unsubscribe_url
+
+- if @ctx.reply_to_message
+  %br
+  %br
+  .mini Your previous message is shown below.
+  %hr
+  = raw @ctx.reply_to_message.part_html_sanitized

data/app/views/wco_email/email_templates/_form.haml

@@ -28,10 +28,12 @@
       .label-save-preview= f.submit 'Save & Preview'
     .tabs
       .tab-raw
-        = f.text_area :body # , class: 'tinymce'
+        -## No class tinymce, cannot have tinymce mess with my own templating.
+        = f.text_area :body
       .tab-preview
         - if email_template.persisted?
           %iframe{ src: email_template_iframe_path(email_template), width: '100%', height: '100%' }
+    .gray.mini= link_to email_template_iframe_path(email_template), email_template_iframe_path(email_template), target: :_blank
 
     .row
       .col-md-6

data/app/views/wco_email/email_templates/_plain.haml

@@ -1,4 +1,10 @@
 
+-# = @lead.inspect
+-# = @tmpl.inspect
+= @rendered_str
+
+
+= raw @ctx.body
 = raw ERB.new( @ctx.body ).result
 
 -# = @ctx.reply_to_message.inspect

data/app/views/wco_email/email_templates/show_iframe.haml

@@ -1,2 +1,4 @@
 
-= render "/wco_email/email_templates/#{@tmpl.layout}"
+-# = @renderer.render "/wco_email/email_layouts/#{@tmpl.layout}"
+
+= render "/wco_email/email_layouts/#{@tmpl.layout}"

data/config/routes.rb

@@ -22,7 +22,7 @@ WcoEmail::Engine.routes.draw do
   resources :email_campaigns
   resources :email_layouts
 
-  get  'contexts/iframe_src/:id',     to: 'contexts#iframe_src',       as: :context_iframe
+  get  'contexts/show_iframe/:id',    to: 'contexts#show_iframe',       as: :context_iframe
   get  'contexts/summary',            to: 'contexts#summary'
   post 'contexts/send_immediate/:id', to: 'contexts#send_immediate',   as: :send_context
   resources :contexts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.40
+  version: 0.1.1.42
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
+date: 2024-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -365,10 +365,10 @@ files:
 - app/views/wco_email/contexts/_header.haml
 - app/views/wco_email/contexts/_index.haml
 - app/views/wco_email/contexts/edit.haml
-- app/views/wco_email/contexts/iframe_src.haml
 - app/views/wco_email/contexts/index.haml
 - app/views/wco_email/contexts/new.haml
 - app/views/wco_email/contexts/show.haml
+- app/views/wco_email/contexts/show_iframe.haml
 - app/views/wco_email/contexts/summary.csv.erb
 - app/views/wco_email/contexts/summary.haml
 - app/views/wco_email/conversations/_actions.haml
@@ -401,6 +401,7 @@ files:
 - app/views/wco_email/email_filters/index.haml
 - app/views/wco_email/email_filters/new.haml
 - app/views/wco_email/email_filters/show.haml
+- app/views/wco_email/email_layouts/_plain.haml
 - app/views/wco_email/email_templates/_form.haml
 - app/views/wco_email/email_templates/_form_mini.haml
 - app/views/wco_email/email_templates/_form_reply_mini.haml

data/app/views/wco_email/contexts/iframe_src.haml

@@ -1,3 +0,0 @@
-
-= render "/wco_email/email_templates/#{@tmpl.layout}"
-