active_element 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59c0c229f1a2c98d33fbcb36bfac256d0c41a03ae5149f2134736830eed704f5
-  data.tar.gz: 25f487e038544884b13f224e7fbed2a831584b60b704900e5dae1f17082667c1
+  metadata.gz: b461a50c1dc5d99ecb2a98633424871c2ea25c99817cb0f269b0e55da9521732
+  data.tar.gz: 2d27482a5ffb5ea966c3f15dfa0e412ddb61b04cb63dbd628d272e95072d89c4
 SHA512:
-  metadata.gz: ca8865cdf14f3f7aad1c7935661a31b61a8de6e97928262d6a39a468e195934958f766e87e021c110e7c23369aa15c61e304bf375fb3ed7adef89f4532d36962
-  data.tar.gz: aaa94959dfaddb83889c62bc5899a109394a1688428186c12550b29fc21d013852deaa37d8167165e48e831a636ed58e50a90a88f71c9e77ca04595619435910
+  metadata.gz: d671afa4e3c6cea6eba9d3882bfbc3c21e2df90237d1afcd7c5c303fee433e8ce0a2a813402eeb79431ca2a33fcb737ed0879a0f3349b25ccba0b1b0763ec55b
+  data.tar.gz: 8e40f9498e58fd5430fa56290a5034c960dc5be81aa8b8e9e88fb790c138c7039a522e909a126bb6769d7cf680ce8937dfefa0e3c5942e5b1d541ac5b718d6ad

data/.rubocop.yml

@@ -25,6 +25,6 @@ Style/SymbolArray:
   Exclude:
   - 'rspec-documentation/pages/**/*.md'
 
-Style/Style/WordArray:
+Style/WordArray:
   Exclude:
   - 'rspec-documentation/pages/**/*.md'

data/Gemfile

@@ -10,6 +10,7 @@ gem 'devise', '~> 4.9'
 gem 'devpack', '~> 0.4.1'
 gem 'factory_bot_rails', '~> 5.2'
 gem 'faker', '~> 2.23'
+gem 'listen', '~> 3.8'
 gem 'rake', '~> 13.0'
 gem 'rspec', '~> 3.12'
 gem 'rspec-documentation', '~> 0.0.9'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_element (0.0.11)
+    active_element (0.0.12)
       bootstrap (~> 5.3.0alpha3)
       kaminari (~> 1.2)
       paintbrush (~> 0.1.2)
@@ -135,6 +135,9 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
+    listen (3.8.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.21.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -203,6 +206,9 @@ GEM
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
     redcarpet (3.6.0)
     regexp_parser (2.8.1)
     responders (3.1.0)
@@ -325,6 +331,7 @@ DEPENDENCIES
   devpack (~> 0.4.1)
   factory_bot_rails (~> 5.2)
   faker (~> 2.23)
+  listen (~> 3.8)
   rake (~> 13.0)
   rspec (~> 3.12)
   rspec-documentation (~> 0.0.9)

data/app/assets/javascripts/active_element/text_search_field.js

@@ -71,7 +71,16 @@
       const token = ActiveElement.getAntiCsrfToken();
       const responseErrorContainer = cloneElement('response-error');
       const searchResultsContainer = cloneElement('results');
-      const spinner = cloneElement('spinner');
+      const icons = cloneElement('icons');
+      const spinner = icons.querySelector('[data-item-class="spinner"]');
+      const clearButton = icons.querySelector('[data-item-class="clear"]');
+
+      if (element.value) clearButton.classList.remove('invisible');
+      clearButton.addEventListener('click', () => {
+        element.value = '';
+        hiddenInput.value = '';
+        clearButton.classList.add('invisible');
+      });
 
       document.addEventListener('click', () => {
         searchResultsContainer.classList.add('d-none');
@@ -79,6 +88,7 @@
 
       element.addEventListener('change', () => {
         hiddenInput.value = element.value;
+        if (element.value) clearButton.classList.remove('invisible');
       });
 
       element.addEventListener('keyup', () => {
@@ -87,6 +97,7 @@
         lastRequestId = requestId;
 
         spinner.classList.remove('invisible');
+        if (element.value) clearButton.classList.remove('invisible');
         searchResultsContainer.classList.add('d-none');
 
         if (!query || query.length < 3) {
@@ -119,6 +130,7 @@
 
       form.append(hiddenInput);
       element.parentElement.append(searchResultsContainer);
+      element.parentElement.append(clearButton);
       element.parentElement.append(spinner);
       element.parentElement.append(responseErrorContainer);
     });

data/app/views/active_element/components/form/_label.html.erb

@@ -6,7 +6,7 @@
             data-bs-trigger="focus"
             data-bs-toggle="popover"
             title="Required"
-            data-bs-content="<%= "#{options.fetch(:label)} is a required field." %>"
+            data-bs-content="<%= "#{options.fetch(:label)} is a required field." %>">
             <i class="text-secondary fa-solid fa-star-of-life"></i>
     </button>
   <% end %>

data/app/views/active_element/components/form/_templates.html.erb

@@ -18,8 +18,8 @@
     <input id="json-time-field-template" type="time" class="form-control m-1 d-inline-block json-time-field" />
     <input id="json-datetime-field-template" type="datetime-local" class="form-control m-1 d-inline-block json-datetime-field" />
     <input id="json-integer-field-template" type="number" class="form-control m-1 json-integer-field" />
-    <input id="json-float-field-template" type="number" class="form-control m-1 json-float-field" />
-    <input id="json-decimal-field-template" type="number" class="form-control m-1 json-decimal-field" />
+    <input id="json-float-field-template" type="number" step="any" class="form-control m-1 json-float-field" />
+    <input id="json-decimal-field-template" type="number" step="any" class="form-control m-1 json-decimal-field" />
 
     <select id="json-select-template" class="form-select m-1 json-select-field"></select>
 
@@ -65,9 +65,12 @@
     <p id="form-search-field-response-error-template" class="text-danger validation-error-message pt-1 m-0"></p>
     <div id="form-search-field-results-template" class="search-field-results d-none border border-top-0"></div>
     <div id="form-search-field-results-item-template" class="search-field-result p-2"></div>
-    <div id="form-search-field-spinner-template" class="invisible text-end">
-      <div style="position: relative; float: right; width: auto; right: 0.5rem; top: -1.7rem;">
-        <i class="fa-solid fa-spinner fa-spin"></i>
+    <div id="form-search-field-icons-template" class="text-end">
+      <div data-item-class="spinner" class="invisible" style="position: relative; float: right; width: auto; right: 0.5rem; top: -1.7rem;">
+        <i class="fa-fw fa-solid fa-spinner fa-spin"></i>
+      </div>
+      <div data-item-class="clear" class="invisible" style="position: relative; float: right; width: auto; right: 0.5rem; top: -1.7rem; cursor: pointer;">
+        <i class="fa-solid fa-fw fa-xmark"></i>
       </div>
     </div>
   </div>

data/app/views/active_element/components/form/_text_search.html.erb

@@ -3,7 +3,7 @@
                          id: "#{form_id}-#{field}-text-search",
                          class: "form-control #{component.valid?(field) ? nil : 'is-invalid'}",
                          autocomplete: 'off',
-                         placeholder: options[:placeholder].presence || 'Search...',
+                         placeholder: options[:placeholder].presence || "Search...",
                          tabindex: component.tabindex,
                          data: {
                            field_type: 'text-search',

data/app/views/active_element/components/table/_field.html.erb

@@ -1,5 +1,5 @@
 <% if value.is_a?(Array) %>
-  <% value.each_with_index do |each_value, index| %>
+  <% value.sort.each_with_index do |each_value, index| %>
     <%= each_value %>
     <%= index < value.size - 1 ? '|' : nil %>
   <% end %>

data/app/views/active_element/components/table/_ungrouped_collection.html.erb

@@ -8,6 +8,7 @@
             <button type="button"
                     style="background: none; border: none; outline: 0; position: absolute; margin-top: 0.3rem"
                     data-bs-toggle="popover"
+                    data-bs-trigger="focus"
                     data-bs-content="<%= options[:description] %>">
                     <i class="text-secondary fa-solid fa-circle-info"></i>
             </button>

data/app/views/active_element/components/table/item.html.erb

@@ -20,6 +20,7 @@
             <button type="button"
                     style="background: none; border: none; outline: 0; position: absolute; margin-top: 0.3rem"
                     data-bs-toggle="popover"
+                    data-bs-trigger="focus"
                     data-bs-content="<%= options[:description] %>">
                     <i class="text-secondary fa-solid fa-circle-info"></i>
             </button>

data/app/views/active_element/default_views/edit.html.erb

@@ -1,5 +1,5 @@
 <%= active_element.component.page_title record.model_name.to_s.titleize %>
 
 <%= active_element.component.form model: [namespace, record].compact,
-                                  destroy: true,
-                                  fields: active_element.state.fetch(:editable_fields, []) %>
+                                  destroy: active_element.state.deletable?,
+                                  fields: active_element.state.editable_fields %>

data/app/views/active_element/default_views/forbidden.html.erb

@@ -0,0 +1,7 @@
+<h1>Forbidden</h1>
+
+<h2 class="text-danger">Access to this resource has not been configured</h2>
+
+<p>The <span class="text-primary font-monospace"><%= type %></span> resource for <span class="text-primary font-monospace"><%= controller_name.titleize %></span> has not been configured, please contact your administrator.</p>
+
+<hr/>

data/app/views/active_element/default_views/index.html.erb

@@ -1,15 +1,15 @@
-<% if active_element.state.key?(:searchable_fields) %>
+<% if active_element.state.searchable_fields.present? %>
   <%= active_element.component.form title: 'Search Filters',
                                     submit: 'Search',
                                     modal: true,
                                     search: true,
                                     item: search_filters,
-                                    fields: active_element.state.fetch(:searchable_fields) %>
+                                    fields: active_element.state.searchable_fields %>
 <% end %>
 
-<%= active_element.component.table new: true,
-                                   show: true,
-                                   edit: true,
-                                   destroy: true,
+<%= active_element.component.table new: active_element.state.creatable?,
+                                   show: active_element.state.viewable?,
+                                   edit: active_element.state.editable?,
+                                   destroy: active_element.state.deletable?,
                                    collection: collection,
-                                   fields: active_element.state.fetch(:listable_fields, []) %>
+                                   fields: active_element.state.listable_fields %>

data/app/views/active_element/default_views/new.html.erb

@@ -1,4 +1,4 @@
 <%= active_element.component.page_title record.model_name.to_s.titleize %>
 
 <%= active_element.component.form model: [namespace, record].compact,
-                                  fields: active_element.state.fetch(:editable_fields, []) %>
+                                  fields: active_element.state.editable_fields %>

data/app/views/active_element/default_views/show.html.erb

@@ -1,7 +1,7 @@
 <%= active_element.component.page_title record.model_name.to_s.titleize %>
 
 <%= active_element.component.table item: record,
-                                   edit: true,
-                                   destroy: true,
-                                   fields: active_element.state.fetch(:viewable_fields, []) %>
+                                   edit: active_element.state.editable?,
+                                   destroy: active_element.state.deletable?,
+                                   fields: active_element.state.viewable_fields %>
 

data/config/locales/en.yml

@@ -0,0 +1,3 @@
+en:
+  active_element:
+    unexpected_error: 'Unexpected error'

data/example_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_element (0.0.11)
+    active_element (0.0.12)
       bootstrap (~> 5.3.0alpha3)
       kaminari (~> 1.2)
       paintbrush (~> 0.1.2)

data/example_app/app/controllers/pets_controller.rb

@@ -3,4 +3,5 @@ class PetsController < ApplicationController
   active_element.viewable_fields :name, :animal, :owner, :created_at, :updated_at
   active_element.editable_fields :name, :animal, :owner
   active_element.searchable_fields :name, :animal, :owner, :created_at, :updated_at
+  active_element.deletable
 end

data/example_app/app/controllers/users_controller.rb

@@ -3,4 +3,5 @@ class UsersController < ApplicationController
   active_element.viewable_fields :name, :email, :created_at, :updated_at, :pets
   active_element.listable_fields :name, :email, :created_at, :updated_at
   active_element.searchable_fields :name, :email, :created_at, :updated_at
+  active_element.deletable
 end

data/lib/active_element/components/text_search.rb

@@ -19,7 +19,16 @@ module ActiveElement
         end
 
         def text_search_options(model:, with:, providing:)
-          { search: { model: model.name.underscore, with: with, providing: providing } }
+          {
+            search: { model: model.name.underscore, with: with, providing: providing },
+            placeholder: "Search for #{model.name.titleize} by #{humanized_names(with).join(', ')}..."
+          }
+        end
+
+        private
+
+        def humanized_names(names)
+          Array(names).compact.map.map(&:to_s).map(&:humanize)
         end
       end
     end

data/lib/active_element/components/util/form_field_mapping.rb

@@ -127,21 +127,21 @@ module ActiveElement
         end
 
         def relation_text_search_field(field)
-          relation_model = relation(field).klass
-          record.public_send(field)
           [field, :text_search_field,
            TextSearch.text_search_options(
-             model: relation_model,
+             model: relation(field).klass,
              with: searchable_fields(field),
-             providing: relation_model.primary_key
-           ).merge({ display_value: association_mapping(field).display_value })]
+             providing: relation(field).klass.primary_key
+           ).merge({ display_value: association_mapping(field).display_value, label: i18n.label(field) })]
         end
 
         def searchable_fields(field)
-          Util.relation_controller(model, controller, field)
-              .active_element
-              .state
-              .fetch(:searchable_fields, [])
+          (Util.relation_controller(model, controller, field)&.active_element&.state&.searchable_fields || [])
+            .reject { |field| field.to_s.end_with?('_at') } # FIXME: Select strings/numbers only.
+        end
+
+        def relation_primary_key(field)
+          relation(field).options.fetch(:primary_key) { relation_model.primary_key }
         end
 
         def default_type_from_column_type(field, column_type) # rubocop:disable Metrics/MethodLength
@@ -204,7 +204,9 @@ module ActiveElement
         end
 
         def default_options(field)
-          { required: required?(field) }
+          {
+            required: required?(field)
+          }.merge(field_options(field))
         end
 
         def required?(field)
@@ -215,6 +217,16 @@ module ActiveElement
             validator.kind == :presence && validator.attributes.include?(field.to_sym)
           end
         end
+
+        def field_options(field)
+          return NumericField.new(field: field, column: column(field)).options if numeric?(field)
+
+          {}
+        end
+
+        def numeric?(field)
+          %i[float decimal integer].include?(column(field)&.type)
+        end
       end
     end
   end

data/lib/active_element/components/util/numeric_field.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module ActiveElement
+  module Components
+    module Util
+      # Provides options for a `<input type="number" />` element based on database column properties.
+      class NumericField
+        def initialize(field:, column:)
+          @field = field
+          @column = column
+        end
+
+        def options
+          {
+            step: step,
+            min: min,
+            max: max
+          }.compact
+        end
+
+        private
+
+        attr_reader :field, :column
+
+        def step
+          return 'any' if column.blank?
+          return '1' if column.type == :integer
+          return 'any' if column.try(:scale).blank?
+
+          "0.#{'1'.rjust(column.scale, '0')}"
+        end
+
+        def min
+          return min_decimal if column.try(:precision).present?
+          return min_integer if column.try(:limit).present?
+
+          nil
+        end
+
+        def max
+          return max_decimal if column.try(:precision).present?
+          return max_integer if column.try(:limit).present?
+
+          nil
+        end
+
+        # XXX: This is the theoretical maximum value for a column with a given precision but,
+        # since the maximum database value is constrained by total significant figures (i.e.
+        # before and after the decimal point), an input can still be provided that would cause an
+        # error, so the default controller rescues `ActiveRecord::RangeError` to deal with this.
+        def max_decimal
+          '9' * column.precision
+        end
+
+        def min_decimal
+          "-#{'9' * column.precision}"
+        end
+
+        # `limit` represents available bytes for storing a signed integer e.g.
+        # 2**(8 * 8) / 2 - 1 == 9223372036854775807
+        # which matches PostgreSQL's `bigint` max value:
+        # https://www.postgresql.org/docs/current/datatype-numeric.html
+        def max_integer
+          ((2**(column.limit * 8)) / 2) - 1
+        end
+
+        def min_integer
+          -2**(column.limit * 8) / 2
+        end
+      end
+    end
+  end
+end

data/lib/active_element/components/util.rb

@@ -9,6 +9,7 @@ require_relative 'util/form_value_mapping'
 require_relative 'util/display_value_mapping'
 require_relative 'util/association_mapping'
 require_relative 'util/decorator'
+require_relative 'util/numeric_field'
 
 module ActiveElement
   module Components

data/lib/active_element/controller_interface.rb

@@ -16,7 +16,7 @@ module ActiveElement
     def initialize(controller_class, controller_instance = nil)
       @controller_class = controller_class
       @controller_instance = controller_instance
-      initialize_state
+      initialize_state(controller_class)
       @missing_template_store = {}
       @authorize = false
     end
@@ -26,19 +26,23 @@ module ActiveElement
     end
 
     def listable_fields(*args)
-      state[:listable_fields] = args.map(&:to_sym)
+      state.listable_fields.concat(args.map(&:to_sym)).uniq!
     end
 
     def viewable_fields(*args)
-      state[:viewable_fields] = args.map(&:to_sym)
+      state.viewable_fields.concat(args.map(&:to_sym)).uniq!
     end
 
     def editable_fields(*args)
-      state[:editable_fields] = args.map(&:to_sym)
+      state.editable_fields.concat(args.map(&:to_sym)).uniq!
     end
 
     def searchable_fields(*args)
-      state[:searchable_fields] = args.map(&:to_sym)
+      state.searchable_fields.concat(args.map(&:to_sym)).uniq!
+    end
+
+    def deletable
+      state.deletable = true
     end
 
     def application_name
@@ -46,43 +50,39 @@ module ActiveElement
     end
 
     def authenticate_with(&block)
-      state[:authenticator] = block
+      state.authenticator = block
     end
 
     def authorize_with(&block)
       @authorize = true
-      state[:authorizor] = block
+      state.authorizor = block
     end
 
     def sign_out_with(method: :get, &block)
-      state[:sign_out_method] = method
-      state[:sign_out_path] = block
+      state.sign_out_method = method
+      state.sign_out_path = block
     end
 
     def sign_out_path
-      state[:sign_out_path]&.call
+      state.sign_out_path&.call
     end
 
-    def sign_out_method
-      state[:sign_out_method]
-    end
+    delegate :sign_out_method, to: :state
 
     def sign_in_with(method: :get, &block)
-      state[:sign_in_method] = method
-      state[:sign_in_path] = block
+      state.sign_in_method = method
+      state.sign_in_path = block
     end
 
     def sign_in_path
-      state[:sign_in_path]&.call
+      state.sign_in_path&.call
     end
 
-    def sign_in_method
-      state[:sign_in_method]
-    end
+    delegate :sign_in_method, to: :state
 
     def authenticate
       authenticator&.call
-      @current_user = state[:authorizor]&.call
+      @current_user = state.authorizor&.call
 
       nil
     end
@@ -91,16 +91,12 @@ module ActiveElement
       raise ArgumentError, "Must specify `with: '<permission>'` or `always: true`" unless with.present? || always
       raise ArgumentError, 'Cannot specify both `with` and `always: true`' if with.present? && always
 
-      state[:permissions] << { with: with, always: always, action: action }
+      state.permissions << { with: with, always: always, action: action }
     end
 
-    def authenticator
-      state[:authenticator]
-    end
+    delegate :authenticator, to: :state
 
-    def permissions
-      state.fetch(:permissions)
-    end
+    delegate :permissions, to: :state
 
     def component
       return (@component ||= ActiveElement::Component.new(controller_instance)) unless controller_instance.nil?
@@ -116,8 +112,8 @@ module ActiveElement
 
     attr_reader :controller_class, :controller_instance
 
-    def initialize_state
-      self.class.state[controller_class] ||= { permissions: [], authenticator: nil }
+    def initialize_state(key)
+      self.class.state[key] ||= ControllerState.new(controller: controller_instance)
     end
   end
 end

data/lib/active_element/controller_state.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module ActiveElement
+  # Stores various data for a controller, including various field definitions and authentication
+  # configuration. Used throughout ActiveElement for generating dynamic content based on
+  # controller configuration.
+  class ControllerState
+    attr_reader :permissions, :listable_fields, :viewable_fields, :editable_fields, :searchable_fields
+    attr_accessor :sign_in_path, :sign_in, :sign_in_method, :sign_out_path, :sign_out_method,
+                  :deletable, :authorizor, :authenticator
+
+    def initialize(controller:)
+      @controller = controller
+      @permissions = []
+      @authenticator = nil
+      @authorizor = nil
+      @deletable = false
+      @listable_fields = []
+      @viewable_fields = []
+      @editable_fields = []
+      @searchable_fields = []
+    end
+
+    def deletable?
+      !!deletable
+    end
+
+    def viewable?
+      viewable_fields.present? || controller.public_methods(false).include?(:show)
+    end
+
+    def editable?
+      editable_fields.present? || controller.public_methods(false).include?(:edit)
+    end
+
+    def creatable?
+      editable_fields.present? || controller.public_methods(false).include?(:new)
+    end
+
+    private
+
+    attr_reader :controller
+  end
+end

data/lib/active_element/default_controller.rb

@@ -9,6 +9,8 @@ module ActiveElement
     end
 
     def index
+      return render_forbidden(:listable) unless configured?(:listable)
+
       controller.render 'active_element/default_views/index',
                         locals: {
                           collection: collection,
@@ -17,16 +19,22 @@ module ActiveElement
     end
 
     def show
+      return render_forbidden(:viewable) unless configured?(:viewable)
+
       controller.render 'active_element/default_views/show', locals: { record: record }
     end
 
     def new
+      return render_forbidden(:editable) unless configured?(:editable)
+
       controller.render 'active_element/default_views/new', locals: { record: model.new, namespace: namespace }
     end
 
-    def create # rubocop:disable Metrics/AbcSize
+    def create # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      return render_forbidden(:editable) unless configured?(:editable)
+
       new_record = model.new(default_record_params.params)
-      # Ensure associations are applied:
+      # XXX: Ensure associations are applied - there must be a better way.
       if new_record.save && new_record.reload.update(default_record_params.params)
         controller.flash.notice = "#{new_record.model_name.to_s.titleize} created successfully."
         controller.redirect_to record_path(new_record, :show).path
@@ -34,13 +42,19 @@ module ActiveElement
         controller.flash.now.alert = "Failed to create #{model.name.to_s.titleize}."
         controller.render 'active_element/default_views/new', locals: { record: new_record, namespace: namespace }
       end
+    rescue ActiveRecord::RangeError => e
+      render_range_error(error: e, action: :new)
     end
 
     def edit
+      return render_forbidden(:editable) unless configured?(:editable)
+
       controller.render 'active_element/default_views/edit', locals: { record: record, namespace: namespace }
     end
 
     def update # rubocop:disable Metrics/AbcSize
+      return render_forbidden(:editable) unless configured?(:editable)
+
       if record.update(default_record_params.params)
         controller.flash.notice = "#{record.model_name.to_s.titleize} updated successfully."
         controller.redirect_to record_path(record, :show).path
@@ -48,9 +62,13 @@ module ActiveElement
         controller.flash.now.alert = "Failed to update #{model.name.to_s.titleize}."
         controller.render 'active_element/default_views/edit', locals: { record: record, namespace: namespace }
       end
+    rescue ActiveRecord::RangeError => e
+      render_range_error(error: e, action: :edit)
     end
 
     def destroy
+      return render_forbidden(:deletable) unless configured?(:deletable)
+
       record.destroy
       controller.flash.notice = "Deleted #{record.model_name.to_s.titleize}."
       controller.redirect_to record_path(model, :index).path
@@ -60,12 +78,26 @@ module ActiveElement
 
     attr_reader :controller
 
+    def render_forbidden(type)
+      controller.render 'active_element/default_views/forbidden', locals: { type: type }
+    end
+
+    def configured?(type)
+      return state.deletable? if type == :deletable
+
+      state.public_send("#{type}_fields").present?
+    end
+
+    def state
+      @state ||= controller.active_element.state
+    end
+
     def default_record_params
       @default_record_params ||= ActiveElement::DefaultRecordParams.new(controller: controller, model: model)
     end
 
     def default_text_search
-      @default_text_search ||= ActiveElement::DefaultTextSearch.new(controller: controller, model: model)
+      @default_text_search ||= ActiveElement::DefaultSearch.new(controller: controller, model: model)
     end
 
     def record_path(record, type = nil)
@@ -89,5 +121,17 @@ module ActiveElement
 
       model.left_outer_joins(default_text_search.search_relations).where(*default_text_search.text_search)
     end
+
+    def render_range_error(error:, action:)
+      controller.flash.now.alert = formatted_error(error)
+      controller.render "active_element/default_views/#{action}", locals: { record: record, namespace: namespace }
+    end
+
+    def formatted_error(error)
+      return error.cause.message.split("\n").join(', ') if error.try(:cause)&.try(:message).present?
+      return error.message if error.try(:message).present?
+
+      I18n.t('active_element.unexpected_error')
+    end
   end
 end

data/lib/active_element/default_record_params.rb

@@ -12,7 +12,7 @@ module ActiveElement
     def params
       with_transformed_relations(
         controller.params.require(controller.controller_name.singularize)
-                  .permit(controller.active_element.state.fetch(:editable_fields, []))
+                  .permit(controller.active_element.state.editable_fields)
       )
     end
 

data/lib/active_element/{default_text_search.rb → default_search.rb}

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 module ActiveElement
-  # Full text search querying for DefaultController, provides full text search filters for all
-  # controllers with configured searchable fields. Includes support for querying across relations.
-  class DefaultTextSearch
+  # Full text search and datetime querying for DefaultController, provides full text search
+  # filters for all controllers with configured searchable fields. Includes support for querying
+  # across relations.
+  class DefaultSearch
     def initialize(controller:, model:)
       @controller = controller
       @model = model
@@ -40,8 +41,7 @@ module ActiveElement
     attr_reader :controller, :model
 
     def searchable_fields
-      base_fields = controller.active_element.state.fetch(:searchable_fields, [])
-      base_fields.map do |field|
+      controller.active_element.state.searchable_fields.map do |field|
         next field unless field.to_s.end_with?('_at')
 
         { field => %i[from to] }
@@ -66,7 +66,7 @@ module ActiveElement
       value[:from].present? ? Time.zone.parse(value[:from]) + timezone_offset : -Float::INFINITY
     end
 
-    def range_end
+    def range_end(value)
       value[:to].present? ? Time.zone.parse(value[:to]) + timezone_offset : Float::INFINITY
     end
 

data/lib/active_element/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveElement
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

data/lib/active_element.rb

@@ -12,10 +12,11 @@ require_relative 'active_element/active_menu_link'
 require_relative 'active_element/permissions_check'
 require_relative 'active_element/permissions_report'
 require_relative 'active_element/controller_interface'
+require_relative 'active_element/controller_state'
 require_relative 'active_element/controller_action'
 require_relative 'active_element/default_controller'
 require_relative 'active_element/default_record_params'
-require_relative 'active_element/default_text_search'
+require_relative 'active_element/default_search'
 require_relative 'active_element/pre_render_processors'
 require_relative 'active_element/rails_component'
 require_relative 'active_element/route'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_element
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-18 00:00:00.000000000 Z
+date: 2023-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap
@@ -168,6 +168,7 @@ files:
 - app/views/active_element/decorators/_datetime.html.erb
 - app/views/active_element/decorators/_time.html.erb
 - app/views/active_element/default_views/edit.html.erb
+- app/views/active_element/default_views/forbidden.html.erb
 - app/views/active_element/default_views/index.html.erb
 - app/views/active_element/default_views/new.html.erb
 - app/views/active_element/default_views/show.html.erb
@@ -186,6 +187,7 @@ files:
 - app/views/layouts/active_element.html.erb
 - app/views/layouts/active_element_error.html.erb
 - config/brakeman.ignore
+- config/locales/en.yml
 - config/routes.rb
 - example_app/.gitattributes
 - example_app/.gitignore
@@ -309,13 +311,15 @@ files:
 - lib/active_element/components/util/form_field_mapping.rb
 - lib/active_element/components/util/form_value_mapping.rb
 - lib/active_element/components/util/i18n.rb
+- lib/active_element/components/util/numeric_field.rb
 - lib/active_element/components/util/record_mapping.rb
 - lib/active_element/components/util/record_path.rb
 - lib/active_element/controller_action.rb
 - lib/active_element/controller_interface.rb
+- lib/active_element/controller_state.rb
 - lib/active_element/default_controller.rb
 - lib/active_element/default_record_params.rb
-- lib/active_element/default_text_search.rb
+- lib/active_element/default_search.rb
 - lib/active_element/engine.rb
 - lib/active_element/json_field_schema.rb
 - lib/active_element/permissions_check.rb