signum 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70f07ba920350cfcc01c51e62854936d070951d4a3dcf37ad381bf0d29e2c75f
-  data.tar.gz: e8d35f2cd2a4c09033bcd87a69b7373fc6ea002c64001e9d0f64d8cc8c96cba7
+  metadata.gz: 9acff14e5d11f110525162eed1f0866c92b7dc9c22c1f7390658e463cc88b5f3
+  data.tar.gz: e4f284537c9c20296d9d113d294e12036963dd6390fc2090023be3c372e23895
 SHA512:
-  metadata.gz: 6757ede07a145e076903f8cc667521166e99c8ff0215bb0e606d4f3dd15e7d21eab5a1dbe4fdd7712539fb16a743e21f67e74416b0ca1cc0ced422653b53f39f
-  data.tar.gz: 3d263f2cc1d3d53604eea2c2c21b58dd648b10a79d8fb7593f8e6829ecf5c7a5c4327f78cf8dcb532d7daa94f465f0d1e48078f0f11e9c9bc01ce9ddfb6239ab
+  metadata.gz: 884944f576e484920bf7530da0b8be24a8fc2df82716ceb5712525398b8438da1ba5f4febcdcef6551da167ccc273a8c757e4746def498ac5eef6629c97e507c
+  data.tar.gz: e23ffab144d91f8f8c5b853acd5007220fc26b0e19a6e15c71d5a65cc2f2342bd6f3c7a19473d15bf151515e03762a33704de4c86de221b677f91853aa5502c9

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

@@ -1,4 +1,4 @@
-.signum-notification-body data-controller="signum-notification-body" data-signum-notification-body-type-value=data[:type] data-signum-notification-body-timeout-value=data[:timeout] data-signum-notification-body-sticky-value="#{signal.sticky.present? ? signal.sticky.to_s : 'false'}" data-signum-notification-body-signal-state-value="#{signal.state}" data-signum-notification-body-signal-id-value="#{signal.id}" id="notification_#{data[:type]}_#{signal.signalable_id}_#{signal.id}"
+.signum-notification-body data-controller="signum-notification-body" data-signum-notification-body-type-value=data[:type] data-signum-notification-body-timeout-value=data[:timeout] data-signum-notification-body-sticky-value="#{signal.sticky.present? ? signal.sticky.to_s : 'false'}" data-signum-notification-body-signal-state-value="#{signal.state}" data-signum-notification-body-signal-id-value="#{signal.id}" id="#{Signum.config.notification_body_id.call(data[:type], signal)}"
   .signum-notification-body__mb
     .signum-notification-body__mb__bc
       .signum-notification-body__mb__bc__ic
@@ -15,7 +15,7 @@
           .signum-notification-body__mb__bc__mc__lkc
             - signal.links.each do | link |
               - next unless link.is_a?(Hash)
-              a.signum-notification-body__mb__bc__mc__lkc__lk*{href: link.fetch('url', '#'), target:link.fetch("target", "_blank"), 'data-action': button["close"] ? "click->signum-notification-body#close" : "" }.merge(link.fetch("link_attributes", {}))
+              a.signum-notification-body__mb__bc__mc__lkc__lk*{href: link.fetch('url', '#'), target:link.fetch("target", "_blank"), 'data-action': link["close"] ? "click->signum-notification-body#close" : "" }.merge(link.fetch("link_attributes", {}))
                 i.fas.fa-link
                 =< link["title"] || link["url"] || '(...)'
         - if signal.attachments.attached?

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

@@ -1,8 +1,9 @@
-div.text-left[data-controller="signum-notification-drawer" data-action="mouseover->signum-notification-drawer#show mouseleave->signum-notification-drawer#hide click->signum-notification-drawer#closeNotifications"]
+div.text-left[data-controller="signum-notification-drawer" data-action="mouseover->signum-notification-drawer#show mouseleave->signum-notification-drawer#hide"]
   button.signum-notification-drawer-button data-action="click->signum-notification-drawer#closeNotifications"
-    i class="hidden #{Signum.config.icons[:unread_main]}" data-signum-notification-drawer-target='alertBellIcon'
-    i class="#{Signum.config.icons[:read_main]}" data-signum-notification-drawer-target='bellIcon'
-    i.hidden.fas.fa-times.cross-icon.text-xs.absolute.top-5.right-15#crossIcon data-signum-notification-drawer-target="crossIcon" data-action="click->signum-notification-drawer#closeNotifications"
+    span.pointer-events-none
+      i class="hidden #{Signum.config.icons[:unread_main]}" data-signum-notification-drawer-target='alertBellIcon'
+      i class="#{Signum.config.icons[:read_main]}" data-signum-notification-drawer-target='bellIcon'
+      i.hidden.fas.fa-times.cross-icon.text-xs.absolute.top-5.right-15#crossIcon data-signum-notification-drawer-target="crossIcon"
 
   .signum-notification-drawer-tray.hidden[data-signum-notification-drawer-target="submenu" id="#{Signum.config.drawer_notifications_container_id.call}"]
     = render(Signum::NotificationDrawerItem::Component.with_collection(signals))

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

@@ -1,7 +1,6 @@
 import ApplicationController from "signum/controllers/application_controller"
 
 export default class extends ApplicationController {
-
   static targets = ["alertBellIcon", "bellIcon", "submenu", "item", "crossIcon"]
 
   connect() {
@@ -11,7 +10,6 @@ export default class extends ApplicationController {
     setTimeout(() => {
       this.manageBellIcon()
     }, 300)
-
   }
 
   disconnect() {
@@ -36,19 +34,21 @@ export default class extends ApplicationController {
   }
 
   closeNotifications(event) {
-      fetch("/signal/close_all", {
-        method: "GET",
-        headers: {
-          "Content-Type": "application/json",
-        },
+    fetch("/signal/close_all", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({}),
+    })
+      .then((res) => {
+        setTimeout(() => {
+          this.manageBellIcon()
+        }, 300)
+      })
+      .catch((err) => {
+        console.log(err)
       })
-        .then((res) => {})
-        .catch((err) => {
-          console.log(err)
-        })
-      this.crossIconTarget.style.display = 'none';
-      this.bellIconTarget.style.display = 'inline-block'
-      this.alertBellIconTarget.style.display = 'none';
   }
 
   itemActivity(event) {
@@ -66,6 +66,7 @@ export default class extends ApplicationController {
     } else {
       this.alertBellIconTarget.classList.add("hidden")
       this.bellIconTarget.classList.remove("hidden")
+      this.crossIconTarget.classList.add("hidden")
     }
   }
 }

data/app/controllers/signum/signal_controller.rb

@@ -13,7 +13,8 @@ module Signum
     end
 
     def close_all
-      signals = Signum.config.current_user.call.signals.where.not(state: "closed")
+      # signals = Signum.config.current_user.call.signals.where.not(state: "closed") // current_user is nil when called from an api
+      signals = current_user.signals.where.not(state: "closed")
       signals.each(&:close!)
       head :ok
     end

data/app/models/signum/signal.rb

@@ -13,10 +13,10 @@ module Signum
     def broadcast_create
       broadcast! if can_broadcast?
 
-      broadcast_prepend_to(:signals, target: Signum.config.balloon_notifications_container_id.call(key || signalable, id),
+      broadcast_prepend_to(:signals, target: Signum.config.balloon_notifications_container_id.call(key || signalable),
         html: ApplicationController.render(Signum::Notification::Component.new(self)))
 
-      broadcast_prepend_to(:signals, target: Signum.config.drawer_notifications_container_id.call(key || signalable, id),
+      broadcast_prepend_to(:signals, target: Signum.config.drawer_notifications_container_id.call(key || signalable),
         html: ApplicationController.render(Signum::NotificationDrawerItem::Component.new(signal: self)))
     end
 
@@ -28,9 +28,9 @@ module Signum
         return
       end
 
-      broadcast_replace_to(:signals, target: Signum.config.balloon_notifications_container_id.call(key || signalable, id),
+      broadcast_replace_to(:signals, target: Signum.config.notification_body_id.call(:balloon, self),
         html: ApplicationController.render(Signum::NotificationBody::Component.new(self, {type: :balloon, timeout: 5})))
-      broadcast_replace_to(:signals, target: Signum.config.drawer_notifications_container_id.call(key || signalable, id),
+      broadcast_replace_to(:signals, target: Signum.config.notification_body_id.call(:drawer_item, self),
         html: ApplicationController.render(Signum::NotificationBody::Component.new(self, {type: :drawer_item, timeout: 5})))
     end
 

data/config/routes.rb

@@ -1,6 +1,6 @@
 Signum::Engine.routes.draw do
   post "signal/show", to: "signal#show"
   post "signal/close", to: "signal#close"
-  get "signal/close_all", to: "signal#close_all"
+  post "signal/close_all", to: "signal#close_all"
   post "signal/open_stickies", to: "signal#open_stickies"
 end

data/lib/signum/configuration.rb

@@ -35,8 +35,15 @@ module Signum
     option :base_service, default: "::ApplicationService"
     option :base_service_context, default: "::ApplicationContext"
     option :current_user, default: -> {}
-    option :drawer_notifications_container_id, default: ->(signalable = nil, id = nil) {}
-    option :balloon_notifications_container_id, default: ->(signalable = nil, id = nil) {}
+    option :drawer_notifications_container_id, default: ->(signalable = nil) {
+      signalable.is_a?(String) ? "drawer_notifications_#{signalable}" : "drawer_notifications_#{(signalable || Signum.config.current_user.call)&.class&.name}_#{(signalable || Signum.config.current_user.call)&.id}"
+    }
+    option :balloon_notifications_container_id, default: ->(signalable = nil) {
+      signalable.is_a?(String) ? "balloon_notifications_#{signalable}" : "balloon_notifications_#{(signalable || Signum.config.current_user.call)&.class&.name}_#{(signalable || Signum.config.current_user.call)&.id}"
+    }
+    option :notification_body_id, default: ->(type = nil, signal = nil) {
+      "notification_#{type}_#{signal.signalable_id}_#{signal.id}"
+    }
     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.7.2"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signum
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-10 00:00:00.000000000 Z
+date: 2024-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg