pg_rails 7.6.22 → 7.6.24.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba5c6d7d214fdfee7b74981aec959f7ab5b0b993ef14527d6fc50024aa2e90be
-  data.tar.gz: 72d42c66107bafeabfd63f9249223ddb33317edfbacf296e432a88c280d1452e
+  metadata.gz: 515caff33953b3d9a058e092be6152c0e9da6ca0fe740075c5fca7833bc39644
+  data.tar.gz: 4ed2e3e33a0c6d39461c20f7a616c04f182c909f557125739bb065d4e92f58e9
 SHA512:
-  metadata.gz: fb4e10fe0f30f27a36509b16051abade54c8c84c8a3f0141d54910a2d671b534dabea23c1dda48d3f2500339e3e539e22813ddbd8d0b7e225a114ef6e193b42b
-  data.tar.gz: b3a897a09bd7f58c85aa783cc7ee8e10ff145afa75d515d16a1fd48006c029c4fbd3a41f16707b805d34700a4c5150c18ab6c252e80a731c07fda1a581962d19
+  metadata.gz: 5715a8c111e862a1e560f1e095b4f601700f841a2bdb76dad9594c33774b9c5d369947a553a63d5a12ddd0240f2c09380f6e04baee3db28715ae56e5f2ffbccb
+  data.tar.gz: d96915a2c9aaf4210491829e80ecb0785d706375f9a3610e38676c9e1708dc01db22b89e5f8a4a6daad49ef934b6e3147a4b13a00cdabe4cd6f0adcbb23e9d1b

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

@@ -152,15 +152,6 @@ input[type=datetime-local], input[type=datetime] {
   @extend .bg-primary;
 }
 
-// Root variables
-:root {
-  --bs-border-radius-sm: 0.06rem;
-  --bs-border-radius: 0.1rem;
-  --bs-border-radius-lg: 0.25rem;
-  --bs-border-radius-xl: 0.45rem;
-  --bs-border-radius-xxl: 0.6rem;
-  --bs-border-color: #a7b7bb;
-}
 
 // Alerts
 .alert-dismissible {

data/pg_engine/app/components/inline_edit/inline_component.rb

@@ -1,4 +1,5 @@
 class InlineComponent < ViewComponent::Base
+  include PgEngine::IndexHelper
   def initialize(model, attribute)
     @model = model
     @attribute = attribute
@@ -7,15 +8,4 @@ class InlineComponent < ViewComponent::Base
 
     super
   end
-
-  SUFIJOS = %i[f text].freeze
-  def unsuffixed(attribute)
-    ret = attribute.to_s.dup
-
-    SUFIJOS.each do |sufijo|
-      ret.gsub!(/_#{sufijo}$/, '')
-    end
-
-    ret
-  end
 end

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

@@ -2,7 +2,6 @@
 
 module PgEngine
   # rubocop:disable Rails/ApplicationController
-  # rubocop:disable Metrics/ClassLength
   class BaseController < ActionController::Base
     # Importante que esta línea esté al principio
     protect_from_forgery with: :exception
@@ -56,6 +55,7 @@ module PgEngine
     include RouteHelper
     include PgAssociable::Helpers
     include FrameHelper
+    include PgRailsHelper
 
     class Redirect < PgEngine::Error
       attr_accessor :url
@@ -126,16 +126,6 @@ module PgEngine
       render_my_component(InternalErrorComponent.new, :ok)
     end
 
-    helper_method :dev_user_or_env?
-    def dev_user_or_env?
-      Rails.env.development? || dev_user?
-    end
-
-    helper_method :dev_user?
-    def dev_user?
-      Current.user&.developer?
-    end
-
     helper_method :mobile_device?
 
     layout 'pg_layout/base'
@@ -231,5 +221,4 @@ module PgEngine
       redirect_back fallback_location: root_path
     end
   end
-  # rubocop:enable Metrics/ClassLength
 end

data/pg_engine/app/decorators/pg_engine/base_record_decorator.rb

@@ -4,6 +4,8 @@
 module PgEngine
   class BaseRecordDecorator < Draper::Decorator
     include ActionView::Helpers
+    include PgEngine::DefaultUrlOptions
+    include Rails.application.routes.url_helpers
     include PrintHelper
     include FormHelper
     include RouteHelper
@@ -173,7 +175,11 @@ module PgEngine
     end
 
     def object_url
-      helpers.url_for(target_object)
+      # FIXME: arreglar las urls generadas con "helpers"
+      # ver cómo se construye el view helper en los jobs
+      # y si se puede injectar el default url options ahí
+      # helpers.url_for(target_object)
+      url_for(target_object)
     end
 
     def nested_record

data/pg_engine/app/helpers/pg_engine/index_helper.rb

@@ -8,20 +8,29 @@ module PgEngine
       end
     end
 
+    SUFIJOS = %i[f text].freeze
+    def unsuffixed(attribute, sufijos = SUFIJOS)
+      ret = attribute.to_s.dup
+
+      sufijos.each do |sufijo|
+        ret.gsub!(/_#{sufijo}$/, '')
+      end
+
+      ret
+    end
+
+    def unsuffixed_for_export(attribute)
+      unsuffixed(attribute, %i[f])
+    end
+
     def encabezado(input, options = {})
       if input.is_a? Array
-        campo = input.first
+        campo = unsuffixed(input.first)
         sort_field = input.last
       else
-        campo = sort_field = input
-        sort_field = sort_field.to_s.sub(/_f\z/, '')
-        sort_field = sort_field.to_s.sub(/_text\z/, '')
+        campo = sort_field = unsuffixed(input)
       end
 
-      # Unsuffixed
-      campo = campo.to_s.sub(/_f\z/, '')
-      campo = campo.to_s.sub(/_text\z/, '')
-
       clase = options[:clase] || @clase_modelo
 
       human_name = scoped_human_attr_name(clase, campo, 'listado_header')

data/pg_engine/app/helpers/pg_engine/pg_rails_helper.rb

@@ -9,6 +9,14 @@ module PgEngine
       end
     end
 
+    def dev_user_or_env?
+      Rails.env.development? || dev_user?
+    end
+
+    def dev_user?
+      Current.user&.developer?
+    end
+
     private
 
     def do_placeholder(src = nil, width: '100%', height: '100%', **img_opts)

data/pg_engine/app/helpers/pg_engine/route_helper.rb

@@ -67,5 +67,13 @@ module PgEngine
     def path_for(array)
       url_for(array.push({ only_path: true }))
     end
+
+    def context_root_path
+      if Current.tid.present?
+        tenant_root_path(tid: Current.tid)
+      else
+        (Current.user.present? ? users_root_path : root_path)
+      end
+    end
   end
 end

data/pg_engine/app/views/layouts/_logo.html.slim

@@ -1,8 +1,8 @@
-- href = Current.tid.present? ? tenant_root_path(tid: Current.tid) : root_path
-a.navbar-brand href="#{ href }"
+a.navbar-brand href="#{ context_root_path }" data-turbo="false"
   = image_tag(PgEngine.site_brand.logo_navbar_url, alt: PgEngine.site_brand.name)
 
 css:
   a.navbar-brand img {
     max-height: 31px;
+    max-width: 100%;
   }

data/pg_engine/app/views/pg_engine/base/download.xlsx.axlsx

@@ -1,16 +1,22 @@
 # frozen_string_literal: true
 
 wb = xlsx_package.workbook
+
+title = wb.styles.add_style(
+  b: true, sz: 13, bg_color: '1a172f', fg_color: 'ebebeb'
+  # alignment: { horizontal: :center, vertical: :center }
+)
+
 wb.add_worksheet(name: @clase_modelo.nombre_plural) do |sheet|
   headers = atributos_para_listar.map { |a, _sort_by| @clase_modelo.human_attribute_name(a) }
-  headers.prepend 'ID interno'
-  sheet.add_row(headers)
+  headers.append 'ID interno'
+  sheet.add_row(headers, style: headers.map { title })
 
   @collection.decorate.each do |object|
     array = atributos_para_listar.map do |att, _sort_by|
-      object.send(att)
+      object.send(unsuffixed_for_export(att))
     end
-    array.prepend object.to_key
+    array.append object.to_key
     sheet.add_row array
   end
 end

data/pg_engine/config/routes.rb

@@ -48,6 +48,7 @@ Rails.application.routes.draw do
   end
 
   # root to: 'users/accounts#index'
+  # FIXME: qué onda
   root to: redirect('/u')
 
   namespace :admin, path: 'a' do

data/pg_engine/lib/pg_engine/site_brand.rb

@@ -11,7 +11,7 @@ module PgEngine
     def value_for(key)
       options = @options[key.to_sym]
 
-      raise PgEngine::Error, 'Key not found' if options.nil?
+      raise PgEngine::Error, "Key not found: #{key}" if options.nil?
 
       if Current.app_name.present? && options.keys.include?(Current.app_name)
         options[Current.app_name]

data/pg_engine/lib/pg_engine/test/dummy_brand.rb

@@ -7,9 +7,9 @@ module PgEngine
         @default_site_brand = :factura
 
         @options = {
-          landing_site_url: {
-            procura: 'https://bien.com.ar/procura',
-            factura: 'https://bien.com.ar/factura'
+          landing_site_url: { # Se usa en el footer de los mails
+            procura: 'https://procura.bien.com.ar',
+            factura: 'https://factura.bien.com.ar'
           },
           logo_navbar_url: {
             procura: 'test/procura-logo-navbar-1.png',
@@ -72,7 +72,7 @@ module PgEngine
         return :procura if request.host.match(/procura/)
         return :factura if request.host.match(/factura/)
 
-        pg_warn 'default site_brand assigned'
+        pg_warn 'default site_brand assigned' unless Rails.env.local?
 
         :factura
       end

data/pg_engine/spec/requests/resource_spec.rb

@@ -80,4 +80,16 @@ describe 'Resources', :tpath_req do
       expect { subject }.to change { cosa.reload.discarded_at }.to(be_nil)
     end
   end
+
+  describe '#download' do
+    subject do
+      get '/u/t/cosas.xlsx'
+    end
+
+    it do
+      subject
+      expect(response.content_type).to eq 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+      expect(response).to be_successful
+    end
+  end
 end

data/pg_layout/app/javascript/application.js

@@ -37,7 +37,7 @@ window.addEventListener('trix-file-accept', function (event) {
   const maxFileSize = 1024 * 1024 * 10 // 10MB
   if (event.file.size > maxFileSize) {
     event.preventDefault()
-    flashMessage('Lo siento mucho pero el tamaño máximo por archivo es de 10MB', 'warning')
+    flashMessage('El tamaño máximo por archivo es de 10MB', 'warning')
   }
 })
 

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

@@ -0,0 +1,19 @@
+import { application } from './application'
+
+import NavbarController from './navbar_controller'
+import FadeinOnloadController from './fadein_onload_controller'
+import ClearTimeoutController from './clear_timeout_controller'
+import SwitcherController from './switcher_controller'
+import ThemeController from './theme_controller'
+import TooltipController from './tooltip_controller'
+import PopoverController from './popover_controller'
+import PopoverTogglerController from './popover_toggler_controller'
+
+application.register('navbar', NavbarController)
+application.register('fadein_onload', FadeinOnloadController)
+application.register('clear-timeout', ClearTimeoutController)
+application.register('switcher', SwitcherController)
+application.register('theme', ThemeController)
+application.register('tooltip', TooltipController)
+application.register('popover', PopoverController)
+application.register('popover-toggler', PopoverTogglerController)

data/pg_layout/app/javascript/landing.js

@@ -0,0 +1,3 @@
+import './controllers/index-landing.js'
+
+import '@hotwired/turbo-rails'

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

@@ -27,13 +27,16 @@ html
     meta name="turbo-prefetch" content="#{ENV.fetch('TURBO_PREFETCH_ENABLE', 'false')}"
     meta name="view-transition" content="same-origin"
     meta name="cable-history-timestamp" content="#{Time.now.to_i}"
-    = csrf_meta_tags
+
+    - unless @skip_csrf_meta_tags
+      = csrf_meta_tags
+
     = csp_meta_tag
     - if defined?(AnyCable::Rails)
       = action_cable_with_jwt_meta_tag
 
     = stylesheet_link_tag 'application', 'data-turbo-track': 'reload'
-    = javascript_include_tag 'application', 'data-turbo-track': 'reload', type: 'module'
+    = javascript_include_tag 'application', 'data-turbo-track': 'reload'
     meta(name="actioncable-protocol"
          content="#{Rails.env.test? ? 'actioncable-v1-json' : 'actioncable-v1-ext-json'}")
     - if @rollbar_token.present?
@@ -114,10 +117,11 @@ html
               = captured_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'
+          - if dev_user?
+            .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/js/landing.js

@@ -0,0 +1 @@
+import './../../pg_layout/app/javascript/landing'

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.6.22'
+  VERSION = '7.6.24-3'
 end

data/pg_rails/scss/bootstrap_pre.scss

@@ -1,3 +1,37 @@
+// Default bootstrap colours
+$blue:    #0d6efd !default;
+$indigo:  #6610f2 !default;
+$purple:  #6f42c1 !default;
+$pink:    #d63384 !default;
+$red:     #dc3545 !default;
+$orange:  #fd7e14 !default;
+$yellow:  #ffc107 !default;
+$green:   #198754 !default;
+$teal:    #20c997 !default;
+$cyan:    #0dcaf0 !default;
+
+// Overriding some of the default colours
+$yellow:       #ffb401;
+$orange:       #e35b17;
+$red:          #a70101;
+
+$warning:      $yellow;
+$info:         #87accc;
+
+$warning-text-emphasis:  $orange;
+$danger-text-emphasis:   #910303;
+
+$tooltip-opacity: 1;
+$tooltip-bg:                     var(--bs-primary) !default;
+$tooltip-color:                        var(--bs-light) !default;
+
+$enable-validation-icons:       false;
+$focus-ring-width:              .05rem;
+$alert-padding-y:               0.5rem;
+$alert-margin-bottom:           0.5rem;
+
+$breadcrumb-margin-bottom: 0;
+
 @import "bootstrap/scss/mixins/banner";
 @include bsBanner("");
 

data/pg_rails/scss/border_radius.scss

@@ -0,0 +1,8 @@
+:root {
+  --bs-border-radius-sm: 0.06rem;
+  --bs-border-radius: 0.1rem;
+  --bs-border-radius-lg: 0.25rem;
+  --bs-border-radius-xl: 0.45rem;
+  --bs-border-radius-xxl: 0.6rem;
+  --bs-border-color: #a7b7bb;
+}

data/pg_rails/scss/pg_rails.scss

@@ -1,41 +1,10 @@
-// Default bootstrap colours
-$blue:    #0d6efd !default;
-$indigo:  #6610f2 !default;
-$purple:  #6f42c1 !default;
-$pink:    #d63384 !default;
-$red:     #dc3545 !default;
-$orange:  #fd7e14 !default;
-$yellow:  #ffc107 !default;
-$green:   #198754 !default;
-$teal:    #20c997 !default;
-$cyan:    #0dcaf0 !default;
-
-// Overriding some of the default colours
-$yellow:       #ffb401;
-$orange:       #e35b17;
-$red:          #a70101;
-
-$warning:      $yellow;
-$info:         #87accc;
-
-$warning-text-emphasis:  $orange;
-$danger-text-emphasis:   #910303;
-
-$tooltip-opacity: 1;
-$tooltip-bg:                     var(--bs-primary) !default;
-$tooltip-color:                        var(--bs-light) !default;
 
 $font-size-base: 0.9rem;
-$enable-validation-icons:       false;
-$focus-ring-width:              .05rem;
-$alert-padding-y:               0.5rem;
-$alert-margin-bottom:           0.5rem;
-
-$breadcrumb-margin-bottom: 0;
 
 @import 'bootstrap_pre';
 @import 'bootstrap_overrides';
 @import 'bootstrap_post';
+@import 'border_radius';
 
 @import './../../pg_engine/app/assets/stylesheets/pg_rails_b5';
 @import './../../pg_associable/app/assets/stylesheets/pg_associable';
@@ -47,6 +16,7 @@ $breadcrumb-margin-bottom: 0;
 @import 'trix/dist/trix';
 @import 'tom-select/dist/scss/tom-select.bootstrap5';
 
+// Tom Select
 .ts-control {
   padding-top: 2px!important;
   padding-bottom: 2px!important;
@@ -63,6 +33,7 @@ $breadcrumb-margin-bottom: 0;
 	padding-right: 0.75rem !important;
 }
 
+// Column truncate
 $values: 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100;
 
 @for $i from 1 through length($values) {
@@ -86,6 +57,7 @@ $values: 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100;
   }
 }
 
+// Buttons border in nav toolbar
 $warning-border-emphasis:   shade-color($yellow, 60%);
 .btn-toolbar .btn-warning {
   border: 1px solid $warning-border-emphasis;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.22
+  version: 7.6.24.pre.3
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-09 00:00:00.000000000 Z
+date: 2025-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -986,6 +986,7 @@ files:
 - pg_layout/app/javascript/controllers/embedded_frame_controller.js
 - pg_layout/app/javascript/controllers/fadein_onload_controller.js
 - pg_layout/app/javascript/controllers/filtros_controller.js
+- pg_layout/app/javascript/controllers/index-landing.js
 - pg_layout/app/javascript/controllers/index.js
 - pg_layout/app/javascript/controllers/navbar_controller.js
 - pg_layout/app/javascript/controllers/nested_controller.js
@@ -999,6 +1000,7 @@ files:
 - pg_layout/app/javascript/controllers/tooltip_controller.js
 - pg_layout/app/javascript/elements/index.js
 - pg_layout/app/javascript/elements/pg_event.js
+- pg_layout/app/javascript/landing.js
 - pg_layout/app/javascript/utils/cookies.js
 - pg_layout/app/javascript/utils/utils.ts
 - pg_layout/app/lib/navbar.rb
@@ -1047,6 +1049,7 @@ files:
 - pg_layout/lib/pg_layout/engine.rb
 - pg_layout/spec/lib/navbar_spec.rb
 - pg_rails/js/index.js
+- pg_rails/js/landing.js
 - pg_rails/lib/pg_rails.rb
 - pg_rails/lib/pg_rails/capybara_support.rb
 - pg_rails/lib/pg_rails/current_attributes_support.rb
@@ -1062,6 +1065,7 @@ files:
 - pg_rails/scss/bootstrap_overrides.scss
 - pg_rails/scss/bootstrap_post.scss
 - pg_rails/scss/bootstrap_pre.scss
+- pg_rails/scss/border_radius.scss
 - pg_rails/scss/pg_rails.scss
 - pg_scaffold/lib/generators/pg_active_record/model/model_generator.rb
 - pg_scaffold/lib/generators/pg_active_record/model/templates/admin.rb