practical 3.0.0.pre.alpha2 → 3.0.0.pre.alpha4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5cd9e0fb40bc07050d68f122c8f99b2769ebc047de756ba4baba2df7eb5a5fd
-  data.tar.gz: 4f9ea83a5bd5dc2b6da7a8a7b50321b185a1368abf820ba2c7abaac9e82468ae
+  metadata.gz: 9e7a07f1391054c9ea8b5743e39aa4a57cabc1da209f3b5d1fff81939f20d041
+  data.tar.gz: 6d8a26dc1d531ada515b79913137ff063f8ce0470b4e9cf3feb212bbd0188698
 SHA512:
-  metadata.gz: 790f33b8ef5decf8588d588f798f2e9ac65cb8b776eb0ca108a124e361bed765ba8230d8637918a3e904db2c497237064421028993b876081130efab9482f3d3
-  data.tar.gz: 0f07a49cd479ce6ff63d3627b1111e0908536e3b81807aec6daae24b913b342ab54d285b3c33e591d08071737a1da6007ced40112f21f62444efab9089aa4cc9
+  metadata.gz: 565c40aad6bf9c924c2941d27eb657994b22dc457ea0ccca2b54e9af3ee67db11f5a659403752e6ce085c864c0e1613d5536dc610206ffa0613d73f9f8e84086
+  data.tar.gz: b2d4c7c1d63b42edb948a5f99890eeaa253152a24af75d0fa8319c627fb1c6c07dc51254d396e6a20503fec304d488bed87604e62b1797c5626234a61bef88af

data/app/components/practical/views/button_to_component.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class Practical::Views::ButtonToComponent < Practical::Views::BaseComponent
+  include Practical::Views::Button::Styling
+  attr_accessor :url, :options, :appearance, :color_variant, :size, :html_options
+
+  def initialize(url:, options:, appearance: nil, color_variant: nil, size: nil, html_options: {})
+    self.url = url
+    self.options = options
+    self.html_options = html_options
+    initialize_style_utilities(appearance: appearance, color_variant: color_variant, size: size)
+  end
+
+  def call
+    html_option_defaults = {
+      class: css_classes_from_style_utilities,
+      data: {disable: true}
+    }
+
+    finalized_html_options = mix(html_option_defaults, html_options)
+    helpers.button_to(url, **options, **finalized_html_options) { content }
+  end
+end

data/app/components/practical/views/flash_messages_component.rb

@@ -2,15 +2,20 @@
 
 class Practical::Views::FlashMessagesComponent < Practical::Views::BaseComponent
   def call
+    messages = toasts
     tag.aside(class: 'notification-messages wa-stack') do
-      safe_join([
-        alert_toast,
-        notice_toast,
-        success_toast,
-      ])
+      safe_join(messages) if messages.present?
     end
   end
 
+  def toasts
+    [
+      alert_toast,
+      notice_toast,
+      success_toast,
+    ].compact
+  end
+
   def success_toast
     render_toast(
       color_variant: :success,
@@ -51,8 +56,11 @@ class Practical::Views::FlashMessagesComponent < Practical::Views::BaseComponent
     component = Practical::Views::ToastComponent.new(color_variant: color_variant)
 
     render component do |component|
-      if icon.present? && icon.is_a?(Hash)
-        icon = Practical::Views::IconComponent.new(**icon.to_h.symbolize_keys)
+      if icon.present? && (icon.is_a?(Hash) || icon.is_a?(ViewComponent::Base))
+        if icon.is_a?(Hash)
+          icon = Practical::Views::IconComponent.new(**icon.to_h.symbolize_keys)
+        end
+
         component.with_icon do
           render icon
         end

data/app/components/practical/views/form/error_list_component.rb

@@ -8,7 +8,7 @@ class Practical::Views::Form::ErrorListComponent < Practical::Views::BaseCompone
   end
 
   def call
-    tag.ul(data: {'data-pf-error-container': true}) {
+    tag.ul {
       safe_join(errors.map{|error| render Practical::Views::Form::ErrorListItemComponent.new(error: error) })
     }
   end

data/app/components/practical/views/form/error_list_item_component.rb

@@ -12,8 +12,7 @@ class Practical::Views::Form::ErrorListItemComponent < Practical::Views::BaseCom
   end
 
   def call
-    tag.li(class: 'wa-flank', data: {"pf-error-type": error.type, "pf-error-visible": true}) {
-      render(icon_set.error_list_icon) +
+    tag.li(data: {"pf-error-type": error.type, "pf-error-visible": true}) {
       tag.span(error.message, data: { "pf-error-message": true })
     }
   end

data/app/components/practical/views/form/fallback_errors_section_component.html.erb

@@ -1,7 +1,10 @@
-<%= tag.section(**finalized_options) do %>
-  <header>
-    <strong><%= blurb %></strong>
-  </header>
+<%= tag.wa_callout(variant: :danger) do %>
+  <%= render icon_set.error_callout_icon %>
+  <%= tag.section(**finalized_options) do %>
+    <header>
+      <strong><%= blurb %></strong>
+    </header>
 
-  <%= render Practical::Views::Form::ErrorListComponent.new(errors: remaining_errors) %>
+    <%= render Practical::Views::Form::ErrorListComponent.new(errors: remaining_errors) %>
+  <% end %>
 <% end %>

data/app/components/practical/views/form/fallback_errors_section_component.rb

@@ -11,7 +11,6 @@ class Practical::Views::Form::FallbackErrorsSectionComponent < Practical::Views:
 
   def finalized_options
     mix({
-      class: ["wa-callout", "wa-danger"],
       data: {"pf-error-container": true, "pf-fallback-error-section": true},
       id: id
     }, @options)

data/app/components/practical/views/form/field_errors_component.html.erb

@@ -0,0 +1,8 @@
+<wa-callout variant="danger">
+  <%= render icon_set.error_callout_icon %>
+
+  <%= label(object_method, nil, finalized_options) do %>
+    <header data-pf-field-multiple-errors-blurb><strong><%= multiple_errors_blurb %></strong></header>
+    <%= render Practical::Views::Form::ErrorListComponent.new(errors: errors) %>
+  <% end %>
+</wa-callout>

data/app/components/practical/views/form/field_errors_component.rb

@@ -1,28 +1,31 @@
 # frozen_string_literal: true
 
 class Practical::Views::Form::FieldErrorsComponent < Practical::Views::BaseComponent
-  attr_reader :f, :object_method, :options
+  attr_reader :f, :object_method, :multiple_errors_blurb, :options
 
-  def initialize(f:, object_method:, options:)
+  def initialize(f:, object_method:, multiple_errors_blurb:, options:)
     @f = f
     @object_method = object_method
+    @multiple_errors_blurb = multiple_errors_blurb
     @options = options
   end
 
-  def call
+  def errors
+    f.errors_for(object_method) || []
+  end
+
+  def finalized_options
     id = f.field_errors_id(object_method)
-    classes = ["error-section", "wa-callout", "wa-danger"]
-    errors = f.errors_for(object_method)
+    classes = ["error-section"]
 
     if errors.blank?
       classes << ["no-server-errors"]
-      errors = []
     end
 
-    finalized_options = mix({id: id, class: classes}, options)
-
-    return label(object_method, nil, finalized_options) {
-      render Practical::Views::Form::ErrorListComponent.new(errors: errors)
-    }
+    return mix({
+      id: id,
+      class: classes,
+      data: {'pf-error-container': true}
+    }, options)
   end
 end

data/app/components/practical/views/form/input_component.html.erb

@@ -1,4 +1,4 @@
-<section class='wa-stack wa-gap-3xs'>
+<section class='wa-stack wa-gap-2xs'>
   <%= tag.label(**label_options) do %>
     <%= label %>
     <%= field %>

data/app/components/practical/views/form/input_component.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class Practical::Views::Form::InputComponent < Practical::Views::BaseComponent
+  class FieldOptionsNotCalledError < StandardError; end
   attr_accessor :f, :object_method, :label_options
 
   renders_one :label
@@ -17,6 +18,19 @@ class Practical::Views::Form::InputComponent < Practical::Views::BaseComponent
   end
 
   def field_options(**options)
-    mix({"aria-describedby": field_errors_id}, options)
+    @_field_options_called = true
+    return mix({
+      "aria-describedby": field_errors_id,
+      "data": {"pf-initial-load-errors": f.errors_for(object_method)&.any? }
+    }, options)
+  end
+
+  def around_render
+    result = yield
+    unless @_field_options_called
+      raise FieldOptionsNotCalledError, "field_options was not called when rendering an InputComponent; which means this the input & its error container are not connected."
+    end
+
+    return result
   end
 end

data/app/components/practical/views/modal_dialog_component.html.erb

@@ -1,5 +1,5 @@
 <%= tag.dialog(**finalized_options) do %>
-  <header>
+  <header class="wa-flank:end">
     <h2><%= header %></h2>
     <form method="dialog">
       <button class="wa-plain"><%= render icon_set.dialog_close_icon %></button>

data/app/components/practical/views/modal_dialog_component.rb

@@ -11,6 +11,6 @@ class Practical::Views::ModalDialogComponent < Practical::Views::BaseComponent
   end
 
   def finalized_options
-    mix({id: id, open: open, data: {ensure_modal: true}, class: 'wa-dialog-stack-patch'}, options)
+    mix({id: id, open: open, data: {ensure_modal: true}, class: 'wa-dialog-stack-patch wa-dialog-contents-patch'}, options)
   end
 end

data/app/components/practical/views/navigation/pagination/goto_form_component.html.erb

@@ -1,21 +1,15 @@
 <%= render Practical::Views::OpenDialogButtonComponent.new(dialog_id: dialog_id, appearance: "filled outlined", size: :small) do %>
-  <%= pagy_t('pagy.nav.gap').html_safe %>
+  <%= Pagy::I18n.translate('pagy.nav.gap').html_safe %>
 <% end %>
 
 <%= render Practical::Views::ModalDialogComponent.new(id: dialog_id) do |component| %>
 
   <% component.with_header do %>
-    <%= pagy_t("pagy.nav.goto_page_form.legend") %>
+    <%= Pagy::I18n.translate("pagy.nav.goto_page_form.legend") %>
   <% end %>
   <section class="wa-stack">
     <p><%= page_detail_text %></p>
-    <%= helpers.webawesome_form_with(
-      url: uri_parts.uri.to_s,
-      method: :get,
-      local: true,
-      builder: NewApplicationFormBuilder,
-      class: 'pagination-goto-form wa-size-s'
-    ) do |f| %>
+    <%= form_wrapper do |f| %>
       <% uri_parts.params.each do |key, value| %>
         <%= hidden_field_for_goto_form(key: key, value: value) %>
       <% end %>
@@ -23,7 +17,7 @@
       <section class="wa-cluster">
         <%= f.number_field :page, value: pagy.page, placeholder: pagy.page.to_s, required: true, min: 1, max: pagy.last %>
         <%= f.button_component(type: :submit, color_variant: :neutral, appearance: :filled) do
-          pagy_t("pagy.nav.goto_page_form.button")
+          Pagy::I18n.translate("pagy.nav.goto_page_form.button")
         end %>
       </section>
     <% end %>

data/app/components/practical/views/navigation/pagination/goto_form_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Practical::Views::Navigation::Pagination::GotoFormComponent < Practical::Views::BaseComponent
-  include Pagy::Frontend
+  include Practical::Views::FormWrapper
   attr_accessor :pagy, :dialog_id, :page_detail_text
 
   URIParts = Data.define(:uri, :params)
@@ -13,7 +13,7 @@ class Practical::Views::Navigation::Pagination::GotoFormComponent < Practical::V
   end
 
   def uri_parts
-    uri = URI.parse(pagy_url_for(pagy, nil))
+    uri = URI.parse(pagy.page_url)
     params = Rack::Utils.parse_query(uri.query)
     params.delete("page")
     uri.query = ""
@@ -31,4 +31,19 @@ class Practical::Views::Navigation::Pagination::GotoFormComponent < Practical::V
       helpers.hidden_field_tag key, value
     end
   end
+
+  def generic_errors_id
+    "#{dialog_id}_pagination"
+  end
+
+  def form_wrapper(&block)
+    wrapped_form_with(
+      url: uri_parts.uri.to_s,
+      method: :get,
+      local: true,
+      builder: ApplicationFormBuilder,
+      class: 'pagination-goto-form wa-size-s',
+      &block
+    )
+  end
 end

data/app/components/practical/views/navigation/pagination_component.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Practical::Views::Navigation::PaginationComponent < ApplicationComponent
-  include Pagy::Frontend
   attr_reader :request
   attr_accessor :pagy, :item_name, :i18n_key
 
@@ -15,40 +14,35 @@ class Practical::Views::Navigation::PaginationComponent < ApplicationComponent
   def page_detail_text
     pagy_count = pagy.count
     if pagy_count == 0
-      key = "pagy.info.no_items"
+      key = "pagy.info_tag.no_items"
     elsif pagy.pages == 1
-      key = "pagy.info.single_page"
+      key = "pagy.info_tag.single_page"
     else
-      key = "pagy.info.multiple_pages"
+      key = "pagy.info_tag.multiple_pages"
     end
 
-    item_name = item_name.presence || pagy_t(i18n_key || pagy.vars[:i18n_key], count: pagy_count)
+    item_name = item_name.presence || Pagy::I18n.translate(i18n_key || pagy.vars[:i18n_key], count: pagy_count)
 
-    item_text = pagy_t(key,
+    item_text = Pagy::I18n.translate(key,
                        item_name: item_name,
                        count: pagy_count, from: pagy.from, to: pagy.to
     )
 
-    page_count_text = pagy_t("pagy.info.page_count", page: pagy.page, count: pagy.pages)
+    page_count_text = Pagy::I18n.translate("pagy.info_tag.page_count", page: pagy.page, count: pagy.pages)
 
-    return pagy_t("pagy.info.page_detail_text", item_text: item_text, page_count_text: page_count_text)
+    return Pagy::I18n.translate("pagy.info_tag.page_detail_text", item_text: item_text, page_count_text: page_count_text)
   end
 
   def previous_item
-    classes = helpers.class_names(:page, :previous, disabled: !pagy.prev)
-
-    text = icon_text(
-      icon: icon_set.previous_arrow,
-      text: pagy_t('pagy.nav.v2_prev')
-    )
+    classes = helpers.class_names(:page, :previous, disabled: !pagy.previous)
 
     tag.div(class: classes, role: :listitem){
-      if pagy.prev
-        tag.a(href: pagy_url_for(pagy, pagy.prev), title: pagy_t("pagy.nav.prev_page_title")) {
-          text
+      if pagy.previous
+        tag.a(href: pagy.page_url(pagy.previous), title: Pagy::I18n.translate("pagy.aria_label.previous")) {
+          render icon_set.previous_arrow
         }
       else
-        text
+        render icon_set.previous_arrow
       end
     }
   end
@@ -56,18 +50,13 @@ class Practical::Views::Navigation::PaginationComponent < ApplicationComponent
   def next_item
     classes = helpers.class_names(:page, :next, disabled: !pagy.next)
 
-    text = icon_text(
-      icon: icon_set.next_arrow,
-      text: pagy_t('pagy.nav.v2_next')
-    )
-
     tag.div(class: classes, role: :listitem){
       if pagy.next
-        tag.a(href: pagy_url_for(pagy, pagy.next), title: pagy_t("pagy.nav.next_page_title")) {
-          text
+        tag.a(href: pagy.page_url(pagy.next), title: Pagy::I18n.translate("pagy.aria_label.next")) {
+          render icon_set.next_arrow
         }
       else
-        text
+        render icon_set.next_arrow
       end
     }
   end
@@ -80,12 +69,12 @@ class Practical::Views::Navigation::PaginationComponent < ApplicationComponent
     case item
     when Integer
       tag.div(class: :page, role: :listitem) {
-        tag.a(item, href: pagy_url_for(pagy, item), title: pagy_t("pagy.nav.page_title", page_number: item))
+        tag.a(item, href: pagy.page_url(item), title: Pagy::I18n.translate("pagy.nav.page_title", page_number: item))
       }
     when String
       tag.div(
         item,
-        class: "page current", role: :listitem, title: pagy_t("pagy.nav.current_page_title", page_number: item)
+        class: "page current", role: :listitem, title: Pagy::I18n.translate("pagy.nav.current_page_title", page_number: item)
       )
     when :gap
       render Practical::Views::Navigation::Pagination::GotoFormComponent.new(

data/app/components/practical/views/open_drawer_button_component.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class Practical::Views::OpenDrawerButtonComponent < Practical::Views::ButtonComponent
+  attr_accessor :drawer_id
+
+  def initialize(drawer_id:, appearance: nil, color_variant: nil, size: nil, options: {})
+    options = options.with_defaults(
+      onclick: self.class.inline_js_to_open_dialog(drawer_id: drawer_id)
+    )
+    super(type: :button, appearance: appearance, color_variant: color_variant, size: size, options: options)
+  end
+
+  def self.inline_js_to_open_dialog(drawer_id:)
+    return "document.getElementById(`#{drawer_id}`).open = true"
+  end
+end

data/app/components/practical/views/page_component.html.erb

@@ -41,10 +41,22 @@
     </aside>
   <% end %>
 
-  <main class="wa-body-l">
+  <main>
     <%= content %>
   </main>
 
+  <% if aside? %>
+    <aside slot="aside">
+      <%= aside %>
+    </aside>
+  <% end %>
+
+  <% if main_footer? %>
+    <footer slot="main-footer">
+      <%= main_footer %>
+    </footer>
+  <% end %>
+
   <% if footer? %>
     <footer slot="footer">
       <%= footer %>

data/app/components/practical/views/page_component.rb

@@ -6,7 +6,9 @@ class Practical::Views::PageComponent < Practical::Views::BaseComponent
   renders_one :subheader
   renders_one :footer
   renders_one :main_header
+  renders_one :main_footer
   renders_one :navigation
   renders_one :navigation_header
   renders_one :navigation_footer
+  renders_one :aside
 end

data/app/components/practical/views/toast_component.html.erb

@@ -1,6 +1,6 @@
 <toast-dialog>
   <dialog open class='wa-off toast'>
-    <%= tag.section(**finalized_callout_options) do %>
+    <%= tag.wa_callout(**finalized_callout_options) do %>
     <div class="wa-flank:end wa-gap-xs">
       <% if icon? %>
         <section class='wa-flank'>

data/app/components/practical/views/toast_component.rb

@@ -12,8 +12,6 @@ class Practical::Views::ToastComponent < Practical::Views::BaseComponent
   end
 
   def finalized_callout_options
-    mix({
-      class: class_names("wa-callout", css_classes_from_style_utilities)
-    }, options)
+    mix(attributes_from_style_utilities, options)
   end
 end

data/app/concerns/practical/auth/passkeys/controllers/emergency_registrations.rb

@@ -52,6 +52,6 @@ module Practical::Auth::Passkeys::Controllers::EmergencyRegistrations
       helpers: helpers
     )
 
-    render json: errors, status: :unprocessable_entity
+    render json: errors, status: :unprocessable_content
   end
 end

data/app/lib/practical/loaders/base.rb

@@ -1,17 +1,20 @@
 # frozen_string_literal: true
 
 class Practical::Loaders::Base
-  include Pagy::Backend
+  include Pagy::Method
 
-  attr_accessor :params, :base_relation, :datatable_form, :relation_builder, :pagy_instance, :records
+  attr_accessor :request, :base_relation, :datatable_form,
+                :relation_builder, :pagy_instance, :records
 
-  def initialize(params:, base_relation:)
-    self.params = params
+  delegate :params, to: :request
+
+  def initialize(request:, base_relation:)
+    self.request = request
     self.base_relation = base_relation
   end
 
-  def self.load(params:, base_relation:)
-    instance = self.new(params: params, base_relation: base_relation)
+  def self.load(request:, base_relation:)
+    instance = self.new(request: request, base_relation: base_relation)
     instance.load
     return instance
   end
@@ -19,7 +22,7 @@ class Practical::Loaders::Base
   def load
     self.datatable_form = build_datatable_form
     self.relation_builder = build_relation_builder
-    self.pagy_instance, self.records = pagy(relation_builder.applied_relation, overflow: :last_page)
+    self.pagy_instance, self.records = pagy(relation_builder.applied_relation)
   end
 
   def datatable_payload
@@ -41,4 +44,9 @@ class Practical::Loaders::Base
   def default_payload
     raise NotImplementedError
   end
+
+  def params
+    return request.params if request.params.kind_of?(ActionController::Parameters)
+    return ActionController::Parameters.new(request.params)
+  end
 end

data/app/lib/practical/test/helpers/integration/assertions.rb

@@ -18,6 +18,6 @@ module Practical::Test::Helpers::Integration::Assertions
   end
 
   def assert_error_dom(container_id:, message:)
-    assert_dom("##{container_id}", text: message)
+    assert_dom("##{container_id}", text: %r{#{message}})
   end
 end

data/app/lib/practical/test/helpers/passkey/system/selenium.rb

@@ -24,7 +24,9 @@ module Practical::Test::Helpers::Passkey::System::Selenium
 
     driven_by :selenium, using: selenium_driver_key, screen_size: [1400, 1400] do |options|
       options.accept_insecure_certs = true
-      options.args << "--auto-open-devtools-for-tabs"
+      if ENV.has_key?("HEADLESS_TESTS")
+        options.args << "--headless=new"
+      end
     end
   end
 

data/app/lib/practical/test/helpers/setup/debug.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
 module Practical::Test::Helpers::Setup::Debug
-  # rubocop:disable Rails/Output
-  puts "MINITEST_PARALLEL_EXECUTOR_SIZE: #{Minitest.parallel_executor.size}"
-  puts "PARALLEL_WORKERS: #{ENV["PARALLEL_WORKERS"]}"
-  # rubocop:enable Rails/Output
+  extend ActiveSupport::Concern
+  included do
+    # rubocop:disable Rails/Output
+    puts "MINITEST_PARALLEL_EXECUTOR_SIZE: #{Minitest.parallel_executor.size}"
+    puts "PARALLEL_WORKERS: #{ENV["PARALLEL_WORKERS"]}"
+    # rubocop:enable Rails/Output
+  end
 end

data/app/lib/practical/test/helpers/system/assertions.rb

@@ -3,7 +3,7 @@
 module Practical::Test::Helpers::System::Assertions
   def assert_toast_message(text:)
     within(".notification-messages") do
-      assert_selector("dialog", text: text)
+      assert_selector("dialog", text: text, visible: :all)
     end
   end