hot-glue 0.6.2 → 0.6.3.1

data/lib/generators/hot_glue/fields/time_field.rb

@@ -5,7 +5,7 @@ class TimeField < Field
   end
 
   def form_field_output
-    "<%= time_field_localized(f, :#{name}, #{singular}.#{name},  '#{ name.to_s.humanize  }') %>"
+    "<%= time_field_localized(f, :#{name}, #{singular}.#{name}, label: '#{ name.to_s.humanize  }') %>"
   end
 
   def line_field_output
@@ -30,5 +30,21 @@ class TimeField < Field
     # "expect(page).to have_content(#{singular}#{1}.#{name})"
   end
 
+  def search_field_output
+    "      <div data-controller='time-range-picker' >"+
+      "\n        <%= f.select 'q[0][#{name}_match]', options_for_select([['', ''], ['is at exactly', 'is_at_exactly']], @q[\'0\']['#{name}_match']), {} ," +
+      "\n         { class: 'form-control match', 'data-action': 'change->time-range-picker#matchSelection' } %>"+
+      "\n        <%= time_field_localized f, 'q[0][#{name}_search_start]',  @q[\'0\'][:#{name}_search_start], autocomplete: 'off', size: 40, class: 'form-control', type: 'text', placeholder: 'start', 'data-time-range-picker-target': 'start' %>" +
+      "\n        <%= time_field_localized f, 'q[0][#{name}_search_end]',  @q[\'0\'][:#{name}_search_end], autocomplete: 'off', size: 40, class: 'form-control', type: 'text', placeholder: 'end' , 'data-time-range-picker-target': 'end' %>" +
+      "\n      </div>"
+  end
+
 
+  def where_query_statement
+    ".where(*#{name}_query)"
+  end
+
+  def load_all_query_statement
+    "#{name}_query = time_query_constructor(:#{name}, @q['0'][:#{name}_match], @q['0'][:#{name}_search_start], @q['0'][:#{name}_search_end])"
+  end
 end

data/lib/generators/hot_glue/markup_templates/erb.rb

@@ -8,19 +8,34 @@ module  HotGlue
                   :inline_list_labels, :layout_object,
                   :columns,  :col_identifier, :singular,
                   :form_placeholder_labels, :hawk_keys, :update_show_only,
-                  :attachments, :show_only, :columns_map, :pundit, :related_sets
-
-
-      def initialize(singular:, singular_class: ,
-                   layout_strategy: , magic_buttons: ,
-                   small_buttons: , show_only: ,
-                   ownership_field: , form_labels_position: ,
-                   inline_list_labels: ,
-                   form_placeholder_labels:, hawk_keys: ,
-                   update_show_only:, attachments: , columns_map:, pundit:, related_sets:  )
+                  :attachments, :show_only, :columns_map, :pundit, :related_sets,
+                  :search, :search_fields, :search_query_fields, :search_position,
+                  :form_path, :layout_object, :search_clear_button, :search_autosearch
+
+
+    def initialize(singular:, singular_class: ,
+                 layout_strategy: , magic_buttons: ,
+                 small_buttons: , show_only: ,
+                 ownership_field: , form_labels_position: ,
+                 inline_list_labels: ,
+                 form_placeholder_labels:, hawk_keys: ,
+                 update_show_only:, attachments: , columns_map:, pundit:, related_sets:,
+                 search:, search_fields:, search_query_fields: , search_position:,
+                 search_clear_button:, search_autosearch:, layout_object:,
+                 form_path: )
+
+
+      @form_path = form_path
+      @search = search
+      @search_fields = search_fields
+      @search_by_query = search_query_fields
+      @search_position = search_position
+      @layout_object = layout_object
 
       @singular = singular
       @singular_class = singular_class
+      @search_clear_button = search_clear_button
+      @search_autosearch = search_autosearch
 
       @columns_map = columns_map
 
@@ -56,8 +71,7 @@ module  HotGlue
       }.join("\n")
     end
 
-    def list_column_headings(layout_object: ,
-                             col_identifier: ,
+    def list_column_headings(col_identifier: ,
                              column_width:, singular: )
       col_style = @layout_strategy.column_headings_col_style
 
@@ -74,8 +88,44 @@ module  HotGlue
     # THE FORM
     ################################################################
 
+    def search_input_area
+      columns = layout_object[:columns][:container]
+      column_classes = layout_strategy.column_classes_for_form_fields
 
-    def all_form_fields(layout_strategy:, layout_object: )
+      res =+ "<\%= form_with url: #{form_path}, method: :get, html: {'data-turbo-action': 'advance', 'data-controller': 'search-form'} do |f| %>"
+      res << "<div class=\"#{@layout_strategy.row_classes} search--#{@plural}\">"
+
+      res << columns.map{ |column|
+        if (column & @search_fields.collect(&:to_sym )).size > 0
+          "  <div class='#{column_classes} search-cell--#{singular}--#{column.join("-")}' >" +
+          column.map { |col|
+            if @search_fields.collect(&:to_sym).include?(col)
+              label_class = columns_map[col].label_class
+              label_for = columns_map[col].label_for
+              the_label = "\n<label class='#{label_class}' for='search-#{label_for}'>#{col.to_s.humanize}</label>"
+              search_field_result =  columns_map[col].search_field_output
+
+              add_spaces_each_line( "\n  <span class='' >\n" +
+                                      add_spaces_each_line( (form_labels_position == 'before' ? the_label || "" : "") +
+                                                              +  " <br />\n" + search_field_result +
+                                                              (form_labels_position == 'after' ? the_label : "")   , 4) +
+                                      "\n  </span>\n  <br /></div>", 2)
+            end
+
+          }.join("\n")
+        end
+      }.join("\n")
+      res << "<div class='#{column_classes}'>"
+      if @search_clear_button
+        res << "<\%= f.button \"Clear\", name: nil, 'data-search-form-target': 'clearButton', class: 'btn btn-sm btn-secondary' %>"
+      end
+      res << "<\%= submit_tag \"Search\", name: nil, class: 'btn btn-sm btn-primary' %>"
+      res << "</div><\% end %>"
+      res
+    end
+
+
+    def all_form_fields(layout_strategy:)
       column_classes = layout_strategy.column_classes_for_form_fields
       columns = layout_object[:columns][:container]
 
@@ -105,7 +155,7 @@ module  HotGlue
             else
               columns_map[col].form_field_output
             end
-            # byebug
+
             @tinymce_stimulus_controller = (columns_map[col].modify_as == {tinymce: 1} ?  "data-controller='tiny-mce' " : "")
 
             add_spaces_each_line( "\n  <span #{@tinymce_stimulus_controller}class='<%= \"alert alert-danger\" if #{singular}.errors.details.keys.include?(:#{field_error_name}) %>'  #{'style="display: inherit;"'}  >\n" +
@@ -133,7 +183,6 @@ module  HotGlue
     ################################################################
 
     def all_line_fields(layout_strategy:,
-                        layout_object: ,
                         perc_width:,
                         col_identifier: nil)
 

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -23,7 +23,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
                 :nest_with, :path, :plural, :sample_file_path, :show_only_data, :singular,
                 :singular_class, :smart_layout, :stacked_downnesting, :update_show_only, :ownership_field,
                 :layout_strategy, :form_placeholder_labels, :form_labels_position, :pundit,
-                :self_auth, :namespace_value, :related_sets
+                :self_auth, :namespace_value, :related_sets, :search_clear_button, :search_autosearch
   # important: using an attr_accessor called :namespace indirectly causes a conflict with Rails class_name method
   # so we use namespace_value instead
 
@@ -48,7 +48,6 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   class_option :no_edit, type: :boolean, default: false
   class_option :no_list, type: :boolean, default: false
   class_option :no_controller, type: :boolean, default: false
-  class_option :no_list, type: :boolean, default: false
   class_option :no_paginate, type: :boolean, default: false
   class_option :paginate_per_page_selector, type: :boolean, default: false
   class_option :big_edit, type: :boolean, default: false
@@ -95,6 +94,24 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   class_option :code_before_update, default: nil
   class_option :code_after_update, default: nil
 
+  class_option :search, default: nil # set or predicate
+
+  # FOR THE SET SEARCH
+  class_option :search_fields, default: nil # comma separated list of all fields to search
+
+  # for the single-entry search box, they will be removed from the list specified above.
+  class_option :search_query_fields, default: '' # comma separated list of fields to search by single-entry search term
+  class_option :search_position, default: 'vertical' # choices are vertical or horizontal
+
+
+  class_option :search_clear_button, default: false
+  class_option :saerch_autosearch, default: false
+
+
+  # FOR THE PREDICATE SEARCH
+  # TDB
+
+
   def initialize(*meta_args)
     super
 
@@ -295,6 +312,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
     @no_edit = options['no_edit'] || false
     @no_list = options['no_list'] || false
+
     @no_controller = options['no_controller'] || false
     @no_list = options['no_list'] || false
     @no_list_label = options['no_list_label'] || false
@@ -471,6 +489,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       @columns_map[col] = this_column_object.field
     end
 
+
     @columns_map.each do |key, field|
       if field.is_a?(AssociationField)
         if @modify_as && @modify_as[key] && @modify_as[key][:typeahead]
@@ -490,11 +509,43 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       end
     end
 
+    # search
+    @search = options['search']
+    if @search == 'set'
+      @search_fields = options['search_fields'].split(',') || @columns
+
+      # within the set search we will take out any fields on the query list
+      # or the field
+      @search_query_fields = options['search_query_fields'].split(',') || []
+      @search_position = options['search_position'] || 'vertical'
+
+      @search_fields = @search_fields - @search_query_fields
+
+      @search_fields.each do |field|
+        if !@columns.include?(field.to_sym)
+          raise "You specified a search field for #{field} but that field is not in the list of columns"
+        end
+      end
+
+      @search_clear_button = !!options['search_clear_button']
+      @search_autosearch = !!options['search_autosearch']
+
+    elsif @search == 'predicate'
+
+    end
+
+    builder = HotGlue::Layout::Builder.new(generator: self,
+                                           include_setting: options['include'],
+                                           buttons_width: buttons_width)
+    @layout_object = builder.construct
 
 
     # create the template object
+
+
     if @markup == "erb"
       @template_builder = HotGlue::ErbTemplate.new(
+        layout_object: @layout_object,
         layout_strategy: @layout_strategy,
         magic_buttons: @magic_buttons,
         small_buttons: @small_buttons,
@@ -510,7 +561,14 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
         attachments: @attachments,
         columns_map: @columns_map,
         pundit: @pundit,
-        related_sets: @related_sets
+        related_sets: @related_sets,
+        search: @search,
+        search_fields: @search_fields,
+        search_query_fields: @search_query_fields,
+        search_position: @search_position,
+        search_clear_button: @search_clear_button,
+        search_autosearch: @search_autosearch,
+        form_path: form_path_new_helper
       )
     elsif @markup == "slim"
       raise(HotGlue::Error, "SLIM IS NOT IMPLEMENTED")
@@ -518,10 +576,6 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       raise(HotGlue::Error, "HAML IS NOT IMPLEMENTED")
     end
 
-    builder = HotGlue::Layout::Builder.new(generator: self,
-                                           include_setting: options['include'],
-                                           buttons_width: buttons_width)
-    @layout_object = builder.construct
 
     @menu_file_exists = true if @nested_set.none? && File.exist?("#{Rails.root}/app/views/#{namespace_with_trailing_dash}_menu.#{@markup}")
 
@@ -688,6 +742,9 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       @columns = @the_object.columns.map(&:name).map(&:to_sym).reject { |field| !@include_fields.include?(field) }
     end
 
+
+    @columns = @columns -@nested_set.collect { |set| (set[:singular] + "_id").to_sym  }
+
     if @attachments.any?
       puts "Adding attachments-as-columns: #{@attachments}"
       @attachments.keys.each do |attachment|
@@ -826,7 +883,6 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
   def list_column_headings
     @template_builder.list_column_headings(
-      layout_object: @layout_object,
       col_identifier: @layout_strategy.column_classes_for_column_headings,
       column_width: @layout_strategy.column_width,
       singular: @singular
@@ -1252,8 +1308,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
   end
 
   def form_fields_html
-    @template_builder.all_form_fields(layout_strategy: @layout_strategy,
-                                      layout_object: @layout_object)
+    @template_builder.all_form_fields(layout_strategy: @layout_strategy)
   end
 
   def list_label
@@ -1268,8 +1323,7 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     @template_builder.all_line_fields(
       col_identifier: @layout_strategy.column_classes_for_line_fields,
       perc_width: @layout_strategy.each_col, # undefined method `each_col'
-      layout_strategy: @layout_strategy,
-      layout_object: @layout_object
+      layout_strategy: @layout_strategy
     )
   end
 
@@ -1387,8 +1441,57 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     end
   end
 
+
+  def load_all_code
+    # the inner method definition of the load_all_* method
+    res = +""
+    if @search_fields
+      res << @search_fields.collect{ |field|
+        if !@columns_map[field.to_sym].load_all_query_statement.empty?
+          @columns_map[field.to_sym].load_all_query_statement
+        end
+      }.compact.join("\n" + spaces(4))
+      res << "\n"
+    end
+
+    if pundit
+      res << "    @#{ plural_name } = policy_scope(#{ object_scope }).page(params[:page])#{ n_plus_one_includes }#{ ".per(per)" if @paginate_per_page_selector }"
+    else
+      if !@self_auth
+        res << spaces(4) + "@#{ plural_name } = #{ object_scope.gsub("@",'') }#{ n_plus_one_includes }.page(params[:page])#{ ".per(per)" if @paginate_per_page_selector }"
+        if @search_fields
+          res << @search_fields.collect{ |field|
+            wqs = @columns_map[field.to_sym].where_query_statement
+            if !wqs.empty?
+              "\n" + spaces(4) +  "@#{ plural_name } = @#{ plural_name }#{ wqs } if #{field}_query"
+            end
+          }.compact.join
+        end
+      elsif @nested_set[0] && @nested_set[0][:optional]
+        res << "@#{ plural_name } = #{ class_name }.all"
+      else
+        res << "@#{ plural_name } = #{ class_name }.where(id: #{ auth_object.gsub("@",'') }.id)#{ n_plus_one_includes }"
+
+        res << ".page(params[:page])#{ ".per(per)" if @paginate_per_page_selector }"
+      end
+    end
+    res << "\n"
+    if @search_fields
+      res << @search_fields.collect{ |field|
+        spaces(4) + "@#{plural_name} = @#{plural_name}" + @columns_map[field.to_sym].where_query_statement + " if #{field}_query"
+      }.join("\n")
+    end
+    res
+  end
+
+
   private # thor does something fancy like sending the class all of its own methods during some strange run sequence
   # does not like public methods
+
+  def spaces(num)
+    " " * num
+  end
+
   def cc_filename_with_extensions(name, file_format = format)
     [name, file_format].compact.join(".")
   end
@@ -1419,8 +1522,8 @@ class HotGlue::ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
 
   def turbo_parental_updates
     @nested_set.collect { |data|
-      "<%= turbo_stream.replace \"#{@namespace + '__' if @namespace}\#{dom_id(@#{data[:singular]})}\" do %>
-    <%= render partial: \"#{@namespace}/#{data[:plural]}/edit\", locals: {#{data[:singular]}: @#{singular}.#{data[:singular]}.reload} %>
+      "<%= turbo_stream.replace \"__#{@namespace if @namespace}\#{dom_id(@#{data[:singular]})}\" do %>
+    <%= render partial: \"#{@namespace}/#{data[:plural]}/line\", locals: {#{data[:singular]}: @#{singular}.#{data[:singular]}.reload} %>
   <% end %>"
     }.join("\n")
   end

data/lib/generators/hot_glue/set_search_interface_install_generator.rb

@@ -0,0 +1,26 @@
+
+
+module HotGlue
+  class SetSearchInterfaceInstallGenerator < Rails::Generators::Base
+    source_root File.expand_path('templates', __dir__)
+
+    def filepath_prefix
+      # todo: inject the context
+      'spec/dummy/' if $INTERNAL_SPECS
+    end
+
+    def initialize(*args) #:nodoc:
+      super
+
+      ['date_range_picker','time_range_picker','search_form'].each do |file|
+        system("./bin/rails generate stimulus #{file.titlecase.gsub(" ", "")}")
+        copy_file "javascript/#{file}_controller.js", "#{filepath_prefix}app/javascript/controllers/#{file}.js"
+        puts "HOT GLUE --> copying #{file} stimulus controller into app/javascript/controllers/#{file}.js"
+
+      end
+    end
+  end
+end
+
+
+

data/lib/generators/hot_glue/templates/controller.rb.erb

@@ -70,24 +70,21 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end<% end %>
   <% if @paginate_per_page_selector %>def per
     params[:per] || 10
+  end<% end %>
+  <% unless @no_list %>
+  def load_all_<%= plural %>
+    <%= load_all_code %>
   end
 
-  <% end %>def load_all_<%= plural %><% if @pundit %>
-    @<%= plural_name %> =  policy_scope(<%= object_scope %>).page(params[:page])<%= n_plus_one_includes %><%= ".per(per)" if @paginate_per_page_selector %>
-    <% else %> <% if !@self_auth %>
-    @<%= plural_name %> = <%= object_scope.gsub("@",'') %><%= n_plus_one_includes %>.page(params[:page])<%= ".per(per)" if @paginate_per_page_selector %><%= " if params.include?(:#{ @nested_set.last[:singular]}_id)" if @nested_set.any? && @nested_set[0] &&  @nested_set[0][:optional] %><% if @nested_set[0] &&  @nested_set[0][:optional] %>
-    @<%= plural_name %> = <%= class_name %>.all<% end %><% else %>
-    @<%= plural_name %> = <%= class_name %>.where(id: <%= auth_object.gsub("@",'') %>.id)<%= n_plus_one_includes %>.page(params[:page])<%= ".per(per)" if @paginate_per_page_selector %><% end %>
-    <% end %>
-  end
-
-  def index
+  def index <% if @search == "set" %>
+    @q = params[:q] ||  <%= {"0" => @search_fields.collect{|foo| {"#{foo}_match".to_sym => "", "#{foo}_search".to_sym => ""}}.reduce({}, :merge)  } %> <% end %><% if @search_fields %>
+<%= @search_fields.collect{|field_name| @columns_map[field_name.to_sym].code_to_reset_match_if_search_is_blank}.compact.join("     \n") %><% end %>
     load_all_<%= plural %><% if @pundit %><% if @pundit %>
     authorize @<%= plural_name %><% end %>
   rescue Pundit::NotAuthorizedError
     flash[:alert] = 'You are not authorized to perform this action.'
     render 'layouts/error'<% end %>
-  end
+  end<% end %>
 
 <% if create_action %>  def new<% if @object_owner_sym %>
     @<%= singular_name %> = <% if @pundit %>policy_scope(<% end %><%= class_name %><% if @pundit %>)<% end %>.new<% if eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>(<%= @object_owner_sym %>: <%= @object_owner_eval %>)<% end %><% elsif @object_owner_optional && any_nested? %>
@@ -102,10 +99,11 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   end
 
   def create
-    modified_params = modify_date_inputs_on_params(<%= singular_name %>_params.dup, <%= current_user_object %>, <%= datetime_fields_list %>) <% if @object_owner_sym &&  eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>
+    flash[:alert] = +''
+    flash[:notice] = +''
+    modified_params = modify_date_inputs_on_params(<%= singular_name %>_params.dup, <%= current_user_object %>, <%= datetime_fields_list %>)<% if @object_owner_sym &&  eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>
     modified_params = modified_params.merge(<%= @object_owner_sym %>: <%= @object_owner_eval %>) <% elsif @object_owner_optional && any_nested? %>
-    modified_params = modified_params.merge(<%= @object_owner_name %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}) <% elsif !@object_owner_eval.empty? && !@god %>
-    modified_params = modified_params.merge(<%= @object_owner_eval %>) <% end %>
+    modified_params = modified_params.merge(<%= @object_owner_name %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}) <% end %>
 
       <% if @hawk_keys.any? %>
     modified_params = hawk_params({<%= hawk_to_ruby %>}, modified_params)<% end %>
@@ -125,11 +123,9 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
       @action = 'new'
       render :create, status: :unprocessable_entity
     end<% if @pundit %>
-  rescue Pundit::NotAuthorizedError
-    flash[:alert] << 'Creating organization not authorized. '
-    flash[:alert] << @<%= singular %>.errors.collect{|k| "#{k.attribute} #{k.message}"}.join(" ")
-    flash[:alert] << flash[:notice]
-    render :index <% end %>
+  rescue Pundit::NotAuthorizedError => e
+    @user.errors.add(:base, e.message)
+    render :create, status: :unprocessable_entity<% end %>
   end
 
 <% end %>
@@ -165,8 +161,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 
     modified_params = modify_date_inputs_on_params(<% if @update_show_only %>update_<% end %><%= singular_name %>_params.dup<%= controller_update_params_tap_away_magic_buttons  %>, <%= current_user_object %>, <%= datetime_fields_list %>) <% if @object_owner_sym &&  eval("#{class_name}.reflect_on_association(:#{@object_owner_sym})").class == ActiveRecord::Reflection::BelongsToReflection  %>
     modified_params = modified_params.merge(<%= @object_owner_sym %>: <%= @object_owner_eval %>) <% elsif @object_owner_optional && any_nested? %>
-    modified_params = modified_params.merge(<%= @object_owner_name %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}) <% elsif ! @object_owner_eval.empty?  && !@self_auth && ! @god%>
-    modified_params = modified_params.merge(<%= @object_owner_eval %>) <% end %>
+    modified_params = modified_params.merge(<%= @object_owner_name %> ? {<%= @object_owner_sym %>: <%= @object_owner_eval %>} : {}) <% end %>
     <% if @pundit %><% @related_sets.each do |key, related_set| %>
     check_<%= related_set[:association_ids_method].to_s %>_permissions(modified_params, :update)<% end %><% end %>
 
@@ -212,27 +207,31 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 
 <% if @pundit %><% @related_sets.each do |key, rs| %>
   def check_<%= rs[:association_ids_method] %>_permissions(modified_params, action)
-    if modified_params[:<%= rs[:association_ids_method] %>].present? &&
-      modified_params[:<%= rs[:association_ids_method] %>] != @<%= singular %>.<%= rs[:association_ids_method] %>
-      # authorize the <%= rs[:association_ids_method] %> change using special modified_relations: {
-      # <%= rs[:association_ids_method] %>: modified_params[:<%= rs[:association_ids_method] %>>]} syntax for Pundit
-      if ! <%= singular_class %>Policy.new(current_user, @<%= singular %>,
-          modified_relations: {role_ids: modified_params[:<%= rs[:association_ids_method] %>]
-        }).method("#{action}?".to_sym).call
-        authorize @<%= singular %>, "#{action}?".to_sym
-        raise Pundit::NotAuthorizedError, message: @<%= singular %>.errors.collect{|k| "#{k.attribute} #{k.message}"}.join(" ")
-      end
-    end
+    # authorize the <%= rs[:association_ids_method] %> change using special modified_relations: {
+    # <%= rs[:association_ids_method] %>: modified_params[:<%= rs[:association_ids_method] %>>]} syntax for Pundit
+    modified_relations = { <%= rs[:association_ids_method] %>: modified_params[:<%= rs[:association_ids_method] %>] }
+    return unless modified_params[:<%= rs[:association_ids_method] %>].present?
+    policy_check = <%= singular_class %>Policy.new(current_user, @<%= singular %>,
+                                                   modified_relations:).method("#{action}?".to_sym).call
+    return if policy_check
+    raise Pundit::NotAuthorizedError, message: @<%= singular %>.errors.collect{|k| "#{k.attribute} #{k.message}"}.join(" ")
   end<% end %><% end %>
 
   def <%=singular_name%>_params
     params.require(:<%= testing_name %>).permit(<%= ((fields_filtered_for_strong_params - @show_only ) + @magic_buttons.collect{|x| "__#{x}"}).collect{|sym| ":#{sym}"}.join(", ") %><%= ", " + @related_sets.collect{|key, rs| "#{rs[:association_ids_method]}: []"}.join(", ") if @related_sets.any? %>)
   end<% if @update_show_only %>
 
+  <% unless @no_edit %>
   def update_<%=singular_name%>_params
     params.require(:<%= testing_name %>).permit(<%= ((fields_filtered_for_strong_params - @update_show_only)  + @magic_buttons.collect{|x| "__#{x}"}).collect{|sym| ":#{sym}"}.join(", ") %><%= ", " + @related_sets.collect{|key, rs| "#{rs[:association_ids_method]}: []"}.join(", ") if @related_sets.any? %>)
   end<% end %>
+  <% end %>
 
+  <% if @search %>
+  def search_params
+    params.permit(:q, :page)
+  end
+  <% end %>
   def namespace
     <% if @namespace %>'<%= @namespace %>/'<% else %><% end %>
   end

data/lib/generators/hot_glue/templates/erb/_list.erb

@@ -1,4 +1,5 @@
 <\%= turbo_frame_tag "<%= @namespace %>__<%= plural %>-list" <%= nested_for_turbo_id_list_constructor %>  do %>
+
   <div class="<%= @container_name %> <%= @layout_strategy.list_classes %>">
     <% unless @no_list  || @no_list_label || (@nested_set.any? && !@nested_set.collect{|x| x[:optional]}.any?)  %>
       <% unless list_label.nil? %><h4>
@@ -40,6 +41,10 @@
         </div>
       <% end %>
 
+      <% if @search %>
+        <%= @template_builder.search_input_area %>
+      <% end %>
+
       <\% if <%= plural %>.empty? %>
     <div>
         None

data/lib/generators/hot_glue/templates/javascript/date_range_picker_controller.js

@@ -0,0 +1,45 @@
+import { Controller } from "@hotwired/stimulus"
+
+// Connects to data-controller="date-range-picker"
+export default class extends Controller {
+
+  static targets = [ "matchSelector", "start", "end" ];
+  connect() {
+
+    console.log("date_range_picker_controller.js connect.....")
+  }
+
+  matchSelection(event) {
+
+    console.log("date_range_picker_controller.js matchSelection.....")
+    console.log(event.target.value)
+    // this.matchSelectorTarget.value = event.target.value
+
+    switch(event.target.value) {
+      case "is_on":
+        this.startTarget.disabled = false
+        this.endTarget.disabled = true
+        this.endTarget.value = ""
+        break;
+      case "is_between":
+        this.startTarget.disabled = false
+        this.endTarget.disabled = false
+        break;
+      case "is_on_or_after":
+        this.startTarget.disabled = false
+        this.endTarget.disabled = true
+        this.endTarget.value = ""
+        break;
+      case "is_before_or_on":
+        this.startTarget.disabled = true
+        this.startTarget.value = ""
+        this.endTarget.disabled = false
+        break;
+      case "not_on":
+        this.startTarget.disabled = false
+        this.endTarget.disabled = true
+        this.endTarget.value = ""
+        break;
+    }
+  }
+}

data/lib/generators/hot_glue/templates/javascript/search_form_controller.js

@@ -0,0 +1,16 @@
+import { Controller } from "@hotwired/stimulus"
+
+// Connects to data-controller="search_form"
+export default class extends Controller {
+  static targets = ["clearButton"];
+
+  connect() {
+
+    if (this.hasClearButtonTarget) {
+      this.clearButtonTarget.addEventListener("click", (event) => {
+        event.preventDefault()
+        this.element.reset()
+      })
+    }
+  }
+}

data/lib/generators/hot_glue/templates/javascript/time_range_picker_controller.js

@@ -0,0 +1,38 @@
+import { Controller } from "@hotwired/stimulus"
+
+// Connects to data-controller="time-range-picker"
+export default class extends Controller {
+  static targets = [ "matchSelector", "start", "end" ];
+  connect() {
+    console.log("time_range_picker_controller.js connect.....")
+  }
+
+  matchSelection(event) {
+
+    console.log("time_range_picker_controller.js matchSelection.....")
+    console.log(event.target.value)
+    // this.matchSelectorTarget.value = event.target.value
+
+    switch(event.target.value) {
+      case "is_at":
+        this.startTarget.disabled = false
+        this.endTarget.disabled = true
+        this.endTarget.value = ""
+        break;
+      case "is_between":
+        this.startTarget.disabled = false
+        this.endTarget.disabled = false
+        break;
+      case "is_at_or_after":
+        this.startTarget.disabled = false
+        this.endTarget.disabled = true
+        this.endTarget.value = ""
+        break;
+      case "is_before_or_at":
+        this.startTarget.disabled = true
+        this.startTarget.value = ""
+        this.endTarget.disabled = false
+        break;
+    }
+  }
+}

data/lib/hotglue/version.rb

@@ -1,5 +1,5 @@
 module HotGlue
   class Version
-    CURRENT = '0.6.2'
+    CURRENT = '0.6.3.1'
   end
 end