web47core 3.2.9 → 3.2.12

data/app/views/delayed_job_workers/index.html.haml

@@ -1 +1,30 @@
-=render 'index'
+- title t('.title')
+.card
+  .card-body
+    .table-responsive.text-nowrap
+      %table.table.card-table.border.table-striped
+        %thead
+          %tr
+            %th Host Name
+            %th PID
+            %th Status
+            %th Last Check In
+            %th Runs
+            %th Actions
+        %tbody.table-border-bottom-0
+          - @workers.each do |worker|
+            %tr
+              %td=worker.host_name
+              %td=worker.pid
+              %td
+                - if worker.dead?
+                  = remix_icon(:dislike, tooltip_text: 'Dead')
+                - elsif worker.running?
+                  = remix_icon(:run, tooltip_text: 'Running')
+                - else
+                  = remix_icon(:zzz, tooltip_text: 'Waiting for jobs')
+              %td=current_user.local_time(worker.last_check_in_at)
+              %td=worker.runs.count
+              %td.actions
+                = delete_dropdown_item(worker, model_path(worker))
+

data/app/views/delayed_jobs/index.html.haml

@@ -1 +1,28 @@
-=render 'index'
+- title t('.title')
+= multiple_floating_action_button do
+  = delete_floating_action_button(Delayed::Backend::Mongoid::Job, class_action_path(:destroy_all, failed_only:true), title: t('.destroy_failed'), confirm: t('.confirm_destroy_failed'))
+  = delete_floating_action_button(Delayed::Backend::Mongoid::Job, class_action_path(:destroy_all, failed_only:false), title: t('.destroy_all'), confirm: t('.confirm_destroy_all'))
+  = refresh_floating_action_link(Delayed::Backend::Mongoid::Job, class_action_path(:resbumit_all, failed_only:true), title: t('.resubmit_failed'), confirm: t('.confirm_resubmit_failed'))
+  = refresh_floating_action_link(Delayed::Backend::Mongoid::Job, class_action_path(:resbumit_all, failed_only:false), title: t('.resubmit_all'), confirm: t('.confirm_resubmit_all'))
+.card
+  .card-body
+    .table-responsive.text-no-wrap
+      %table.table.card-table.border.table-striped
+        %thead
+          %tr
+            %th Run At
+            %th Name
+            %th Priority
+            %th Status
+            %th Actions
+        %tbody
+          - @delayed_jobs.each do |delayed_job|
+            %tr
+              %td=current_user.local_time(delayed_job.created_at)
+              %td.name=link_to(delayed_job.display_name, model_path(delayed_job))
+              %td=delayed_job.priority
+              %td=delayed_job.status_description
+              %td.actions
+                = dropdown_menu do
+                  = replay_dropdown_item(delayed_job, model_action_path(delayed_job, :resubmit), confirm: 'Are you sure you want to restart this job?')
+                  = delete_dropdown_item(delayed_job, model_path(delayed_job))

data/app/views/delayed_jobs/show.html.haml

@@ -1 +1,55 @@
-= render 'show'
+- title t('.title')
+- content_for :breadcrumbs do
+  =breadcrumb_step delayed_jobs_path, 'Delayed Job Queue'
+.card
+  .card-header
+    %h3.float-start=t('.title')
+    = card_nav_items do
+      = delete_nav_link(@delayed_job, delayed_job_path(@delayed_job))
+      = restart_nav_link(@delayed_job, resubmit_delayed_job_path(@delayed_job))
+  .card-body
+    .table-responsive
+      %table.table.card-table.border.table-stripped
+        %thead
+          %tr
+            %th Key
+            %th Value
+        %tbody
+          %tr
+            %td=t('.name_label')
+            %td=@delayed_job.name
+          %tr
+            %td=t('.queue_label')
+            %td=@delayed_job.queue&.titleize
+          %tr
+            %td=t('.priority_label')
+            %td=@delayed_job.priority
+          %tr
+            %td=t('.run_at_label')
+            %td=current_user.local_time(@delayed_job.run_at)
+          %tr
+            %td=t('.locked_at_label')
+            %td=current_user.local_time(@delayed_job.locked_at)
+          %tr
+            %td=t('.locked_by_label')
+            %td=@delayed_job.locked_by.presence || 'N/A'
+          %tr
+            %td=t('.handler_label')
+            %td=@delayed_job.job_payload
+          - if @delayed_job.failed?
+            %tr
+              %td=t('.failed_at_label')
+              %td=current_user.local_time(@delayed_job.failed_at)
+            %tr
+              %td=t('.failed_object_label')
+              %td=@delayed_job.failed_object.inspect
+            %tr
+              %td=t('.failed_method_label')
+              %td=@delayed_job.failed_method_name
+            %tr
+              %td=t('.failed_args_label')
+              %td=@delayed_job.failed_args
+            -if @delayed_job.last_error.present?
+              %tr
+                %td=t('.last_error_label')
+                %td=@delayed_job.last_error

data/app/views/system_configurations/edit.html.haml

@@ -1 +1,14 @@
-= render 'edit'
+- title 'Edit'
+- content_for :breadcrumbs do
+  =breadcrumb_step(system_configurations_path,  SystemConfiguration.environment.titleize)
+%form{action: system_configurations_path, method: :post}
+  %input{type: :hidden, value: form_authenticity_token, name: :authenticity_token}
+  %input{type: :hidden, name: '_method', value: :put}
+  .card
+    .card-body
+      .container
+        .row
+          = html5_text_field(@system_configuration, :switchboard_base_url, classes: %w[col-sm-12 col-lg-4] )
+          = html5_text_field(@system_configuration, :switchboard_stack_id, classes: %w[col-sm-12 col-lg-4])
+          = html5_password(@system_configuration, :switchboard_stack_api_token, classes: %w[col-sm-12 col-lg-4])
+    .card-footer= render 'common/form_actions', form_cancel_path: system_configurations_path

data/app/views/system_configurations/show.html.haml

@@ -1 +1,18 @@
-=render 'show'
+- title SystemConfiguration.environment.titleize
+= multiple_floating_action_button do
+  = edit_floating_action_link(SystemConfiguration.configuration, edit_system_configurations_path)
+  = refresh_floating_action_link(SystemConfiguration.configuration, sync_system_configurations_path)
+.card
+  .card-body
+    .table-responsive.text-nowrap
+      %table.table.card-table.border.table-striped
+        %thead
+          %tr
+            %th Field
+            %th Value
+        %tbody.table-border-bottom-0
+          - SystemConfiguration.allowed_param_names.each do |field|
+            %tr
+              %td= field
+              %td= mask_system_configuration(field)
+

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

@@ -6,6 +6,20 @@
 module CoreController
   extend ActiveSupport::Concern
 
+  protected
+
+  def redirect_to_referrer(default_url)
+    redirect_to session.delete(:referrer) || default_url
+  end
+
+  def capture_referrer_url
+    session[:referrer] = request.referrer
+  end
+
+  def clear_referrer_url
+    session.delete(:referrer)
+  end
+
   private
 
   def index_path

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+#
+# Manage cron_servers job servers
+#
+module CoreCronServersController
+  include CoreController
+  # Demote a cron_servers job server
+  def demote
+    cron_server.become_secondary
+    redirect_to_referrer(index_path)
+  rescue StandardError => error
+    log_controller_error error, true
+    redirect_to redirect_to_referrer(index_path)
+  end
+
+  # Destroy a cron_servers job server
+  def destroy
+    cron_server.destroy!
+    redirect_to_referrer(index_path)
+  rescue StandardError => error
+    log_controller_error error, true
+    redirect_to_referrer(index_path)
+  end
+
+  private
+
+  def cron_server
+    @cron_server ||= Cron::Server.find(params[:id])
+  end
+end

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+#
+# Manage cron_servers job servers
+#
+module CoreCronTabsController
+  include CoreController
+  #
+  # Run the crontab entry now
+  #
+  def run_now
+    cron_tab.run
+    redirect_to_referrer index_path
+  rescue StandardError => error
+    log_controller_error error, true
+    redirect_to_referrer index_path
+  end
+
+  #
+  # Update a crontab entry
+  #
+  def update
+    cron_tab.update! cron_tab_params
+    redirect_to_referrer index_path
+  rescue StandardError => error
+    log_controller_error error
+    render :edit
+  end
+
+  private
+
+  def cron_tab
+    @cron_tab ||= Cron::Tab.find(params[:id])
+  end
+
+  def cron_tab_params
+    p = params['cron_servers/job_tab']
+    p[:enabled] ||= false
+    p.permit(Cron::Tab.allowed_param_names)
+  end
+end

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

@@ -20,10 +20,10 @@ module CoreDelayedJobMetricsController
     authorize! :manage, delayed_job_metric
     delayed_job_metric.destroy!
     flash.now[:info] = 'Delayed Job Metric has been destroyed'
-    redirect_to index_path
+    redirect_to_referrer index_path
   rescue StandardError => error
     log_controller_error error, true
-    redirect_to index_path
+    redirect_to_referrer index_path
   end
 
   #

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

@@ -13,7 +13,7 @@ module Cron
     end
 
     #
-    # Check which audit logs we wanted deleted
+    # Check which audit logs we wanted to be deleted
     #
     # Should be older than 90 days and either not a user model audit log or the model associated with
     # the UserModelAuditLog has been deleted

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+#
+# Add methods to the Object class
+#
+class Object
+  #
+  # Return my class name as a readable string
+  #
+  def class_name
+    self.class.to_s
+  end
+
+  #
+  # Return my class name as a readable string
+  #
+  def class_name_underscored
+    class_name.underscore
+  end
+  #
+  # Return my class name as a readable titleized string
+  #
+  def class_title
+    class_name_underscored.titleize
+  end
+end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+#
+# Public: Support taggable entities
+#
+module TagAble
+  extend ActiveSupport::Concern
+
+  included do
+    #
+    # Fields
+    #
+    has_many :tags, dependent: :destroy, inverse_of: :model, class_name: 'Tag', foreign_key: :model_id
+  end
+
+  # @abstract Update the tags associated with the model
+  # First update what is from the updated tags
+  # Then delete any that are no longer associated with them
+  # @param updated_tags Array<Types::Tag> - tags to update with
+  def sync_tags(updated_tags)
+    updated_tags.each do |t|
+      tag = tags.where(key: t.key).first_or_initialize(key: t.key, model: self)
+      tag.update! value: t.value
+    end
+    keys = updated_tags.map(&:key)
+    tags.each { |t| t.destroy unless keys.include?(t.key) }
+  end
+
+  def tag_value(key, default = nil)
+    tags.find_by(key: key.to_s).value
+  rescue StandardError
+    default
+  end
+end

data/lib/app/models/tag.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+#
+# Represents a volume.
+#
+class Tag
+  include StandardModel
+  #
+  # Fields
+  #
+  field :key, type: String
+  field :value, type: String
+  #
+  # Validations
+  #
+  validates :key, presence: true, uniqueness: { scope: :model_id }
+  #
+  # Relationships
+  #
+  belongs_to :model, polymorphic: true
+end

data/lib/app/models/user_audit_log.rb

@@ -23,7 +23,7 @@ class UserAuditLog < AuditLog
   end
 
   #
-  # Safely return the user name
+  # Safely return the username
   #
   def user_name
     user.name
@@ -34,7 +34,7 @@ class UserAuditLog < AuditLog
   private
 
   #
-  # update the user name in case it is deleted
+  # update the username in case it is deleted
   #
   def record_names
     return if user.blank?

data/lib/web47core/version.rb

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

data/lib/web47core.rb

@@ -3,6 +3,7 @@ require 'app/models/concerns/app47_logger'
 require 'app/models/concerns/api_tokenable'
 require 'app/models/concerns/archive_able'
 require 'app/models/concerns/aws_configuration'
+require 'app/models/concerns/class_name'
 require 'app/models/concerns/core_system_configuration'
 require 'app/models/concerns/core_account'
 require 'app/models/concerns/cipher_able'
@@ -22,6 +23,7 @@ require 'app/models/concerns/switchboard_able'
 require 'app/models/concerns/switchboard_configuration'
 require 'app/models/concerns/secure_fields'
 require 'app/models/concerns/twilio_configuration'
+require 'app/models/concerns/tag_able'
 require 'app/models/concerns/zendesk_configuration'
 require 'app/models/command_job'
 require 'app/models/command_job_log'
@@ -44,6 +46,7 @@ require 'app/models/notification_template'
 require 'app/models/slack_notification'
 require 'app/models/sms_notification'
 require 'app/models/smtp_configuration'
+require 'app/models/tag'
 #
 # Cron
 #
@@ -80,7 +83,8 @@ require 'web47core/version'
 require 'app/controllers/concerns/restful_controller'
 require 'app/controllers/concerns/core_controller'
 require 'app/controllers/concerns/core_system_configuration_controller'
-require 'app/controllers/concerns/core_cron_controller'
+require 'app/controllers/concerns/core_cron_servers_controller'
+require 'app/controllers/concerns/core_cron_tabs_controller'
 require 'app/controllers/concerns/core_delayed_jobs_controller'
 require 'app/controllers/concerns/core_delayed_job_metrics_controller'
 require 'app/controllers/concerns/core_delayed_job_workers_controller'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 3.2.9
+  version: 3.2.12
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-30 00:00:00.000000000 Z
+date: 2025-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -564,43 +564,32 @@ files:
 - app/controllers/exceptions_controller.rb
 - app/controllers/notifications_controller.rb
 - app/controllers/status_controller.rb
+- app/helpers/core_breadcrumb_helper.rb
+- app/helpers/core_card_nav_items_helper.rb
+- app/helpers/core_dropdown_helper.rb
+- app/helpers/core_floating_action_button_helper.rb
 - app/helpers/core_form_helper.rb
 - app/helpers/core_helper.rb
+- app/helpers/core_html5_form_helper.rb
+- app/helpers/core_job_state_helper.rb
 - app/helpers/core_link_helper.rb
 - app/helpers/core_nav_bar_helper.rb
+- app/helpers/core_remix_icon_helper.rb
+- app/helpers/core_select_two_helper.rb
 - app/helpers/core_table_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/_create_actions.html.haml
 - app/views/common/_flash.html.haml
 - app/views/common/_form_actions.html.haml
 - app/views/common/_update_actions.html.haml
-- app/views/cron/_edit.html.haml
-- app/views/cron/_index.html.haml
-- app/views/cron/edit.html.haml
-- app/views/cron/index.html.haml
-- app/views/delayed_job_metrics/_index.html.haml
+- app/views/cron_servers/index.html.haml
+- app/views/cron_tabs/edit.html.haml
+- app/views/cron_tabs/index.html.haml
 - app/views/delayed_job_metrics/index.html.haml
-- app/views/delayed_job_workers/_index.html.haml
 - app/views/delayed_job_workers/index.html.haml
-- app/views/delayed_jobs/_index.html.haml
-- app/views/delayed_jobs/_show.html.haml
 - app/views/delayed_jobs/index.html.haml
 - app/views/delayed_jobs/show.html.haml
-- app/views/stack/cron/edit.html.haml
-- app/views/stack/cron/index.html.haml
-- app/views/stack/delayed_jobs/index.html.haml
-- app/views/stack/delayed_jobs/show.html.haml
-- app/views/stack/system_configurations/edit.html.haml
-- app/views/stack/system_configurations/show.html.haml
 - app/views/status/index.html.haml
-- app/views/system_configurations/_edit.html.haml
-- app/views/system_configurations/_show.html.haml
 - app/views/system_configurations/edit.html.haml
 - app/views/system_configurations/show.html.haml
 - bin/cron_server
@@ -615,7 +604,8 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - lib/app/controllers/concerns/core_controller.rb
-- lib/app/controllers/concerns/core_cron_controller.rb
+- lib/app/controllers/concerns/core_cron_servers_controller.rb
+- lib/app/controllers/concerns/core_cron_tabs_controller.rb
 - lib/app/controllers/concerns/core_delayed_job_metrics_controller.rb
 - lib/app/controllers/concerns/core_delayed_job_workers_controller.rb
 - lib/app/controllers/concerns/core_delayed_jobs_controller.rb
@@ -649,6 +639,7 @@ files:
 - lib/app/models/concerns/aws_configuration.rb
 - lib/app/models/concerns/cdn_url.rb
 - lib/app/models/concerns/cipher_able.rb
+- lib/app/models/concerns/class_name.rb
 - lib/app/models/concerns/core_account.rb
 - lib/app/models/concerns/core_smtp_configuration.rb
 - lib/app/models/concerns/core_system_configuration.rb
@@ -664,6 +655,7 @@ files:
 - lib/app/models/concerns/standard_model.rb
 - lib/app/models/concerns/switchboard_able.rb
 - lib/app/models/concerns/switchboard_configuration.rb
+- lib/app/models/concerns/tag_able.rb
 - lib/app/models/concerns/time_zone_able.rb
 - lib/app/models/concerns/twilio_configuration.rb
 - lib/app/models/concerns/zendesk_configuration.rb
@@ -681,6 +673,7 @@ files:
 - lib/app/models/slack_notification.rb
 - lib/app/models/sms_notification.rb
 - lib/app/models/smtp_configuration.rb
+- lib/app/models/tag.rb
 - lib/app/models/template.rb
 - lib/app/models/user_action_audit_log.rb
 - lib/app/models/user_audit_log.rb

data/app/views/admin/cron/edit.html.haml

@@ -1 +0,0 @@
-=render '/cron/edit'

data/app/views/admin/cron/index.html.haml

@@ -1 +0,0 @@
-=render '/cron/index'

data/app/views/admin/delayed_jobs/index.html.haml

@@ -1 +0,0 @@
-=render '/delayed_jobs/index'

data/app/views/admin/delayed_jobs/show.html.haml

@@ -1 +0,0 @@
-=render '/delayed_jobs/show'

data/app/views/admin/system_configurations/edit.html.haml

@@ -1 +0,0 @@
-= render '/system_configurations/edit'

data/app/views/admin/system_configurations/show.html.haml

@@ -1 +0,0 @@
-= render '/system_configurations/show'

data/app/views/cron/_edit.html.haml

@@ -1,19 +0,0 @@
-- title t('.title', name: @cron_tab.name)
-
-%form{action: model_path(@cron_tab), method: :post}
-  %input{type: :hidden, value: form_authenticity_token, name: :authenticity_token}
-  %input{type: :hidden, name: '_method', value: :put}
-  .container
-    .row
-      .col.s12
-        .card
-          .card-content
-            .card-title= t('.title', name: @cron_tab.name)
-            .row
-              = form_text_field(@cron_tab, :min)
-              = form_text_field(@cron_tab, :hour)
-              = form_text_field(@cron_tab, :mday)
-              = form_text_field(@cron_tab, :month)
-              = form_text_field(@cron_tab, :wday)
-              = form_checkbox(@cron_tab, :enabled)
-          = render 'common/update_actions', form_cancel_path: index_path

data/app/views/cron/_index.html.haml

@@ -1,77 +0,0 @@
-- title t('cron.index.title')
-.container
-  .row
-    .col.s12
-      .card
-        .card-content
-          .card-title= t('cron.index.title')
-      .card.section-data-tables
-        .card-content
-          %ul.tabs#stack_cron
-            %li.tab.col.s6
-              %a{href: '#cron_job_servers'}='Cron Servers'
-            %li.tab.col.s6
-              %a{href: '#job_cron_tabs'}='Cron Jobs'
-          .container
-            .row
-              .col.s12
-                #cron_job_servers{data: {cache: 'stack_cron'}}
-                  %table.highlight.data-table
-                    %thead
-                      %tr
-                        = table_header_tag :host
-                        = table_header_tag :state, priority: 3
-                        = table_header_tag :last_check_in_at, priority: 4
-                        = table_header_actions_tag
-                    %tbody.white-text
-                      - Cron::Server.all.each do |server|
-                        %tr{class: server.alive? ? 'green lighten-1' : 'red lighten-1'}
-                          %td="#{server.host_name}:#{server.pid}"
-                          %td.center-align
-                            - if server.primary?
-                              %i.material-icons.white-text
-                                grade
-                            - else
-                               
-                          %td=current_user.local_time(server.last_check_in_at)
-                          %td.center-align
-                            - if can? :manage, server
-                              .actions
-                                - if server.primary?
-                                  = action_link_tag(can?(:manage, Cron::Server), model_action_path(server, :demote), icon_name: 'thumb_down' )
-                                - else
-                                  = delete_link_tag(server, model_path(server))
-              .col.s12
-                #job_cron_tabs{data: {cache: 'stack_cron'}}
-                  %table.highlight.data-table
-                    %thead
-                      %tr
-                        = table_header_tag :name
-                        = table_header_tag :last_run_at, priority: 4
-                        = table_header_tag :min, priority: 5
-                        = table_header_tag :hour, priority: 6
-                        = table_header_tag :mday, priority: 7
-                        = table_header_tag :month, priority: 8
-                        = table_header_tag :wday, priority: 9
-                        = table_header_tag :enabled, priority: 3
-                        = table_header_actions_tag
-                    %tbody
-                      - Cron::JobTab.matching_search_text(params[:search]).each do |cron_tab|
-                        %tr
-                          %td.name=cron_tab.name.humanize
-                          %td=current_user.local_time(cron_tab.last_run_at)
-                          %td=cron_tab.min
-                          %td=cron_tab.hour
-                          %td=cron_tab.mday
-                          %td=cron_tab.month
-                          %td=cron_tab.wday
-                          %td
-                            - if cron_tab.valid_environment?
-                              %i.material-icons.green-text
-                                check
-                            - else
-                              %nbsp
-                          %td.actions
-                            = edit_link_tag(cron_tab, edit_model_path(cron_tab))
-                            - if cron_tab.valid_environment?
-                              = replay_link_tag(cron_tab, model_action_path(cron_tab, :run_now), icon_name: 'directions_run', confirm: t('.confirm', name: cron_tab.name.humanize))

data/app/views/cron/edit.html.haml

@@ -1 +0,0 @@
-= render 'edit'

data/app/views/cron/index.html.haml

@@ -1 +0,0 @@
-= render 'index'