web47core 0.4.5 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62f27101007d6a08a3a21570d5d03b299ff09618587b024298cb6ba7a0a2acc1
-  data.tar.gz: aadbb1ff2be4b2176903302ce2f013332e8f1bf911dc7a49b761b594836cfaf6
+  metadata.gz: b89eaeeec4187eecc158409f7f0af8ba2748814cdab21fe9f19cb0ac071adf64
+  data.tar.gz: 288b0ceb85c4ba0656106357e7c3dbe28ecc0ee094e32b1d74595fa004361795
 SHA512:
-  metadata.gz: 1d5e07109eb32edf3760ab0e3f6e38b6dfcf8dc052d6953101914c44fbfef69eda0508086bf0ac7d2ecdc07d7a209335a02f254e6d2f9d145e5fd3d759228593
-  data.tar.gz: ce504663f0b0fddd7296bfb0f4e28ba5b04fe471c0491acbc25f84aa600810c3c67bab020ee4574eedebe1dc022d05ca251c17f604964089b57b6ca245306b71
+  metadata.gz: 6e1815ea8ac8f046d9ac3964c0dbb3935b33ce04108dd82359f6df9ebc24c0fe91898e97cf5f7e2263e242bd70ceb2e8e41f0b6b956a687196e8340c9009563c
+  data.tar.gz: bd952fc65ed2eea64389e92911ea46b439ecfd593b6821a026a5757b8eeb4c4444a5c17e6c812211f03a6363f578d88a9d760cd9cca85ba6a4d16d93cb53b46e

data/README.md

@@ -145,6 +145,10 @@ Before starting the server, you need to run the database command
 ```mongo
 db.cron_tabs.updateMany({_type: 'JobCronTab'}, {$set: {_type: 'Cron::JobTab'}});
 ``` 
+#### Routes
+Update abilities to new class names
+CronTab, JobCronTab, CronJobServer to Cron::Tab, Cron::JobTab, Cron::Server
+
 #### Routes
 The following routes should be added to the correct namespace for your applicaiton
 ```ruby
@@ -179,4 +183,52 @@ The following routes should be added to the correct namespace for your applicait
         get :resubmit
       end
     end
-```
+```
+#### Controllers
+##### CronController
+Update the CronController with something like below, and remove the views and any localization you might have made.
+```ruby
+# frozen_string_literal: true
+
+#
+# Manage all crontabs in the system Configuration
+#
+class CronController < AdminController
+  load_and_authorize_resource :cron_tab, only: %w[run_now update edit], id_param: :id, class: 'Cron::Tab'
+  load_and_authorize_resource :cron_server, only: %w[demote destroy], id_param: :id, class: 'Cron::Server'
+  include ::CoreCronController
+  rescue_from Mongoid::Errors::DocumentNotFound, with: :document_not_found_error
+end
+```
+##### DelayedJobController
+Update the DelayedJobController with something like below, and remove the views and any localization you might have made.
+```ruby
+# frozen_string_literal: true
+
+#
+# Manage access to delayed jobs for the admin UI
+#
+class DelayedJobsController < AdminController
+  include ::CoreDelayedJobsController
+  load_and_authorize_resource class: 'Delayed::Backend::Mongoid::Job'
+  rescue_from Mongoid::Errors::DocumentNotFound, with: :document_not_found_error
+end
+```
+##### StatusController
+Remove controller, views and localizations
+##### SystemConfigurationsController
+Update the SystemConfigurationsController with something like below, and remove the views and any localization you might have made.
+```ruby
+# frozen_string_literal: true
+
+#
+# Manage the system configuration page
+#
+class SystemConfigurationsController < AdminController
+  include ::CoreSystemConfigurationsController
+  load_and_authorize_resource :system_configuration
+end
+```
+#### ~/bin Directory
+
+Remove the delayed_job, delayed_job.sh and cron_server.sh files

data/app/assets/javascript/flash.coffee

@@ -0,0 +1,6 @@
+#
+# Transform the flash message to toast messages
+#
+$(document).ready ->
+  $('.flash .message').each ->
+    M.toast(html: $(this).html())

data/app/helpers/core_helper.rb

@@ -11,6 +11,36 @@ module CoreHelper
     content_for(:title) { page_title }
   end
 
+  #
+  # Record the search url if one is needed
+  #
+  def search_url(search_url)
+    content_for(:search_url) { search_url }
+  end
+
+  #
+  # Set the bread crumbs for navigation
+  #
+  def breadcrumbs(&block)
+    content_for(:breadcrumb_content) { block }
+  end
+
+  #
+  # Map alerts to a valid icon
+  #
+  def flash_map_name(key)
+    case key
+    when 'alert'
+      'notification_important'
+    when 'success'
+      'check_circle'
+    when 'notice'
+      'note'
+    else
+      key
+    end
+  end
+
   #
   # Pull the value from system configuration and mask the ones that match the given strings
   #

data/app/helpers/core_nav_bar_helper.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+#
+# Helpful methods for navigation bar on the side
+#
+module CoreNavBarHelper
+  #
+  # Determines which css attributes should be assigned to the current menu,
+  # options are
+  # <ul>
+  #  <li>read-only -  the menu is greyed out and disabled</li>
+  #  <li>locked - a lock icon appears</li>
+  #  <li>active - if the current controller matches either the name or names</li>
+  # </ul>
+  #
+  def nav_css(names, read_only = false, feature_enabled = true, feature_visible = true)
+    states = []
+    states << 'read-only' if read_only
+    states << 'locked' unless feature_enabled
+    states << 'hidden' unless feature_visible
+    if names.is_a? String
+      states << 'active' if names.eql?(controller.controller_name)
+    elsif names.is_a? Symbol
+      states << 'active' if names.to_s.eql?(controller.controller_name)
+    elsif names.is_a? Array
+      states << 'active' if names.include?(controller.controller_name)
+    end
+    states.join(' ')
+  end
+end

data/app/helpers/model_modal_helper.rb

@@ -0,0 +1,213 @@
+# frozen_string_literal: true
+
+#
+# Helper to create a modal dialog for a given model
+#
+module ModelModalHelper
+  #
+  # Render the relationship for the model, using caching to speed things up a bit
+  #
+  # This helper should be used on the related objects in the table, to cut down on the database queries when rendering
+  # the table.
+  #
+  def related_modal_tag(model, relation, options = {})
+    related_model = fetch_related_model(model, relation)
+    return if related_model.blank?
+
+    dynamic_related_modal(related_model, related_model_edit_path(model, relation, related_model, options), options)
+  end
+
+  #
+  # Only show the trigger with the edit path, let the rest be generated later
+  #
+  def dynamic_related_modal(related_model, edit_path, _options = {})
+    model_name = related_model.class.to_s.underscore
+    datum = { view_url: edit_path.gsub('/edit', '') }
+    anchor_id = "#{model_name}-#{related_model.id}"
+    title = related_model.respond_to?(:short_name) ? related_model.short_name : related_model.name
+    content_tag(:div) do
+      concat(content_tag(:a, href: "##{anchor_id}", class: 'modal-trigger') do
+        concat(content_tag(:span, title))
+      end)
+      concat(content_tag(:div, id: anchor_id, class: 'modal', data: datum) do
+        concat(content_tag(:div, class: 'modal-content') do
+          concat(content_tag(:h2, class: 'center') do
+            concat(content_tag(:span, related_model.name))
+          end)
+          concat(content_tag(:div, class: 'center-align') do
+            concat(content_tag(:div, class: 'progress red lighten-4') do
+              tag(:div, class: 'indeterminate red')
+            end)
+          end)
+        end)
+        concat(model_modal_footer(related_model, edit_path))
+      end)
+    end
+  end
+
+  def related_model_edit_path(model, relation, related_model, options = {})
+    if options[:parent].present?
+      parent_model = fetch_related_model(model, options[:parent])
+      send("edit_#{options[:parent]}_#{relation}_path", parent_model, related_model)
+    else
+      send("edit_#{relation}_path", related_model)
+    end
+  end
+
+  def fetch_related_model(model, relation)
+    # First get the relationship from cache
+    related_id = model.send("#{relation}_id")
+    key = "model_modal::#{relation}::#{related_id}"
+    Rails.cache.fetch(key, expires_in: 6.hours) { model.send(relation) }
+  end
+
+  #
+  # Render a modal tag for the given model object
+  #
+  def model_modal_tag(model, edit_path, options = {})
+    model_modal_action(model, options) + model_modal(model, edit_path, options)
+  end
+
+  def model_modal_action(model, _options = {})
+    content_tag(:a, class: 'modal-trigger', href: "#modal-#{model.id}") do
+      concat(model.name)
+    end
+  end
+
+  def model_modal(model, edit_path, options = {})
+    content_tag(:div, class: 'modal', id: "modal-#{model.id}") do
+      concat(model_modal_content(model, options))
+      concat(model_modal_footer(model, edit_path))
+    end
+  end
+
+  def dynamic_model_modal(model, options = {})
+    model_modal_content(model, options) + model_modal_footer(model, "#{request.url}/edit")
+  end
+
+  def model_modal_content(model, options = {})
+    content_tag(:div, class: 'modal-content') do
+      concat(content_tag(:h2) { model.name })
+      concat(content_tag(:div, class: 'row') do
+        concat(model_modal_tabs(model, options))
+        concat(model_modal_fields_tab(model, options))
+        concat(model_modal_standard_tab(model, options))
+        concat(model_modal_logs_tab(model, options)) if model.respond_to?(:logs)
+      end)
+    end
+  end
+
+  def model_modal_tabs(model, _options = {})
+    content_tag(:div, class: 'col s12') do
+      concat(content_tag(:ul, class: 'tabs tabs-fixed-width') do
+        concat(content_tag(:li, class: 'tab') do
+          content_tag(:a, href: "#field-tab-#{model.id}") { model.class.to_s.titleize }
+        end)
+        concat(content_tag(:li, class: 'tab') { content_tag(:a, href: "#standard-tab-#{model.id}") { 'Details' } })
+        if model.respond_to?(:logs)
+          concat(content_tag(:li, class: 'tab') { content_tag(:a, href: "#logs-tab-#{model.id}") { 'Logs' } })
+        end
+      end)
+    end
+  end
+
+  def model_modal_standard_tab(model, options = {})
+    content_tag(:div, id: "standard-tab-#{model.id}", class: 'col s12') do
+      concat(model_modal_standard(model, options))
+    end
+  end
+
+  def model_modal_fields_tab(model, options = {})
+    content_tag(:div, id: "field-tab-#{model.id}", class: 'col s12') do
+      concat(model_modal_fields(model, options))
+    end
+  end
+
+  def model_modal_logs_tab(model, _options = {})
+    content_tag(:div, id: "logs-tab-#{model.id}", class: 'col s12') do
+      content_tag(:table, class: 'center-align') do
+        concat(content_tag(:thead) do
+          concat(content_tag(:tr) do
+            concat(content_tag(:th) { 'Created' })
+            concat(content_tag(:th) { 'Command' })
+            concat(content_tag(:th) { 'Message' })
+          end)
+        end)
+        concat(content_tag(:tbody) do
+          model.logs.each do |log|
+            concat(model_modal_log(log))
+          end
+        end)
+      end
+    end
+  end
+
+  def model_modal_log(log)
+    content_tag(:tr) do
+      concat(content_tag(:td) { log.created_at })
+      concat(content_tag(:td) { log.display_message })
+    end
+  end
+
+  def model_modal_fields(model, _options = {})
+    content_tag(:table, class: 'center-align') do
+      concat(content_tag(:tbody) do
+        model.class.allowed_param_names.sort.each do |field_name|
+          concat(model_modal_field(model, field_name))
+        end
+      end)
+    end
+  end
+
+  def model_modal_standard(model, _options = {})
+    content_tag(:table, class: 'center-align highlighted') do
+      concat(content_tag(:tbody) do
+        %w[_id _type created_at updated_at search_text sort_text].each do |field_name|
+          concat(model_modal_field(model, field_name))
+        end
+      end)
+    end
+  end
+
+  def model_modal_field(model, field_name)
+    content_tag(:tr) do
+      concat(content_tag(:th, class: 'right-align') do
+        field_name.titleize
+      end)
+      concat(content_tag(:td) do
+        model_modal_field_value(model, field_name)
+      end)
+    end
+  end
+
+  def model_modal_field_value(model, field_name)
+    value = model.respond_to?(field_name) ? model.send(field_name) : ''
+    case value
+    when BSON::ObjectId
+      if field_name.eql?('_id')
+        value.to_s
+      else
+        related_model = fetch_related_model(model, field_name.chomp('_id'))
+        related_model.present? ? related_model.name : 'N/A'
+      end
+    when FalseClass
+      'No'
+    when TrueClass
+      'Yes'
+    when Mongoid::Boolean, Boolean
+      value ? 'Yes' : 'No'
+    when Date, DateTime, Time
+      current_user.local_time(value, :long)
+    when Integer, Array
+      value.to_s
+    else
+      value
+    end
+  end
+
+  def model_modal_footer(model, edit_path)
+    content_tag(:div, class: 'modal-footer') do
+      concat(edit_modal_tag(model, edit_path))
+    end
+  end
+end

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

@@ -0,0 +1,6 @@
+.flash
+  - flash.each do |key, value|
+    .message
+      %i.material-icons
+        = flash_map_name(key)
+      %p=value

data/config/locales/en.yml

@@ -7,6 +7,7 @@ en:
     actions:
       update: Update
       cancel: Cancel
+      save: Save
   time:
     formats:
       long: '%Y-%m-%d %H:%M:%ss (%Z)'

data/lib/app/jobs/cron/switchboard_sync_configuration.rb

@@ -28,6 +28,7 @@ module Cron
           json = JSON.parse(response.body)
           config = SystemConfiguration.configuration
           json['results'].each { |key, value| update_config(config, key, value) }
+          config.switchboard_last_sync_at = Time.now.utc
           config.save!
         else
           App47Logger.log_error "Unable to fetch switchboard config, #{response.inspect}"

data/lib/app/jobs/cron/trim_audit_logs.rb

@@ -20,6 +20,8 @@ module Cron
     #
     def archive?(item)
       super && (!item.is_a?(UserModelAuditLog) || item.model.blank?)
+    rescue StandardError
+      super
     end
 
     #

data/lib/app/jobs/cron/trim_collection.rb

@@ -14,16 +14,28 @@ module Cron
       count = 0
       total = collection.count
       while count <= total
-        collection.limit(250).skip(count).each { |item| item.destroy if archive?(item) }
+        collection.limit(250).skip(count).each { |item| trim_item(item) if archive?(item) }
         count += 250
       end
     end
 
+    #
+    # Try to safely destroy the item, warn if not successful
+    #
+    def trim_item(item)
+      item.destroy
+    rescue StandardError => error
+      App47Logger.log_error "Unable to destroy item #{item.inspect}", error
+    end
+
     #
     # Test if this should be archived
     #
     def archive?(item)
       item.updated_at < allowed_time_for_item(item)
+    rescue StandardError => error
+      App47Logger.log_warn "Unable to archive item #{item.inspect}", error
+      false
     end
 
     #

data/lib/app/jobs/cron/trim_failed_delayed_jobs.rb

@@ -34,7 +34,7 @@ module Cron
     # If the slack API is not present, don't delete jobs or we wont know about it.
     #
     def self.valid_environment?
-      SystemConfiguration.slack_api_url.present? && Delayed::Backend::Mongoid::Job.count.positive?
+      SystemConfiguration.slack_api_url.present?
     end
   end
 end

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

@@ -59,6 +59,7 @@ module CoreSystemConfiguration
       field :switchboard_base_url, type: String, default: 'https://switchboard.app47.com'
       field :switchboard_stack_id, type: String
       field :switchboard_stack_api_token, type: String
+      field :switchboard_last_sync_at, type: Time
       #
       # Validations
       #

data/lib/web47core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.2
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-05 00:00:00.000000000 Z
+date: 2020-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -556,18 +556,22 @@ files:
 - LICENSE
 - README.md
 - app/assets/images/1x1.png
+- app/assets/javascript/flash.coffee
 - app/controllers/exceptions_controller.rb
 - app/controllers/notifications_controller.rb
 - app/controllers/status_controller.rb
 - app/helpers/core_form_helper.rb
 - app/helpers/core_helper.rb
 - app/helpers/core_link_helper.rb
+- app/helpers/core_nav_bar_helper.rb
+- app/helpers/model_modal_helper.rb
 - app/views/admin/cron/edit.html.haml
 - app/views/admin/cron/index.html.haml
 - app/views/admin/delayed_jobs/index.html.haml
 - app/views/admin/delayed_jobs/show.html.haml
 - app/views/admin/system_configurations/edit.html.haml
 - app/views/admin/system_configurations/show.html.haml
+- app/views/common/_flash.html.haml
 - app/views/common/_form_actions.html.haml
 - app/views/cron/_edit.html.haml
 - app/views/cron/_index.html.haml