pg_rails 7.0.8.pre.alpha.63 → 7.0.8.pre.alpha.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d32d439bc5fe9dd6527c13d1800daf3381c2590b883844e772ca336732efeec
-  data.tar.gz: f9aff03d93288060f00dfb7efcb6c9160ffc2f7ac6ba9cd3c59aa6f3934d5bbe
+  metadata.gz: c1b7d742107efb7bfdd00d458d0df8b298395702ae8aacaa1cf1ffe9083ca09e
+  data.tar.gz: 2592e3ec5a153c28314bab3c754c86dfee514fe5cf308380bae1324e14167565
 SHA512:
-  metadata.gz: 397c4960f4e804ed8b88096542573b34475a935426db607cb14542a70991697c76404bae1460b0a8859eb3dbe6eefc2b9f829ebebf9cb019a9501b89c5b24790
-  data.tar.gz: dd5e763c4fe36a2f5b7115dffcadceba504e8bdd99a874c727e5ce1197698dafadb142b5601ada51d61a980421c6beef2fbea865fa3df1a15dd0391e96054d82
+  metadata.gz: 1022d09e2a8fad3a7bca4cf92038ed521951daca564ecbca33c52c440cf565bd71758edbc7445f68e023c1eea4292647f50350f378675063912d1c3556a26030
+  data.tar.gz: 10910645b466eeb4bcbaae5610977f4ed61fe4c5886e9562ac25d3a4970f3b9a3c2f3153843d0be3f3d69e2c829683f5b1178e1ed8bb2d56f770aae3b6a8724c

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

@@ -311,7 +311,7 @@ module PgEngine
         direction = options[:default].first[1]
         do_sort(scope, field, direction)
       else
-        scope
+        do_sort(scope, 'id', 'desc')
       end
     end
   end

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

@@ -22,7 +22,7 @@ module PgEngine
 
     protect_from_forgery with: :exception
 
-    rescue_from PgEngine::Error, with: :internal_error
+    rescue_from StandardError, with: :internal_error
     rescue_from Pundit::NotAuthorizedError, with: :not_authorized
     rescue_from Redirect do |e|
       redirect_to e.url

data/pg_layout/app/javascript/application.js

@@ -33,8 +33,8 @@ Rollbar.configure({
   }
 })
 
-document.addEventListener('turbo:load', bindToasts)
-document.addEventListener('turbo:render', bindToasts)
+document.addEventListener('turbo:load', bindAndObserveToasts)
+document.addEventListener('turbo:render', bindAndObserveToasts)
 
 document.addEventListener('turbo:before-cache', () => {
   document.querySelectorAll('.offcanvas-backdrop').forEach((el) => {
@@ -45,9 +45,20 @@ document.addEventListener('turbo:before-cache', () => {
   })
 })
 
-function bindToasts () {
-  const toastElList = document.querySelectorAll('.toast:not(.hide):not(.show)')
-  Array.from(toastElList).map(toastEl => new bootstrap.Toast(toastEl).show())
+function bindToastElements () {
+  const toastQuery = '.pg-toast:not(.hide):not(.show)'
+
+  const toastElList = document.querySelectorAll(toastQuery)
+  Array.from(toastElList).map(toastEl => {
+    toastEl.addEventListener('hidden.bs.toast', () => {
+      toastEl.remove()
+    })
+    return new bootstrap.Toast(toastEl).show()
+  })
+}
+
+function bindAndObserveToasts () {
+  bindToastElements()
 
   // Select the node that will be observed for mutations
   const targetNode = document.getElementById('flash')
@@ -59,11 +70,7 @@ function bindToasts () {
   const callback = (mutationList, observer) => {
     for (const mutation of mutationList) {
       if (mutation.type === 'childList') {
-        // console.log('A child node has been added or removed.')
-        const toastElList = document.querySelectorAll('.toast:not(.hide):not(.show)')
-        Array.from(toastElList).map(toastEl => new bootstrap.Toast(toastEl).show())
-      } else if (mutation.type === 'attributes') {
-        // console.log(`The ${mutation.attributeName} attribute was modified.`)
+        bindToastElements()
       }
     }
   }

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

@@ -5,7 +5,8 @@ import { fadeOut, fadeIn } from './../utils/utils'
 export default class extends Controller {
   connect () {
     if (document.getElementById('sidebar').classList.contains('opened')) {
-      document.querySelector('.navbar .navbar-brand').style.visibility = 'hidden'
+      const brand = document.querySelector('.navbar .navbar-brand')
+      if (brand) brand.style.visibility = 'hidden'
     }
   }
 

data/pg_layout/app/views/pg_layout/_flash.html.slim

@@ -2,22 +2,4 @@
 - flash_to_show = flash.select { |fm| fm[0].to_sym.in?(ApplicationController._flash_types) && fm[1].present? }
 / slim-lint:enable LineLength
 - flash_to_show.each do |flash_type, message|
-  .alert.alert-dismissible[
-    class="mt-2 d-flex align-items-center alert-#{flash_type_to_class(flash_type)}"
-    data-turbo-temporary="true"
-    aria-live="assertive" aria-atomic="true" role="alert"
-  ]
-    - case flash_type
-    - when 'critical'
-      / .bi.bi-emoji-dizzy.me-3.fs-2
-      .bi.bi-exclamation-triangle-fill.me-3.fs-2
-    - when 'alert'
-      .bi.bi-exclamation-triangle-fill.me-2
-    - when 'warning'
-      .bi.bi-exclamation-circle.me-2
-    - when 'success'
-      .bi.bi-check-lg.me-2
-    - when 'notice'
-      .bi.bi-info-circle.me-2
-    = message
-    button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"
+  = render partial: 'pg_layout/flash_inner', locals: { flash_type:, message:, toast: flash[:toast] }

data/pg_layout/app/views/pg_layout/_flash_container.html.slim

@@ -1,3 +1,3 @@
 #flash-wrapper.d-flex.justify-content-around
-  #flash.flash
+  #flash.flash.position-relative.w-100.d-flex.justify-content-center
     = render partial: 'pg_layout/flash'

data/pg_layout/app/views/pg_layout/_flash_inner.html.slim

@@ -0,0 +1,24 @@
+/ # locals: (flash_type:, message:, toast: false)
+
+.alert.alert-dismissible[
+  class="
+    mt-2 d-flex align-items-center
+    alert-#{flash_type_to_class(flash_type)}
+    #{'position-absolute pg-toast' if toast}"
+  data-turbo-temporary="true" data-bs-autohide="true"
+  aria-live="assertive" aria-atomic="true" role="alert"
+]
+  - case flash_type
+  - when 'critical'
+    / .bi.bi-emoji-dizzy.me-3.fs-2
+    .bi.bi-exclamation-triangle-fill.me-3.fs-2
+  - when 'alert'
+    .bi.bi-exclamation-triangle-fill.me-2
+  - when 'warning'
+    .bi.bi-exclamation-circle.me-2
+  - when 'success'
+    .bi.bi-check-lg.me-2
+  - when 'notice'
+    .bi.bi-info-circle.me-2
+  = message
+  button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"

data/pg_rails/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.63
+  version: 7.0.8.pre.alpha.65
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-09 00:00:00.000000000 Z
+date: 2024-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1093,6 +1093,7 @@ files:
 - pg_layout/app/views/pg_layout/_error.html.erb
 - pg_layout/app/views/pg_layout/_flash.html.slim
 - pg_layout/app/views/pg_layout/_flash_container.html.slim
+- pg_layout/app/views/pg_layout/_flash_inner.html.slim
 - pg_layout/app/views/pg_layout/_navbar.html.erb
 - pg_layout/app/views/pg_layout/_sidebar.html.erb
 - pg_layout/app/views/pg_layout/_sidebar_mobile.html.erb