flexi_admin 0.0.5 → 0.0.6

data/lib/flexi_admin/components/resource/autocomplete_component.html.slim

@@ -2,20 +2,32 @@
   - if disabled && data_list?
     = value
   - elsif disabled && !data_list?
-      a href="#{resource_path(resource)}" data-turbo-frame="_top" = resource&.ac_title
+    - if resource.present?
+      a href="#{resource_path(resource)}" data-turbo-frame="_top" = resource&.try(:ac_title) || resource&.try(:title)
       /= helpers.link_to resource&.ac_title, resource_path(resource), data: { turbo_frame: '_top' }
+    - else
+      span.text-muted = disabled_empty_custom_message
   - else
     .input-group style="width: #{width || '100%'}"
       .input-group-text id="button-addon1"
         i.bi class="#{icon_class}"
 
-      = text_field_tag name, resource&.ac_title,
-                        class: 'form-control',
-                        placeholder: 'hledat',
+      - if data_list?
+        = text_area_tag name, value,
+                        class: 'form-control expandable-field',
+                        placeholder:,
                         'aria-describedby': 'button-addon1',
-                        value: ,
                         required:,
-                        **autocomplete_options
+                        rows: 1,
+                        **expandable_autocomplete_options
+      - else
+        = text_field_tag name, resource&.ac_title,
+                          class: 'form-control',
+                          placeholder:,
+                          'aria-describedby': 'button-addon1',
+                          value: ,
+                          required:,
+                          **autocomplete_options
       .invalid-feedback.d-none
       - if select?
         input [type="hidden"
@@ -27,4 +39,4 @@
       .loading-icon.d-none data-autocomplete-target="loadingIcon"
         .icon
 
-      ul.collapse.show data-autocomplete-target="list"
+      ul.collapse.show data-autocomplete-target="list"

data/lib/flexi_admin/components/resource/autocomplete_component.rb

@@ -5,41 +5,71 @@ module FlexiAdmin::Components::Resource
   class AutocompleteComponent < FlexiAdmin::Components::BaseComponent
     include FlexiAdmin::Components::Helpers::ResourceHelper
 
+    ALLOWED_ACTIONS = %i[select show input].freeze
+
     attr_reader :resource, :disabled, :action, :parent, :fields, :required,
-                :name, :html_options, :path, :width, :value
+                :name, :html_options, :path, :width, :value,
+                :disabled_empty_custom_message, :placeholder, :priority_value
 
     def initialize(resource = nil, scope:, fields: [:title],
                   action: :select, parent: nil, path: nil,
-                  value: nil, **html_options)
+                  value: nil, disabled_empty_custom_message: nil,
+                  target_controller: nil, placeholder: nil,
+                  custom_scope: nil, priority_value: nil, **html_options)
       @resource = resource
       @scope = scope
+      @target_controller = target_controller
       @parent = parent
       @fields = fields
       @path = path
       @action = action
       @value = value
+      @custom_scope = custom_scope&.to_s
+      @priority_value = priority_value
 
       @html_options = html_options
       @width = html_options.delete(:width)
       @required = html_options[:required]
       @style = html_options.delete(:style)
       @disabled = html_options.key?(:disabled) ? html_options[:disabled] : false
+
       @name = html_options[:name] || resource_input_name
 
+      @disabled_empty_custom_message = disabled_empty_custom_message || 'žádný zdroj'
+      @placeholder = placeholder || 'hledat'
+
       validate_action!
     end
 
     def autocomplete_options
+      base_data = { autocomplete_target: 'input',
+                    action: 'focus->autocomplete#focus keyup->autocomplete#keyup ' \
+                            'focusout->autocomplete#onFocusOut',
+                    autocomplete_search_path: get_path,
+                    autocomplete_is_disabled: disabled,
+                    field_type: kind }.merge(html_options)
+
+      # An app can mark one record as "the one the user is working on" so the
+      # backend can float it to the top; the value is set client-side because
+      # only the app knows what "current" means (see `ac_priority`).
+      base_data[:autocomplete_priority_value] = priority_value if priority_value.present?
+
       {
         style: 'border-top-right-radius: 0.4rem; border-bottom-right-radius: 0.4rem;',
-        data: { autocomplete_target: 'input',
-                action: 'keyup->autocomplete#keyup focusout->autocomplete#onFocusOut',
-                autocomplete_search_path: get_path,
-                autocomplete_is_disabled: disabled,
-                field_type: kind }.merge(html_options)
+        autocomplete: 'off',
+        data: base_data
       }
     end
 
+    def expandable_autocomplete_options
+      opts = autocomplete_options
+      data = opts[:data].merge(
+        controller: 'expandable-field',
+        action: "input->expandable-field#resize #{opts[:data][:action]}"
+      )
+      { data: data, **opts.except(:data) }
+    end
+
     private
 
     def icon_class
@@ -68,16 +98,16 @@ module FlexiAdmin::Components::Resource
 
       case action
       when :input
-        datalist_path(action: :input, parent:, fields:)
+        datalist_path(action: :input, parent: parent, fields: fields)
       else
-        autocomplete_path(action:, parent:, fields:)
+        autocomplete_path(action: action, parent: parent, fields: fields, custom_scope: @custom_scope)
       end
     end
 
     def validate_action!
-      return if %i[select show input].include?(@action)
+      return if ALLOWED_ACTIONS.include?(@action)
 
       raise "Invalid action: #{@action}"
     end
   end
-end
+end

data/lib/flexi_admin/components/resource/button_select_component.html.slim

@@ -2,11 +2,11 @@ div.button-select data-controller="button-select" data-button-select-disabled-va
   .btn-group
     - if disabled
       button.btn.btn-outline-secondary.text-nowrap data-value=value data-button-select-target="button" disabled=true
-        = value || '-'
+        = value ? label_for(value) : '-'
     - else
       - options.each do |option|
         button.btn.btn-outline-secondary.text-nowrap data-action="click->button-select#select" data-value=option data-button-select-target="button"
-          = option
+          = label_for(option)
   = hidden_field_tag html_options[:name] || attr_name, value, data: { 'button-select-target': 'input' }
   - if form
     .invalid-feedback data-button-select-target="invalid-feedback"

data/lib/flexi_admin/components/resource/button_select_component.rb

@@ -5,7 +5,7 @@ module FlexiAdmin::Components::Resource
   class ButtonSelectComponent < FlexiAdmin::Components::BaseComponent
     attr_reader :resource, :attr_name, :options, :form, :label, :value, :html_options, :disabled
 
-    def initialize(resource, attr_name, options, form:, label: nil, value: nil, disabled: false, **html_options)
+    def initialize(resource, attr_name, options, form:, label: nil, value: nil, disabled: false, labels: nil, **html_options)
       @resource = resource
       @attr_name = attr_name
       @options = options
@@ -14,6 +14,13 @@ module FlexiAdmin::Components::Resource
       @value = value
       @html_options = html_options
       @disabled = disabled
+      @labels = labels || {}
+    end
+
+    def label_for(option)
+      return option if @labels.empty?
+
+      @labels[option] || @labels[option.to_s] || @labels[option.to_s.to_sym] || option
     end
   end
 end

data/lib/flexi_admin/components/resource/filter_component.html.slim

@@ -0,0 +1,47 @@
+.filters.w-100
+  - active_filters = @params.to_h.except('controller', 'action', 'subdomain').select { |k, v| v.present? }
+  - filter_label_lookup = {}
+  - filter_configs.each do |filter|
+    - filter_label_lookup[filter[:name].to_s] = filter[:options].index_by { |o| o[:value].to_s }
+  - if active_filters.any?
+    .mb-2.w-100
+      | Aktivní filtry:
+      - active_filters.each do |k, v|
+        - values = v.is_a?(Array) ? v : [v]
+        - values.each do |val|
+          - label = filter_label_lookup[k]&.dig(val.to_s, :label) || val
+          - new_params = @params.deep_dup
+          - if new_params[k].is_a?(Array)
+            - new_params[k] = new_params[k] - [val]
+            - new_params.delete(k) if new_params[k].empty?
+          - else
+            - new_params.delete(k)
+          span.badge.bg-primary.text-white.mx-1
+            = "#{field_labels[k] || k.humanize}: #{label}"
+            = link_to helpers.url_for(params: new_params), class: 'text-white ms-1', title: "Odebrat filtr" do
+              i.bi.bi-x
+  .form-bar.w-100
+    = form_with url: '', method: :get, local: true, html: { class: 'd-flex align-items-center flex-row flex-wrap gap-2 w-100 filter-bar', style: '', data: { controller: 'filter-auto-submit' } } do
+      - if search_field
+        div(style="flex: 1 1 auto; min-width: 250px; max-width: 500px;" data-action="focusout->filter-auto-submit#submitOnBlur")
+          = search_field
+      - filter_configs.each do |filter|
+        - custom_label = field_labels[filter[:name].to_s] || filter[:label]
+        - if filter[:multiple]
+          .flex-shrink-0(style="min-width: 180px;")
+            .dropdown
+              button.btn.btn-outline-secondary.form-control.dropdown-toggle type="button" id="#{filter[:dropdown_id]}" data-bs-toggle="dropdown" aria-expanded="false"
+                = custom_label
+              .dropdown-menu.p-2 aria-labelledby="#{filter[:dropdown_id]}" style="max-height: 300px; overflow-y: auto; min-width: 220px;" data-action="click->filter-auto-submit#handleDropdownChange:stop"
+                - filter[:options].each do |opt|
+                  label.form-check-label.dropdown-item
+                    = check_box_tag "#{filter[:name]}[]", opt[:value], Array(filter[:current_value]).include?(opt[:value].to_s), class: 'form-check-input me-2'
+                    = opt[:label]
+        - else
+          .flex-shrink-0(style="min-width: 180px;")
+            - select_classes = ['form-select']
+            - select_classes << 'is-active' if filter[:current_value].present?
+            label.form-label.mb-0 = custom_label
+            = select_tag filter[:name], options_for_select(filter[:options].map { |o| [o[:label], o[:value]] }, filter[:current_value]), class: select_classes.join(' '), include_blank: true, onchange: 'this.form.submit();'
+      .d-flex.gap-2
+        = button_tag t('flexi_admin.filters.cancel', default: 'Zrušit'), type: 'button', class: 'btn btn-outline-secondary', onclick: "window.location = window.location.pathname;"

data/lib/flexi_admin/components/resource/filter_component.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module FlexiAdmin::Components::Resource
+  class FilterComponent < FlexiAdmin::Components::BaseComponent
+    include FlexiAdmin::Components::Helpers::ResourceHelper
+
+    attr_reader :filter_options, :filters, :params, :search_field, :field_labels
+
+    def initialize(filter_options:, filters: true, params: {}, search_field: nil, field_labels: {})
+      @filter_options = filter_options
+      @filters = filters
+      @search_field = search_field
+      @field_labels = field_labels.with_indifferent_access
+      # tech-debt: handle params conversion
+      if params.respond_to?(:to_unsafe_h)
+        @params = params.to_unsafe_h.with_indifferent_access
+      elsif params.respond_to?(:to_h)
+        @params = params.to_h.with_indifferent_access
+      else
+        @params = params.with_indifferent_access
+      end
+    end
+
+    def filter_configs
+      return [] unless filters && filter_options.present?
+
+      filter_options.map do |filter_name, options|
+        opts, multiple = if options.is_a?(Hash)
+                           [options[:options], options[:multiple]]
+                         else
+                           [options, false]
+                         end
+        opts = opts.map do |opt|
+          if opt.is_a?(Array)
+            { label: opt[1], value: opt[0] }
+          else
+            { label: opt.to_s.humanize, value: opt }
+          end
+        end
+        {
+          name: filter_name,
+          label: filter_name.to_s.humanize,
+          options: opts,
+          multiple: multiple,
+          current_value: params[filter_name],
+          dropdown_id: "dropdown-#{filter_name}"
+        }
+      end
+    end
+  end
+end

data/lib/flexi_admin/components/resource/form_component.rb

@@ -4,6 +4,8 @@ module FlexiAdmin::Components::Resource
   class FormComponent < FlexiAdmin::Components::BaseComponent
     include FlexiAdmin::Components::Resource::FormMixin
 
+    ResourceOrScopeNotDefinedError = Class.new(StandardError)
+
     attr_reader :resource
 
     def initialize(resource, disabled: true)
@@ -12,7 +14,20 @@ module FlexiAdmin::Components::Resource
     end
 
     def disabled
-      !helpers.current_ability&.can?(:update, resource) || @disabled
+      if defined?(CanCan)
+        raise ResourceOrScopeNotDefinedError, "Resource or scope is not defined" if resource.blank? && scope.blank?
+
+        resource_to_check = resource.presence || self.class.class_name || scope.classify.constantize
+
+        !helpers.current_ability&.can?(:update, resource_to_check) || @disabled
+      else
+        @disabled
+      end
+    rescue ResourceOrScopeNotDefinedError => e
+      BugTracker.notify(e, scope: scope)
+
+      # Let it pass, we need to fix missing scope or resource
+      false
     end
   end
 end

data/lib/flexi_admin/components/resource/form_element_component.rb

@@ -24,7 +24,7 @@ module FlexiAdmin::Components::Resource
 
     def merge_data_keys(data)
       controller = data[:controller]
-      controllers = controller.present? ? [controller, "form-validation"] : ["form-validation"]
+      controllers = controller.present? ? [controller, "form-validation", "add-row"] : ["form-validation", "add-row"]
       data.merge(controller: controllers.join(" "))
     end
   end

data/lib/flexi_admin/components/resource/form_mixin.rb

@@ -28,48 +28,64 @@ module FlexiAdmin::Components::Resource
     attr_reader :resource, :disabled, :inline, :parent_resource
 
     # Form does not render; fields do.
-    def form(url: resource_path(resource), css_class: 'myForm section', method: :patch, **html_options, &block)
+    # TODO: allow setting label_col/field_col for non-modal forms (e.g. via FormComponent initialize)
+    def form(url: resource_path(resource), css_class: 'myForm section', method: :patch, label_col: 'col-md-3', field_col: 'col-md-9', **html_options, &block)
+      previous_label_col = @label_col
+      previous_field_col = @field_col
+      @label_col = label_col
+      @field_col = field_col
+
       render FlexiAdmin::Components::Resource::FormElementComponent.new(resource, url:, css_class:, method:, **html_options) do |component|
         component.with_fields do
           capture(&block)
         end
       end
+    ensure
+      @label_col = previous_label_col
+      @field_col = previous_field_col
     end
 
     def select_field(attr_name, options:, label: nil, value: nil, **html_options)
       field = render_select(attr_name, value:, options:, **html_options)
       field_wrapper = render_field_wrapper(field, attr_name)
 
-      inline ? field_wrapper : render_form_row(attr_name, field_wrapper, label:)
+      inline ? field_wrapper : render_form_row(attr_name, field_wrapper, label:, required: html_options[:required])
     end
 
     def button_select_field(attr_name, options:, label: nil, value: nil, **html_options)
       field = render_button_select(attr_name, options:, value:, disabled:, **html_options)
       field_wrapper = render_field_wrapper(field, attr_name)
 
-      inline ? field_wrapper : render_form_row(attr_name, field_wrapper, label:)
+      inline ? field_wrapper : render_form_row(attr_name, field_wrapper, label:, required: html_options[:required])
     end
 
-    def text_field(attr_name, label: nil, value: nil, **html_options)
-      field = text_field_tag(attr_name, value:, **html_options)
+    def text_field(attr_name, label: nil, value: nil, expandable: false, **html_options)
+      field = if expandable
+        render_expandable_field(attr_name, value, html_options)
+      else
+        text_field_tag(attr_name, value:, **html_options)
+      end
       field_wrapper = render_field_wrapper(field, attr_name)
 
-      inline ? field_wrapper : render_form_row(attr_name, field_wrapper, label:)
+      inline ? field_wrapper : render_form_row(attr_name, field_wrapper, label:, required: html_options[:required])
     end
 
     def text_field_tag(attr_name, value: nil, **html_options)
       render_standard_field(:text, attr_name, value, html_options)
     end
 
-    def number_field(attr_name, label: nil, value: nil, **html_options)
-      render_standard_field(:number, attr_name, value, html_options)
+    def number_field(attr_name, label: nil, value: nil, step: 0.01, **html_options)
+      field = render_standard_field(:number, attr_name, value, html_options.merge(step: step.to_s))
+      field_wrapper = render_field_wrapper(field, attr_name)
+
+      inline ? field_wrapper : render_form_row(attr_name, field_wrapper, label:, required: html_options[:required])
     end
 
     def checkbox_field(attr_name, label: nil, checked: nil, **html_options)
       checkbox = checkbox_field_tag(attr_name, checked:, **html_options)
       field_wrapper = render_field_wrapper(checkbox, attr_name)
 
-      inline ? field_wrapper : render_form_row(attr_name, field_wrapper, label:)
+      inline ? field_wrapper : render_form_row(attr_name, field_wrapper, label:, required: html_options[:required])
     end
 
     def checkbox_field_tag(attr_name, checked: nil, **html_options)
@@ -99,14 +115,25 @@ module FlexiAdmin::Components::Resource
       field = render_standard_field(:date, attr_name, value, html_options.merge(style: 'max-width: 180px;'))
       field_wrapper = render_field_wrapper(field, attr_name)
 
-      inline ? field_wrapper : render_form_row(attr_name, field_wrapper, label:)
+      inline ? field_wrapper : render_form_row(attr_name, field_wrapper, label:, required: html_options[:required])
     end
 
     def datetime_field(attr_name, label: nil, value: nil, **html_options)
       field = render_standard_field(:datetime, attr_name, value, html_options.merge(style: 'max-width: 180px;'))
       field_wrapper = render_field_wrapper(field, attr_name)
 
-      inline ? field_wrapper : render_form_row(attr_name, field_wrapper, label:)
+      inline ? field_wrapper : render_form_row(attr_name, field_wrapper, label:, required: html_options[:required])
+    end
+
+    def text_area_field(attr_name, label: nil, value: nil, **html_options)
+      field = text_area_field_tag(attr_name, value:, **html_options)
+      field_wrapper = render_field_wrapper(field, attr_name)
+
+      inline ? field_wrapper : render_form_row(attr_name, field_wrapper, label:, required: html_options[:required])
+    end
+
+    def text_area_field_tag(attr_name, value: nil, **html_options)
+      content_tag(:textarea, value, html_options.merge(name: attr_name, class: 'form-control'))
     end
 
     # Trix field
@@ -158,6 +185,73 @@ module FlexiAdmin::Components::Resource
       end
     end
 
+    def add_row_button(container:, template_selector: '.dynamic-rows > .form-row:has(input, select, textarea)', label: I18n.t('flexi_admin.form.add_row_button'), icon: 'plus', classes: '')
+      button = if icon.present?
+        content_tag(:button, class: 'btn btn-outline-secondary ' + classes, type: 'button',
+                    data: { action: 'click->add-row#add',
+                            'add-row-container-value': container,
+                            'add-row-template-selector-value': template_selector }) do
+          content = []
+          content << content_tag(:i, '', class: "bi bi-#{icon} me-2")
+          content << label
+          content.join.html_safe
+        end
+      else
+        content_tag(:button, label, class: 'btn btn-outline-secondary ' + classes, type: 'button',
+                    data: { action: 'click->add-row#add',
+                            'add-row-container-value': container,
+                            'add-row-template-selector-value': template_selector })
+      end
+
+      content_tag(:div, class: 'form-row') do
+        content_tag(:div, class: 'col-12') { button }
+      end
+    end
+
+    def remove_row_button(icon: 'trash', classes: '')
+      content_tag(:button, class: 'btn btn-outline-danger btn-sm ' + classes, type: 'button',
+                  data: { action: 'click->add-row#remove',
+                          'add-row-template-selector-value': '.form-row' }) do
+        content = []
+        content << content_tag(:i, '', class: "bi bi-#{icon}")
+        content.join.html_safe
+      end
+    end
+
+    def columns(**html_options, &block)
+      previous_column_row_counts = @column_row_counts
+      @column_row_counts = []
+      content = capture(&block)
+      max_rows = @column_row_counts.max || 1
+      col_count = @column_row_counts.size
+
+      css_classes = ['form-columns']
+      css_classes << html_options.delete(:class) if html_options[:class]
+
+      style = "grid-template-rows: repeat(#{max_rows}, auto); grid-template-columns: repeat(#{col_count}, 1fr);"
+      existing_style = html_options[:style]
+      style = "#{existing_style} #{style}" if existing_style
+
+      content_tag(:div, content, html_options.merge(class: css_classes.join(' '), style:))
+    ensure
+      @column_row_counts = previous_column_row_counts
+    end
+
+    def column(**html_options, &block)
+      previous_inside_column = @inside_column
+      @inside_column = true
+      @current_column_row_count = 0
+      content = capture(&block)
+      @column_row_counts << @current_column_row_count
+
+      css_classes = ['form-column']
+      css_classes << html_options.delete(:class) if html_options[:class]
+
+      content_tag(:div, content, html_options.merge(class: css_classes.join(' ')))
+    ensure
+      @inside_column = previous_inside_column
+    end
+
     def with_resource(resource)
       previous_resource = @resource
       @resource = resource
@@ -168,35 +262,57 @@ module FlexiAdmin::Components::Resource
 
     private
 
+    def render_expandable_field(attr_name, value, html_options)
+      val, input_classes, resolved_disabled = resolve_field_attrs(attr_name, value, html_options, extra_class: 'expandable-field')
+      data = {
+        controller: 'expandable-field',
+        action: 'input->expandable-field#resize blur->form-validation#handleInvalid keyup->form-validation#handleInvalid'
+      }
+      merge_model_error!(data, attr_name)
+
+      content_tag(:textarea, val, {
+        name: attr_name, class: input_classes, rows: 1, data:, disabled: resolved_disabled
+      }.merge(html_options.except(:disabled)))
+    end
+
     def render_standard_field(type, attr_name, value, html_options)
-      val = value.is_a?(Proc) ? value.call : resource.try(attr_name) || value
+      val, input_classes, resolved_disabled = resolve_field_attrs(attr_name, value, html_options)
       data = {
         action: 'blur->form-validation#handleInvalid keyup->form-validation#handleInvalid'
       }
       merge_model_error!(data, attr_name) unless type == :submit
 
-      content = []
-      input_classes = 'form-control'
-      input_classes += ' is-invalid' if resource.present? && attr_name.present? && resource.errors[attr_name].present?
-      if type != :submit
-        content << content_tag(:input, nil,
-                              {
-                                type:,
-                                name: attr_name,
-                                value: val,
-                                class: input_classes,
-                                data:
-                              }.merge(html_options)
-                                .merge(disabled:))
-      end
+      return ''.html_safe if type == :submit
 
-      content.join.html_safe
+      content_tag(:input, nil, {
+        type:, name: attr_name, value: val, class: input_classes, data:, disabled: resolved_disabled
+      }.merge(html_options.except(:disabled)))
+    end
+
+    def resolve_field_attrs(attr_name, value, html_options, extra_class: nil)
+      val = value.is_a?(Proc) ? value.call : resource.try(attr_name) || value
+      input_classes = ['form-control', extra_class].compact.join(' ')
+      input_classes += ' is-invalid' if resource.present? && attr_name.present? && resource.errors[attr_name].present?
+      resolved_disabled = html_options[:disabled] || disabled
+      [val, input_classes, resolved_disabled]
     end
 
     def render_field_wrapper(field, attr_name)
       content_tag(:div, class: inline ? 'inline-field' : 'field-wrapper') do
         content = []
-        content << field
+        if disabled && attr_name.present?
+          content << content_tag(:div, class: 'copy-field-wrapper', data: { controller: 'copy-to-clipboard' }) do
+            field_content = []
+            field_content << field
+            field_content << content_tag(:button, type: 'button', class: 'copy-field-btn', tabindex: -1,
+                                         data: { action: 'click->copy-to-clipboard#copy' }) do
+              content_tag(:i, '', class: 'bi bi-clipboard')
+            end
+            field_content.join.html_safe
+          end
+        else
+          content << field
+        end
         if resource.present? && attr_name.present?
           content << content_tag(:div, class: 'invalid-feedback') do
             resource.errors[attr_name].join(' ')
@@ -255,25 +371,53 @@ module FlexiAdmin::Components::Resource
                                                                          **html_options))
     end
 
-    def render_form_row(attr_name, field_html, label:, **html_options)
+    def render_form_row(attr_name, field_html, label:, required: false, **html_options)
       label ||= attr_name.to_s.humanize unless label == false
-
-      content_tag(:div, html_options.merge(class: 'form-row')) do
-        concat content_tag(:div, class: 'col-12 col-md-3') { label_tag(attr_name, label) } unless label == false
-        concat content_tag(:div, class: inline ? 'col-12 col-md-9 inline-field-wrapper' : 'col-12 col-md-9') {
-                field_html
-              }
+      @current_column_row_count += 1 if @inside_column
+
+      row_classes = ['form-row']
+      label_col = @label_col || 'col-md-3'
+      field_col = @field_col || 'col-md-9'
+
+      content_tag(:div, html_options.merge(class: row_classes.join(' '))) do
+        lbl = label
+        lbl += ' *' if required && !disabled
+
+        if @inside_column
+          concat content_tag(:div, class: 'col-12') { label_tag(attr_name, lbl) } unless label == false
+          concat content_tag(:div, class: inline ? 'col-12 inline-field-wrapper' : 'col-12') { field_html }
+        else
+          resolved_field_col = label == false ? 'col-md-12' : field_col
+          concat content_tag(:div, class: "col-12 #{label_col}") { label_tag(attr_name, lbl) } unless label == false
+          concat content_tag(:div, class: inline ? "col-12 #{resolved_field_col} inline-field-wrapper" : "col-12 #{resolved_field_col}") {
+                  field_html
+                }
+        end
       end
     end
 
     def render_custom_field(view_component_instance, label, html_options, _value)
-      content_tag(:div, html_options.merge(class: 'form-row')) do
-        unless label == false
-          concat content_tag(:div, class: 'col-12 col-md-3') {
-                  label_tag('autocomplete', label)
-                }
+      @current_column_row_count += 1 if @inside_column
+
+      row_classes = ['form-row']
+      label_col = @label_col || 'col-md-3'
+      field_col = @field_col || 'col-md-9'
+
+      content_tag(:div, html_options.merge(class: row_classes.join(' '))) do
+        if @inside_column
+          unless label == false
+            concat content_tag(:div, class: 'col-12') { label_tag('autocomplete', label) }
+          end
+          concat content_tag(:div, class: 'col-12') { render view_component_instance }
+        else
+          unless label == false
+            concat content_tag(:div, class: "col-12 #{label_col}") {
+                    label_tag('autocomplete', label)
+                  }
+          end
+          resolved_field_col = label == false ? 'col-md-12' : field_col
+          concat content_tag(:div, class: "col-12 #{resolved_field_col}") { render view_component_instance }
         end
-        concat content_tag(:div, class: 'col-12 col-md-9') { render view_component_instance }
       end
     end
 
@@ -284,4 +428,4 @@ module FlexiAdmin::Components::Resource
       data.merge!(validation_error: resource.errors[attr_name].join(' ')) if resource.errors.present?
     end
   end
-end
+end

data/lib/flexi_admin/components/resource/link_action_component.html.slim

@@ -1,8 +1,8 @@
 - if icon.present?
-  = link_to path, **options.merge(data: { turbo_frame: '_top' }, class: 'dropdown-item') do
+  = link_to path, **options.merge(data: { turbo_frame: '_top' }, class: "dropdown-item #{disabled ? 'disabled' : ''}") do
     i.bi.me-2 class=icon_class
     = label
   /a href="#{path}" data-turbo-frame="_top" class="dropdown-item"
 - else
-  = link_to label, path, **options.merge(data: { turbo_frame: '_top' }, class: 'dropdown-item')
+  = link_to label, path, **options.merge(data: { turbo_frame: '_top' }, class: "dropdown-item #{disabled ? 'disabled' : ''}")
   /a href="#{path}" data-turbo-frame="_top" class="dropdown-item" = label