signum 0.4.13 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed7099f07650630cdafb4863f0abcdbf1bcc3e2e77edbf4c130204fd5a148f60
-  data.tar.gz: 59757f06d37a7a0e73911c69b1f8111ebc019905a9e585c21b9b8f8ddcce9776
+  metadata.gz: 80bcbf3b5c508331a717b1f9b17b7d14b06c88612f54635e45f87643453ddf5b
+  data.tar.gz: 5e44b69680cd000e0a048d595aa0539114b3fb1b9424a9b5812eff94d41d80fa
 SHA512:
-  metadata.gz: 374e02bc0f6b76caeecfc49869c830ca025b98fef9eb7154c02fddffc899eb6bd9f3093017f336131f053dd5bfb45a8cc4b1ab13b95150639a550f19722dc60c
-  data.tar.gz: 24ef26d963b3d1db38f09621cefae2994c054359f76ef7614de84c3db6dbe88765966a8ca53dba250a96196fc6368764dcbc0d96ed573b2e5945dc600acabd0c
+  metadata.gz: d698d607336e153b25d2dfbe5717bbdeb7338a88c77049dbfa7c40e24b3cbcdd2918baedb902e360b47b67a0bed9827b73bc9604562263c27de95279d89c9571
+  data.tar.gz: a94a9bea7fb4242fd2f9fd312ffbf2730bd4f8479244828ce977f39b54ea784c7b4048e0c66b6a04a133a1665a590d633964ade726d4af7b73414f3618bd2122

data/app/components/signum/notification_body/component.html.slim

@@ -14,9 +14,10 @@
         - if signal.metadata.present? && signal.metadata["links"].present?
           .signum-notification-body__mb__bc__mc__lkc
             - signal.metadata["links"].each do | link |
-              a.signum-notification-body__mb__bc__mc__lkc__lk href="#{link["url"]}" target=link.fetch("target", "_blank") *link["link_attributes"]
+              - next unless link.is_a?(Hash)
+              a.signum-notification-body__mb__bc__mc__lkc__lk*{href: link.fetch('url', '#'), target:link.fetch("target", "_blank") }.merge(link.fetch("link_attributes", {}))
                 i.fas.fa-link
-                =< link["title"]
+                =< link["title"] || link["url"] || '(...)'
         - if signal.attachments.attached?
           .signum-notification-body__mb__bc__mc__attc
             - signal.attachments.each do | attachment |
@@ -32,10 +33,11 @@
     - if signal.metadata.present? && signal.metadata["buttons"].present?
       .signum-notification-body__mb__bmc
         - signal.metadata["buttons"].each do | button |
+          - next unless button.is_a?(Hash)
           .signum-notification-body__mb__bmc__bc
-            a.signum-notification-body__mb__bmc__bc__b href="#{button["url"]}" target=button.fetch("target", "_blank") *button["link_attributes"]
+            a.signum-notification-body__mb__bmc__bc__b*{href: button.fetch('url', '#'), target:button.fetch("target", "_blank")}.merge(button.fetch("link_attributes", {}))
               = button["title"]
   - if signal.count.present?
     - percentage = signal.total.present? ? signal.count.fdiv(signal.total) * 100 : signal.count
     .signum-notification-body__pbc
-      = sts.progress_bar percentage, size: :small, label: false
+      = sts.progress_bar percentage, size: :small, label: false

data/app/components/signum/notification_body/component_controller.js

@@ -13,7 +13,7 @@ export default class extends ApplicationController {
   close(event) {
     setTimeout(() => {
       this.element?.parentElement?.remove()
-      if (event) {
+      if (event && this.typeValue != "balloon") {
         this.markClose()
       }
     }, 300)

data/app/components/signum/notifications/component.html.slim

@@ -0,0 +1,5 @@
+= helpers.turbo_stream_from :signals
+
+.pointer-events-none.fixed.inset-0.flex.items-end.px-2.py-6.sm:items-start.sm:p-6.z-10 data-turbo-permanent="true" id="signum_notifications"
+  #notifications_all.flex.w-full.flex-col.items-center.space-y-2.sm:items-end
+  div.flex.w-full.flex-col.items-center.space-y-2.sm:items-end[id="#{Signum.config.balloon_notifications_container_id.call}"]

data/app/components/signum/notifications/component.rb

@@ -0,0 +1,9 @@
+module Signum
+  module Notifications
+    class Component < ViewComponent::Base
+
+      def initialize()
+      end
+    end
+  end
+end

data/app/models/signum/signal.rb

@@ -11,10 +11,10 @@ module Signum
     def broadcast_create
       broadcast! if can_broadcast?
 
-      broadcast_prepend_to(:signals, target: Signum.config.balloon_notifications_container_id.call,
+      broadcast_prepend_to(:signals, target: Signum.config.balloon_notifications_container_id.call(signalable, id),
                                      html: ApplicationController.render(Signum::Notification::Component.new(self)))
 
-      broadcast_prepend_to(:signals, target: Signum.config.drawer_notifications_container_id.call,
+      broadcast_prepend_to(:signals, target: Signum.config.drawer_notifications_container_id.call(signalable, id),
                                      html: ApplicationController.render(Signum::NotificationDrawerItem::Component.new(signal: self)))
     end
 

data/lib/signum/configuration.rb

@@ -35,8 +35,8 @@ module Signum
     option :base_service, default: '::ApplicationService'
     option :base_service_context, default: '::ApplicationContext'
     option :current_user, default: -> {}
-    option :drawer_notifications_container_id, default: -> {}
-    option :balloon_notifications_container_id, default: -> {}
+    option :drawer_notifications_container_id, default: ->(signalable = nil, id = nil) {}
+    option :balloon_notifications_container_id, default: ->(signalable = nil, id = nil) {}
     option :icons,
            default: { info: 'fa-solid fa-circle-info fa-lg',
                       error: 'fa-solid fa-square-xmark fa-lg',

data/lib/signum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Signum
-  VERSION = "0.4.13"
+  VERSION = "0.5.1"
 end

data/signum.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'pg'
   spec.add_dependency 'rails', '> 6.0'
-  spec.add_dependency 'state_machines-activemodel'
+  spec.add_dependency 'state_machines-activerecord'
 
   spec.add_development_dependency 'auxilium', '~> 3'
   spec.add_development_dependency 'sqlite3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signum
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.5.1
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-24 00:00:00.000000000 Z
+date: 2024-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: state_machines-activemodel
+  name: state_machines-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -183,6 +183,8 @@ files:
 - app/components/signum/notification_drawer_item/component.html.slim
 - app/components/signum/notification_drawer_item/component.rb
 - app/components/signum/notification_drawer_item/component_controller.js
+- app/components/signum/notifications/component.html.slim
+- app/components/signum/notifications/component.rb
 - app/controllers/signum/api_controller.rb
 - app/controllers/signum/application_controller.rb
 - app/controllers/signum/signal_controller.rb