pg_rails 7.1.10 → 7.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 671c1939e1e9cae615f0b025c14af1b2c7e25d725782bc28aa7a0416c6b9138b
-  data.tar.gz: 9ef68287946ee5aa453beec59bb1ffbcfd6a5acee7bac7c34b993313535b158c
+  metadata.gz: dfa6040427b2819258e1afc08b32b84c8e91c834752369678619c6d4fa8db024
+  data.tar.gz: '07198f45eabdf38b2e0d6990b82298eda1da31391973aa8190a223cbb4995e23'
 SHA512:
-  metadata.gz: 85c0900adc13bfb4955f46da877756864940b6e00e5a3a3f65b9c07d6792b068b5acb5d9baa3fc674bb51ab722f21c826e10c564644d60fae52780214c7c2493
-  data.tar.gz: 90a1bdfb038b4c9d0c5004ff854384669aa537e1efa1895c9f4bf9756a2deef9083552a152a870db0e43bf01c48b247ad8e6b10fe051cc40ee838c3b080437dc
+  metadata.gz: 80054255f87043cae6ca876997a4acbb0bfc5eeb0418991826c3fab5862389543f5916870b61063a6a0d88327c97a96c58ed454075559691f79f81fb4fbd3cd6
+  data.tar.gz: 78068cb66d350fed57c7fc3369caee7295070b0fe66c6e691792ad5ae3b5cbfbb1c36ab19316f11610e8e9f88a06a3e4d12427df339064f1250a398ad4368fe1

data/pg_associable/app/javascript/modal_controller.js

@@ -12,6 +12,7 @@ export default class extends Controller {
     if (this.element.dataset.removeOnHide) {
       this.element.addEventListener('hidden.bs.modal', (e) => {
         this.element.remove()
+        // FIXME: handlear mejor
         window.Stimulus.controllers.map((c) => { return c.calendar })
           .filter((e) => { return e })
           .forEach((c) => { c.refetchEvents() })

data/pg_engine/app/components/notification_component.rb

@@ -7,7 +7,7 @@ class NotificationComponent < BaseComponent
   erb_template <<~ERB
     <div class="notification d-flex flex-column flex-sm-row justify-content-between <%= 'unseen' if @notification.unseen? %>"
          id="<%= dom_id(@notification) %>" data-id="<%= @notification.id %>">
-      <div class="pe-3">
+      <div class="pe-3 trix-content">
         <%= @notification.message.html_safe %>
       </div>
       <div class="notification--time d-flex flex-column justify-content-end text-body-tertiary text-end">

data/pg_engine/app/components/search_bar_component.html.slim

@@ -0,0 +1,17 @@
+- if helpers.show_filters?
+  .border-bottom#filtros
+    .d-flex.align-items-center.px-3.py-2
+      .px-2.d-none.d-sm-inline-block
+        span.bi.bi-funnel-fill
+      = helpers.search_form_for @q, url: url_for do |f|
+        .row.g-1
+          .col
+            .row.g-1
+              = @builder.filtros_html(form: f)
+          .col-auto.gap-1.d-flex.align-items-start
+            = helpers.button_tag class: 'btn btn-sm btn-primary col-auto' do
+              span.bi.bi-search
+              span.d-none.d-sm-inline
+                | &nbsp
+                span.text Buscar
+            = helpers.clear_filter(title: 'Limpiar', class: 'btn btn-sm btn-secondary col-auto')

data/pg_engine/app/components/search_bar_component.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class SearchBarComponent < ViewComponent::Base
+  def initialize(ransack, filtros)
+    @q = ransack
+    @builder = filtros
+
+    super
+  end
+end

data/pg_engine/app/components/search_bar_toggler_component.html.slim

@@ -0,0 +1,8 @@
+- if helpers.show_filters?
+  = link_to url_for(ocultar_filtros: 1, cancel_filter: 'true'),
+            class: 'btn btn-sm btn-outline-primary col-auto' do
+    | Ocultar filtros
+- else
+  = link_to url_for(mostrar_filtros: 1),
+            class: 'btn btn-sm btn-outline-primary col-auto' do
+    | Filtrar

data/pg_engine/app/components/search_bar_toggler_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class SearchBarTogglerComponent < ViewComponent::Base
+end

data/pg_engine/app/lib/pg_engine/filtros_builder.rb

@@ -91,8 +91,6 @@ module PgEngine
           # real sino filtro booleano por presencia de discarded_at
           return :boolean if campo.to_s == 'discarded'
 
-          pg_warn("no existe el campo: #{nombre_campo}")
-
           return
         end
         columna.type

data/pg_engine/app/views/pg_engine/base/index.html.slim

@@ -3,34 +3,12 @@
   - @actions&.each do |link_args|
     = link_to(*link_args)
   - if @filtros.present?
-    - if show_filters?
-      = link_to namespaced_path(@clase_modelo, ocultar_filtros: 1),
-                class: 'btn btn-sm btn-outline-primary col-auto' do
-        | Ocultar filtros
-    - else
-      = link_to namespaced_path(@clase_modelo, mostrar_filtros: 1),
-                class: 'btn btn-sm btn-outline-primary col-auto' do
-        | Filtrar
+    = render SearchBarTogglerComponent.new
     .ms-1
   = @clase_modelo.new.decorate.new_link
 
-- if @filtros.present? && show_filters?
-  .border-bottom#filtros
-    .d-flex.align-items-center.px-3.py-2
-      .px-2.d-none.d-sm-inline-block
-        span.bi.bi-funnel-fill
-      = search_form_for @q, url: namespaced_path(@clase_modelo) do |f|
-        .row.g-1
-          .col
-            .row.g-1
-              = @filtros.filtros_html(form: f)
-          .col-auto.gap-1.d-flex.align-items-start
-            = button_tag class: 'btn btn-sm btn-primary col-auto' do
-              span.bi.bi-search
-              span.d-none.d-sm-inline
-                | &nbsp
-                span.text Buscar
-            = clear_filter(title: 'Limpiar', class: 'btn btn-sm btn-secondary col-auto')
+- if @filtros.present?
+  = render SearchBarComponent.new(@q, @filtros)
 
 div
   - if @collection.any?

data/pg_engine/config/initializers/view_component.rb

@@ -0,0 +1,3 @@
+Rails.application.configure do
+  config.view_component.capture_compatibility_patch_enabled = true
+end

data/pg_engine/spec/components/previews/alert_component_preview/colours.html.slim

@@ -1,3 +1,36 @@
-- %w[danger warning info success].each do |status|
-  h1 class="text-#{status}" = status
-  h1 class="text-#{status}-emphasis" = "#{status} emphasis"
+.row
+  .col
+    - %w[danger warning info success].each do |status|
+      h1 class="text-#{status}" = status
+      h1 class="text-#{status}-emphasis" = "#{status} emphasis"
+
+  .col
+    - %w[danger warning info success].each do |status|
+      .alert class="alert-#{status}"
+        = "Alert #{status}"
+
+.row
+  .col
+    div class="p-3 mb-2 bg-primary text-white" .bg-primary
+    div class="p-3 mb-2 bg-primary-subtle text-primary-emphasis" .bg-primary-subtle
+    div class="p-3 mb-2 bg-secondary text-white" .bg-secondary
+    div class="p-3 mb-2 bg-secondary-subtle text-secondary-emphasis" .bg-secondary-subtle
+    div class="p-3 mb-2 bg-success text-white" .bg-success
+    div class="p-3 mb-2 bg-success-subtle text-success-emphasis" .bg-success-subtle
+    div class="p-3 mb-2 bg-danger text-white" .bg-danger
+    div class="p-3 mb-2 bg-danger-subtle text-danger-emphasis" .bg-danger-subtle
+    div class="p-3 mb-2 bg-warning text-dark" .bg-warning
+    div class="p-3 mb-2 bg-warning-subtle text-warning-emphasis" .bg-warning-subtle
+    div class="p-3 mb-2 bg-info text-dark" .bg-info
+  .col
+    div class="p-3 mb-2 bg-info-subtle text-info-emphasis" .bg-info-subtle
+    div class="p-3 mb-2 bg-light text-dark" .bg-light
+    div class="p-3 mb-2 bg-light-subtle text-light-emphasis" .bg-light-subtle
+    div class="p-3 mb-2 bg-dark-subtle text-dark-emphasis" .bg-dark-subtle
+    div class="p-3 mb-2 bg-body-secondary" .bg-body-secondary
+    div class="p-3 mb-2 bg-body-tertiary" .bg-body-tertiary
+    div class="p-3 mb-2 bg-dark text-white" .bg-dark
+    div class="p-3 mb-2 bg-body text-body" .bg-body
+    div class="p-3 mb-2 bg-black text-white" .bg-black
+    div class="p-3 mb-2 bg-white text-dark" .bg-white
+    div class="p-3 mb-2 bg-transparent text-body" .bg-transparent

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

@@ -9,6 +9,7 @@ import SwitcherController from './switcher_controller'
 import FiltrosController from './filtros_controller'
 import NotificationsController from './notifications_controller'
 import SelectizeController from './selectize_controller'
+import ThemeController from './theme_controller'
 
 application.register('navbar', NavbarController)
 application.register('nested', NestedController)
@@ -19,5 +20,6 @@ application.register('switcher', SwitcherController)
 application.register('filtros', FiltrosController)
 application.register('notifications', NotificationsController)
 application.register('selectize', SelectizeController)
+application.register('theme', ThemeController)
 
 // TODO: testear con capybara todo lo que se pueda

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

@@ -0,0 +1,12 @@
+import { Controller } from '@hotwired/stimulus'
+
+// Connects to data-controller="theme"
+export default class extends Controller {
+  dark () {
+    document.documentElement.setAttribute('data-bs-theme', 'dark')
+  }
+
+  light () {
+    document.documentElement.setAttribute('data-bs-theme', 'light')
+  }
+}

data/pg_layout/app/javascript/utils/utils.ts

@@ -81,14 +81,14 @@ export function flashMessage (message, flashType = 'warning', toast = false) {
 }
 
 export function fadeOut (e) {
-  if (window.getComputedStyle(e).visibility !== 'hidden') {
+  if (e && window.getComputedStyle(e).visibility !== 'hidden') {
     e.classList.add('fade-out')
     e.addEventListener('animationend', onAnimationEndHide, { once: true })
   }
 }
 
 export function fadeIn (e) {
-  if (window.getComputedStyle(e).visibility !== 'visible') {
+  if (e && window.getComputedStyle(e).visibility !== 'visible') {
     e.classList.add('fade-in')
     e.addEventListener('animationend', onAnimationEndShow, { once: true })
   }

data/pg_layout/app/views/layouts/pg_layout/base.html.slim

@@ -77,6 +77,10 @@ html
           = yield(:filtros)
           = content
           div style="width:100%; height: 10em"
+          .d-flex.gap-1.justify-content-center.opacity-50 data-controller="theme"
+            | (Beta) Tema:
+            = link_to 'Claro', 'javascript:void(0)', 'data-action': 'theme#light'
+            = link_to 'Oscuro', 'javascript:void(0)', 'data-action': 'theme#dark'
           = render partial: 'layouts/footer'
           div style="width:100%; height: 10em"
     = render_turbo_stream_title

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.1.10'
+  VERSION = '7.1.12'
 end

data/pg_rails/scss/bootstrap_overrides.scss

@@ -8,7 +8,7 @@ $danger-bg-subtle:        tint-color($danger, 98%);
 $warning-border-subtle:   tint-color($warning, 20%);
 // $danger-border-subtle:    tint-color($danger, 60%);
 $secondary-bg-subtle:     tint-color($secondary, 92%);
-$warning-bg-subtle:       tint-color($warning, 40%);
+// $warning-bg-subtle:       tint-color($warning, 40%);
 
 
 $btn-close-focus-shadow: none;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.1.10
+  version: 7.1.12
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-03 00:00:00.000000000 Z
+date: 2024-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -617,6 +617,10 @@ files:
 - 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/components/search_bar_component.html.slim
+- pg_engine/app/components/search_bar_component.rb
+- pg_engine/app/components/search_bar_toggler_component.html.slim
+- pg_engine/app/components/search_bar_toggler_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
@@ -721,6 +725,7 @@ files:
 - pg_engine/config/initializers/ransack_memory.rb
 - pg_engine/config/initializers/rollbar.rb
 - pg_engine/config/initializers/simple_form_monkey_patch.rb
+- pg_engine/config/initializers/view_component.rb
 - pg_engine/config/initializers/zeitwerk.rb
 - pg_engine/config/locales/devise.en.yml
 - pg_engine/config/locales/es.yml
@@ -833,6 +838,7 @@ files:
 - pg_layout/app/javascript/controllers/pg_form_controller.js
 - pg_layout/app/javascript/controllers/selectize_controller.js
 - pg_layout/app/javascript/controllers/switcher_controller.js
+- pg_layout/app/javascript/controllers/theme_controller.js
 - pg_layout/app/javascript/utils/cookies.js
 - pg_layout/app/javascript/utils/utils.ts
 - pg_layout/app/lib/navbar.rb