maily_herald-webui 0.8.0 → 0.9.0

data/app/controllers/maily_herald/webui/periodical_mailings_controller.rb

@@ -9,7 +9,7 @@ module MailyHerald
       spec = super
       spec.params.push(:start_at, :period_in_days)
       spec.update_containers["schedules"] = true
-      spec.containers_order = ["details", "template", "entities", "schedules", "logs"]
+      spec.containers_order = ["details", "template", "subscribers", "schedules", "logs"]
       spec
     end
 

data/app/controllers/maily_herald/webui/resources_controller.rb

@@ -49,9 +49,12 @@ module MailyHerald
       yield(@item) if block_given?
 
       if @item.save
-        redirect_to @item
+        if @item.is_a?(MailyHerald::SequenceMailing)
+          redirect_to sequence_mailing_path(@item.sequence, @item)
+        else
+          redirect_to @item
+        end
       else
-        puts @item.errors.to_yaml
         add_breadcrumb view_context.tw("#{controller_name}.new.label", :action => :new)
         render :action => :new
       end
@@ -126,10 +129,11 @@ module MailyHerald
     # Run code required by rendered containers
     def collect_action_dependencies
       if @rendered_containers
-        begin
-          action_dependencies @rendered_containers
-        rescue NoMethodError
-        end
+        action_dependencies @rendered_containers
+        #begin
+          #action_dependencies @rendered_containers
+        #rescue NoMethodError
+        #end
       end
     end
 

data/app/controllers/maily_herald/webui/sequence_mailings_controller.rb

@@ -27,7 +27,7 @@ module MailyHerald
       spec = super
       spec.params.push(:absolute_delay_in_days)
       spec.update_containers["schedules"] = true
-      spec.containers_order = ["details", "template", "entities", "schedules", "logs"]
+      spec.containers_order = ["details", "template", "subscribers", "schedules", "logs"]
       spec
     end
 

data/app/controllers/maily_herald/webui/sequences_controller.rb

@@ -21,11 +21,11 @@ module MailyHerald
         spec.params = [:title, :list, :start_at, :override_subscription]
         spec.update_containers = {
           "mailings" => true,
-          "entities" => true,
+          "subscribers" => true,
           "schedules" => true,
           "logs" => true
         }
-        spec.containers_order = ["details", "mailings", "entities", "schedules", "logs"]
+        spec.containers_order = ["details", "mailings", "subscribers", "schedules", "logs"]
       end
     end
 
@@ -41,10 +41,10 @@ module MailyHerald
           @logs = smart_listing_create(:logs, @item.logs.processed, :partial => "maily_herald/webui/logs/items", default_sort: {processing_at: "desc"})
         when "schedules"
           @schedules = smart_listing_create(:schedules, @item.logs.scheduled, :partial => "maily_herald/webui/logs/items", default_sort: {processing_at: "asc"})
-        when "entities"
-          @entities = @item.list.subscribers
-          @entities = @entities.merge(@item.list.context.scope_like(params[:entities_filter])) if params[:entities_filter]
-          @entities = smart_listing_create(:entities, @entities, :partial => "maily_herald/webui/subscribers/list")
+        when "subscribers"
+          @subscribers = @item.list.subscribers
+          @subscribers = @subscribers.merge(@item.list.context.scope_like(params[:subscribers_filter])) if params[:subscribers_filter]
+          @subscribers = smart_listing_create(:subscribers, @subscribers, :partial => "maily_herald/webui/subscribers/list")
         when "mailings"
           @mailings = smart_listing_create(:mailings, @item.mailings, :partial => "maily_herald/webui/mailings/list")
         else

data/app/controllers/maily_herald/webui/sessions_controller.rb

@@ -1,11 +1,15 @@
 module MailyHerald
 	class Webui::SessionsController < Webui::ApplicationController
-    def switch_mode
-      if %w{regular expert}.include? params[:mode]
-        session[:work_mode] = params[:mode].to_sym
-      end
+    def switch_setting
+      settings.toggle params[:setting]
 
       redirect_to :back
     end
+
+    private
+
+    def setting_cookie_name setting
+      "maily_settings_#{setting}"
+    end
   end
 end

data/app/controllers/maily_herald/webui/subscriptions_controller.rb

@@ -13,7 +13,7 @@ module MailyHerald
       add_breadcrumb view_context.tw("subscriptions.show.users_subscription", user: @item.entity.to_s)
 
       @entity = @item
-      smart_listing_create(:delivered_logs, @item.logs.delivered, :partial => "maily_herald/webui/logs/items", default_sort: {processing_at: "desc"})
+      smart_listing_create(:processed_logs, @item.logs.processed, :partial => "maily_herald/webui/logs/items", default_sort: {processing_at: "desc"})
       smart_listing_create(:scheduled_logs, @item.logs.scheduled, :partial => "maily_herald/webui/logs/items", default_sort: {processing_at: "asc"})
     end
 
@@ -29,5 +29,8 @@ module MailyHerald
         spec.klass = MailyHerald::Subscription
       end
     end
+
+    def action_dependencies *containers
+    end
   end
 end

data/app/helpers/maily_herald/webui/application_helper.rb

@@ -41,7 +41,7 @@ module MailyHerald
       end
 
       def link_to_context_attributes_overview list, options = {}
-        link_to context_variables_list_path(id: list, context: list.context_name), data: {toggle: "modal", target: "#modal-generic"}, class: ["link link-help", options[:class]] do 
+        link_to context_attributes_list_path(id: list, context: list.context_name), data: {toggle: "modal", target: "#modal-generic"}, class: ["link link-help", options[:class]] do 
           html = concat(icon(:list))
           html.concat(" ").concat(list.context_name) if options[:text]
         end if list.try(:context_name)
@@ -67,13 +67,17 @@ module MailyHerald
       end
 
       def content_for_expert
-        yield if expert_mode?
+        yield if settings.expert_mode
       end
 
       def work_mode_t mode
         t(mode, {scope: [:maily_herald, :webui, :work_modes]})
       end
 
+      def setting_t setting
+        t(setting, {scope: [:maily_herald, :webui, :settings]})
+      end
+
       def tw(key, options = {})
         t(key, {scope: [:maily_herald, :webui]}.merge(options))
       end
@@ -149,9 +153,25 @@ module MailyHerald
         end
       end
 
+      def setting_switcher setting
+        link_to(switch_setting_path(setting), method: :post) do
+          concat(icon(settings.get(setting) ? "toggle-on" : "toggle-off"))
+          concat(" ".html_safe)
+          concat(setting_t(setting))
+        end
+      end
+
       def smart_listing_config_profile
         :maily_herald
       end
+
+      def display_timestamp t
+        if t && settings.friendly_timestamps?
+          content_tag(:abbr, tw((t > Time.now) ? "commons.time_in" : "commons.time_ago", time: distance_of_time_in_words(t, Time.now)), title: t)
+        else
+          t
+        end
+      end
     end
   end
 end

data/app/helpers/maily_herald/webui/dashboard_helper.rb

@@ -0,0 +1,14 @@
+module MailyHerald
+  module Webui
+    module DashboardHelper
+      def history_graph_data
+        h = {
+          delivered: @delivered.to_json, 
+          failed: @failed.to_json, 
+        }
+        h[:skipped] = @skipped.to_json if settings.show_skipped?
+        h
+      end
+    end
+  end
+end

data/app/helpers/maily_herald/webui/lists_helper.rb

@@ -0,0 +1,13 @@
+module MailyHerald
+  module Webui
+    module ListsHelper
+      def display_list_scope_status list, entity
+        if list.context.scope.exists?(entity)
+          content_tag(:span, icon(:check, tw("commons.positive")))
+        else
+          content_tag(:span, icon(:times, tw("commons.negative")), class: "text-warning")
+        end
+      end
+    end
+  end
+end

data/app/helpers/maily_herald/webui/logs_helper.rb

@@ -3,7 +3,7 @@ module MailyHerald
     module LogsHelper
       def log_actions log
         actions = []
-        subscription = log.mailing.list.subscription_for(log.entity) if log.entity
+        subscription = log.mailing.list.subscription_for(log.entity) if log.mailing && log.entity
         actions << {
           name:      :custom, 
           url:       subscription_path(subscription),
@@ -26,12 +26,17 @@ module MailyHerald
         when :delivered
           content_tag(:span, icon(:check, tw("logs.status.delivered")), class: "text-success")
         when :skipped
+          content_tag(:span, icon(:times, tw("logs.status.skipped")), class: "text-warning")
         when :error
           content_tag(:span, icon(:exclamation, tw("logs.status.error")), class: "text-danger")
         when :scheduled
           content_tag(:span, icon(:"clock-o", tw("logs.status.scheduled")), class: "text-muted")
         end
       end
+
+      def display_log_skip_reason skip_reason
+        tw("logs.skip_reason.#{skip_reason}") if skip_reason
+      end
     end
   end
 end

data/app/helpers/maily_herald/webui/mailings_helper.rb

@@ -15,14 +15,14 @@ module MailyHerald
         actions = []
         actions << {
           name:      :custom, 
-          url:       deliver_one_time_mailing_path(mailing, entity),
+          url:       deliver_ad_hoc_mailing_path(mailing, entity),
           icon:      "fa fa-paper-plane",
           title:     tw("mailings.list.deliver"),
           if:        mailing.processable?(entity),
           remote:    true,
           method:    :post,
-          confirm:   tw("mailings.list.deliver_confirm")
-        } if mailing.one_time?
+          data:      {confirm: tw("mailings.list.deliver_confirm")}
+        } if mailing.ad_hoc?
         actions << {
           name:      :custom, 
           url:       {action: :preview, id: mailing, entity_id: entity},
@@ -44,11 +44,21 @@ module MailyHerald
       end
 
       def link_to_mailing mailing
-        link_to friendly_name(mailing), url_for_mailing(mailing)
+        if mailing
+          link_to url_for_mailing(mailing) do
+            concat(friendly_name(mailing))
+            if mailing.locked?
+              concat("&nbsp;".html_safe)
+              concat(icon(:lock))
+            end
+          end
+        else
+          tw("mailings.missing")
+        end
       end
 
       def display_mailing_from mailing
-        tw("mailings.from.default", email: mailing.mailer.default[:from])
+        mailing.from || tw("mailings.from.default", email: mailing.mailer.default[:from])
       end
 
       def display_mailing_period mailing
@@ -59,6 +69,41 @@ module MailyHerald
       def display_mailing_absolute_delay mailing
         distance_of_time_in_words mailing.absolute_delay
       end
+
+      def display_mailing_conditions mailing
+        if mailing.has_conditions_proc?
+          content_tag :span, class: "text-warning", data: {:toggle => "tooltip", :placement => "top"}, :title => tw("dispatches.hardcoded_info") do
+            concat(icon(:gears))
+            concat("&nbsp;".html_safe)
+            concat(tw(:label_hardcoded))
+          end
+        elsif mailing.conditions.is_a?(String)
+          content_tag(:code, mailing.conditions)
+        else
+          tw("mailings.conditions.missing")
+        end
+      end
+
+      def display_mailing_conditions_status mailing, entity
+        if mailing.conditions_met?(entity)
+          content_tag(:span, icon(:check, tw("mailings.conditions.met")))
+        else
+          content_tag(:span, icon(:times, tw("mailings.conditions.unmet")), class: "text-warning")
+        end
+      end
+
+      def display_mailing_start_at mailing
+        if mailing.has_start_at_proc?
+          content_tag :span, class: "text-warning", data: {:toggle => "tooltip", :placement => "top"}, :title => tw("dispatches.hardcoded_info") do
+            concat(icon(:gears))
+            concat("&nbsp;".html_safe)
+            concat(tw(:label_hardcoded))
+          end
+        elsif mailing.start_at.is_a?(String)
+          content_tag(:code, mailing.start_at)
+        else
+        end
+      end
     end
   end
 end

data/app/helpers/maily_herald/webui/sequences_helper.rb

@@ -1,6 +1,19 @@
 module MailyHerald
   module Webui
     module SequencesHelper
+      def link_to_sequence sequence
+        if sequence
+          link_to url_for(sequence) do
+            concat(friendly_name(sequence))
+            if sequence.locked?
+              concat(" ".html_safe)
+              concat(icon(:lock))
+            end
+          end
+        else
+          tw("mailings.missing")
+        end
+      end
     end
   end
 end

data/app/helpers/maily_herald/webui/subscribers_helper.rb

@@ -3,7 +3,7 @@ module MailyHerald
     module SubscribersHelper
       def subscriber_actions list, entity
         actions = []
-        subscription = list.subscription_for(entity)
+        subscription = MailyHerald::Subscription.get_from(entity) || list.subscription_for(entity)
         actions << {
           name:      :custom, 
           url:       subscription_path(subscription),

data/app/mailers/ad_hoc_mailer.rb

@@ -0,0 +1,8 @@
+class AdHocMailer < MailyHerald::Mailer
+  default from: "no-reply@mailyherald.org"
+
+  def ad_hoc_mail user
+    @user = user
+    mail to: user.email, subject: "Test"
+  end
+end

data/app/mailers/custom_one_time_mailer.rb

@@ -0,0 +1,7 @@
+class CustomOneTimeMailer < MailyHerald::Mailer
+  default from: "no-reply@mailyherald.org"
+
+  def one_time_mail user
+    mail to: user.email, subject: "Test"
+  end
+end

data/app/models/maily_herald/webui/settings.rb

@@ -0,0 +1,70 @@
+module MailyHerald
+  module Webui
+    class Settings
+      MAP = {
+        expert_mode: {type: :boolean, default: false},
+        show_skipped: {type: :boolean, default: false},
+        friendly_timestamps: {type: :boolean, default: true},
+      }.freeze
+
+      def initialize cookies
+        @cookies = cookies
+      end
+
+      def get setting
+        return unless exists?(setting)
+
+        v = @cookies[setting_key(setting)]
+        case setting_type(setting)
+        when :boolean
+          return setting_default(setting) unless v
+          return v == "1" ? true : false
+        end
+      end
+
+      def set setting, value
+        return unless exists?(setting)
+
+        value = case setting_type(setting)
+                when :boolean
+                  value ? "1" : "0"
+                end
+        @cookies.permanent[setting_key(setting)] = value
+      end
+
+      def toggle setting
+        return unless exists?(setting)
+
+        if setting_type(setting) == :boolean
+          v = get(setting)
+          set(setting, !v)
+        end
+      end
+
+      def exists? s
+        MAP.keys.include?(s.to_sym)
+      end
+
+      def method_missing(m, *args, &block)  
+        m =  m[0..(m.length-2)] if m[-1] == "?"
+        if exists?(m)
+          get(m)
+        end
+      end
+
+      private
+
+      def setting_key s
+        "maily_settings_#{s}"
+      end
+
+      def setting_type s
+        MAP[s.to_sym][:type]
+      end
+
+      def setting_default s
+        MAP[s.to_sym][:default]
+      end
+    end
+  end
+end

data/app/views/layouts/maily_herald/webui/application.html.haml

@@ -13,14 +13,13 @@
             %h1= link_to image_tag("maily_herald/webui/logo.svg", :class => "img-responsive logo"), root_path
           .col-sm-6= render_breadcrumbs
           .col-sm-3
-            .dropdown.pull-right
-              %a{:href => '#', :data => { toggle: 'dropdown'}, :class => 'account'} 
-                %span= work_mode_t(work_mode)
+            .dropdown.pull-right.dropdown-settings
+              %a{:href => '#', :data => { toggle: 'dropdown'}} 
+                = icon(:cog, nil, title: t(".settings"))
               %ul.dropdown-menu{'role' => 'menu'}
-                - if work_mode == :expert
-                  %li= link_to work_mode_t(:regular), switch_mode_path(:regular), :method => :post
-                - else
-                  %li= link_to work_mode_t(:expert), switch_mode_path(:expert), :method => :post
+                %li= setting_switcher :expert_mode
+                %li= setting_switcher :show_skipped
+                %li= setting_switcher :friendly_timestamps
 
       .section-wrapper
         = render_main_menu