plutonium 0.15.4 → 0.15.6

data/lib/plutonium/ui/action_button.rb

@@ -80,7 +80,7 @@ module Plutonium
         if @variant == :table
           "h-4 w-4 mr-1"
         else
-          "h-3.5 w-3.5 mr-2 -ml-1"
+          "h-3.5 w-3.5 -ml-1"
         end
       end
 
@@ -91,35 +91,50 @@ module Plutonium
       def color_classes
         case @action.color || @action.category.to_sym
         when :primary
-          table_variant_class(
-            "bg-primary-100 text-primary-700 hover:bg-primary-200 focus:ring-primary-300 dark:bg-primary-700 dark:text-primary-100 dark:hover:bg-primary-600 dark:focus:ring-primary-600",
-            "bg-primary-700 text-white hover:bg-primary-800 focus:ring-primary-300 dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800"
+          variant_class(
+            "bg-primary-700 text-white hover:bg-primary-800 focus:ring-primary-300 dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800",
+            table: "bg-primary-100 text-primary-700 hover:bg-primary-200 focus:ring-primary-300 dark:bg-primary-700 dark:text-primary-100 dark:hover:bg-primary-600 dark:focus:ring-primary-600"
+          )
+        when :success
+          variant_class(
+            "bg-success-700 text-white hover:bg-success-800 focus:ring-success-300 dark:bg-success-600 dark:hover:bg-success-700 dark:focus:ring-success-800",
+            table: "bg-success-100 text-success-700 hover:bg-success-200 focus:ring-success-300 dark:bg-success-700 dark:text-success-100 dark:hover:bg-success-600 dark:focus:ring-success-600"
+          )
+        when :info
+          variant_class(
+            "bg-info-700 text-white hover:bg-info-800 focus:ring-info-300 dark:bg-info-600 dark:hover:bg-info-700 dark:focus:ring-info-800",
+            table: "bg-info-100 text-info-700 hover:bg-info-200 focus:ring-info-300 dark:bg-info-700 dark:text-info-100 dark:hover:bg-info-600 dark:focus:ring-info-600"
           )
         when :warning
-          table_variant_class(
-            "bg-yellow-100 text-yellow-700 hover:bg-yellow-200 focus:ring-yellow-300 dark:bg-yellow-700 dark:text-yellow-100 dark:hover:bg-yellow-600 dark:focus:ring-yellow-600",
-            "bg-yellow-400 text-white hover:bg-yellow-500 focus:ring-yellow-300 dark:bg-yellow-600 dark:hover:bg-yellow-700 dark:focus:ring-yellow-800"
+          variant_class(
+            "bg-warning-700 text-white hover:bg-warning-800 focus:ring-warning-300 dark:bg-warning-600 dark:hover:bg-warning-700 dark:focus:ring-warning-800",
+            table: "bg-warning-100 text-warning-700 hover:bg-warning-200 focus:ring-warning-300 dark:bg-warning-700 dark:text-warning-100 dark:hover:bg-warning-600 dark:focus:ring-warning-600"
           )
         when :danger
-          table_variant_class(
-            "bg-red-100 text-red-700 hover:bg-red-200 focus:ring-red-300 dark:bg-red-700 dark:text-red-100 dark:hover:bg-red-600 dark:focus:ring-red-600",
-            "bg-red-700 text-white hover:bg-red-800 focus:ring-red-300 dark:bg-red-600 dark:hover:bg-red-700 dark:focus:ring-red-900"
+          variant_class(
+            "bg-danger-700 text-white hover:bg-danger-800 focus:ring-danger-300 dark:bg-danger-600 dark:hover:bg-danger-700 dark:focus:ring-danger-800",
+            table: "bg-danger-100 text-danger-700 hover:bg-danger-200 focus:ring-danger-300 dark:bg-danger-700 dark:text-danger-100 dark:hover:bg-danger-600 dark:focus:ring-danger-600"
           )
-        when :success
-          table_variant_class(
-            "bg-green-100 text-green-700 hover:bg-green-200 focus:ring-green-300 dark:bg-green-700 dark:text-green-100 dark:hover:bg-green-600 dark:focus:ring-green-600",
-            "bg-green-700 text-white hover:bg-green-800 focus:ring-green-300 dark:bg-green-600 dark:hover:bg-green-700 dark:focus:ring-green-800"
+        when :accent
+          variant_class(
+            "bg-accent-700 text-white hover:bg-accent-800 focus:ring-accent-300 dark:bg-accent-600 dark:hover:bg-accent-700 dark:focus:ring-accent-800",
+            table: "bg-accent-100 text-accent-700 hover:bg-accent-200 focus:ring-accent-300 dark:bg-accent-700 dark:text-accent-100 dark:hover:bg-accent-600 dark:focus:ring-accent-600"
           )
         else
-          table_variant_class(
-            "bg-gray-100 text-gray-700 hover:bg-gray-200 focus:ring-gray-300 dark:bg-gray-700 dark:text-gray-100 dark:hover:bg-gray-600 dark:focus:ring-gray-600",
-            "border border-gray-200 bg-white text-gray-900 hover:bg-gray-100 hover:text-primary-700 focus:z-10 focus:ring-gray-100 dark:border-gray-600 dark:bg-gray-800 dark:text-gray-200 dark:hover:bg-gray-700 dark:hover:text-white dark:focus:ring-gray-700"
+          variant_class(
+            "bg-secondary-700 text-white hover:bg-secondary-800 focus:ring-secondary-300 dark:bg-secondary-600 dark:hover:bg-secondary-700 dark:focus:ring-secondary-800",
+            table: "bg-secondary-100 text-secondary-700 hover:bg-secondary-200 focus:ring-secondary-300 dark:bg-secondary-700 dark:text-secondary-100 dark:hover:bg-secondary-600 dark:focus:ring-secondary-600"
           )
         end
       end
 
-      def table_variant_class(table_class, default_class)
-        (@variant == :table) ? table_class : default_class
+      def variant_class(default, table:)
+        case @variant
+        when :table
+          table
+        else
+          default
+        end
       end
     end
   end

data/lib/plutonium/ui/component/methods.rb

@@ -41,7 +41,7 @@ module Plutonium
           :resource_url_for,
           :current_definition,
           :current_query_object,
-          :resource_query_params,
+          :raw_resource_query_params,
           :current_policy,
           :current_turbo_frame,
           :current_interactive_action,

data/lib/plutonium/ui/display/resource.rb

@@ -37,27 +37,31 @@ module Plutonium
         end
 
         def render_resource_field(name)
-          # display :name, as: :string
-          # display :description, class: "col-span-full"
-          # display :age, field: {class: "max-h-fit"}
-          # display :dob do |f|
-          #   f.date_tag
-          # end
-
           when_permitted(name) do
+            # field :name, as: :string
+            # display :name, as: :string
+            # display :description, class: "col-span-full"
+            # display :age, tag: {class: "max-h-fit"}
+            # display :dob do |f|
+            #   f.date_tag
+            # end
+
+            field_options = resource_definition.defined_fields[name] ? resource_definition.defined_fields[name][:options] : {}
+
             display_definition = resource_definition.defined_displays[name] || {}
             display_options = display_definition[:options] || {}
-            display_field_as = display_options.delete(:as)
 
-            display_field_options = display_options.delete(:field) || {}
-            display_block = display_definition[:block] || ->(f) {
-              display_field_as ||= f.inferred_field_component
-              f.send(:"#{display_field_as}_tag", **display_field_options)
+            tag = field_options[:as] || display_options[:as]
+            tag_attributes = display_options[:tag] || {}
+            tag_block = display_definition[:block] || ->(f) {
+              tag ||= f.inferred_field_component
+              f.send(:"#{tag}_tag", **tag_attributes)
             }
 
-            field_options = resource_definition.defined_fields[name] ? resource_definition.defined_fields[name][:options] : {}
-            render field(name, **field_options).wrapped(**display_options) do |f|
-              render display_block.call(f)
+            field_options = field_options.except(:as)
+            wrapper_options = display_options.except(:tag, :as)
+            render field(name, **field_options).wrapped(**wrapper_options) do |f|
+              render tag_block.call(f)
             end
           end
         end

data/lib/plutonium/ui/form/query.rb

@@ -0,0 +1,171 @@
+# frozen_string_literal: true
+
+module Plutonium
+  module UI
+    module Form
+      class Query < Base
+        attr_reader :query_object
+
+        def initialize(*, query_object:, page_size:, attributes: {}, **options, &)
+          options[:as] = :q
+          options[:method] = :get
+          attributes.deep_merge!(
+            id: :search_form,
+            class!: "space-y-2 mb-4",
+            controller: "form",
+            data: {controller: "form", turbo_frame: nil}
+          )
+          super(*, attributes:, **options, &)
+
+          @query_object = query_object
+          @page_size = page_size
+        end
+
+        def form_template
+          render_fields
+        end
+
+        private
+
+        def render_fields
+          render_search_fields
+          render_filter_fields
+          div hidden: true do # workaround the fact that input array does not accept other attributes for now
+            input(name: "limit", value: @page_size, type: :hidden, hidden: true) if @page_size
+            render_sort_fields
+            render_scope_fields
+          end
+        end
+
+        def render_sort_fields
+          # q[sort_fields][]=name&q[sort_fields][]=created_at
+          field :sort_fields do |name|
+            render name.input_array_tag do |array|
+              render array.input_tag(type: :hidden, hidden: true)
+            end
+          end
+          # q[sort_directions][created_at]=ASC&q[sort_directions][name]=ASC&
+          nest_one :sort_directions do |nested|
+            query_object.sort_definitions.each do |filter_name, definition|
+              nested.field(filter_name) do |f|
+                render f.input_tag(type: :hidden, hidden: true)
+              end
+            end
+          end
+        end
+
+        def render_scope_fields
+          # q[scope]=&
+          return if query_object.scope_definitions.blank?
+
+          render field(:scope).input_tag(type: :hidden, hidden: true)
+        end
+
+        def render_search_fields
+          # q[search]=&
+          return unless query_object.search_filter
+
+          search_query = query_object.search_query
+          div(class: "relative") do
+            div(class: "absolute inset-y-0 left-0 flex items-center pl-3 pointer-events-none") do
+              svg(
+                class: "w-5 h-5 text-gray-500 dark:text-gray-400",
+                aria_hidden: "true",
+                fill: "currentColor",
+                viewbox: "0 0 20 20",
+                xmlns: "http://www.w3.org/2000/svg"
+              ) do |s|
+                s.path(
+                  fill_rule: "evenodd",
+                  d:
+                    "M8 4a4 4 0 100 8 4 4 0 000-8zM2 8a6 6 0 1110.89 3.476l4.817 4.817a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 012 8z",
+                  clip_rule: "evenodd"
+                )
+              end
+            end
+            render field(:search, value: search_query)
+              .placeholder("Search...")
+              .input_tag(
+                value: search_query,
+                class: "block w-full p-2 pl-10 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-primary-500 focus:border-primary-500 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500",
+                data: {
+                  action: "form#submit",
+                  turbo_permanent: true
+                }
+              )
+          end
+        end
+
+        def render_filter_fields
+          div(class: "flex flex-wrap items-center gap-4") do
+            span(class: "text-sm font-medium text-gray-900 dark:text-white") { "Filters:" }
+            div(class: "flex flex-wrap items-center gap-4 mr-auto") do
+              div class: "flex flex-wrap items-center gap-4" do
+                query_object.filter_definitions.each do |filter_name, definition|
+                  nest_one filter_name do |nested|
+                    definition.defined_inputs.each do |input_name, _|
+                      render_defined_field nested, definition, input_name
+                    end
+                  end
+                end
+              end
+            end
+            div(class: "flex flex-wrap items-center gap-2") do
+              actions_wrapper do
+                render field(:submit).submit_button_tag(
+                  name: nil,
+                  class!: "inline-flex items-center text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-medium rounded-lg text-sm px-4 py-2 dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none dark:focus:ring-blue-800"
+                ) do
+                  render Phlex::TablerIcons::Filter.new(class: "w-4 h-4 mr-2")
+                  plain "Apply Filters"
+                end
+
+                render field(:reset).submit_button_tag(
+                  name: nil,
+                  type: :reset,
+                  class!: "inline-flex items-center text-gray-900 bg-white border border-gray-300 focus:outline-none hover:bg-gray-100 focus:ring-4 focus:ring-gray-200 font-medium rounded-lg text-sm px-4 py-2 dark:bg-gray-800 dark:text-white dark:border-gray-600 dark:hover:bg-gray-700 dark:hover:border-gray-600 dark:focus:ring-gray-700"
+                ) do
+                  render Phlex::TablerIcons::X.new(class: "w-4 h-4 mr-2")
+                  plain "Clear Filters"
+                end
+              end
+            end
+          end
+        end
+
+        def form_action
+          # query forms post to the same page
+          nil
+        end
+
+        def render_defined_field(nested, resource_definition, name)
+          # field :name, as: :string
+          # input :name, as: :string
+          # input :description, class: "col-span-full"
+          # input :age, tag: {class: "max-h-fit"}
+          # input :dob do |f|
+          #   f.date_tag
+          # end
+
+          field_options = resource_definition.defined_fields[name] ? resource_definition.defined_fields[name][:options] : {}
+
+          input_definition = resource_definition.defined_inputs[name] || {}
+          input_options = input_definition[:options] || {}
+
+          tag = field_options[:as] || input_options[:as]
+          tag_attributes = input_options[:tag] || {}
+          tag_block = input_definition[:block] || ->(f) {
+            tag ||= f.inferred_field_component
+            f.send(:"#{tag}_tag", **tag_attributes, class: tokens(tag_attributes[:class], "flex-1"))
+          }
+
+          field_options = field_options.except(:as)
+          nested.field(name, **field_options) do |f|
+            f.placeholder(f.label) unless f.placeholder
+            render tag_block.call(f)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/plutonium/ui/form/resource.rb

@@ -34,32 +34,37 @@ module Plutonium
         end
 
         def render_resource_field(name)
-          # input :name, as: :string
-          # input :description, class: "col-span-full"
-          # input :age, field: {class: "max-h-fit"}
-          # input :dob do |f|
-          #   f.date_tag
-          # end
-
           when_permitted(name) do
+            # field :name, as: :string
+            # input :name, as: :string
+            # input :description, class: "col-span-full"
+            # input :age, tag: {class: "max-h-fit"}
+            # input :dob do |f|
+            #   f.date_tag
+            # end
+
+            field_options = resource_definition.defined_fields[name] ? resource_definition.defined_fields[name][:options] : {}
+
             input_definition = resource_definition.defined_inputs[name] || {}
             input_options = input_definition[:options] || {}
-            input_field_as = input_options.delete(:as)
 
-            input_field_options = input_options.delete(:field) || {}
-            input_block = input_definition[:block] || ->(f) {
-              input_field_as ||= f.inferred_field_component
-              f.send(:"#{input_field_as}_tag", **input_field_options)
+            tag = field_options[:as] || input_options[:as]
+            tag_attributes = input_options[:tag] || {}
+            tag_block = input_definition[:block] || ->(f) {
+              tag ||= f.inferred_field_component
+              f.send(:"#{tag}_tag", **tag_attributes)
             }
 
-            field_options = resource_definition.defined_fields[name] ? resource_definition.defined_fields[name][:options] : {}
-            if !input_options[:class] || !input_options[:class].include?("col-span")
+            field_options = field_options.except(:as)
+            wrapper_options = input_options.except(:tag, :as)
+            if !wrapper_options[:class] || !wrapper_options[:class].include?("col-span")
               # temp hack to allow col span overrides
               # TODO: remove once we complete theming, which will support merges
-              input_options[:class] = tokens("col-span-full", input_options[:class])
+              wrapper_options[:class] = tokens("col-span-full", wrapper_options[:class])
             end
-            render field(name, **field_options).wrapped(**input_options) do |f|
-              render input_block.call(f)
+
+            render field(name, **field_options).wrapped(**wrapper_options) do |f|
+              render tag_block.call(f)
             end
           end
         end

data/lib/plutonium/ui/table/components/scopes_bar.rb

@@ -124,7 +124,7 @@ module Plutonium
 
           private
 
-          def current_scope = resource_query_params[:scope]
+          def current_scope = raw_resource_query_params[:scope]
 
           def render?
             current_query_object.scope_definitions.present?

data/lib/plutonium/ui/table/components/search_bar.rb

@@ -6,150 +6,17 @@ module Plutonium
       module Components
         class SearchBar < Plutonium::UI::Component::Base
           def view_template
-            original_attributes = Phlex::HTML::EVENT_ATTRIBUTES
-            temp_attributes = Phlex::HTML::EVENT_ATTRIBUTES.dup
-            temp_attributes.delete("oninput")
-            temp_attributes.delete("onclick")
-            Phlex::HTML.const_set(:EVENT_ATTRIBUTES, temp_attributes)
-
-            div(
-              class:
-                # "p-4 bg-white border border-gray-200 rounded-lg dark:bg-gray-800 dark:border-gray-700 space-y-2 mb-4"
-                "space-y-2 mb-4"
-            ) do
-              search_query = current_query_object.search_query
-              query_params = resource_query_params
-              render Phlexi::Form(:q, attributes: {class!: nil, data: {controller: "form", turbo_frame: nil}}) {
-                div(class: "relative") do
-                  div(class: "absolute inset-y-0 left-0 flex items-center pl-3 pointer-events-none") do
-                    svg(
-                      class: "w-5 h-5 text-gray-500 dark:text-gray-400",
-                      aria_hidden: "true",
-                      fill: "currentColor",
-                      viewbox: "0 0 20 20",
-                      xmlns: "http://www.w3.org/2000/svg"
-                    ) do |s|
-                      s.path(
-                        fill_rule: "evenodd",
-                        d:
-                          "M8 4a4 4 0 100 8 4 4 0 000-8zM2 8a6 6 0 1110.89 3.476l4.817 4.817a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 012 8z",
-                        clip_rule: "evenodd"
-                      )
-                    end
-                  end
-                  render field(:search, value: search_query)
-                    .placeholder("Search...")
-                    .input_tag(
-                      id: "search",
-                      value: search_query,
-                      class: "block w-full p-2 pl-10 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-primary-500 focus:border-primary-500 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500",
-                      data: {
-                        action: "form#submit",
-                        turbo_permanent: true
-                      }
-                    )
-
-                  render field(:scope, value: query_params[:scope]).input_tag(type: :hidden)
-                  render field(:sort_fields, value: query_params[:sort_fields]).input_array_tag do |f|
-                    render f.input_tag(type: :hidden)
-                  end
-                  nest_one(:sort_directions) do |directions|
-                    query_params[:sort_directions]&.each do |name, value|
-                      render directions.field(name, value:).input_tag(hidden: true)
-                    end
-                  end
-                end
-              }
-
-              # div(class: "flex flex-wrap items-center gap-4") do
-              #   span(class: "text-sm font-medium text-gray-900 dark:text-white") do
-              #     "Filters:"
-              #   end
-              #   select(
-              #     id: "category-filter",
-              #     class:
-              #       "bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-500 focus:border-primary-500 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500"
-              #   ) do
-              #     option(selected: "selected", value: "") { "All Categories" }
-              #     option(value: "technology") { "Technology" }
-              #     option(value: "science") { "Science" }
-              #     option(value: "health") { "Health" }
-              #   end
-              #   div(class: "flex items-center space-x-2") do
-              #     input(
-              #       type: "date",
-              #       id: "start-date",
-              #       class:
-              #         "bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-500 focus:border-primary-500 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500"
-              #     )
-              #     span(class: "text-gray-500 dark:text-gray-400") { "to" }
-              #     input(
-              #       type: "date",
-              #       id: "end-date",
-              #       class:
-              #         "bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-500 focus:border-primary-500 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500"
-              #     )
-              #   end
-              #   select(
-              #     id: "author-filter",
-              #     class:
-              #       "bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-500 focus:border-primary-500 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500"
-              #   ) do
-              #     option(selected: "selected", value: "") { "All Authors" }
-              #     option(value: "john-doe") { "John Doe" }
-              #     option(value: "jane-smith") { "Jane Smith" }
-              #   end
-              #   button(
-              #     onclick: "applyFilters()",
-              #     class:
-              #       "inline-flex items-center text-white bg-primary-700 hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 font-medium rounded-lg text-sm px-4 py-2 dark:bg-primary-600 dark:hover:bg-primary-700 focus:outline-none dark:focus:ring-primary-800"
-              #   ) do
-              #     svg(
-              #       class: "w-4 h-4 mr-2",
-              #       fill: "currentColor",
-              #       viewbox: "0 0 20 20",
-              #       xmlns: "http://www.w3.org/2000/svg"
-              #     ) do |s|
-              #       s.path(
-              #         fill_rule: "evenodd",
-              #         d:
-              #           "M3 3a1 1 0 011-1h12a1 1 0 011 1v3a1 1 0 01-.293.707L12 11.414V15a1 1 0 01-.293.707l-2 2A1 1 0 018 17v-5.586L3.293 6.707A1 1 0 013 6V3z",
-              #         clip_rule: "evenodd"
-              #       )
-              #     end
-              #     plain " Apply Filters "
-              #   end
-              #   button(
-              #     onclick: "clearFilters()",
-              #     class:
-              #       "inline-flex items-center text-gray-900 bg-white border border-gray-300 focus:outline-none hover:bg-gray-100 focus:ring-4 focus:ring-gray-200 font-medium rounded-lg text-sm px-4 py-2 dark:bg-gray-800 dark:text-white dark:border-gray-600 dark:hover:bg-gray-700 dark:hover:border-gray-600 dark:focus:ring-gray-700"
-              #   ) do
-              #     svg(
-              #       class: "w-4 h-4 mr-2",
-              #       fill: "currentColor",
-              #       viewbox: "0 0 20 20",
-              #       xmlns: "http://www.w3.org/2000/svg"
-              #     ) do |s|
-              #       s.path(
-              #         fill_rule: "evenodd",
-              #         d:
-              #           "M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z",
-              #         clip_rule: "evenodd"
-              #       )
-              #     end
-              #     plain " Clear Filters "
-              #   end
-              # end
-            end
-          ensure
-            # TODO: remove this once Phlex adds support for SafeValues
-            Phlex::HTML.const_set(:EVENT_ATTRIBUTES, original_attributes)
+            render current_definition.query_form.new(
+              raw_resource_query_params,
+              query_object: current_query_object,
+              page_size: request.parameters[:limit]
+            )
           end
 
           private
 
           def render?
-            current_query_object.search_filter.present? && current_policy.allowed_to?(:search?)
+            (current_query_object.search_filter.present? || current_query_object.filter_definitions.present?) && current_policy.allowed_to?(:search?)
           end
         end
       end

data/lib/plutonium/ui/table/resource.rb

@@ -53,19 +53,20 @@ module Plutonium
 
               column_definition = resource_definition.defined_columns[name] || {}
               column_display_options = column_definition[:options] || {}
-              display_field_as = column_display_options.delete(:as)
-              align_field_to = column_display_options.delete(:align)
 
-              display_block = column_definition[:block] || ->(wrapped_object, key) {
+              display_tag = column_display_options[:as]
+              display_tag_options = column_display_options.except(:as, :align)
+              display_tag_block = column_definition[:block] || ->(wrapped_object, key) {
                 f = wrapped_object.field(key)
-                display_field_as ||= f.inferred_field_component
-                f.send(:"#{display_field_as}_tag", **column_display_options)
+                display_tag ||= f.inferred_field_component
+                f.send(:"#{display_tag}_tag", **display_tag_options)
               }
 
-              field_options = resource_definition.defined_fields[name] ? resource_definition.defined_fields[name][:options] : {}
-              field_options[:as] = display_field_as
-              field_options[:align] = align_field_to if align_field_to
-              table.column name, **field_options, sort_params: current_query_object.sort_params_for(name), &display_block
+              # align_field_to = column_display_options.slice(:align)
+              field_options = resource_definition.defined_fields[name] ? resource_definition.defined_fields[name][:options].dup : {}
+              field_options = field_options.merge(**column_display_options.slice(:align))
+              # field_options[:align] = align_field_to if align_field_to
+              table.column name, **field_options, sort_params: current_query_object.sort_params_for(name), &display_tag_block
             end
 
             table.actions do |wrapped_object|

data/lib/plutonium/version.rb

@@ -1,5 +1,5 @@
 module Plutonium
-  VERSION = "0.15.4"
+  VERSION = "0.15.6"
   NEXT_MAJOR_VERSION = VERSION.split(".").tap { |v|
     v[1] = v[1].to_i + 1
     v[2] = 0