pg_rails 7.0.8.pre.alpha.93 → 7.0.8.pre.alpha.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdf7d3d8c84262ae3dbb580c76a11f33d9cb91a6168ec187dfd0f760a080fde6
-  data.tar.gz: ebb7a5b8d8680a82f71574c04efe8f517b04134c628e6cd10103828d34d78727
+  metadata.gz: 2f8a869085b05c79395519bbd89206705710f949f49304c41f015030c12a125e
+  data.tar.gz: 8f1ff6c3b0f428c6b4d7b4b5b9f91b7b5979d9d491a7ca553918abf8fe5de462
 SHA512:
-  metadata.gz: 82cc777c32238b7c5430a95c6ebf701b188cb94b885373e43d1b20976e4081f3c6fa7ce0366cd8c5ed455cd9375fac70b2e7c5fdff3ea1d258f6cb546f6709ec
-  data.tar.gz: 84c40fd802a3681eeb76c11e0de4e5280bc41d9e97cf88a5a74a71b396c02dd7e68af0985a541325a1be9b26e692d0d35e893c37d16849b53a114fc4cebdf522
+  metadata.gz: 4fd90973e9c75ed200bdbce2a95cf3d4ef34e47aa9c5ba48105dc8aa34ab8c934eff9f01d4dd7ba735b111968a17dc4c8f24e38294ca71d28c8aec8dd18d62a3
+  data.tar.gz: e3dd8ddc322319711e8471b2d9ee5e329d2291c0e2b6ae5cadb023506f53dc960bf7a746349623b9ac38a51a0266ea71fccc9c142e2ad14342548badd9b9c826

data/pg_engine/app/assets/stylesheets/notifications.scss

@@ -0,0 +1,49 @@
+#notifications {
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  gap: 5px;
+  background-color: #6a2a05;
+  padding: 1.5em 5px;
+}
+
+#notifications-inner {
+  max-width: 400px;
+  display: flex;
+  flex-direction: column;
+  gap: 0.4em;
+}
+.notification {
+  border: 1px solid #0003;
+  border-radius: 2px;
+  position: relative;
+  padding: 0.3em 2.5em;
+  xpadding-left: 2.5em;
+  display: flex;
+  align-items: center;
+  background-color: white;
+}
+.notification:not(.unseen) {
+  xcolor: #646464;
+}
+.notification.unseen {
+  background-color: rgb(230, 225, 251);
+}
+.notification.unseen::before {
+  content: '';
+  padding: 5px;
+  left: 1em;
+  vertical-align: middle;
+  position: absolute;
+  background-color: #079510;
+  border-radius: 50%;
+}
+.notifications-unseen-mark {
+  border: 1px solid #ffffff9d;
+  //background-color: #ea3d2b !important;
+  background-color: #079510;
+}
+.notification--time {
+  font-size: 0.8em;
+  min-width: 6em;
+}

data/pg_engine/app/assets/stylesheets/pg_rails_b5.scss

@@ -1,5 +1,8 @@
 @use 'sass:color';
 
+@import 'notifications';
+
+
 :root,
 [data-bs-theme=light] {
   --bs-form-invalid-color: #b50000;

data/pg_engine/app/components/notification_component.rb

@@ -0,0 +1,19 @@
+class NotificationComponent < BaseComponent
+  def initialize(notification: nil)
+    @notification = notification
+    super
+  end
+
+  erb_template <<~ERB
+    <div class="notification d-flex justify-content-between <%= 'unseen' if @notification.unseen? %>"
+         id="<%= dom_id(@notification) %>" data-id="<%= @notification.id %>">
+      <div>
+        <%= @notification.message %>
+      </div>
+      <div class="notification--time text-body-tertiary text-end ms-4">
+        hace
+        <%= distance_of_time_in_words @notification.created_at, Time.zone.now %>
+      </div>
+    </div>
+  ERB
+end

data/pg_engine/app/controllers/pg_engine/base_controller.rb

@@ -79,6 +79,11 @@ module PgEngine
       if Rollbar.configuration.enabled && Rails.application.credentials.rollbar.present?
         @rollbar_token = Rails.application.credentials.rollbar.access_token_client
       end
+
+      if Current.user.present?
+        @notifications = Current.user.notifications.order(id: :desc)
+        @unseen_notifications = @notifications.unseen.any?
+      end
     end
 
     def mobile_device?

data/pg_engine/app/controllers/users/notifications_controller.rb

@@ -0,0 +1,11 @@
+module Users
+  class NotificationsController < ApplicationController
+    def mark_as_seen
+      # No handleo errores porque no debería fallar, y si falla
+      # se notifica a rollbar y al user no le pasa nada
+      notifications = Noticed::Notification.where(id: params[:ids].split(','))
+      notifications.each(&:mark_as_seen!)
+      head :ok
+    end
+  end
+end

data/pg_engine/app/models/email_log.rb

@@ -19,7 +19,6 @@
 #
 #  fk_rails_...  (email_id => emails.id)
 #
-# generado con pg_rails
 
 class EmailLog < ApplicationRecord
   audited

data/pg_engine/app/models/user.rb

@@ -38,6 +38,7 @@ class User < ApplicationRecord
 
   has_many :user_accounts
   has_many :accounts, through: :user_accounts
+  has_many :notifications, as: :recipient, class_name: 'Noticed::Notification'
 
   validates :nombre, :apellido, presence: true
 

data/pg_engine/app/notifiers/application_notifier.rb

@@ -0,0 +1,2 @@
+class ApplicationNotifier < Noticed::Event
+end

data/pg_engine/app/notifiers/simple_user_notifier.rb

@@ -0,0 +1,28 @@
+# To deliver this notification:
+#
+# SimpleUserNotifier.with(message: "New post").deliver(User.all, enqueue_job: false)
+
+class SimpleUserNotifier < ApplicationNotifier
+  # Add your delivery methods
+  #
+  # deliver_by :email do |config|
+  #   config.mailer = "UserMailer"
+  #   config.method = "new_post"
+  # end
+  #
+  # bulk_deliver_by :slack do |config|
+  #   config.url = -> { Rails.application.credentials.slack_webhook_url }
+  # end
+  #
+  # deliver_by :custom do |config|
+  #   config.class = "MyDeliveryMethod"
+  # end
+  notification_methods do
+    def message
+      params[:message]
+    end
+  end
+  # Add required params
+  #
+  required_param :message
+end

data/pg_engine/config/initializers/anycable.rb

@@ -10,4 +10,7 @@ if defined?(AnyCable::Rails)
   AnyCable::Rails::Rack.middleware.use Warden::Manager do |config|
     Devise.warden_config = config
   end
+
+  # Lo dejo comentado porque no sé si hará falta
+  # AnyCable::Rails.extend_adapter!(ActionCable.server.pubsub) unless AnyCable::Rails.enabled?
 end

data/pg_engine/config/routes.rb

@@ -10,6 +10,9 @@ Rails.application.routes.draw do
     confirmations: 'users/confirmations',
     registrations: 'users/registrations'
   }, failure_app: PgEngine::DeviseFailureApp
+  namespace :users, path: 'u' do
+    post 'notifications/mark_as_seen', to: 'notifications#mark_as_seen'
+  end
   namespace :admin, path: 'a' do
     pg_resource(:emails)
     pg_resource(:email_logs) do

data/pg_engine/db/migrate/20240611000219_create_noticed_tables.noticed.rb

@@ -0,0 +1,37 @@
+# This migration comes from noticed (originally 20231215190233)
+class CreateNoticedTables < ActiveRecord::Migration[6.1]
+  def change
+    primary_key_type, foreign_key_type = primary_and_foreign_key_types
+    create_table :noticed_events, id: primary_key_type do |t|
+      t.string :type
+      t.belongs_to :record, polymorphic: true, type: foreign_key_type
+      if t.respond_to?(:jsonb)
+        t.jsonb :params
+      else
+        t.json :params
+      end
+
+      t.timestamps
+    end
+
+    create_table :noticed_notifications, id: primary_key_type do |t|
+      t.string :type
+      t.belongs_to :event, null: false, type: foreign_key_type
+      t.belongs_to :recipient, polymorphic: true, null: false, type: foreign_key_type
+      t.datetime :read_at
+      t.datetime :seen_at
+
+      t.timestamps
+    end
+  end
+
+  private
+
+  def primary_and_foreign_key_types
+    config = Rails.configuration.generators
+    setting = config.options[config.orm][:primary_key_type]
+    primary_key_type = setting || :primary_key
+    foreign_key_type = setting || :bigint
+    [primary_key_type, foreign_key_type]
+  end
+end

data/pg_engine/db/migrate/20240611000220_add_notifications_count_to_noticed_event.noticed.rb

@@ -0,0 +1,6 @@
+# This migration comes from noticed (originally 20240129184740)
+class AddNotificationsCountToNoticedEvent < ActiveRecord::Migration[6.1]
+  def change
+    add_column :noticed_events, :notifications_count, :integer
+  end
+end

data/pg_engine/spec/system/noticed_spec.rb

@@ -0,0 +1,36 @@
+require 'rails_helper'
+
+describe 'Notifications' do
+  subject do
+    visit '/'
+  end
+
+  let(:user) { create :user }
+
+  before do
+    driven_by ENV['DRIVER']&.to_sym || :selenium_chrome_headless_iphone
+    login_as user
+  end
+
+  context 'no notifications' do
+    it do
+      subject
+      expect(page).to have_no_css('.notifications-unseen-mark')
+    end
+  end
+
+  context 'with unseen notifications' do
+    before do
+      SimpleUserNotifier.with(message: 'probandooo').deliver(User.all)
+    end
+
+    it do
+      subject
+      expect(page).to have_css('.notifications-unseen-mark')
+      find('.bi-bell-fill').click
+      expect(page).to have_no_css('.notifications-unseen-mark', wait: 5)
+    end
+  end
+
+  pending 'with read notifications'
+end

data/pg_layout/app/javascript/controllers/index.js

@@ -7,6 +7,7 @@ import FadeinOnloadController from './fadein_onload_controller'
 import ClearTimeoutController from './clear_timeout_controller'
 import SwitcherController from './switcher_controller'
 import FiltrosController from './filtros_controller'
+import NotificationsController from './notifications_controller'
 
 application.register('navbar', NavbarController)
 application.register('nested', NestedController)
@@ -15,5 +16,6 @@ application.register('fadein_onload', FadeinOnloadController)
 application.register('clear-timeout', ClearTimeoutController)
 application.register('switcher', SwitcherController)
 application.register('filtros', FiltrosController)
+application.register('notifications', NotificationsController)
 
 // TODO: testear con capybara todo lo que se pueda

data/pg_layout/app/javascript/controllers/notifications_controller.js

@@ -0,0 +1,46 @@
+import { Controller } from '@hotwired/stimulus'
+import { post } from '@rails/request.js'
+import { Rollbar } from 'rollbar'
+
+// Connects to data-controller="notifications"
+export default class extends Controller {
+  timeoutId = null
+
+  connect () {
+    this.element.addEventListener('shown.bs.collapse', event => {
+      this.timeoutId = setTimeout(() => {
+        this.markAsSeen()
+      }, 2000)
+      document.addEventListener('turbo:load', () => { this.cancelTimeout() })
+    })
+    this.element.addEventListener('hide.bs.collapse', event => {
+      clearTimeout(this.timeoutId)
+    })
+  }
+
+  async markAsSeen () {
+    const ids = []
+    document.querySelectorAll('.notification')
+      .forEach((e) => { ids.push(e.dataset.id) })
+    const response = await post('/u/notifications/mark_as_seen',
+      { query: { ids }, responseKind: 'turbo-stream' })
+
+    if (response.ok) {
+      document.querySelectorAll('.notification.unseen').forEach(
+        (notif) => {
+          notif.classList.remove('unseen')
+        }
+      )
+      document.querySelector('.notifications-unseen-mark').remove()
+    } else {
+      const text = await response.text
+      Rollbar.error('Error marking as seen: ', text)
+    }
+  }
+
+  cancelTimeout () {
+    if (this.timeoutId) {
+      clearTimeout(this.timeoutId)
+    }
+  }
+}

data/pg_layout/app/views/pg_layout/_navbar.html.erb

@@ -1,7 +1,8 @@
 <nav class="navbar navbar-expand-<%= @breakpoint_navbar_expand %>" data-bs-theme="dark">
   <div class="container-fluid">
     <% unless @sidebar == false %>
-      <button data-controller="navbar" data-action="navbar#expandNavbar" class="btn btn-outline-light me-2 d-none d-<%= @breakpoint_navbar_expand %>-inline-block">
+      <button data-controller="navbar" data-action="navbar#expandNavbar"
+              class="btn btn-outline-light me-2 d-none d-<%= @breakpoint_navbar_expand %>-inline-block">
         <i class="bi <%= @navbar_chevron_class %>"></i>
       </button>
 
@@ -9,12 +10,43 @@
     <% @navbar.extensiones.each do |extension| %>
       <%= extension %>
     <% end %>
+    <% if Current.user.present? %>
+      <button type="button" class="btn btn-primary btn-sm position-relative"
+                            data-bs-toggle="collapse" data-bs-target="#notifications-collapse">
+        <i class="bi-bell-fill fs-5 text-light"></i>
+        <% if @unseen_notifications %>
+          <span class="position-absolute p-1 xbg-danger bg-gradient rounded-circle start-50 notifications-unseen-mark">
+          </span>
+        <% end %>
+      </button>
+    <% end %>
     <%= @navbar.logo if @navbar.logo.present? %>
-    <button class="btn btn-outline-light d-inline-block d-<%= @breakpoint_navbar_expand %>-none" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasExample" aria-controls="offcanvasExample">
+    <button class="btn btn-outline-light d-inline-block d-<%= @breakpoint_navbar_expand %>-none"
+            type="button"
+            data-bs-toggle="offcanvas"
+            data-bs-target="#offcanvasExample" aria-controls="offcanvasExample">
       <i class="bi bi-list"></i>
     </button>
   </div>
 </nav>
+<div class="collapse" id="notifications-collapse" data-controller="notifications">
+  <div id="notifications">
+    <div id="notifications-inner">
+      <% if @notifications&.any? %>
+        <%= render NotificationComponent.with_collection(@notifications) if @notifications&.any? %>
+      <% else %>
+        <span class="text-light">
+          No hay notificaciones
+        </span>
+      <% end %>
+      <div class="text-center">
+        <button type="button" class="btn btn-link text-light btn-sm" data-bs-toggle="collapse" data-bs-target="#notifications-collapse">
+          <i class="bi-chevron-up fs-3"></i>
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
 
 <style type="text/css" media="(max-width: 767px)">
   .navbar .navbar-brand {

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.0.8-alpha.93'
+  VERSION = '7.0.8-alpha.95'
 end

data/pg_rails/scss/pg_rails.scss

@@ -11,12 +11,16 @@ $teal:    #20c997 !default;
 $cyan:    #0dcaf0 !default;
 
 // Overriding some of the default colours
+$yellow:       #ffb401;
 $orange:       #e35b17;
 $red:          #a70101;
 
-$warning:      $orange;
+$warning:      $yellow;
 $info:         #87accc;
 
+$warning-text-emphasis:  $orange;
+$danger-text-emphasis:   #910303;
+
 $font-size-base: 0.9rem;
 $enable-validation-icons:       false;
 $focus-ring-width:              .05rem;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.93
+  version: 7.0.8.pre.alpha.95
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-09 00:00:00.000000000 Z
+date: 2024-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -968,6 +968,7 @@ files:
 - pg_engine/app/assets/images/plantita.png
 - pg_engine/app/assets/javascripts/active_admin.js
 - pg_engine/app/assets/stylesheets/active_admin.scss
+- pg_engine/app/assets/stylesheets/notifications.scss
 - pg_engine/app/assets/stylesheets/pg_rails_b5.scss
 - pg_engine/app/components/alert_component.html.slim
 - pg_engine/app/components/alert_component.rb
@@ -975,6 +976,7 @@ files:
 - pg_engine/app/components/base_component.rb
 - pg_engine/app/components/flash_container_component.rb
 - pg_engine/app/components/internal_error_component.rb
+- pg_engine/app/components/notification_component.rb
 - pg_engine/app/controllers/admin/accounts_controller.rb
 - pg_engine/app/controllers/admin/email_logs_controller.rb
 - pg_engine/app/controllers/admin/emails_controller.rb
@@ -988,6 +990,7 @@ files:
 - pg_engine/app/controllers/public/mensaje_contactos_controller.rb
 - pg_engine/app/controllers/public/webhooks_controller.rb
 - pg_engine/app/controllers/users/confirmations_controller.rb
+- pg_engine/app/controllers/users/notifications_controller.rb
 - pg_engine/app/controllers/users/registrations_controller.rb
 - pg_engine/app/decorators/account_decorator.rb
 - pg_engine/app/decorators/email_decorator.rb
@@ -1020,6 +1023,8 @@ files:
 - pg_engine/app/models/pg_engine/base_record.rb
 - pg_engine/app/models/user.rb
 - pg_engine/app/models/user_account.rb
+- pg_engine/app/notifiers/application_notifier.rb
+- pg_engine/app/notifiers/simple_user_notifier.rb
 - pg_engine/app/policies/account_policy.rb
 - pg_engine/app/policies/email_log_policy.rb
 - pg_engine/app/policies/email_policy.rb
@@ -1081,6 +1086,8 @@ files:
 - pg_engine/db/migrate/20240506194106_create_emails.rb
 - pg_engine/db/migrate/20240517174821_pg_trgm.rb
 - pg_engine/db/migrate/20240523183651_create_email_logs.rb
+- pg_engine/db/migrate/20240611000219_create_noticed_tables.noticed.rb
+- pg_engine/db/migrate/20240611000220_add_notifications_count_to_noticed_event.noticed.rb
 - pg_engine/db/seeds.rb
 - pg_engine/lib/pg_engine.rb
 - pg_engine/lib/pg_engine/configuracion.rb
@@ -1141,6 +1148,7 @@ files:
 - pg_engine/spec/system/alerts_spec.rb
 - pg_engine/spec/system/destroy_spec.rb
 - pg_engine/spec/system/login_spec.rb
+- pg_engine/spec/system/noticed_spec.rb
 - pg_engine/spec/system/send_mail_spec.rb
 - pg_engine/spec/system/signup_spec.rb
 - pg_layout/app/assets/stylesheets/animations.scss
@@ -1161,6 +1169,7 @@ files:
 - pg_layout/app/javascript/controllers/index.js
 - pg_layout/app/javascript/controllers/navbar_controller.js
 - pg_layout/app/javascript/controllers/nested_controller.js
+- pg_layout/app/javascript/controllers/notifications_controller.js
 - pg_layout/app/javascript/controllers/pg_form_controller.js
 - pg_layout/app/javascript/controllers/switcher_controller.js
 - pg_layout/app/javascript/utils/cookies.js