avo 2.5.2.pre.6 → 2.6.1.pre.1

data/app/assets/stylesheets/avo.css

@@ -4,6 +4,7 @@
 @import './../../../node_modules/trix/dist/trix.css';
 @import './../../../node_modules/flatpickr/dist/flatpickr.css';
 @import './../../../node_modules/@algolia/autocomplete-theme-classic/dist/theme.css';
+@import './../../../node_modules/@yaireo/tagify/dist/tagify.css';
 
 @import 'tailwindcss/base';
 
@@ -17,6 +18,7 @@
 @import './css/search.css';
 @import './css/active-storage.css';
 @import './css/spinner.css';
+@import './css/tags.css';
 
 @import './css/components/status.css';
 @import './css/components/code.css';

data/app/assets/stylesheets/css/tags.css

@@ -0,0 +1,16 @@
+tags.tagify {
+  --tag-inset-shadow-size: 3em;
+}
+
+tags.tagify {
+  @apply !p-0;
+
+  span.tagify__input {
+    @apply my-1;
+  }
+}
+
+tag.tagify__tag {
+  @apply text-sm my-1 mb-0;
+}
+

data/app/components/avo/actions_component.html.erb

@@ -35,7 +35,7 @@
             'actions-picker-target': action.standalone ? 'standaloneAction' : 'resourceAction',
             'disabled': disabled,
           },
-          class: "flex items-center px-4 py-4 w-full font-medium #{disabled ? 'text-gray-500' : 'text-black hover:bg-blue-500 hover:text-white'}" do %>
+          class: "flex items-center px-4 py-3 w-full font-semibold text-sm #{disabled ? 'text-gray-500' : 'text-black hover:bg-blue-500 hover:text-white'}" do %>
           <%= svg 'play', class: 'h-5 mr-1 inline' %> <%= action.action_name %>
         <% end %>
       <% end %>

data/app/components/avo/button_component.rb

@@ -44,8 +44,8 @@ class Avo::ButtonComponent < ViewComponent::Base
 
     classes += style_classes
 
-    classes += padding_classes
-    classes += spacing_classes
+    classes += horizontal_padding_classes
+    classes += vertical_padding_classes
     classes += text_size_classes
 
     classes
@@ -101,7 +101,7 @@ class Avo::ButtonComponent < ViewComponent::Base
 
   private
 
-  def spacing_classes
+  def vertical_padding_classes
     case @size.to_sym
     when :xs
       " py-0"
@@ -118,7 +118,7 @@ class Avo::ButtonComponent < ViewComponent::Base
     end
   end
 
-  def padding_classes
+  def horizontal_padding_classes
     return " px-1" if @compact
 
     case @size.to_sym
@@ -164,19 +164,13 @@ class Avo::ButtonComponent < ViewComponent::Base
 
     case @size
     when :xs
-      icon_classes += " h-4"
-      # When icon is solo we need to add an offset
-      icon_classes += " my-1" if content.blank?
+      icon_classes += " h-4 my-1"
     when :sm
-      icon_classes += " h-4"
-      # When icon is solo we need to add an offset
-      icon_classes += " my-1" if content.blank?
+      icon_classes += " h-4 my-1"
     when :md
-      icon_classes += " h-4 my-1.5"
-      # When icon is solo we need to add an offset
-      icon_classes += " my-0.5" if content.blank?
+      icon_classes += " h-4 my-1"
     when :lg
-      icon_classes += " h-5 my-2"
+      icon_classes += " h-5 my-0.5"
     when :xl
       icon_classes += " h-6"
     end

data/app/components/avo/card_component.rb

@@ -3,9 +3,21 @@
 class Avo::CardComponent < ViewComponent::Base
   def initialize(card: nil)
     @card = card
+
+    init_card
   end
 
   def render?
     !@card.nil?
   end
+
+  # Initializing the card byt running the query method.
+  # We'll still keep the query block around for compatibility reasons.
+  def init_card
+    if @card.respond_to? :query
+      @card.query
+    elsif @card.query_block.present?
+      @card.compute_result
+    end
+  end
 end

data/app/components/avo/fields/belongs_to_field/autocomplete_component.html.erb

@@ -7,6 +7,8 @@
     data-via-association-id="<%= @field.id %>"
     data-via-reflection-id="<%= @field.model.id %>"
     data-via-reflection-class="<%= @field.model.class.to_s %>"
+    data-via-parent-resource-id="<%= params[:via_resource_id] %>"
+    data-via-parent-resource-class="<%= params[:via_relation_class] %>"
   ></div>
   <div class="relative w-full" autocomplete="off">
     <%= @form.text_field @foreign_key,

data/app/components/avo/fields/concerns/item_labels.rb

@@ -0,0 +1,40 @@
+module Avo
+  module Fields
+    module Concerns
+      module ItemLabels
+        extend ActiveSupport::Concern
+
+        def value_for_item(item)
+          if @field.acts_as_taggable_on.present?
+            item["value"]
+          else
+            item
+          end
+        end
+
+        def label_from_item(item)
+          value = value_for_item item
+
+          if suggestions_are_a_hash?
+            return suggestions_by_id[value.to_s][:label] if suggestions_by_id[value.to_s].present?
+          end
+          value
+        end
+
+        def suggestions_by_id
+          return {} unless suggestions_are_a_hash?
+
+          @field.suggestions.map do |suggestion|
+            [suggestion[:value].to_s, suggestion]
+          end.to_h
+        end
+
+        def suggestions_are_a_hash?
+          return false if @field.suggestions.blank?
+
+          @field.suggestions.first.is_a? Hash
+        end
+      end
+    end
+  end
+end

data/app/components/avo/fields/tags_field/edit_component.html.erb

@@ -0,0 +1,27 @@
+<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
+  <div data-controller="tags-field">
+    <%# dummy field %>
+    <%= text_field_tag "#{@field.id}-dummy", '',
+      class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
+      placeholder: @field.placeholder,
+      disabled: @field.readonly,
+      value: '',
+      data: {
+        'tags-field-target': 'fakeInput',
+      } %>
+    <%# real field %>
+    <%= @form.text_field @field.id,
+      class: helpers.input_classes('hidden w-full', has_error: @field.model_errors.include?(@field.id)),
+      placeholder: @field.placeholder,
+      disabled: @field.readonly,
+      value: @field.field_value.to_json,
+      data: {
+        'tags-field-target': 'input',
+        'whitelist-items': @field.suggestions.to_json,
+        'disallowed-items': @field.disallowed.to_json,
+        'enforce-suggestions': @field.enforce_suggestions ? 1 : 0,
+        'delimiters': @field.delimiters,
+        'close-on-select': @field.close_on_select ? 1 : 0,
+      } %>
+  </div>
+<% end %>

data/app/components/avo/fields/tags_field/edit_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TagsField::EditComponent < Avo::Fields::EditComponent
+end

data/app/components/avo/fields/tags_field/index_component.html.erb

@@ -0,0 +1,10 @@
+<%= index_field_wrapper field: @field do %>
+  <div class="flex gap-1 items-center flex-nowrap">
+    <% value.take(3).each do |item| %>
+      <%= render Avo::Fields::TagsField::TagComponent.new(label: label_from_item(item)) %>
+    <% end %>
+    <% if value.count > 3 %>
+      <%= render Avo::Fields::TagsField::TagComponent.new(label: '...', title: I18n.t('avo.x_items_more', count: value.count - 3)) %>
+    <% end %>
+  </div>
+<% end %>

data/app/components/avo/fields/tags_field/index_component.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TagsField::IndexComponent < Avo::Fields::IndexComponent
+  include Avo::Fields::Concerns::ItemLabels
+
+  def value
+    @field.field_value
+  end
+end

data/app/components/avo/fields/tags_field/show_component.html.erb

@@ -0,0 +1,7 @@
+<%= show_field_wrapper field: @field, index: @index do %>
+  <div class="flex gap-1 items-center flex-wrap">
+    <% @field.field_value.each do |item| %>
+      <%= render Avo::Fields::TagsField::TagComponent.new(label: label_from_item(item)) %>
+    <% end %>
+  </div>
+<% end %>

data/app/components/avo/fields/tags_field/show_component.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# require_relative 'item_labels'
+
+class Avo::Fields::TagsField::ShowComponent < Avo::Fields::ShowComponent
+  include Avo::Fields::Concerns::ItemLabels
+end

data/app/components/avo/fields/tags_field/tag_component.html.erb

@@ -0,0 +1,9 @@
+<div class="flex px-2 py-1 rounded bg-gray-100 text-sm text-gray-800 font-normal flex-shrink-0"
+  <% if title.present? %>
+    data-tippy="tooltip"
+    title="<%= title %>"
+  <% end %>
+  data-target="tag-component"
+>
+  <%= label %>
+</div>

data/app/components/avo/fields/tags_field/tag_component.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TagsField::TagComponent < ViewComponent::Base
+  attr_reader :label
+  attr_reader :title
+
+  def initialize(label: nil, title: nil)
+    @label = label
+    @title = title
+  end
+end

data/app/components/avo/index/resource_table_component.html.erb

@@ -1,5 +1,5 @@
 <div class="w-full ">
-  <table class="w-full px-4 bg-white rounded" data-resource-name='<%= @resource.model_key %>' data-controller='item-select-all'>
+  <table class="w-full px-4 bg-white" data-resource-name='<%= @resource.model_key %>' data-controller='item-select-all'>
     <%= render partial: 'avo/partials/table_header', locals: {fields: @resource.get_fields(reflection: @reflection)} %>
     <tbody class="divide-y">
       <% @resources.each_with_index do |resource, index| %>

data/app/components/avo/paginator_component.html.erb

@@ -25,9 +25,9 @@
           </div>
           <% per_page_options.each do |option| %>
             <% if parent_model.present? %>
-              <%= link_to "Change to #{option} items per page", helpers.related_resources_path(parent_model, parent_model, per_page: option, keep_query_params: true), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
+              <%= link_to "Change to #{option} items per page", helpers.related_resources_path(parent_model, parent_model, per_page: option, keep_query_params: true, page: 1), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
             <% else %>
-              <%= link_to "Change to #{option} items per page", helpers.resources_path(resource: resource, per_page: option, keep_query_params: true), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
+              <%= link_to "Change to #{option} items per page", helpers.resources_path(resource: resource, per_page: option, keep_query_params: true, page: 1), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
             <% end %>
           <% end %>
         </div>

data/app/components/avo/sidebar_component.html.erb

@@ -1,5 +1,5 @@
 <div
-  class="fixed z-[60] t-0 application-sidebar hidden lg:flex flex-1 border-r lg:border-none bg-none min-w-[16rem] h-[calc(100vh-4rem)] bg-gray-25 lg:bg-transparent <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %>"
+  class="fixed z-[60] t-0 application-sidebar w-64 hidden lg:flex flex-1 border-r lg:border-none bg-none h-[calc(100vh-4rem)] bg-gray-25 lg:bg-transparent <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %>"
   data-mobile-target="sidebar"
 >
   <div class="flex flex-col w-full h-full">

data/app/components/avo/sidebar_profile_component.html.erb

@@ -1,4 +1,4 @@
-<div class="text-black Xborder-t border-gray-200 p-4 flex">
+<div class="text-black border-gray-200 p-4 flex">
   <div class="flex-1 flex space-x-4">
     <% if avatar.present? %>
       <div class="relative aspect-square w-10 h-10 overflow-hidden rounded">

data/app/controllers/avo/base_controller.rb

@@ -11,8 +11,6 @@ module Avo
     before_action :set_edit_title_and_breadcrumbs, only: [:edit, :update]
     before_action :fill_model, only: [:create, :update]
     before_action :authorize_action
-    # before_action :reset_pagination_if_filters_changed, only: :index
-    # before_action :cache_applied_filters, only: :index
 
     def index
       @page_title = @resource.plural_name.humanize
@@ -360,23 +358,6 @@ module Avo
       filter_defaults.merge(@applied_filters)
     end
 
-    # Caching these so we know when the filters have changed so we reset the pagination
-    # def cache_applied_filters
-    #   # puts ["Rails.session->", session].inspect
-    #   session[:avo_applied_filters] = params[:filters]
-    #   # ::Avo::App.cache_store.delete(applied_filters_cache_key) if params[:filters].nil?
-
-    #   # ::Avo::App.cache_store.write(applied_filters_cache_key, params[:filters], expires_in: 1.day)
-    # end
-
-    # def reset_pagination_if_filters_changed
-    #   params[:page] = 1 if params[:filters] != session[:avo_applied_filters]
-    # end
-
-    # def applied_filters_cache_key
-    #   "avo.base_controller.#{@resource.model_key}.applied_filters"
-    # end
-
     def set_edit_title_and_breadcrumbs
       @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
       @page_title = @resource.default_panel_name.to_s

data/app/controllers/avo/search_controller.rb

@@ -47,16 +47,23 @@ module Avo
       query = resource.search_query.call(params: params).limit(8)
 
       # Figure oute if this is a belongs_to search
-      if params[:via_reflection_class].present? && params[:via_reflection_id].present?
+      if params[:via_reflection_class].present?
         # Fetch the field
         field = belongs_to_field
 
         if field.attach_scope.present?
-          # Fetch the parent
-          parent = params[:via_reflection_class].safe_constantize.find params[:via_reflection_id]
+          # Try to fetch the parent.
+          if params[:via_reflection_id].present?
+            parent = params[:via_reflection_class].safe_constantize.find params[:via_reflection_id]
+          end
+
+          # Try to fetch the grandparent for the new views where the parent is nil.
+          if params[:via_parent_resource_id].present? && params[:via_parent_resource_class].present?
+            grandparent = params[:via_parent_resource_class].safe_constantize.find params[:via_parent_resource_id]
+          end
 
           # Add to the query
-          query = Avo::Hosts::AssociationScopeHost.new(block: belongs_to_field.attach_scope, query: query, parent: parent).handle
+          query = Avo::Hosts::AssociationScopeHost.new(block: belongs_to_field.attach_scope, query: query, parent: parent, grandparent: grandparent).handle
         end
       end
 

data/app/javascript/js/application.js

@@ -4,7 +4,7 @@ import { Application } from '@hotwired/stimulus'
 const application = Application.start()
 
 // Configure Stimulus development experience
-application.debug = false
+application.debug = window?.localStorage.getItem('avo.debug')
 window.Stimulus = application
 
 // Register stimulus-components controller

data/app/javascript/js/controllers/base_controller.js

@@ -0,0 +1,22 @@
+import { Controller } from '@hotwired/stimulus'
+
+export default class extends Controller {
+  /**
+  * Helper that parses the data attribute value to JSON
+  */
+  getJsonAttribute(target, attribute, defaultValue = []) {
+    let result = defaultValue
+    try {
+      result = JSON.parse(target.getAttribute(attribute))
+    } catch (error) {}
+
+    return result
+  }
+
+  /**
+  * Parses the attribute to boolean
+  */
+  getBooleanAttribute(target, attribute) {
+    return target.getAttribute(attribute) === '1'
+  }
+}

data/app/javascript/js/controllers/fields/tags_field_controller.js

@@ -0,0 +1,86 @@
+import { first, isObject, merge } from 'lodash'
+import Tagify from '@yaireo/tagify'
+
+import BaseController from '../base_controller'
+
+import { suggestionItemTemplate, tagTemplate } from './tags_field_helpers'
+
+export default class extends BaseController {
+  static targets = ['input', 'fakeInput'];
+
+  tagify = null;
+
+  get whitelistItems() {
+    return this.getJsonAttribute(this.inputTarget, 'data-whitelist-items', [])
+  }
+
+  get disallowedItems() {
+    return this.getJsonAttribute(this.inputTarget, 'data-disallowed-items', [])
+  }
+
+  get enforceSuggestions() {
+    return this.getBooleanAttribute(this.inputTarget, 'data-enforce-suggestions')
+  }
+
+  get closeOnSelect() {
+    return this.getBooleanAttribute(this.inputTarget, 'data-close-on-select')
+  }
+
+  get delimiters() {
+    return this.getJsonAttribute(this.inputTarget, 'data-delimiters', [])
+  }
+
+  get suggestionsAreObjects() {
+    return isObject(first(this.whitelistItems))
+  }
+
+  get tagifyOptions() {
+    let options = {
+      whitelist: this.whitelistItems,
+      blacklist: this.disallowedItems,
+      enforceWhitelist: this.enforceSuggestions,
+      delimiters: this.delimiters.join('|'),
+      maxTags: 10,
+      dropdown: {
+        maxItems: 20,
+        enabled: 0,
+        closeOnSelect: this.closeOnSelect,
+      },
+    }
+
+    if (this.suggestionsAreObjects) {
+      options = merge(options, {
+        tagTextProp: 'label',
+        dropdown: {
+          searchKeys: ['label'],
+        },
+        templates: {
+          tag: tagTemplate,
+          dropdownItem: suggestionItemTemplate,
+        },
+      })
+    }
+
+    return options
+  }
+
+  connect() {
+    if (this.hasInputTarget) {
+      this.hideFakeInput()
+      this.showRealInput()
+      this.initTagify()
+    }
+  }
+
+  initTagify() {
+    this.tagify = new Tagify(this.inputTarget, this.tagifyOptions)
+  }
+
+  hideFakeInput() {
+    this.fakeInputTarget.classList.add('hidden')
+  }
+
+  showRealInput() {
+    this.inputTarget.classList.remove('hidden')
+  }
+}

data/app/javascript/js/controllers/fields/tags_field_helpers.js

@@ -0,0 +1,47 @@
+export function tagTemplate(tagData) {
+  const suggestions = this.settings.whitelist || []
+
+  const possibleSuggestion = suggestions.find(
+    // eslint-disable-next-line eqeqeq
+    (item) => item.value == tagData.value,
+  )
+  const possibleLabel = possibleSuggestion
+    ? possibleSuggestion.label
+    : tagData.value
+
+  return `
+<tag title="${tagData.value}"
+  contenteditable='false'
+  spellcheck='false'
+  tabIndex="-1"
+  class="tagify__tag ${tagData.class ? tagData.class : ''}"
+  ${this.getAttributes(tagData)}
+>
+  <x title='' class='tagify__tag__removeBtn' role='button' aria-label='remove tag'></x>
+  <div>
+      <span class='tagify__tag-text'>${possibleLabel}</span>
+  </div>
+</tag>
+`
+}
+
+export function suggestionItemTemplate(tagData) {
+  return `
+<div ${this.getAttributes(tagData)}
+  class='tagify__dropdown__item flex items-center ${
+  tagData.class ? tagData.class : ''
+}'
+  tabindex="0"
+  role="option">
+  ${
+  tagData.avatar
+    ? `
+  <div class='rounded w-8 h-8 block mr-2'>
+      <img onerror="this.style.visibility='hidden'" class="w-full" src="${tagData.avatar}">
+  </div>`
+    : ''
+}
+  <span>${tagData.label}</span>
+</div>
+`
+}

data/app/javascript/js/controllers/search_controller.js

@@ -76,6 +76,10 @@ export default class extends Controller {
         via_reflection_class: this.dataset.viaReflectionClass,
         // eslint-disable-next-line camelcase
         via_reflection_id: this.dataset.viaReflectionId,
+        // eslint-disable-next-line camelcase
+        via_parent_resource_id: this.dataset.viaParentResourceId,
+        // eslint-disable-next-line camelcase
+        via_parent_resource_class: this.dataset.viaParentResourceClass,
       }
     }
 
@@ -193,7 +197,7 @@ export default class extends Controller {
       Mousetrap.bind(['command+k', 'ctrl+k'], () => this.showSearchPanel())
     }
 
-    autocomplete({
+    const { destroy } = autocomplete({
       container: this.autocompleteTarget,
       placeholder: this.translationKeys.placeholder,
       translations: {
@@ -216,6 +220,8 @@ export default class extends Controller {
       },
     })
 
+    document.addEventListener('turbo:before-render', destroy)
+
     // When using search for belongs-to
     if (this.buttonTarget.dataset.shouldBeDisabled !== 'true') {
       this.buttonTarget.removeAttribute('disabled')

data/app/javascript/js/controllers.js

@@ -24,6 +24,7 @@ import SearchController from './controllers/search_controller'
 import SelectController from './controllers/select_controller'
 import SelectFilterController from './controllers/select_filter_controller'
 import SimpleMdeController from './controllers/fields/simple_mde_controller'
+import TagsFieldController from './controllers/fields/tags_field_controller'
 import TextFilterController from './controllers/text_filter_controller'
 import TippyController from './controllers/tippy_controller'
 import TogglePanelController from './controllers/toggle_panel_controller'
@@ -48,6 +49,7 @@ application.register('per-page', PerPageController)
 application.register('search', SearchController)
 application.register('select', SelectController)
 application.register('select-filter', SelectFilterController)
+application.register('tags-field', TagsFieldController)
 application.register('text-filter', TextFilterController)
 application.register('tippy', TippyController)
 application.register('toggle-panel', TogglePanelController)

data/app/views/avo/dashboards/_chartkick_card.html.erb

@@ -1,3 +1,3 @@
 <div class="relative flex flex-col <%= @card.chartkick_classes %>">
-  <%= send(@card.chart_type, @card.compute_result.result_data, **@card.chartkick_options) %>
+  <%= send(@card.chart_type, @card.result_data, **@card.chartkick_options) %>
 </div>

data/app/views/avo/dashboards/_metric_card.html.erb

@@ -1,5 +1,5 @@
 <div class="flex mt-4 items-end">
   <span class="text-3xl"><%= @card.prefix %></span>
-  <span class="text-5xl"><%= @card.compute_result.result_data %></span>
+  <span class="text-5xl"><%= @card.result_data %></span>
   <span class="text-3xl"><%= @card.suffix %></span>
 </div>

data/app/views/avo/partials/_global_search.html.erb

@@ -1,4 +1,4 @@
-<div data-controller="search" class="relative flex global-search rounded border border-gray-200 sm:min-w-[16rem]" data-turbo-remove-before-cache>
+<div data-controller="search" class="relative flex global-search rounded border border-gray-200 sm:min-w-[16rem]">
   <div class="flex-1 text-gray-500"
     data-search-target="autocomplete"
     data-search-resource="global"

data/app/views/avo/partials/_navbar.html.erb

@@ -1,12 +1,12 @@
 <div
-  class="fixed bg-white p-2 w-full flex flex-shrink-0 items-center z-50 px-4 lg:px-4 border-b space-x-4 lg:space-x-0 min-h-[4rem] <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %>"
+  class="fixed bg-white p-2 w-full flex flex-shrink-0 items-center z-50 px-4 lg:px-4 border-b space-x-4 lg:space-x-0 h-16 <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %>"
   v-if="layout !== 'blank'"
 >
-  <div class="flex items-center space-x-2 lg:space-x-0 w-64">
+  <div class="flex items-center space-x-2 lg:space-x-0 w-32 sm:w-64 flex-shrink-0">
     <%= a_button class: 'lg:hidden', icon: 'menu', size: :xs, compact: true, style: :text, data: { action: 'click->mobile#toggleSidebar' } %>
     <%= render partial: "avo/partials/logo" %>
   </div>
-  <div class="flex-1 flex items-center justify-between lg:justify-start space-x-8 lg:pl-4">
+  <div class="flex-1 flex items-center justify-between lg:justify-start space-x-2 sm:space-x-8 lg:pl-4">
     <div class="flex">
       <%= render partial: "avo/partials/global_search" if ::Avo::App.license.has_with_trial(:global_search) && ::Avo.configuration.feature_enabled?(:global_search) %>
     </div>

data/app/views/avo/partials/_resource_search.html.erb

@@ -1,4 +1,4 @@
-<div data-controller="search" class="resource-search flex items-center h-full w-full" data-turbo-remove-before-cache>
+<div data-controller="search" class="resource-search flex items-center h-full w-full">
   <div class="w-full"
     data-search-target="autocomplete"
     data-search-resource="<%= resource %>"

data/db/factories.rb

@@ -25,6 +25,7 @@ FactoryBot.define do
         Time.now - rand(10...365).days
       end
     end
+    tag_list { ["1", "2", "five", "seven"].shuffle }
     status { ::Post.statuses.keys.sample }
   end
 
@@ -64,6 +65,7 @@ FactoryBot.define do
 
   factory :course do
     name { Faker::Educator.unique.course_name }
+    skills { [Faker::Educator.subject, Faker::Educator.subject, Faker::Educator.subject, Faker::Educator.subject, Faker::Educator.subject] }
     country { Course.countries.sample }
     city { Course.cities.stringify_keys[country].sample }
   end

data/lib/avo/base_resource.rb

@@ -136,6 +136,12 @@ module Avo
         end
       end
 
+      if Avo::App.license.lacks_with_trial(:advanced_fields)
+        fields = fields.reject do |field|
+          field.type == 'tags'
+        end
+      end
+
       fields
     end