signum 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56ad1a15e3abcc754f0f2c389b7c59aaa8c43adfe6b3d7ef2296379a0d42f6d6
-  data.tar.gz: 146fe001b1ba7664c5bbf1b0834a0adc41f3a3fd889822b30fdb436042fcd1b9
+  metadata.gz: afc66ab9111c5abd8514d9886085a4009616b991088f8e942125fc193d3cb1b1
+  data.tar.gz: 5e86e69e0e07f2cff2f377ceb9dc652e41d2ec31069649f7bd364c74b04583b4
 SHA512:
-  metadata.gz: 75ebff55bdbf08eda7f36c1f1a27d3c78414412089a197b171e454c618be103c44ff17c2119912981131f31a0ccf96e3298c3eabe65cbc0be39dcaea879f4d6b
-  data.tar.gz: 9cab86de0a234c0bd94f3a819b64899bf0f735963afcd641f7e482b18cbfd96f8066794e37de5311bd09c985de2189ce0dc7a745bd9d26f0c08e8eed785de3f9
+  metadata.gz: 0037367c3fbc51de0dacae3f556a6edfaed552c4dd1c6dc1b5ac6ae375d5f4fa59f1ab2c1d769851d5923b3a645ed4997ce979cc6cdd59924564cdd3f92cab12
+  data.tar.gz: 706885e899ea2fe06c37e8191f45e17196dfd4a020a39633337f07d4f626555125a055196c4784feec9b202178e3164fa5e0fcc676ecc6599edfc3bf4f63bb61

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

@@ -1,4 +1,5 @@
 import ApplicationController from "signum/controllers/application_controller"
+import { post } from '@rails/request.js';
 
 export default class extends ApplicationController {
   static values = { type: String, timeout: Number, sticky: Boolean, signalId: String, signalState: String }
@@ -19,23 +20,23 @@ export default class extends ApplicationController {
     }, 300)
   }
 
-  markClose() {
-    fetch("/signal/close", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({ id: this.signalIdValue }),
-    })
-      .then((res) => {
+  async markClose() {
+    try {
+      const response = await post('/signal/close', {
+        body: JSON.stringify({ id: this.signalIdValue }),
+        contentType: 'application/json'
+      });
+      if (response.ok) {
         const niE = new CustomEvent("nd-item-activity", {
           bubbles: true,
           detail: "closed",
-        })
-        window.dispatchEvent(niE)
-      })
-      .catch((err) => {
-        console.log(err)
-      })
+        });
+        window.dispatchEvent(niE);
+      } else {
+        console.error('Error: ', response.statusText);
+      }
+    } catch (error) {
+      console.error('Request failed', error);
+    }
   }
 }

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

@@ -1,4 +1,5 @@
 import ApplicationController from "signum/controllers/application_controller"
+import { post } from '@rails/request.js';
 
 export default class extends ApplicationController {
   static targets = ["alertBellIcon", "bellIcon", "submenu", "item", "crossIcon"]
@@ -33,22 +34,22 @@ export default class extends ApplicationController {
     }
   }
 
-  closeNotifications(event) {
-    fetch("/signal/close_all", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({}),
-    })
-      .then((res) => {
+  async closeNotifications(event) {
+    try {
+      const response = await post('/signal/close_all', {
+        body: JSON.stringify({}),
+        contentType: 'application/json'
+      });
+      if (response.ok) {
         setTimeout(() => {
           this.manageBellIcon()
-        }, 300)
-      })
-      .catch((err) => {
-        console.log(err)
-      })
+        }, 300);
+      } else {
+        console.error('Error: ', response.statusText);
+      }
+    } catch (error) {
+      console.error('Request failed', error);
+    }
   }
 
   itemActivity(event) {

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

@@ -1,4 +1,5 @@
 import ApplicationController from "signum/controllers/application_controller"
+import { post } from '@rails/request.js';
 
 export default class extends ApplicationController {
   static targets = []
@@ -14,17 +15,22 @@ export default class extends ApplicationController {
     })
     window.dispatchEvent(niE)
     if (this.signalStateValue == "broadcasted") {
-      fetch("/signal/show", {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
+      this.showSignal()
+    }
+  }
+
+  async showSignal() {
+    try {
+      const response = await post("/signal/show", {
         body: JSON.stringify({ id: this.signalIdValue }),
-      })
-        .then((res) => {})
-        .catch((err) => {
-          console.log(err)
-        })
+        contentType: 'application/json'
+      });
+      if (response.ok) {
+      } else {
+        console.error('Error: ', response.statusText);
+      }
+    } catch (error) {
+      console.error('Request failed', error);
     }
   }
 }

data/app/controllers/signum/application_controller.rb

@@ -1,5 +1,5 @@
 module Signum
-  class ApplicationController < ActionController::Base
+  class ApplicationController < Signum.config.base_controller.constantize
     protect_from_forgery with: :exception
   end
 end

data/app/controllers/signum/signal_controller.rb

@@ -1,5 +1,7 @@
+require_dependency 'signum/application_controller'
+
 module Signum
-  class SignalController < ApiController
+  class SignalController < ApplicationController
     def show
       signal = Signum::Signal.find(signal_params[:id])
       signal.show! if signal.broadcasted?
@@ -13,8 +15,7 @@ module Signum
     end
 
     def close_all
-      # 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 = Signum.config.current_user.call.signals.where.not(state: "closed")
       signals.each(&:close!)
       head :ok
     end

data/app/models/signum/signal.rb

@@ -14,10 +14,10 @@ module Signum
       broadcast! if can_broadcast?
 
       broadcast_prepend_to(:signals, target: Signum.config.balloon_notifications_container_id.call(key || signalable),
-        html: ApplicationController.render(Signum::Notification::Component.new(self)))
+        html: ActionController::Base.render(Signum::Notification::Component.new(self)))
 
       broadcast_prepend_to(:signals, target: Signum.config.drawer_notifications_container_id.call(key || signalable),
-        html: ApplicationController.render(Signum::NotificationDrawerItem::Component.new(signal: self)))
+        html: ActionController::Base.render(Signum::NotificationDrawerItem::Component.new(signal: self)))
     end
 
     def broadcast_update
@@ -29,9 +29,9 @@ module Signum
       end
 
       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})))
+        html: ActionController::Base.render(Signum::NotificationBody::Component.new(self, {type: :balloon, timeout: 5})))
       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})))
+        html: ActionController::Base.render(Signum::NotificationBody::Component.new(self, {type: :drawer_item, timeout: 5})))
     end
 
     validates :text, presence: true

data/lib/generators/signum/templates/config/initializers/signum.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 Signum.setup do |config|
+  config.base_controller = "::ApplicationController"
+  config.admin_authentication_module = "Authenticated"
   config.hide_after = 60_000 if Rails.env.test?
   config.current_user = -> { Current.user }
   config.drawer_notifications_container_id = -> { "drawer_notifications_#{Current.user.id}" }

data/lib/signum/configuration.rb

@@ -32,9 +32,7 @@ module Signum
     option :user_model_name, default: "User"
     option :hide_after, default: 3000
     option :base_controller, default: "::ApplicationController"
-    option :base_service, default: "::ApplicationService"
-    option :base_service_context, default: "::ApplicationContext"
-    option :current_user, default: -> {}
+    option :current_user, default: lambda {}
     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}"
     }

data/lib/signum/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signum
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-17 00:00:00.000000000 Z
+date: 2024-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -242,7 +242,6 @@ files:
 - 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
 - app/helpers/signum/application_helper.rb

data/app/controllers/signum/api_controller.rb

@@ -1,4 +0,0 @@
-module Signum
-  class ApiController < ActionController::API
-  end
-end