web47core 3.2.34 → 3.2.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a8a580a319f7241419d24577486e7e796ac0134c8151b98d2260396e0dfc5cd
-  data.tar.gz: ef377aa5df9e45caeb2fafae5df80f52c5cbfab68240412d2a3b977e38aab9d8
+  metadata.gz: 507f1a54c183040f0556e3ab8bec5bffac4ffe69ad5bc5c61bc7af05e6fec2c7
+  data.tar.gz: 59d36d5dc86de4c074138842a81dbe3dad4c9365d872393e3f44872c62e39e46
 SHA512:
-  metadata.gz: 51c047e2b49ffebc2a80ca6092bb5fa02bd8b973ef1c0aa831f9b9ddbbd1c25bc243a7797f3e63698e091fac1a68f935f6aec58bed87d09ee47e682144d491ba
-  data.tar.gz: c89b1d1205608802af2af66537cc8b3a12b8b3e0e43bded3190b182e4af7badc35be7055794b50128af825377cf459d53222cb8f015f3e86e9da991d4f152b83
+  metadata.gz: df0c33fc82e216700b19c47a52541c2d51c257ca9f59d59cf9870bfd55882bd31d2480a0a2f77b9ba58bd07bb1a9479d0096335cedc31e54ca7cef17dbf9e9be
+  data.tar.gz: 5f0f90d0b998d31e3b47a4a817eb896caf00a8e5286f36470ca51dd5fa7315eaaeabd958a25d0387252aae4ec412b609a3ee21e000400438e43158726c5613ad

data/app/helpers/core_flash_toast_helper.rb

@@ -2,18 +2,28 @@
 
 # Helper methods for rendering the flash information received from the server and displaying it as toast messages
 module CoreFlashToastHelper
+  def flash_color(key)
+    case key.to_sym
+    when :notice then 'text-success'
+    when :alert then 'text-danger'
+    when :error then 'text-danger'
+    when :warning then 'text-warning'
+    else 'text-info'
+    end
+  end
+
   # @abstract render the whole toast container if there are toast messages to render
   # @return HTML - To render in the page
   def toast_container
     return if flash.blank?
 
-    content_tag(:div, class: 'toast-container position-fixed top-0 start-50 translate-middle-x mt-5') do
+    content_tag(:div, class: 'toast-container position-fixed top-25 start-50 translate-middle-x mt-5') do
       flash.each { |key, value| concat(toast_flash_message(key, value)) unless 'timedout'.eql?(key) }
     end
   end
 
   def toast_flash_message(key, value)
-    content_tag(:div, class: 'toast', role: :alert, aria: { live: :assertive, atomic: true }) do
+    content_tag(:div, class: 'toast hide', role: :alert, aria: { live: :assertive, atomic: true }) do
       concat(toast_flash_header(key))
       concat(content_tag(:div, class: 'toast-body') { value })
     end
@@ -21,8 +31,8 @@ module CoreFlashToastHelper
 
   def toast_flash_header(key)
     content_tag(:div, class: 'toast-header') do
-      concat(content_tag(:i, class: [toast_flash_icon(key), 'me-2', toast_flash_color(key)].join(' ')) {})
-      concat(content_tag(:div, style: ['me-auto', 'fw-medium', toast_flash_color(key)].join(' ')) { key.humanize })
+      concat(svg_icon(toast_flash_icon(key), classes: [toast_flash_color(key), 'me-2'].join(' '), size: 24))
+      concat(content_tag(:div, class: ['me-auto', 'fw-medium', toast_flash_color(key)].join(' ')) { key.humanize })
       concat(tag(:button,
                  class: 'btn-close',
                  type: :button,
@@ -31,16 +41,12 @@ module CoreFlashToastHelper
     end
   end
 
-  # @abstract map the flash key to an icon
-  # @return String - name of the icon to render
   def toast_flash_color(key)
-    case key.downcase
-    when 'alert', 'error'
-      'text-danger'
-    when 'warning'
-      'text-warning'
-    else
-      'text-info'
+    case key.to_sym
+    when :notice then 'text-success'
+    when :alert, :error then 'text-danger'
+    when :warning then 'text-warning'
+    else 'text-info'
     end
   end
 
@@ -49,11 +55,11 @@ module CoreFlashToastHelper
   def toast_flash_icon(key)
     case key
     when 'alert', 'error'
-      'ri-alert-fill'
+      'alert-square-rounded'
     when 'warning'
-      'ri-error-warning-fill'
+      'alert-triangle'
     else
-      'ri-information-fill'
+      'info-circle'
     end
   end
 end

data/app/helpers/svg_icon_helper.rb

@@ -0,0 +1,51 @@
+# app/helpers/svg_icon_helper.rb
+module SvgIconHelper
+  # @abstract Render the appropriate icon based on the name and type
+  # @return [View]
+  def svg_icon(name, size: 24, type: :outline, classes: [], color: 'currentColor')
+    classes = ['icon', classes].compact.flatten.join(' ')
+    key = "icon_partial_path:#{name}:#{type}"
+    (partial, stroke) = Rails.cache.fetch(key, expires_in: 1.hour) do
+      path_with_type = "icons/#{name}-#{type}"
+      path_without_type = "icons/#{name}"
+
+      if I18n.exists?("nav.icons.#{name}")
+        [['icons', I18n.t("nav.icons.#{name}")].join('/'), color]
+      elsif lookup_context.exists?(path_with_type, [], true)
+        [path_with_type, color]
+      elsif lookup_context.exists?(path_without_type, [], true)
+        [path_without_type, color]
+      else
+        %w(icons/bug-outline red)
+      end
+    end
+
+    tag.svg(xmlns: "http://www.w3.org/2000/svg",
+            viewBox: "0 0 24 24",
+            width: size,
+            height: size,
+            class: classes,
+            fill: 'none',
+            stroke: stroke,
+            stroke_width: 1,
+            stroke_linecap: 'round',
+            stroke_linejoin: 'round') do
+      render partial
+    end
+  rescue StandardError 
+    tag.svg(xmlns: "http://www.w3.org/2000/svg",
+            viewBox: "0 0 24 24",
+            width: size,
+            height: size,
+            class: classes,
+            fill: 'none',
+            stroke: 'red',
+            stroke_width: 1,
+            stroke_linecap: 'round',
+            stroke_linejoin: 'round',
+            data: { bs_toggle: :tooltip },
+            title: "#{name}-#{type}") do
+      render 'icons/bug-outline'
+    end
+  end
+end

data/lib/web47core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 3.2.34
+  version: 3.2.35
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-03 00:00:00.000000000 Z
+date: 2025-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -541,6 +541,7 @@ files:
 - app/helpers/core_sso_servers_helper.rb
 - app/helpers/core_table_helper.rb
 - app/helpers/model_modal_helper.rb
+- app/helpers/svg_icon_helper.rb
 - app/views/common/_create_actions.html.haml
 - app/views/common/_flash.html.haml
 - app/views/common/_form_actions.html.haml