pg_rails 7.0.8.pre.alpha.103 → 7.0.8.pre.alpha.104

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adf3e1c08971d75321d41dd7af1e1e564429e53ff550f79ba17a9ad68414c5f9
-  data.tar.gz: 6b2795f204ae9f2cd47b7fec7d1899bc49fb9c07fd2b48eb616aebb7a10e93c9
+  metadata.gz: a6fdaccc20ccfd58b84e38d8e40297b88dfeedbb6f7a15537f3e73c8b8df44ec
+  data.tar.gz: c4ade51d7e5e236773a2bd383c7eb57450b62f7c34bd2e2de6dbfb31359bebe7
 SHA512:
-  metadata.gz: ce8f1e2eda8c93f15128ea12fb6dbf334b8dd7a85e0e9e6286a4e18d19484176105ed975a5cd1f641db05c773d80a72130c9649abfe55e6b0bec736e1f760235
-  data.tar.gz: b8f789a849733993524a2a403b0782dbb77ec3e043b913ca9641fb707e99261a13ccaf5b42809b20be516dffccb21954ef9411638a6f49a19857d05977f6e432
+  metadata.gz: '009593f789f9711382f098a7fd6cbf71f944374c2da8a5f16c6cc1a3873793412ff03e5496d705e3533cfdb4c8796172b258a54d8becdf72a2253bdbc6404e0d'
+  data.tar.gz: 639c41eb50e2a611522577a8bfc808257e8ca350e7b0a40632749ee6994c797da860de6d4eb39327885c0433f37a4292c2a7b8d7a9aa966f59a9de18dfa0da5b

data/pg_engine/app/assets/stylesheets/actiontext.css

@@ -0,0 +1,31 @@
+/*
+ * Provides a drop-in pointer for the default Trix stylesheet that will format the toolbar and
+ * the trix-editor content (whether displayed or under editing). Feel free to incorporate this
+ * inclusion directly in any other asset bundle and remove this file.
+ *
+ *= require trix
+*/
+
+/*
+ * We need to override trix.css’s image gallery styles to accommodate the
+ * <action-text-attachment> element we wrap around attachments. Otherwise,
+ * images in galleries will be squished by the max-width: 33%; rule.
+*/
+.trix-content .attachment-gallery > action-text-attachment,
+.trix-content .attachment-gallery > .attachment {
+  flex: 1 0 33%;
+  padding: 0 0.5em;
+  max-width: 33%;
+}
+
+.trix-content .attachment-gallery.attachment-gallery--2 > action-text-attachment,
+.trix-content .attachment-gallery.attachment-gallery--2 > .attachment, .trix-content .attachment-gallery.attachment-gallery--4 > action-text-attachment,
+.trix-content .attachment-gallery.attachment-gallery--4 > .attachment {
+  flex-basis: 50%;
+  max-width: 50%;
+}
+
+.trix-content action-text-attachment .attachment {
+  padding: 0 !important;
+  max-width: 100% !important;
+}

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

@@ -1,3 +1,26 @@
+.pg--notifications-bell--tooltip {
+  position: relative;
+  background-color: #99570b;
+  padding: 4px;
+  z-index: 10;
+  border-radius: 2px;
+}
+.pg--notifications-bell--tooltip::after {
+  content: '';
+  color: white;
+  display: block;
+  position: absolute;
+  right: -9px;
+  top: 3px;
+  border-color: transparent;
+  border-left-color: #99570b;
+  border-style: solid;
+  border-top-width: 0.7rem;
+  border-bottom-width: 0.7rem;
+  border-left-width: 0.7rem;
+  z-index: -1;
+}
+
 #notifications {
   display: flex;
   align-items: center;
@@ -8,7 +31,8 @@
 }
 
 #notifications-inner {
-  max-width: 400px;
+  width: 100%;
+  max-width: 40em;
   display: flex;
   flex-direction: column;
   gap: 0.4em;
@@ -18,10 +42,15 @@
   border-radius: 2px;
   position: relative;
   padding: 0.3em 2.5em;
+  padding-right: 0.5em;
   xpadding-left: 2.5em;
   display: flex;
-  align-items: center;
+  align-items: stretch;
   background-color: white;
+
+  figcaption {
+    display: none;
+  }
 }
 .notification:not(.unseen) {
   xcolor: #646464;

data/pg_engine/app/components/notification_component.rb

@@ -8,11 +8,16 @@ class NotificationComponent < BaseComponent
     <div class="notification d-flex justify-content-between <%= 'unseen' if @notification.unseen? %>"
          id="<%= dom_id(@notification) %>" data-id="<%= @notification.id %>">
       <div>
-        <%= @notification.message %>
+        <%= @notification.message.html_safe %>
       </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 class="notification--time d-flex flex-column justify-content-end text-body-tertiary text-end ms-4">
+        <div>
+          hace
+          <%= distance_of_time_in_words @notification.created_at, Time.zone.now %>
+        </div>
+        <div>
+          <a href="javascript:void" class="link-opacity-50" data-action="notifications#markAsUnseen">Marcar como no leído</a>
+        </div>
       </div>
     </div>
   ERB

data/pg_engine/app/components/notifications_bell_component.rb

@@ -0,0 +1,25 @@
+class NotificationsBellComponent < BaseComponent
+  def initialize(tooltip:, unseen:)
+    @tooltip = tooltip
+    @unseen = unseen
+    super
+  end
+
+  erb_template <<~ERB
+    <div>
+      <% if @tooltip.present? %>
+        <div class="d-none d-sm-inline-block text-white pg--notifications-bell--tooltip">
+          <%= @tooltip %>
+        </div>
+      <% end %>
+      <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 %>
+          <span class="position-absolute p-1 xbg-danger bg-gradient rounded-circle start-50 notifications-unseen-mark">
+          </span>
+        <% end %>
+      </button>
+    </div>
+  ERB
+end

data/pg_engine/app/controllers/admin/eventos_controller.rb

@@ -0,0 +1,57 @@
+module Admin
+  class EventosController < AdminController
+    layout 'pg_layout/containerized'
+
+    add_breadcrumb 'Eventos'
+
+    def index
+      @events = Noticed::Event.order(id: :desc)
+    end
+
+    def new
+      @event = Evento.new(type: SimpleUserNotifier.to_s)
+    end
+
+    # rubocop:disable Metrics/MethodLength
+    def create # rubocop:disable Metrics/AbcSize
+      @event = Evento.new(event_params)
+      # @event.message.save!
+      unless @event.valid?
+        render :new, status: :unprocessable_entity
+        return
+      end
+      json_params_for_event = {
+        message: @event.message,
+        tooltip: @event.tooltip
+      }
+      notifier_class = @event.type.constantize
+      notifier = notifier_class.with(json_params_for_event)
+
+      if @event.target == 'todos'
+        notifier.deliver(User.all)
+      elsif @event.target == 'devs'
+        notifier.deliver(User.where(developer: true))
+      else
+        # :nocov:
+        'shouldnt happen'
+        # :nocov:
+      end
+
+      redirect_to admin_eventos_path
+    rescue StandardError => e
+      # :nocov:
+      flash.now[:alert] = e.to_s
+      render :new, status: :unprocessable_entity
+      # :nocov:
+    end
+    # rubocop:enable Metrics/MethodLength
+
+    private
+
+    def event_params
+      params.require(:evento).permit(
+        :type, :message, :tooltip, :record_type, :record_id, :target
+      )
+    end
+  end
+end

data/pg_engine/app/controllers/concerns/pg_engine/resource.rb

@@ -212,9 +212,7 @@ module PgEngine
       if Object.const_defined?('FriendlyId') && @clase_modelo.is_a?(FriendlyId)
         @clase_modelo.friendly.find(params[:id])
       elsif @clase_modelo.respond_to? :find_by_hashid!
-        # rubocop:disable Rails/DynamicFindBy
         @clase_modelo.find_by_hashid!(params[:id])
-        # rubocop:enable Rails/DynamicFindBy
       else
         @clase_modelo.find(params[:id])
       end

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

@@ -92,7 +92,12 @@ module PgEngine
 
       if Current.user.present?
         @notifications = Current.user.notifications.order(id: :desc)
-        @unseen_notifications = @notifications.unseen.any?
+        unseen = @notifications.unseen.any?
+        tooltip = @notifications.unseen.map(&:tooltip).first
+        @notifications_bell = NotificationsBellComponent.new(
+          unseen:,
+          tooltip:
+        )
       end
     end
 

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

@@ -1,5 +1,11 @@
 module Users
   class NotificationsController < ApplicationController
+    def mark_as_unseen
+      notification = Noticed::Notification.find(params[:id])
+      notification.mark_as_unseen!
+      head :ok
+    end
+
     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

data/pg_engine/app/models/evento.rb

@@ -0,0 +1,11 @@
+class Evento
+  include ActiveModel::API
+  include ActionText::Attribute
+  extend Enumerize
+
+  attr_accessor :tooltip, :target, :message, :type, :record_type, :record_id
+
+  validates :target, :type, :message, presence: true
+
+  enumerize :target, in: { todos: 0, devs: 1 }
+end

data/pg_engine/app/notifiers/simple_user_notifier.rb

@@ -21,6 +21,10 @@ class SimpleUserNotifier < ApplicationNotifier
     def message
       params[:message]
     end
+
+    def tooltip
+      params[:tooltip]
+    end
   end
   # Add required params
   #

data/pg_engine/app/views/active_storage/blobs/_blob.html.erb

@@ -0,0 +1 @@
+<%= image_tag blob %>

data/pg_engine/app/views/admin/eventos/index.html.slim

@@ -0,0 +1,6 @@
+- content_for :actions do
+  = link_to 'Nuevo', new_admin_evento_path
+h1 Eventos
+
+- @events.each do |event|
+  pre.mb-5 = JSON.pretty_generate event.as_json

data/pg_engine/app/views/admin/eventos/new.html.slim

@@ -0,0 +1,10 @@
+= pg_form_for @event, url: admin_eventos_path do |f|
+  = f.mensajes_de_error
+
+  = f.input :type, as: :select, collection: ApplicationNotifier.descendants.map(&:to_s)
+  = f.rich_text_area :message
+  = f.input :tooltip
+  = f.input :record_type
+  = f.input :record_id
+  = f.input :target
+  = f.submit

data/pg_engine/app/views/layouts/action_text/contents/_content.html.erb

@@ -0,0 +1,3 @@
+<div class="trix-content">
+  <%= yield -%>
+</div>

data/pg_engine/config/routes.rb

@@ -17,9 +17,11 @@ Rails.application.routes.draw do
   }, failure_app: PgEngine::DeviseFailureApp
   namespace :users, path: 'u' do
     post 'notifications/mark_as_seen', to: 'notifications#mark_as_seen'
+    post 'notifications/mark_as_unseen', to: 'notifications#mark_as_unseen'
   end
   namespace :admin, path: 'a' do
     pg_resource(:emails)
+    pg_resource(:eventos)
     pg_resource(:email_logs) do
       collection do
         post :mailgun_sync

data/pg_engine/db/migrate/20240614130246_create_action_text_tables.action_text.rb

@@ -0,0 +1,26 @@
+# This migration comes from action_text (originally 20180528164100)
+class CreateActionTextTables < ActiveRecord::Migration[6.0]
+  def change
+    # Use Active Record's configured type for primary and foreign keys
+    primary_key_type, foreign_key_type = primary_and_foreign_key_types
+
+    create_table :action_text_rich_texts, id: primary_key_type do |t|
+      t.string     :name, null: false
+      t.text       :body, size: :long
+      t.references :record, null: false, polymorphic: true, index: false, type: foreign_key_type
+
+      t.timestamps
+
+      t.index [ :record_type, :record_id, :name ], name: "index_action_text_rich_texts_uniqueness", unique: true
+    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/lib/pg_engine/engine.rb

@@ -13,6 +13,14 @@ module PgEngine
       g.fallbacks[:pg_active_record] = :active_record
     end
 
+    # overrides = "#{PgEngine::Engine.root}/app/overrides"
+
+    # config.to_prepare do
+    #   Dir.glob("#{overrides}/**/*.rb").each do |override|
+    #     load override
+    #   end
+    # end
+
     initializer 'pg_engine.set_exceptions_app' do
       Rails.application.config.exceptions_app = Rails.application.routes
     end

data/pg_engine/spec/helpers/pg_engine/pg_rails_helper_spec.rb

@@ -1,5 +1,4 @@
 require 'rails_helper'
-# rubocop:disable RSpec/ExampleLength
 describe PgEngine::PgRailsHelper do
   describe '#img_placeholder' do
     it 'si no es fade_in' do
@@ -35,4 +34,3 @@ describe PgEngine::PgRailsHelper do
     end
   end
 end
-# rubocop:enable RSpec/ExampleLength

data/pg_engine/spec/requests/admin/eventos_spec.rb

@@ -0,0 +1,56 @@
+require 'rails_helper'
+
+describe 'Eventos' do
+  let(:user) { create :user, :developer }
+
+  before do
+    create :user # no dev
+    sign_in user
+    SimpleUserNotifier.with(message: 'New post').deliver(User.all, enqueue_job: false)
+  end
+
+  it 'renders the event index' do
+    get '/a/eventos'
+
+    expect(response.body).to include 'New post'
+  end
+
+  describe 'posting events' do
+    subject do
+      get '/a/eventos/new'
+      expect(response.body).to include 'Tooltip'
+      post '/a/eventos', params: {
+        evento: {
+          type: 'SimpleUserNotifier',
+          message: 'hola',
+          target:
+        }
+      }
+    end
+
+    context 'cuando se manda a los devs' do
+      let(:target) { 'devs' }
+
+      it do
+        expect { subject }.to change(Noticed::Notification, :count).by(1)
+      end
+    end
+
+    context 'cuando se manda a todos' do
+      let(:target) { 'todos' }
+
+      it do
+        expect { subject }.to change(Noticed::Notification, :count).by(2)
+      end
+    end
+
+    context 'cuando hay error' do
+      let(:target) { 'bla' }
+
+      it do
+        subject
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+    end
+  end
+end

data/pg_engine/spec/system/noticed_spec.rb

@@ -29,6 +29,9 @@ describe 'Notifications' do
       expect(page).to have_css('.notifications-unseen-mark')
       find('.bi-bell-fill').click
       expect(page).to have_no_css('.notifications-unseen-mark', wait: 5)
+      expect(page).to have_no_css('.unseen')
+      click_on 'Marcar como no leído'
+      expect(page).to have_css('.unseen')
     end
   end
 

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

@@ -3,3 +3,6 @@ import './turbo_rails'
 import './rollbar'
 import './bootstrap'
 import './tooltips'
+
+import 'trix'
+import '@rails/actiontext'

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

@@ -18,15 +18,33 @@ export default class extends Controller {
     })
   }
 
+  async markAsUnseen (e) {
+    const notification = e.target.closest('.notification')
+    notification.dataset.markedAsUnseen = true
+    const id = notification.dataset.id
+    const response = await post('/u/notifications/mark_as_unseen',
+      { query: { id } })
+
+    if (response.ok) {
+      notification.classList.add('unseen')
+    } else {
+      const text = await response.text
+      Rollbar.error('Error marking as unseen: ', text)
+    }
+  }
+
   async markAsSeen () {
     const ids = []
-    document.querySelectorAll('.notification')
-      .forEach((e) => { ids.push(e.dataset.id) })
+    const targets = Array.from(document.querySelectorAll('.notification')).filter((e) => {
+      return !e.dataset.markedAsUnseen
+    })
+    targets.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(
+      targets.forEach(
         (notif) => {
           notif.classList.remove('unseen')
         }

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

@@ -10,15 +10,8 @@
     <% @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>
+    <% if Current.user.present? && @notifications_bell.present? %>
+      <%= render @notifications_bell %>
     <% end %>
     <%= @navbar.logo if @navbar.logo.present? %>
     <button class="btn btn-outline-light d-inline-block d-<%= @breakpoint_navbar_expand %>-none"

data/pg_rails/lib/version.rb

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

data/pg_rails/scss/pg_rails.scss

@@ -37,3 +37,5 @@ $alert-margin-bottom:           0.5rem;
 @import './../../pg_layout/app/assets/stylesheets/animations';
 
 @import 'bootstrap-icons/font/bootstrap-icons';
+
+@import 'trix.css';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.103
+  version: 7.0.8.pre.alpha.104
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-19 00:00:00.000000000 Z
+date: 2024-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -981,6 +981,7 @@ files:
 - pg_engine/app/assets/images/plantita-sm.png
 - pg_engine/app/assets/images/plantita.png
 - pg_engine/app/assets/javascripts/active_admin.js
+- pg_engine/app/assets/stylesheets/actiontext.css
 - pg_engine/app/assets/stylesheets/active_admin.scss
 - pg_engine/app/assets/stylesheets/notifications.scss
 - pg_engine/app/assets/stylesheets/pg_rails_b5.scss
@@ -991,10 +992,12 @@ files:
 - 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/components/notifications_bell_component.rb
 - pg_engine/app/components/page_not_found_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
+- pg_engine/app/controllers/admin/eventos_controller.rb
 - pg_engine/app/controllers/admin/user_accounts_controller.rb
 - pg_engine/app/controllers/admin/users_controller.rb
 - pg_engine/app/controllers/concerns/pg_engine/resource.rb
@@ -1034,6 +1037,7 @@ files:
 - pg_engine/app/models/current.rb
 - pg_engine/app/models/email.rb
 - pg_engine/app/models/email_log.rb
+- pg_engine/app/models/evento.rb
 - pg_engine/app/models/mensaje_contacto.rb
 - pg_engine/app/models/pg_engine/base_record.rb
 - pg_engine/app/models/user.rb
@@ -1048,6 +1052,7 @@ files:
 - pg_engine/app/policies/user_account_policy.rb
 - pg_engine/app/policies/user_policy.rb
 - pg_engine/app/policies/user_registration_policy.rb
+- pg_engine/app/views/active_storage/blobs/_blob.html.erb
 - pg_engine/app/views/admin/accounts/_account.html.slim
 - pg_engine/app/views/admin/accounts/_form.html.slim
 - pg_engine/app/views/admin/accounts/edit.html.slim
@@ -1059,6 +1064,8 @@ files:
 - pg_engine/app/views/admin/emails/_form.html.slim
 - pg_engine/app/views/admin/emails/_send.html.slim
 - pg_engine/app/views/admin/emails/show.html.slim
+- pg_engine/app/views/admin/eventos/index.html.slim
+- pg_engine/app/views/admin/eventos/new.html.slim
 - pg_engine/app/views/admin/user_accounts/_form.html.slim
 - pg_engine/app/views/admin/user_accounts/_user_account.html.slim
 - pg_engine/app/views/admin/user_accounts/edit.html.slim
@@ -1069,6 +1076,7 @@ files:
 - pg_engine/app/views/admin/users/edit.html.slim
 - pg_engine/app/views/admin/users/new.html.slim
 - pg_engine/app/views/admin/users/show.html.slim
+- pg_engine/app/views/layouts/action_text/contents/_content.html.erb
 - pg_engine/app/views/pg_engine/admin_mailer/admin_mail.html.slim
 - pg_engine/app/views/pg_engine/base/download.xlsx.axlsx
 - pg_engine/app/views/pg_engine/base/edit.html.slim
@@ -1103,6 +1111,7 @@ files:
 - 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/migrate/20240614130246_create_action_text_tables.action_text.rb
 - pg_engine/db/seeds.rb
 - pg_engine/lib/pg_engine.rb
 - pg_engine/lib/pg_engine/configuracion.rb
@@ -1160,6 +1169,7 @@ files:
 - pg_engine/spec/models/user_account_spec.rb
 - pg_engine/spec/models/user_spec.rb
 - pg_engine/spec/pg_engine/pdf_preview_generator_spec.rb
+- pg_engine/spec/requests/admin/eventos_spec.rb
 - pg_engine/spec/requests/base_controller_requests_spec.rb
 - pg_engine/spec/system/alerts_spec.rb
 - pg_engine/spec/system/destroy_spec.rb