web47core 3.2.3.8 → 3.2.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca2d5269a9cd25712248931a2fe2f12fdea0e275ee52d19b97603c3b68f943ca
-  data.tar.gz: 818a493abc0ce567d2eba6ac4b53f52e8915a8e4a5b43ccdd2f1749e4c8032aa
+  metadata.gz: 502b3b8f2eb2041c496b5fdab4579cd3578d05e436bfaa0cd840da47d30079d2
+  data.tar.gz: 64cd85383fbceeaf7fc82488c23df1d7098708c6e043ddf2f595cca16452b1f5
 SHA512:
-  metadata.gz: 2eeeb02db277e86ca1db1b15aa09ea8ccc1148e05fb189e3167e435186e4377836f224030ca3874d2472eee8b0926a40ec935c0509575d57ccd8a8ce47fa32d8
-  data.tar.gz: 7e486652bbb132f1aeccf0085481b743fcd93ecb6c07e3450e9ca0d98432c7dbd371b0f3c5a02a017fa43bbabd1a235e5a6da0162460ec822b8056a16eae708e
+  metadata.gz: 23373514688cdf82da7b5a34048abf1b96753bd543b3084b27e3cba57466062b6d99bf59360b97d78f5754bb5fba0bdf888f682fcd84efe552230cb7e20f73fc
+  data.tar.gz: e0a3d35a324e193f61b1db5b1dfe769dba57ae40743c295082ece2f8f37112f93849b0d299f00c03c1cae98ca01ca3a29aa08ea484a998dce35b2729f4f451bd

data/app/helpers/card_nav_builder.rb

@@ -0,0 +1,82 @@
+
+class CardNavBuilder
+  include ActionView::Helpers::TagHelper
+  include SvgIconHelper
+
+  def initialize(obj, current_ability, show_text: true, view_context: nil)
+    @obj = obj
+    @show_text = show_text
+    @current_ability = current_ability
+    @view_context = view_context
+  end
+
+  def restart_link(path, confirm: nil, title: 'Restart')
+    return unless can?(:edit, @obj)
+
+    confirm ||= "Are you sure you want to #{title.downcase} this #{@obj.class_title}?"
+    item_link(path, title, :replay, confirm: confirm)
+  end
+
+  def synchronize_link(path, title: 'Sync', icon_name: :sync)
+    return unless can?(:edit, @obj)
+
+    item_link(path, title, icon_name)
+  end
+
+  def action_link(path, title: 'Action', icon_name: :play, method: :get, confirm: nil)
+    return unless can?(:read, @obj)
+
+    item_link(path, title, icon_name, confirm: confirm, method: method)
+  end
+
+  def info_link( path, title: 'Info', icon_name: :info, method: :get)
+    return unless can?(:read, @obj)
+
+    item_link(path, title, icon_name, method: method)
+  end
+
+  def edit_link(path, title: 'Edit')
+    return unless can?(:edit, @obj)
+
+    item_link(path, title, :edit)
+  end
+
+  def create_link(path, title: 'Add', icon_name: :add)
+    return unless can?(:create, @obj)
+
+    item_link(path, title, icon_name)
+  end
+
+  def delete_link(path, confirm: nil, title: 'Delete')
+    return unless can?(:manage, @obj)
+
+    confirm ||= "Are you sure you want to delete this #{@obj.class_title}?"
+    item_link(path, title, :delete, confirm: confirm, method: :delete, btn_class: 'text-danger')
+  end
+
+  private
+
+  def can?(action, obj)
+    @current_ability.can?(action, obj)
+  end
+
+  # @abstract The work horse for the card nav item
+  # @param [String] path - The path/URL for the action
+  # @param [String] title - The title of the action
+  # @param [String, Symbol] icon_name - Name of the icon to render
+  # @param [String] confirm - If the action requires confirmation before completing
+  # @param [String, Symbol] method - The HTTP method to use for the link, default is :get
+  # @param [String] btn_class - The class of button that should be used, btn-primary is the default
+  # @return HTML - The HTML for the given tag
+  def item_link(path, title, icon_name, confirm: nil, method: :get, btn_class: '')
+    data = { method: method, bs_toggle: :tooltip, placement: :bottom }
+    data[:confirm] = confirm if confirm.present?
+
+    @view_context.content_tag(:a, href: path, class: "btn #{btn_class}", data: data, title: title) do
+      parts = []
+      parts << @view_context.svg_icon(icon_name, classes: [])
+      parts << @view_context.content_tag(:span, class: 'ms-2 d-none d-md-inline') { title } if @show_text
+      @view_context.safe_join(parts)
+    end
+  end
+end

data/app/helpers/core_card_nav_items_helper.rb

@@ -1,88 +1,15 @@
 # frozen_string_literal: true
 
+
 #
 # Help with nav items at the top of cards
 #
 module CoreCardNavItemsHelper
   # @abstract Yield the main block for card nav items
-  def card_nav_items(&block)
-    content_tag(:ul, class: 'nav nav-pills float-end') do
-      yield block
-    end
-  end
-
-  # @abstract Link to the jobs icon
-  # @return HTML - The HTML for the given tag
-  def jobs_nav_link(obj, path, title: 'Jobs')
-    return unless can?(:view, obj)
-
-    card_nav_item_link(path, title, 'stack-overflow')
-  end
-
-  # @abstract Link to the jobs icon
-  # @return HTML - The HTML for the given tag
-  def current_job_nav_link(obj, path, title: 'Current')
-    return unless can?(:view, obj)
-
-    card_nav_item_link(path, title, 'run')
-  end
-
-  # @abstract Link to the jobs icon
-  # @return HTML - The HTML for the given tag
-  def start_job_nav_link(obj, path, title: 'Start', confirm: nil)
-    return unless can?(:view, obj)
-
-    confirm ||= "Are you sure you want to start this #{obj.class_title} job?"
-    card_nav_item_link(path, title, :play, btn_class: 'btn-success', confirm: confirm, method: :post)
-  end
-
-  # @abstract Link to restart, replay a given object
-  # @param [Object] obj - The object to operate on, for permission checks
-  # @param [String] path - The path/URL for the action
-  # @param [String] confirm - Override the default confirmation
-  # @param [String] title - Override the default title of the button
-  # @return HTML - The HTML for the given tag
-  def restart_nav_link(obj, path, confirm: nil, title: 'Restart')
-    return unless can?(:edit, obj)
-
-    confirm ||= "Are you sure you want to restart this #{obj.class_title}?"
-    card_nav_item_link(path, title, :replay, confirm: confirm)
-  end
-
-  def edit_nav_link(obj, path, title: 'Edit')
-    return unless can?(:edit, obj)
-
-    card_nav_item_link(path, title, 'edit')
-  end
-
-  # @abstract Link to delete an object
-  # @return HTML - The HTML for the given tag
-  def delete_nav_link(obj, path, confirm: nil, title: 'Delete')
-    return unless can?(:manage, obj)
-
-    confirm ||= "Are you sure you want to delete this #{obj.class_title}?"
-    card_nav_item_link(path, title, :delete, confirm: confirm, method: :delete, btn_class: 'btn-danger')
-  end
-
-  # @abstract The work horse for the card nav item
-  # @param [String] path - The path/URL for the action
-  # @param [String] title - The title of the action
-  # @param [String, Symbol] icon_name - Name of the icon to render
-  # @param [String] confirm - If the action requires confirmation before completing
-  # @param [String|Symbol] method - The HTTP method to use for the link, default is :get
-  # @param [String] btn_class - The class of button that should be used, btn-primary is the default
-  # @return HTML - The HTML for the given tag
-  def card_nav_item_link(path, title, icon_name, confirm: nil, method: :get, btn_class: 'btn-primary')
-    data = { method: method, turbo_method: method }
-    if confirm.present?
-      data[:confirm] = confirm
-      data[:turbo_confirm] = confirm
-    end
-    content_tag(:li, class: 'nav-item me-2') do
-      link_to path, class: "#{btn_class} btn nav-link active", data: data do
-        concat(svg_icon(icon_name, classes: ['me-2']))
-        concat(content_tag(:span, class: 'd-none d-md-inline') { title })
-      end
+  def card_nav_items(obj, title: 'Card Actions', show_text: true, &block)
+    builder = CardNavBuilder.new(obj, current_ability, show_text: show_text, view_context: self)
+    content_tag(:div, class: 'btn-group', role: :group, aria: { label: title }) do
+      capture builder, &block
     end
   end
 end

data/app/helpers/svg_icon_helper.rb

@@ -14,11 +14,7 @@ module SvgIconHelper
   def fetch_svg_icon(name, size: 24, type: :outline, classes: [], color: 'currentColor', stroke_width: 2)
     return if name.blank?
 
-    classes = if size <= 24
-                ['icon', classes].flatten.compact.join(' ')
-              else
-                classes.compact.flatten.join(' ')
-              end
+    classes = classes.compact.flatten.join(' ')
     key = "icon_partial_path:#{name}:#{type}"
     (partial, stroke) = Rails.cache.fetch(key, expires_in: SystemConfiguration.long_cache) do
       preferred_path = I18n.exists?("nav.icons.#{name}") ? 'icons/' + I18n.t("nav.icons.#{name}") : "icons/#{type}/#{name}"

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

@@ -4,16 +4,11 @@
     .card-title
       %h4=t('.title')
     .btn-list
-      - if can?(:manage, Delayed::Backend::Mongoid::Job)
-        %a.btn.bg-warning{href: class_action_path(:destroy_all, failed_only:true), title: t('.destroy_failed'),  data: {bs_toggle: :tooltip, confirm: t('.confirm_destroy_failed'), method: :delete} }
-          =svg_icon(:trash, classes: %w(text-white))
-        %a.btn.bg-danger{href: class_action_path(:destroy_all, failed_only:false), title: t('.destroy_all'), data: {bs_toggle: :tooltip, confirm: t('.confirm_destroy_all'), method: :delete} }
-          =svg_icon(:trash, classes: %w(text-white))
-      - if can?(:update, Delayed::Backend::Mongoid::Job)
-        %a.btn.bg-warning{href: class_action_path(:resubmit_all, failed_only:true), title: t('.resubmit_failed'), data: {bs_toggle: :tooltip, confirm: t('.confirm_resubmit_failed')} }
-          =svg_icon(:repeat, classes: %w(text-white))
-        %a.btn.bg-danger{href: class_action_path(:resubmit_all, failed_only:false), title: t('.resubmit_all'), data: {bs_toggle: :tooltip, confirm: t('.confirm_resubmit_all')} }
-          =svg_icon(:repeat, classes: %w(text-white))
+      = card_nav_items(Delayed::Backend::Mongoid::Job) do |nav|
+        =nav.delete_link(class_action_path(:destroy_all, failed_only:true), title: t('.destroy_failed'), confirm: t('.confirm_destroy_failed'))
+        =nav.delete_link(class_action_path(:destroy_all, failed_only:false), title: t('.destroy_all'), confirm: t('.confirm_destroy_all'))
+        =nav.restart_link(class_action_path(:resubmit_all, failed_only:true), title: t('.resubmit_failed'), confirm: t('.confirm_resubmit_failed'))
+        =nav.restart_link(class_action_path(:resubmit_all, failed_only:false), title: t('.resubmit_all'), confirm: t('.confirm_resubmit_all'))
 
   .card-body
     .table-responsive.text-no-wrap

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

@@ -4,9 +4,9 @@
 .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_nav_items(@delayed_job) do |nav|
+      = nav.delete_link(delayed_job_path(@delayed_job))
+      = nav.restart_link(resubmit_delayed_job_path(@delayed_job))
   .card-body
     .table-responsive
       %table.table.card-table.border.table-stripped

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

@@ -1,10 +1,14 @@
 - 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-header.d-flex.justify-content-between
+    .card-title System Configuration
+    = card_nav_items(SystemConfiguration) do |nav|
+      =nav.edit_link(edit_system_configurations_path)
+      - if SystemConfiguration.switchboard_configured?
+        =nav.synchronize_link(sync_system_configurations_path)
+
   .card-body
-    .table-responsive
+    .table-responsive.text-no-wrap
       %table.table.border.table-hover.table-vcenter.datatable.card-table.no-wrap.responsive
         %thead
           %tr

data/config/locales/en.yml

@@ -50,6 +50,7 @@ en:
     icons:
       copy_icon: outline/copy
       copy_success: filled/circle-check
+      check: filled/circle-check
       copy_error: filled/bug
       dead: outline/skull
       running: outline/treadmill
@@ -86,13 +87,13 @@ en:
       cron: outline/alarm
       cron_servers: outline/server
       cron_tabs: outline/calendar-clock
-      accounts: outline/buildings
       system_configuration: outline/adjustments-horizontal
       sso_servers: outline/login-2
+      accounts: outline/buildings
+      sync: outline/refresh
       edit: outline/edit
       team: outline/users-group
       logout: outline/logout-2
-
   system_configurations:
     show:
       title: "%{name} System Configuration"
@@ -135,12 +136,12 @@ en:
   delayed_jobs:
     index:
       title: "Delayed Jobs"
-      resubmit_all: Resubmit All Jobs
-      resubmit_failed: Resubmit Failed Jobs
+      resubmit_all: Resubmit All
+      resubmit_failed: Resubmit Failed
       confirm_resubmit_all: Are you sure you want to resubmit all jobs?
       confirm_resubmit_failed: Are you sure you want to resbmit failed jobs?
-      destroy_all: Destroy All Jobs
-      destroy_failed: Destroy Failed Jobs
+      destroy_all: Destroy All
+      destroy_failed: Destroy Failed
       confirm_destroy_all: Are you sure you want to destroy all jobs?
       confirm_destroy_failed: Are you sure you want to destroy failed jobs?
       no_data_found: "No Delayed Jobs found"
@@ -175,4 +176,4 @@ en:
       status: Status
       pid: PID
       running: Running?
-      alive: Alive?
+      alive: Alive?

data/lib/web47core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 3.2.3.8
+  version: 3.2.3.9
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-12 00:00:00.000000000 Z
+date: 2025-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -526,15 +526,12 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- app/assets/config/manifest.js
 - app/assets/images/1x1.png
-- app/assets/javascript/clipboard.coffee
-- app/assets/javascript/flash.coffee
-- app/assets/stylesheets/clipboard.scss
 - app/controllers/errors_controller.rb
 - app/controllers/exceptions_controller.rb
 - app/controllers/notifications_controller.rb
 - app/controllers/status_controller.rb
+- app/helpers/card_nav_builder.rb
 - app/helpers/core_application_helper.rb
 - app/helpers/core_avatar_helper.rb
 - app/helpers/core_breadcrumb_helper.rb

data/app/assets/config/manifest.js

@@ -1,3 +0,0 @@
-//= link ../stylesheets .scss
-//= link ../javascript .coffee
-//= link ../images .png

data/app/assets/javascript/clipboard.coffee

@@ -1,34 +0,0 @@
-#
-# Enable copy capability to the machines copy/paste buffer
-#
-$(document).ready ->
-  if clipboardEnabled()
-    $('a.copy').on 'click', (e) ->
-      node = e.target
-      textField = document.createElement('textarea')
-      node.parentNode.insertBefore(textField, node)
-      try
-        textField.innerText =  $(this).data('clipboard-text')
-        textField.select()
-        textField.focus()
-        if document.execCommand('copy')
-          M.toast({html: 'Copied!'}, 3000);
-        else
-          M.toast({html: 'Unable to copy text'}, 3000);
-      catch error
-        M.toast({html: 'Unable to copy text'}, 3000);
-      finally
-        textField.parentNode.removeChild(textField)
-
-  else
-    $('.copy').hide()
-
-#
-# Test that we can issue the execCommand for copy and that it returns
-#
-clipboardEnabled = ->
-  try
-    document.execCommand('copy')
-    true
-  catch error
-    false

data/app/assets/javascript/flash.coffee

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

data/app/assets/stylesheets/clipboard.scss

@@ -1,13 +0,0 @@
-.clipboard {
-  margin: 0 0 0 2px;
-  padding: 0;
-  span {
-    font-size: 1rem;
-  }
-  a.copy {
-    i.material-icons {
-      i.material-icons;
-      font-size: 1rem;
-    }
-  }
-}