web47core 1.0.18 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03eb842ad5444dd142207611058066153025ed42450633fd8bd8016214ccc298
-  data.tar.gz: 85da9686cff8dbae5982617475714889ce1585c631232f6d65fa627bba057b23
+  metadata.gz: 47b8925dffc596fd383ed69ede32318ec8f6a4ede85e2f64c3c9edcbc8b6e2a3
+  data.tar.gz: cd955d06104cdcf6070b912e0e5832ef086ca077470fdf80804ec725df8a8d81
 SHA512:
-  metadata.gz: dfa486a0aa38f932402b77796a8b09d8a80454714bfbd67a7cfef9d0da86bb12b6dda705b3554f5814533ba3251bcc3c4192cd1fd1e8f3d538b988ba890777c9
-  data.tar.gz: c699bca4b6ae1839f33746301386e0b015673de416a804f01288a5a48de1e13bdf9a5b91b5f28a45af4cbc87b2a726711fd3642007d5a88aec35e81c4973f82a
+  metadata.gz: 0ee1fab705f3fb0e87058e8f1d56f49d121d5c136be4b4f74704afd37c4ce77d6355fbf93a04ebabdd9c19994fd00dcb364cb1267f96bebc60fb2b79d9b00885
+  data.tar.gz: 65f4b435fd40e470da4a2697835ef76ca885b20a53ea0cdc64ee025e2d053894e18d61456985036b48e5e7832f863493769ee583f50cf43549da0a38dfc2aa34

data/app/helpers/core_link_helper.rb

@@ -65,6 +65,8 @@ module CoreLinkHelper
   # Add a material icon by name
   #
   def materialize_icon(name, options = {})
+    return if name.blank?
+
     classes = %w[material-icons]
     classes += options[:classes] if options[:classes].present?
     content_tag(:i, class: classes.join(' '), title: options[:title]) { name }
@@ -74,8 +76,11 @@ module CoreLinkHelper
   # Generic link tag
   #
   def link_tag(title, path, options = {})
-    content_tag(:a, href: path, class: options[:class]) do
-      concat(content_tag(:i, class: 'material-icons left') { options[:icon_name] }) if options[:icon_name].present?
+    data = {}
+    link_classes = tooltip_data(options, data)
+    confirmation_data(options, data)
+    content_tag(:a, href: path, class: link_classes, data: data) do
+      concat(materialize_icon(icon_name(options), options))
       concat(title)
     end
   end
@@ -98,12 +103,10 @@ module CoreLinkHelper
   def edit_link_tag(obj, path, options = {})
     return unless can? :edit, obj
 
-    icon = options[:icon] || 'edit'
-    tooltip = options[:tooltip] || 'Edit'
-    content_tag(:a, href: path, class: 'tooltipped', data: {tooltip: tooltip}) do
-      concat(content_tag(:i, class: 'material-icons') do
-        icon
-      end)
+    data = {}
+    link_classes = tooltip_data(options, data, 'Edit')
+    content_tag(:a, href: path, class: link_classes.join(' '), data: data) do
+      concat(materialize_icon(icon_name(options, 'edit'), options))
       concat(options[:label]) if options[:label].present?
     end
   end
@@ -122,12 +125,11 @@ module CoreLinkHelper
   def replay_link_tag(obj, path, options = {})
     return unless can? :edit, obj
 
-    icon_name = options[:icon_name] || 'replay'
-    data = { confirm: options[:confirm] || t('links.replay_confirmation', name: obj.class.to_s.underscore.humanize) }
-    content_tag(:a, href: path, data: data, class: options[:link_classes]) do
-      concat(content_tag(:i, class: 'material-icons') do
-        icon_name
-      end)
+    data = {}
+    confirmation_data(options, data, t('links.replay_confirmation', name: obj.class.to_s.underscore.humanize))
+    link_classes = tooltip_data(options, data)
+    content_tag(:a, href: path, data: data, class: link_classes.join(' ')) do
+      concat(materialize_icon(icon_name(options), options))
       concat(options[:label]) if options[:label].present?
     end
   end
@@ -160,11 +162,10 @@ module CoreLinkHelper
   def info_link_tag(obj, path, options = {})
     return unless can? :read, obj
 
-    icon = options[:icon] || 'info'
-    content_tag(:a, href: path) do
-      concat(content_tag(:i, class: 'material-icons') do
-        icon
-      end)
+    data = {}
+    link_classes = tooltip_data(options, data)
+    content_tag(:a, href: path, classes: link_classes, data: data) do
+      concat(materialize_icon(icon_name(options, 'info'), options))
       concat(options[:label]) if options[:label].present?
     end
   end
@@ -188,12 +189,11 @@ module CoreLinkHelper
   def action_link_tag(condition, path, options = {})
     return unless condition
 
-    confirmation = options[:confirmation] || t('links.action_confirmation')
-    confirmation_required = options[:confirmation].present? ? { confirm: confirmation } : {}
-    content_tag(:a, href: path, class: options[:classes], data: confirmation_required) do
-      concat(content_tag(:i, class: 'material-icons') do
-        options[:icon_name] || 'info'
-      end)
+    data = {}
+    confirmation_data(options, data)
+    link_classes = tooltip_data(options, data)
+    content_tag(:a, href: path, class: link_classes.join(' '), data: data) do
+      concat(materialize_icon(icon_name(options, 'directions_run'), options))
       concat(options[:label]) if options[:label].present?
     end
   end
@@ -216,12 +216,11 @@ module CoreLinkHelper
   def delete_link_tag(obj, path, options = {})
     return unless can? :destroy, obj
 
-    data = { method: :delete,
-             confirm: options[:confirm] || t('links.deletion_confirmation', name: obj.class.to_s.underscore.humanize) }
-    content_tag(:a, href: path, data: data) do
-      concat(content_tag(:i, class: 'material-icons') do
-        options[:icon_name] || 'delete'
-      end)
+    data = { method: :delete }
+    confirmation_data(data, options, t('links.deletion_confirmation', name: obj.class.to_s.underscore.humanize))
+    link_classes = tooltip_data(options, data)
+    content_tag(:a, href: path, class: link_classes, data: data) do
+      concat(materialize_icon(icon_name(options, 'delete'), options))
       concat(options[:label]) if options[:label].present?
     end
   end
@@ -244,11 +243,11 @@ module CoreLinkHelper
   def create_link_tag(obj, path, options = {})
     return unless can? :create, obj
 
-    confirmation = options[:confirmation] || t('links.action_confirmation', name: obj.class.to_s.underscore.humanize)
-    content_tag(:a, href: path, data: { confirm: confirmation }) do
-      concat(content_tag(:i, class: 'material-icons') do
-        options[:icon_name] || 'add'
-      end)
+    data = {}
+    confirmation_data(options, data, t('links.action_confirmation', name: obj.class.to_s.underscore.humanize))
+    link_classes = tooltip_data(options, data)
+    content_tag(:a, href: path, class: link_classes, data: { confirm: data }) do
+      concat(materialize_icon(icon_name(options, 'add'), options))
       concat(options[:label]) if options[:label].present?
     end
   end
@@ -401,4 +400,26 @@ module CoreLinkHelper
       concat(content_tag(:i, class: 'material-icons right') { button_icon })
     end
   end
+
+  #
+  # See if there is any confirmation and add it to the data element
+  #
+  def confirmation_data(options, data, default = nil)
+    confirm = options[:confirm] || options[:confirmation] || default
+    data[:confirm] = confirm if confirm.present?
+  end
+
+  def tooltip_data(options, data, default = nil)
+    link_classes = options[:link_classes] || []
+    tooltip = options[:tooltip] || default
+    if tooltip.present?
+      link_classes << 'tooltipped'
+      data[:tooltip] = tooltip
+    end
+    link_classes
+  end
+
+  def icon_name(options, default = nil)
+    options[:icon] || options[:icon_name] || default
+  end
 end

data/app/views/common/_flash.html.haml

@@ -1,5 +1,6 @@
 .flash
   - flash.each do |key, value|
+    - next if 'timedout'.eql?(key)
     .message
       %i.material-icons
         = flash_map_name(key)

data/config/locales/en.yml

@@ -10,14 +10,16 @@ en:
       save: Save
   time:
     formats:
-      long: '%Y-%m-%d %H:%M:%ss (%Z)'
-      medium: '%Y-%m-%d %H:%M (%Z)'
-      short: '%m/%d/%Y'
+      long: '%a, %d %b %Y %H:%M:%S (%Z)'
+      medium: '%b %d, %Y %H:%M (%Z)'
+      short: '%m/%d/%Y %H:%M (%Z)'
+      axlsx: '%Y-%m-%d %H:%M:%S (%Z)'
   date:
     formats:
       long: '%B %d, %Y'
       medium: '%b %d, %Y'
       short: '%m/%d/%Y'
+      axlsx: '%Y-%m-%d'
   ui_form:
     actions:
       reset: Reset

data/lib/app/controllers/concerns/core_delayed_jobs_controller.rb

@@ -10,7 +10,7 @@ module CoreDelayedJobsController
   #
   def index
     authorize! :read, Delayed::Backend::Mongoid::Job
-    @delayed_jobs = Delayed::Backend::Mongoid::Job.asc(%i[locked_by priority run_at]).limit(100)
+    delayed_jobs
   end
 
   def show
@@ -23,7 +23,7 @@ module CoreDelayedJobsController
   def destroy_all
     authorize! :manage, Delayed::Backend::Mongoid::Job
     failed_only = params[:failed_only].eql?('true')
-    Delayed::Backend::Mongoid::Job.each do |job|
+    delayed_jobs.each do |job|
       next if failed_only && !job.failed?
 
       job.destroy
@@ -41,7 +41,7 @@ module CoreDelayedJobsController
   def resubmit_all
     authorize! :read, Delayed::Backend::Mongoid::Job
     failed_only = params[:failed_only].eql?('true')
-    Delayed::Backend::Mongoid::Job.each do |job|
+    delayed_jobs.each do |job|
       next if failed_only && !job.failed?
 
       job.resubmit
@@ -79,9 +79,28 @@ module CoreDelayedJobsController
     redirect_to index_path
   end
 
-  private
-
+  #
+  # Fetch the required job by id
+  #
   def delayed_job
     @delayed_job ||= Delayed::Backend::Mongoid::Job.find(params[:id])
   end
+
+  #
+  # Find the first jobs for index or deleting all
+  #
+  def delayed_jobs
+    @delayed_jobs ||= Delayed::Backend::Mongoid::Job
+                        .order_by(locked_by: :desc, priority: :asc, run_at: :asc)
+                        .limit(delayed_jobs_limit)
+  end
+
+  #
+  # Define the limit of jobs to fetch for the index of delete all/resubmit all
+  #
+  # Override this in your project if you want a different limit
+  #
+  def delayed_jobs_limit
+    100
+  end
 end

data/lib/app/models/concerns/time_zone_able.rb

@@ -31,7 +31,7 @@ module TimeZoneAble
   # Return the given time in the localized time for this object
   #
   def local_date(date, format = :medium, default = 'N/A')
-    tz = TZInfo::Timezone.get(time_zone || 'GMT')
+    tz = TZInfo::Timezone.get(time_zone.presence || SystemConfiguration.default_time_zone)
     date.present? ? I18n.l(date.in_time_zone(tz).to_date, format: format) : default
   rescue StandardError
     default

data/lib/app/models/template.rb

@@ -40,7 +40,7 @@ class Template
     if File.exist?(Rails.root.join('lib/templates', delivery_channel, file_name))
       File.open(Rails.root.join('lib/templates', delivery_channel, file_name))
     else
-      File.read(File.join(__dir__, '../../lib/templates', delivery_channel, file_name))
+      File.open(File.join(__dir__, '../../../lib/templates', delivery_channel, file_name))
     end.read
   rescue StandardError
     nil

data/lib/templates/slack/error_message.liquid

@@ -1,3 +1,3 @@
 *ERROR:* `{{message}}`{% if exception != blank %} -
-```ruby {{exception}}```
+```{{exception}}```
 {% endif %}

data/lib/web47core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Web47core
-  VERSION = '1.0.18'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.1.4
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-22 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport