pg_rails 7.0.7 → 7.0.8.pre.alpha.6

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

@@ -6,48 +6,44 @@
   --bs-form-invalid-border-color: #b50000;
 }
 
+// Toasts
+.toast.show {
+  display: inline-block;
+}
 
 // FORMS
-// .pg-form {
-  // max-width: 300px;
+input[disabled] {
+  background-color: #e9e9ed;
+  color: black;
+}
 
-  input[disabled] {
-    background-color: #e9e9ed;
-    color: black;
-  }
+.form-control,
+.form-select {
+  border: 1px solid #a7b7bb;
 
-  .form-control,
-  .form-select {
-    width: 100%;
-    height: 35px;
-    border: 1px solid #a7b7bb;
-    border-radius: 3px;
+  &:focus, &:focus-visible {
+    outline: 1px solid color.adjust(#a7b7bb, $saturation: +30%);
+  }
+}
+select[multiple] {
+  height: inherit;
+}
 
-    &.form-control-sm,
-    &.form-select-sm {
-      height: 29px;
-    }
+input[type=date] {
+  max-width: 12em;
+}
 
-    &.is-invalid {
-      background-image: none!important; /* override bootstrap forms */
-      padding-right: 0; /* override bootstrap forms */
-    }
+input[type=datetime-local], input[type=datetime] {
+  max-width: 15em;
+}
 
-    &:focus, &:focus-visible {
-      outline: 1px solid color.adjust(#a7b7bb, $saturation: +30%);
-    }
-  }
-  select[multiple] {
-    height: inherit;
-  }
-  .form-control:focus {
-    box-shadow: none!important; /* override bootstrap forms */
-  }
+.form-select:not(:has(option)) {
+  background-color: #d5d5d5;
+}
 
-  input[type=date] {
-    max-width: 170px;
-  }
-// }
+.form-control.is-invalid, .form-select.is-invalid {
+  background-color: #fff3f3;
+}
 
 // LISTADOS
 .listado {
@@ -56,9 +52,7 @@
   }
 }
 .listado .btn-sm {
-  min-width: 25px;
-  height: 25px;
-  padding: 1px;
+  padding: 0em 0.3em;
   margin-right: 4px;
 }
 
@@ -66,9 +60,23 @@
 .filter {
   display: inline-block;
   vertical-align: top;
-  min-width: 200px;
+  max-width: 17em;
+}
 
-  .input-group {
-    width: 230px;
-  }
+// Modal
+.modal-content {
+  box-shadow: 15px 15px 9px 0px rgba(0, 0, 0, 0.6);
+}
+
+// Nested
+.link-to-add:hover {
+  background-color: #f4f4f4;
+}
+
+.link-to-add {
+  display: inline-block;
+  width: 100%;
+  text-align: center;
+  border-radius: var(--bs-border-radius);
+  padding: 0.6em 0.4em;
 }

data/pg_engine/app/controllers/pg_engine/resource_helper.rb

@@ -93,10 +93,12 @@ module PgEngine
           if params[:asociable]
             format.turbo_stream do
               render turbo_stream:
-                turbo_stream.update('pg-associable-form', <<~HTML
+                # rubocop:disable Rails/SkipsModelValidations
+                turbo_stream.update_all('.modal.show .pg-associable-form', <<~HTML
                   <div data-modal-target="response" data-response='#{object.decorate.to_json}'></div>
                 HTML
                 )
+              # rubocop:enable Rails/SkipsModelValidations
             end
           end
           format.html do
@@ -113,8 +115,10 @@ module PgEngine
           # self.instancia_modelo = instancia_modelo.decorate
           if params[:asociable]
             format.turbo_stream do
+              # rubocop:disable Rails/SkipsModelValidations
               render turbo_stream:
-                turbo_stream.update('pg-associable-form', partial: 'form', locals: { asociable: true })
+                turbo_stream.update_all('.modal.show .pg-associable-form', partial: 'form', locals: { asociable: true })
+              # rubocop:enable Rails/SkipsModelValidations
             end
           end
           format.html { render :new, status: :unprocessable_entity }

data/pg_engine/app/decorators/pg_engine/base_decorator.rb

@@ -12,8 +12,8 @@ module PgEngine
 
     delegate_all
 
-    def as_json(_options = {})
-      object.as_json.tap { |o| o[:to_s] = to_s }
+    def as_json(options = {})
+      object.as_json(options).tap { |o| o[:to_s] = to_s }
     end
 
     # rubocop:disable Style/MissingRespondToMissing

data/pg_engine/app/helpers/pg_engine/flash_helper.rb

@@ -14,9 +14,9 @@ module PgEngine
       case flash_type
       when 'notice'
         'info'
-      when 'error'
-        'danger'
       when 'alert'
+        'danger'
+      when 'warning'
         'warning'
       when 'success'
         'success'

data/pg_engine/app/helpers/pg_engine/form_helper.rb

@@ -29,5 +29,75 @@ module PgEngine
       uri.path = "#{uri.path}.#{formato}"
       uri.to_s
     end
+
+    # This method creates a link with `data-id` `data-fields` attributes.
+    # These attributes are used to create new instances of the nested fields through Javascript.
+    def link_to_add_fields(name, form, association, required: false)
+      # Takes an object (@person) and creates a new instance of its associated model (:addresses)
+      # To better understand, run the following in your terminal:
+      # rails c --sandbox
+      # @person = Person.new
+      # new_object = @person.send(:addresses).klass.new
+      new_object = form.object.send(association).klass.new
+
+      # Saves the unique ID of the object into a variable.
+      # This is needed to ensure the key of the associated array is unique.
+      # This is makes parsing the content in the `data-fields` attribute easier through Javascript.
+      # We could use another method to achive this.
+      id = new_object.object_id
+
+      # https://api.rubyonrails.org/ fields_for(record_name, record_object = nil, fields_options = {}, &block)
+      # record_name = :addresses
+      # record_object = new_object
+      # fields_options = { child_index: id }
+      # child_index` is used to ensure the key of the associated array is unique,
+      # and that it matched the value in the `data-id` attribute.
+      # `person[addresses_attributes][child_index_value][_destroy]`
+      fields =
+        form.fields_for(association, new_object, child_index: id) do |builder|
+          # `association.to_s.singularize + "_fields"` ends up evaluating to `address_fields`
+          # The render function will then look for `views/people/_address_fields.html.erb`
+          # The render function also needs to be passed the value of 'builder', because
+          # `views/people/_address_fields.html.erb` needs this to render the form tags.
+          render("#{association.to_s.singularize}_fields", f: builder)
+        end
+
+      # This renders a simple link, but passes information into `data` attributes.
+      # This info can be named anything we want, but in this case we chose `data-id:` and `data-fields:`.
+      # The `id:` is from `new_object.object_id`.
+      # The `fields:` are rendered from the `fields` blocks.
+      # We use `gsub("\n", "")` to remove anywhite space from the rendered partial.
+      # The `id:` value needs to match the value used in `child_index: id`.
+      link_to(
+        'javascript:void(0)',
+        class: 'link-to-add',
+        data: {
+          controller: 'nested',
+          action: 'nested#addItem',
+          id:,
+          required:,
+          fields: fields.gsub("\n", '')
+        }
+      ) do
+        # rubocop:disable Rails/OutputSafety
+        "<i class=\"bi bi-plus-lg\"></i> #{name}".html_safe
+        # rubocop:enable Rails/OutputSafety
+      end
+    end
+
+    def link_to_remove(text = nil, &)
+      if block_given?
+        link_to('javascript:void(0)', class: 'link-to-remove text-danger-emphasis', title: 'Quitar',
+                                      data: { controller: 'nested', action: 'nested#quitar' }, &)
+      elsif text.present?
+        link_to text, 'javascript:void(0)', class: 'link-to-remove text-danger-emphasis', title: 'Quitar',
+                                            data: { controller: 'nested', action: 'nested#quitar' }
+      else
+        link_to 'javascript:void(0)', class: 'link-to-remove text-danger-emphasis', title: 'Quitar',
+                                      data: { controller: 'nested', action: 'nested#quitar' } do
+          '<i class="bi bi-x-lg"></i>'.html_safe
+        end
+      end
+    end
   end
 end

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

@@ -18,7 +18,7 @@ module PgEngine
 
       def self.namespace(context)
         req = request(context)
-        route = Rails.application.routes.recognize_path(req.path)
+        route = Rails.application.routes.recognize_path(req.path, method: req.env['REQUEST_METHOD'])
         parts = route[:controller].split('/')
         return unless parts.length > 1
 
@@ -32,12 +32,20 @@ module PgEngine
       NamespaceDeductor.namespace(self)
     end
 
-    def namespaced_path(object, prefix: nil, suffix: nil)
+    def namespaced_path(object, options = {})
       target = [pg_namespace, object]
-      target.prepend prefix if prefix
-      target.append suffix if suffix
-      target = target.flatten.compact
-      polymorphic_url(target, only_path: true)
+
+      if options[:prefix]
+        target.prepend options[:prefix]
+        options.delete(:prefix)
+      end
+
+      if options[:suffix]
+        target.append options[:suffix]
+        options.delete(:suffix)
+      end
+
+      polymorphic_url(target.flatten.compact, options.merge(only_path: true))
     end
   end
 end

data/pg_engine/app/views/admin/accounts/_form.html.slim

@@ -1,6 +1,6 @@
 / # locals: (object: nil, asociable: false)
 
-div style="max-width: 300px"
+div style="max-width: 22em"
   = pg_form_for(@account || object) do |f|
     = f.mensajes_de_error
 

data/pg_engine/app/views/admin/user_accounts/_form.html.slim

@@ -1,12 +1,12 @@
 / # locals: (object: nil, asociable: false)
 
-div style="max-width: 300px"
+div style="max-width: 22em"
   = pg_form_for(@user_account || object) do |f|
     = f.mensajes_de_error
 
     = hidden_field_tag :asociable, true if asociable
-    = f.pg_associable_inline :user
-    = f.pg_associable_inline :account
+    = f.pg_associable :user
+    = f.pg_associable :account
     = f.input :profiles
     .mt-2
     = f.button :submit

data/pg_engine/app/views/admin/users/_form.html.slim

@@ -1,6 +1,6 @@
 / # locals: (object: nil, asociable: false)
 
-div style="max-width: 300px"
+div style="max-width: 22em"
   = pg_form_for(@user || object) do |f|
     = f.mensajes_de_error
 

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

@@ -9,8 +9,8 @@
   = @clase_modelo.new.decorate.new_link
   .ms-1
   = @clase_modelo.new.decorate.export_link(request.url)
-.collapse.p-2.border-bottom#filtros class="#{ 'show' if any_filter? }"
-  .d-flex.align-items-center
+.collapse.border-bottom#filtros class="#{ 'show' if any_filter? }"
+  .d-flex.align-items-center.p-2
     .px-2.d-none.d-sm-inline-block
       span.bi.bi-funnel-fill
     = form_tag nil, class: '', method: :get do
@@ -20,7 +20,7 @@
           = button_tag class: 'btn btn-sm btn-primary col-auto' do
             span.bi.bi-search
         .col-auto
-          = link_to namespaced_path(@clase_modelo),
+          = link_to namespaced_path(@clase_modelo, clean: true),
                     class: 'btn btn-sm btn-secondary col-auto' do
             | Limpiar
 

data/pg_engine/config/initializers/active_admin.rb

@@ -34,10 +34,7 @@ ActiveAdmin.setup do |config|
   #     File.join(Rails.root, 'app', 'admin'),
   #     File.join(Rails.root, 'app', 'cashier')
   #   ]
-  config.load_paths = [
-    File.join(Rails.root, 'app', 'admin'),
-    File.join(PgEngine::Engine.root, 'app', 'admin')
-  ]
+  config.load_paths.push(File.join(PgEngine::Engine.root, 'app', 'admin'))
   # == Default Namespace
   #
   # Set the default namespace each administration resource

data/pg_engine/config/simple_form/simple_form_bootstrap.rb

@@ -46,7 +46,7 @@ SimpleForm.setup do |config|
   # vertical forms
   #
   # vertical default_wrapper
-  config.wrappers :vertical_form, class: 'mb-3' do |b|
+  control_wrapper = lambda do |b|
     b.use :html5
     b.use :placeholder
     b.optional :maxlength
@@ -60,6 +60,21 @@ SimpleForm.setup do |config|
     b.use :hint, wrap_with: { class: 'form-text' }
   end
 
+  select_wrapper = lambda do |b|
+    b.use :html5
+    b.optional :readonly
+    b.use :label, class: 'form-label'
+    b.use :input, class: 'form-select', error_class: 'is-invalid'
+    b.use :full_error, wrap_with: { class: 'invalid-feedback' }
+    b.use :hint, wrap_with: { class: 'form-text' }
+  end
+
+  config.wrappers :vertical_no_margin_control, &control_wrapper
+
+  config.wrappers :vertical_no_margin_select, &select_wrapper
+
+  config.wrappers :vertical_form, class: 'mb-3', &control_wrapper
+
   # vertical input for boolean
   config.wrappers :vertical_boolean, tag: 'fieldset', class: 'mb-3' do |b|
     b.use :html5
@@ -112,14 +127,7 @@ SimpleForm.setup do |config|
   end
 
   # vertical select input
-  config.wrappers :vertical_select, class: 'mb-3' do |b|
-    b.use :html5
-    b.optional :readonly
-    b.use :label, class: 'form-label'
-    b.use :input, class: 'form-select', error_class: 'is-invalid'
-    b.use :full_error, wrap_with: { class: 'invalid-feedback' }
-    b.use :hint, wrap_with: { class: 'form-text' }
-  end
+  config.wrappers :vertical_select, class: 'mb-3', &select_wrapper
 
   # vertical multi select
   config.wrappers :vertical_multi_select, class: 'mb-3' do |b|

data/pg_engine/db/migrate/20240222115722_create_active_storage_tables.active_storage.rb

@@ -0,0 +1,57 @@
+# This migration comes from active_storage (originally 20170806125915)
+class CreateActiveStorageTables < ActiveRecord::Migration[7.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 :active_storage_blobs, id: primary_key_type do |t|
+      t.string   :key,          null: false
+      t.string   :filename,     null: false
+      t.string   :content_type
+      t.text     :metadata
+      t.string   :service_name, null: false
+      t.bigint   :byte_size,    null: false
+      t.string   :checksum
+
+      if connection.supports_datetime_with_precision?
+        t.datetime :created_at, precision: 6, null: false
+      else
+        t.datetime :created_at, null: false
+      end
+
+      t.index [ :key ], unique: true
+    end
+
+    create_table :active_storage_attachments, id: primary_key_type do |t|
+      t.string     :name,     null: false
+      t.references :record,   null: false, polymorphic: true, index: false, type: foreign_key_type
+      t.references :blob,     null: false, type: foreign_key_type
+
+      if connection.supports_datetime_with_precision?
+        t.datetime :created_at, precision: 6, null: false
+      else
+        t.datetime :created_at, null: false
+      end
+
+      t.index [ :record_type, :record_id, :name, :blob_id ], name: :index_active_storage_attachments_uniqueness, unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+
+    create_table :active_storage_variant_records, id: primary_key_type do |t|
+      t.belongs_to :blob, null: false, index: false, type: foreign_key_type
+      t.string :variation_digest, null: false
+
+      t.index [ :blob_id, :variation_digest ], name: :index_active_storage_variant_records_uniqueness, unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    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/seeds.rb

@@ -1,5 +1,8 @@
-['mrosso10@gmail.com'].each do |mail|
-  unless User.exists?(email: mail)
-    User.create(email: mail, password: 'admin123', confirmed_at: Time.now, developer: true)
-  end
+DatabaseCleaner.clean_with(:truncation, except: %w(ar_internal_metadata users accounts user_accounts))
+
+MAIL = 'mrosso10@gmail.com'
+
+unless User.where(email: MAIL).exists?
+  FactoryBot.create :user, email: MAIL, password: 'admin123',
+                           confirmed_at: Time.now, developer: true
 end

data/pg_engine/lib/pg_engine/engine.rb

@@ -14,7 +14,7 @@ module PgEngine
     end
 
     if Rails.env.local?
-      initializer 'configurar_factories', after: 'factory_bot.set_factory_paths' do
+      initializer 'pg_engine.set_factory_paths', after: 'factory_bot.set_factory_paths' do
         # Para que tome las factories de pg_engine/spec/factories
         # además de las de dummy/spec/factories
         FactoryBot.definition_file_paths << "#{root}/spec/factories"

data/pg_engine/lib/pg_engine/route_helpers.rb

@@ -6,6 +6,7 @@ module PgEngine
           get :abrir_modal
           post :buscar
         end
+        yield if block_given?
       end
     end
   end

data/pg_engine/lib/pg_engine/utils/pdf_preview_generator.rb

@@ -0,0 +1,50 @@
+require 'English'
+
+module PgEngine
+  class PdfPreviewGenerator
+    def open_tempfile
+      tempfile = Tempfile.open('PgEnginePdfPreview-', 'tmp')
+
+      begin
+        yield tempfile
+      ensure
+        tempfile.close
+        tempfile.unlink
+      end
+    end
+
+    def capture(*argv, to:)
+      to.binmode
+
+      open_tempfile do |err|
+        IO.popen(argv, err:) { |out| IO.copy_stream(out, to) }
+        err.rewind
+
+        unless $CHILD_STATUS.success?
+          raise "#{argv.first} failed (status #{$CHILD_STATUS.exitstatus}): #{err.read.to_s.chomp}"
+        end
+      end
+
+      to.rewind
+    end
+
+    def draw(*argv)
+      open_tempfile do |file|
+        capture(*argv, to: file)
+
+        yield file
+      end
+    end
+
+    def run(pdf_string)
+      open_tempfile do |tmp_pdf_file|
+        tmp_pdf_file.binmode
+        tmp_pdf_file.write pdf_string
+        tmp_pdf_file.close
+        draw 'pdftoppm', '-singlefile', '-cropbox', '-r', '72', '-png', tmp_pdf_file.path do |file|
+          return file.read
+        end
+      end
+    end
+  end
+end

data/pg_engine/lib/pg_engine.rb

@@ -5,6 +5,9 @@ require_relative 'pg_engine/core_ext'
 require_relative 'pg_engine/configuracion'
 require_relative 'pg_engine/route_helpers'
 require_relative 'pg_engine/utils/pg_logger'
+require_relative 'pg_engine/utils/pdf_preview_generator'
+
+require_relative '../app/helpers/pg_engine/print_helper'
 
 module PgEngine
   class << self

data/pg_engine/lib/tasks/auto_anotar_modelos.rake

@@ -11,7 +11,7 @@ if Rails.env.development?
       'additional_file_patterns'    => [],
       'routes'                      => 'true',
       'models'                      => 'true',
-      'position_in_routes'          => 'before',
+      'position_in_routes'          => 'after',
       'position_in_class'           => 'before',
       'position_in_test'            => 'before',
       'position_in_fixture'         => 'before',

data/pg_engine/spec/pg_engine/pdf_preview_generator_spec.rb

@@ -0,0 +1,12 @@
+require 'rails_helper'
+
+describe PgEngine::PdfPreviewGenerator do
+  let(:pdf_string) { File.read("#{PgEngine::Engine.root}/spec/fixtures/test.pdf") }
+  let(:instancia) { described_class.new }
+
+  describe '#run' do
+    subject { instancia.run(pdf_string) }
+
+    it { is_expected.to be_a String }
+  end
+end

data/pg_layout/app/assets/stylesheets/sidebar.scss

@@ -54,6 +54,7 @@ $chevron-color: 200,200,200,.5;
   font-weight: bold;
   --bs-link-color-rgb: white!important;
 }
+// Los small-items están deprecados
 #sidebar {
   &.opened {
     .sidebar--small-items {
@@ -68,7 +69,7 @@ $chevron-color: 200,200,200,.5;
       display: block;
     }
     .sidebar--large-items {
-      display: none;
+      // display: none;
     }
   }
 }
@@ -84,11 +85,18 @@ $chevron-color: 200,200,200,.5;
   // display: none!important;
   flex-basis: 0px;
   transition: flex-basis 0.5s;
+
+  // Para que al cerrar y abrir no se vean los textos por fuera de la sidebar
+  clip-path: inset(0 0 0 0);
   // flex-grow: 1;
 
   &.opened {
     // display: block!important;
-    flex-basis: 140px;
+    flex-basis: 9em;
+  }
+  & > * {
+    width: 9em;
+    position:fixed;
   }
 }
 

data/pg_layout/app/javascript/nested_controller.js

@@ -0,0 +1,48 @@
+import { Controller } from '@hotwired/stimulus'
+
+export default class extends Controller {
+  connect () {
+    this.showRemove()
+  }
+
+  addItem () {
+    // Save a unique timestamp to ensure the key of the associated array is unique.
+    const time = new Date().getTime()
+    // Save the data id attribute into a variable. This corresponds to `new_object.object_id`.
+    const linkId = this.element.dataset.id
+    // Create a new regular expression needed to find any instance of the `new_object.object_id` used in the fields data attribute if there's a value in `linkId`.
+    const regexp = linkId ? new RegExp(linkId, 'g') : null
+    // Replace all instances of the `new_object.object_id` with `time`, and save markup into a variable if there's a value in `regexp`.
+    const newFields = regexp ? this.element.dataset.fields.replace(regexp, time) : null
+    // Add the new markup to the form if there are fields to add.
+    if (newFields) {
+      this.element.insertAdjacentHTML('beforebegin', newFields)
+    }
+    this.element.closest('form').dispatchEvent(new Event('nestedField:added'))
+    this.showRemove()
+  }
+
+  quitar () {
+    const parent = this.element.closest('.nested-fields')
+    parent.style.display = 'none'
+    parent.classList.add('removed')
+    parent.querySelector('[name*=destroy]').value = 'true'
+    this.element.closest('form').dispatchEvent(new Event('nestedField:removed'))
+    this.showRemove()
+  }
+
+  showRemove () {
+    const container = this.element.closest('.nested-container')
+    if (container.dataset.required === 'true') {
+      if (container.querySelectorAll('.nested-fields:not(.removed)').length === 1) {
+        container.querySelectorAll('.link-to-remove').forEach((e) => {
+          e.style.visibility = 'hidden'
+        })
+      } else {
+        container.querySelectorAll('.link-to-remove').forEach((e) => {
+          e.style.visibility = ''
+        })
+      }
+    }
+  }
+}