avo 1.20.2.pre.2 → 1.21.0.pre.1

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

@@ -1,34 +1,22 @@
-<%
-  if @field.types.present? # It's a polymorphic association
-
-  # Set the model keys so we can pass them over
-  model_keys = @field.types.map do |type|
-    resource = Avo::App.get_resource_by_model_name(type.to_s)
-    [type.to_s, resource.model_key]
-  end.to_h
-%>
-  <div data-controller="belongs-to-field"
-    data-searchable="<%= @field.searchable %>"
-    data-association="<%= @field.id %>"
-    data-association-class="<%= @field&.target_resource&.model_class || nil %>"
-  >
+<% if @field.types.present? %>
+  <div data-controller="belongs-to-field">
     <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
       <%= @form.select "#{@field.foreign_key}_type", @field.types.map { |type| [type.to_s.underscore.humanize, type.to_s] },
         {
-          value: @field.value,
           include_blank: @field.placeholder,
         },
         {
           class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
           disabled: disabled,
           'data-belongs-to-field-target': "select",
-          'data-action': 'change->belongs-to-field#changeType'
+          'data-action': 'change->belongs-to-field#changedType'
         }
         %>
       <%
         # If the select field is disabled, no value will be sent. It's how HTML works.
         # Thus the extra hidden field to actually send the related id to the server.
-        if disabled %>
+        if disabled
+      %>
         <%= @form.hidden_field "#{@field.foreign_key}_type" %>
       <% end %>
     <% end %>
@@ -38,18 +26,21 @@
         data-type="<%= type %>"
       >
         <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal, label: type.to_s.underscore.humanize do %>
-          <% if @field.searchable %>
-            <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: @form, field: @field, type: type, model_key: model_keys[type.to_s], foreign_key: "#{@field.foreign_key}_id" %>
-          <% else %>
-            <%= @form.select "#{@field.foreign_key}_id", options_for_select(@field.values_for_type(type), @field.value&.class == type ? @field.field_value : nil),
-              {
-                include_blank: @field.placeholder,
-              },
-              {
-                class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
-                disabled: disabled
-              }
+          <%= @form.select "#{@field.foreign_key}_id", @field.values_for_type(type),
+            {
+              include_blank: @field.placeholder,
+            },
+            {
+              class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
+              disabled: disabled
+            }
             %>
+          <%
+            # If the select field is disabled, no value will be sent. It's how HTML works.
+            # Thus the extra hidden field to actually send the related id to the server.
+            if disabled
+          %>
+            <%= @form.hidden_field "#{@field.foreign_key}_id" %>
           <% end %>
         <% end %>
       </div>
@@ -57,18 +48,21 @@
   </div>
 <% else %>
   <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
-    <% if @field.searchable %>
-      <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: @form, field: @field, model_key: @field.target_resource&.model_key, foreign_key: @field.foreign_key %>
-    <% else %>
-      <%= @form.select @field.foreign_key, @field.options.map { |o| [o[:label], o[:value]] },
-        {
-          include_blank: @field.placeholder,
-        },
-        {
-          class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
-          disabled: disabled
-        }
+    <%= @form.select @field.foreign_key, @field.options.map { |o| [o[:label], o[:value]] },
+      {
+        include_blank: @field.placeholder,
+      },
+      {
+        class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
+        disabled: disabled
+      }
       %>
+    <%
+      # If the select field is disabled, no value will be sent. It's how HTML works.
+      # Thus the extra hidden field to actually send the related id to the server.
+      if disabled
+    %>
+      <%= @form.hidden_field @field.foreign_key %>
     <% end %>
   <% end %>
 <% end %>

data/app/components/avo/views/resource_index_component.html.erb

@@ -24,7 +24,7 @@
         data-selected-resources="[]"
       >
         <div class="flex items-center px-6 w-64">
-          <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.model_key} if @resource.search_query.present? %>
+          <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.model_class.model_name.plural} if @resource.search_query.present? %>
         </div>
         <div class="flex justify-end items-center px-6 space-x-3">
           <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: view_type, turbo_frame: @turbo_frame } if @models.present? %>

data/app/controllers/avo/application_controller.rb

@@ -111,13 +111,7 @@ module Avo
     end
 
     def fill_model
-      # We have to skip filling the the model if this is an attach action
-      is_attach_action = params[model_param_key].blank? && params[:related_name].present? && params[:fields].present?
-      # puts ['fill_model->', is_attach_action, model_param_key].inspect
-
-      unless is_attach_action
-        @model = @resource.fill_model(@model_to_fill, cast_nullable(model_params))
-      end
+      @model = @resource.fill_model(@model_to_fill, cast_nullable(model_params))
     end
 
     def hydrate_resource
@@ -193,6 +187,18 @@ module Avo
       query
     end
 
+    # def authorize_user
+    #   return if params[:controller] == 'avo/search'
+
+    #   model = record = resource.model
+
+    #   if ['show', 'edit', 'update'].include?(params[:action]) && params[:controller] == 'avo/resources'
+    #     record = resource
+    #   end
+
+    #   # AuthorizationService::authorize_action _current_user, record, params[:action] return render_unauthorized unless
+    # end
+
     def _authenticate!
       instance_eval(&Avo.configuration.authenticate)
     end
@@ -237,9 +243,5 @@ module Avo
     def on_api_path
       request.original_url.match?(/.*#{Avo::App.root_path}\/avo_api\/.*/)
     end
-
-    def model_param_key
-      @resource.form_scope
-    end
   end
 end

data/app/controllers/avo/base_controller.rb

@@ -7,7 +7,6 @@ module Avo
     before_action :hydrate_resource
     before_action :set_model, only: [:show, :edit, :destroy, :update]
     before_action :set_model_to_fill
-    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
@@ -113,6 +112,7 @@ module Avo
 
     def create
       # model gets instantiated and filled in the fill_model method
+      fill_model
       saved = @model.save
       @resource.hydrate(model: @model, view: :new, user: _current_user)
 
@@ -166,6 +166,7 @@ module Avo
 
     def update
       # model gets instantiated and filled in the fill_model method
+      fill_model
       saved = @model.save
       @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
 
@@ -193,6 +194,8 @@ module Avo
     private
 
     def model_params
+      model_param_key = @resource.form_scope
+
       request_params = params.require(model_param_key).permit(permitted_params)
 
       if @resource.devise_password_optional && request_params[:password].blank? && request_params[:password_confirmation].blank?

data/app/controllers/avo/relations_controller.rb

@@ -4,11 +4,11 @@ module Avo
   class RelationsController < BaseController
     before_action :set_model, only: [:show, :index, :new, :create, :destroy]
     before_action :set_related_resource_name
-    before_action :set_related_resource, only: [:show, :index, :new, :create, :destroy]
-    before_action :hydrate_related_resource, only: [:show, :index, :new, :create, :destroy]
+    before_action :set_related_resource
+    before_action :hydrate_related_resource
     before_action :set_related_model, only: [:show]
-    before_action :set_attachment_class, only: [:show, :index, :new, :create, :destroy]
-    before_action :set_attachment_resource, only: [:show, :index, :new, :create, :destroy]
+    before_action :set_attachment_class
+    before_action :set_attachment_resource
     before_action :set_attachment_model, only: [:create, :destroy]
     before_action :set_reflection, only: [:index, :show]
 

data/app/controllers/avo/search_controller.rb

@@ -60,6 +60,7 @@ module Avo
           _id: model.id,
           _label: resource.label,
           _url: resource.record_path,
+          model: model
         }
 
         if App.license.has_with_trial(:enhanced_search_results)

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

@@ -1,128 +1,65 @@
 import { Controller } from 'stimulus'
 
 export default class extends Controller {
-  static targets = ['select', 'type', 'loadAssociationLink'];
-
-  defaults = {};
+  static targets = ['select', 'type']
 
   get selectedType() {
     return this.selectTarget.value
   }
 
-  get isSearchable() {
-    return this.context.scope.element.dataset.searchable === 'true'
-  }
-
-  get association() {
-    return this.context.scope.element.dataset.association
+  connect() {
+    this.setValidNames()
+    this.changedType()
   }
 
-  get associationClass() {
-    return this.context.scope.element.dataset.associationClass
-  }
+  setValidNames() {
+    this.typeTargets.forEach((target) => {
+      const { type } = target.dataset
+      const select = target.querySelector('select')
+      const name = select.getAttribute('name')
 
-  connect() {
-    this.copyValidNames()
-    this.changeType() // Do the initial type change
+      select.setAttribute('valid-name', name)
+      if (this.selectedType !== type) {
+        select.selectedIndex = 0
+      }
+    })
   }
 
-  changeType() {
-    this.hideAllTypes()
-    this.showType(this.selectTarget.value)
+  changedType() {
+    this.hideAllTypeTargets()
+    this.enableType(this.selectTarget.value)
   }
 
-  // Private
-
-  hideAllTypes() {
+  hideAllTypeTargets() {
     this.typeTargets.forEach((target) => {
-      target.classList.add('hidden')
-
+      this.hideTarget(target)
       this.invalidateTarget(target)
     })
   }
 
-  /**
-   * Used for invalidating select fields when switching between types so they don't automatically override the previous id.
-   * Ex: There are two types Article and Project and the Comment has commentable_id 3 and commentable_type: Article
-   * When you change the type from Project to Article the Project field will override the commentable_id value
-   * because it was rendered later (alphabetical sorting) and the browser will pick that one up.
-   * So we go and copy the name attribute to valid-name for all types and then copy it back to name when the user selects it.
-   */
-
-  /**
-   * This method does the initial copying from name to valid-name.
-   */
-  copyValidNames() {
-    this.typeTargets.forEach((target) => {
-      const { type } = target.dataset
-
-      if (this.isSearchable) {
-        const textInput = target.querySelector('input[type="text"]')
-        if (textInput) {
-          textInput.setAttribute('valid-name', textInput.getAttribute('name'))
-        }
-
-        const hiddenInput = target.querySelector('input[type="hidden"]')
-        if (hiddenInput) {
-          hiddenInput.setAttribute(
-            'valid-name',
-            hiddenInput.getAttribute('name'),
-          )
-        }
-      } else {
-        const select = target.querySelector('select')
-        if (select) {
-          select.setAttribute('valid-name', select.getAttribute('name'))
-        }
-
-        if (this.selectedType !== type) {
-          select.selectedIndex = 0
-        }
-      }
-    })
+  hideTarget(target) {
+    target.classList.add('hidden')
   }
 
-  showType(type) {
-    const target = this.typeTargets.find(
-      (typeTarget) => typeTarget.dataset.type === type,
-    )
-    if (target) {
-      target.classList.remove('hidden')
+  invalidateTarget(target) {
+    const select = target.querySelector('select')
 
-      this.validateTarget(target)
-    }
+    select.setAttribute('name', '')
   }
 
-  /**
-   * Copy value from `valid-name` to `name`
-   */
   validateTarget(target) {
-    if (this.isSearchable) {
-      const textInput = target.querySelector('input[type="text"]')
-      const hiddenInput = target.querySelector('input[type="hidden"]')
+    const select = target.querySelector('select')
+    const validName = select.getAttribute('valid-name')
 
-      textInput.setAttribute('name', textInput.getAttribute('valid-name'))
-      hiddenInput.setAttribute('name', hiddenInput.getAttribute('valid-name'))
-    } else {
-      const select = target.querySelector('select')
-      select.setAttribute('name', select.getAttribute('valid-name'))
-    }
+    select.setAttribute('name', validName)
   }
 
-  /**
-   * nullify the `name` attribute
-   */
-  invalidateTarget(target) {
-    if (this.isSearchable) {
-      // Wrapping it in a try/catch to counter turbo's cache system (going back to the edit page after initial save)
-      try {
-        target.querySelector('input[type="text"]').setAttribute('name', '')
-        target.querySelector('input[type="hidden"]').setAttribute('name', '')
-      } catch {}
-    } else if (target) {
-      try {
-        target.querySelector('select').setAttribute('name', '')
-      } catch (error) {}
+  enableType(type) {
+    const target = this.typeTargets.find((typeTarget) => typeTarget.dataset.type === type)
+
+    if (target) {
+      target.classList.remove('hidden')
+      this.validateTarget(target)
     }
   }
 }

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

@@ -3,40 +3,17 @@ import * as Mousetrap from 'mousetrap'
 import { Controller } from 'stimulus'
 import { Turbo } from '@hotwired/turbo-rails'
 import { autocomplete } from '@algolia/autocomplete-js'
-import URI from 'urijs'
 import debouncePromise from '../helpers/debounce_promise'
 
-/**
- * The search controller is used in three places.
- * 1. Global search (on the top navbar) and can search through multiple resources.
- * 2. Resource search (on the Index page on top of the table panel) and will search one resource
- * 3. belongs_to field. This requires a bit more cleanup because the user will not navigate away from the page.
- * It will replace the id and label in some fields on the page and also needs a "clear" button which clears the information so the user can submit the form without a value.
- */
 export default class extends Controller {
-  static targets = [
-    'autocomplete',
-    'button',
-    'hiddenId',
-    'visibleLabel',
-    'clearValue',
-    'clearButton',
-  ];
-
-  debouncedFetch = debouncePromise(fetch, this.searchDebounce);
-
-  get dataset() {
-    return this.autocompleteTarget.dataset
-  }
+  static targets = ['autocomplete', 'button']
 
-  get searchDebounce() {
-    return window.Avo.configuration.search_debounce
-  }
+  debouncedFetch = debouncePromise(fetch, this.debounceTimeout)
 
   get translationKeys() {
     let keys
     try {
-      keys = JSON.parse(this.dataset.translationKeys)
+      keys = JSON.parse(this.autocompleteTarget.dataset.translationKeys)
     } catch (error) {
       keys = {}
     }
@@ -44,48 +21,20 @@ export default class extends Controller {
     return keys
   }
 
-  get isBelongsToSearch() {
-    return this.dataset.viaAssociation === 'belongs_to'
+  get debounceTimeout() {
+    return this.autocompleteTarget.dataset.debounceTimeout
   }
 
-  get isGlobalSearch() {
-    return this.dataset.searchResource === 'global'
+  get searchResource() {
+    return this.autocompleteTarget.dataset.searchResource
   }
 
-  searchUrl(query) {
-    const url = URI()
-
-    let params = { q: query }
-    let segments = [
-      window.Avo.configuration.root_path,
-      'avo_api',
-      this.dataset.searchResource,
-      'search',
-    ]
-
-    if (this.isGlobalSearch) {
-      segments = [window.Avo.configuration.root_path, 'avo_api', 'search']
-    }
-
-    if (this.isBelongsToSearch) {
-      // eslint-disable-next-line camelcase
-      params = { ...params, via_association: this.dataset.viaAssociation }
-    }
-
-    return url.segment(segments).search(params).toString()
+  get isGlobalSearch() {
+    return this.searchResource === 'global'
   }
 
-  handleOnSelect({ item }) {
-    if (this.isBelongsToSearch) {
-      this.hiddenIdTarget.setAttribute('value', item._id)
-      this.buttonTarget.setAttribute('value', item._label)
-
-      document.querySelector('.aa-DetachedOverlay').remove()
-
-      this.clearButtonTarget.classList.remove('hidden')
-    } else {
-      Turbo.visit(item._url, { action: 'advance' })
-    }
+  get searchUrl() {
+    return this.isGlobalSearch ? `${window.Avo.configuration.root_path}/avo_api/search` : `${window.Avo.configuration.root_path}/avo_api/${this.searchResource}/search`
   }
 
   addSource(resourceName, data) {
@@ -94,7 +43,9 @@ export default class extends Controller {
     return {
       sourceId: resourceName,
       getItems: () => data.results,
-      onSelect: that.handleOnSelect.bind(that),
+      onSelect({ item }) {
+        Turbo.visit(item._url, { action: 'replace' })
+      },
       templates: {
         header() {
           return `${data.header.toUpperCase()} ${data.help}`
@@ -133,10 +84,7 @@ export default class extends Controller {
           })
         },
         noResults() {
-          return that.translationKeys.no_item_found.replace(
-            '%{item}',
-            resourceName,
-          )
+          return that.translationKeys.no_item_found.replace('%{item}', resourceName)
         },
       },
     }
@@ -146,22 +94,11 @@ export default class extends Controller {
     this.autocompleteTarget.querySelector('button').click()
   }
 
-  clearValue() {
-    this.clearValueTargets.map((e) => e.setAttribute('value', ''))
-    this.clearButtonTarget.classList.add('hidden')
-  }
-
   connect() {
     const that = this
 
     this.buttonTarget.onclick = () => this.showSearchPanel()
 
-    this.clearValueTargets.forEach((target) => {
-      if (target.getAttribute('value')) {
-        this.clearButtonTarget.classList.remove('hidden')
-      }
-    })
-
     if (this.isGlobalSearch) {
       Mousetrap.bind(['command+k', 'ctrl+k'], () => this.showSearchPanel())
     }
@@ -175,15 +112,12 @@ export default class extends Controller {
       openOnFocus: true,
       detachedMediaQuery: '',
       getSources: ({ query }) => {
-        const endpoint = that.searchUrl(query)
+        const endpoint = `${that.searchUrl}?q=${query}`
 
-        return that
-          .debouncedFetch(endpoint)
+        return that.debouncedFetch(endpoint)
           .then((response) => response.json())
           .then((data) => Object.keys(data).map((resourceName) => that.addSource(resourceName, data[resourceName])))
       },
     })
-
-    this.buttonTarget.removeAttribute('disabled')
   }
 }

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

@@ -3,6 +3,7 @@
     data-search-target="autocomplete"
     data-search-resource="global"
     data-translation-keys='{"no_item_found": "<%= I18n.translate 'avo.no_item_found' %>", "placeholder": "<%= I18n.translate 'avo.search.placeholder' %>", "cancel_button": "<%= I18n.translate 'avo.search.cancel_button' %>"}'
+    data-debounce-timeout='<%= Avo.configuration.search_debounce %>'
   >
   </div>
   <div class="relative top-[-5px] inline-flex text-gray-400 text-sm leading-5 py-0.5 px-1.5 border border-gray-300 rounded-md cursor-pointer"

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

@@ -2,5 +2,4 @@
   window.Avo = window.Avo || { configuration: {} }
   Avo.configuration.timezone = '<%= Avo.configuration.timezone %>'
   Avo.configuration.root_path = '<%= Avo::App.root_path %>'
-  Avo.configuration.search_debounce = '<%= Avo.configuration.search_debounce %>'
 <% end %>

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

@@ -3,6 +3,7 @@
     data-search-target="autocomplete"
     data-search-resource="<%= resource %>"
     data-translation-keys='{"no_item_found": "<%= I18n.translate 'avo.no_item_found' %>"}'
+    data-debounce-timeout='<%= Avo.configuration.search_debounce %>'
   >
   </div>
   <div class="hidden relative inline-flex text-gray-400 text-sm border border-gray-300 rounded-full cursor-pointer" data-search-target="button"></div>

data/db/factories.rb

@@ -45,10 +45,6 @@ FactoryBot.define do
     body { Faker::Lorem.paragraphs(number: rand(4...10)).join("\n") }
   end
 
-  factory :review do
-    body { Faker::Lorem.paragraphs(number: rand(4...10)).join("\n") }
-  end
-
   factory :person do
     name { "#{Faker::Name.first_name} #{Faker::Name.last_name}" }
   end

data/lib/avo/fields/base_field.rb

@@ -136,7 +136,7 @@ module Avo
           end
         end
 
-        # Run computable callback block if present
+        # Run callback block if present
         if computable && block.present?
           final_value = instance_exec(@model, @resource, @view, self, &block)
         end

data/lib/avo/fields/belongs_to_field.rb

@@ -1,9 +1,10 @@
 module Avo
   module Fields
     class BelongsToField < BaseField
+      attr_reader :searchable
       attr_reader :polymorphic_as
       attr_reader :relation_method
-      attr_reader :types # for Polymorphic associations
+      attr_reader :types
 
       def initialize(id, **args, &block)
         args[:placeholder] ||= I18n.t("avo.choose_an_option")
@@ -16,28 +17,10 @@ module Avo
         @relation_method = name.to_s.parameterize.underscore
       end
 
-      def searchable
-        @searchable && ::Avo::App.license.has_with_trial(:searchable_belongs_to)
-      end
-
       def value
         super(polymorphic_as)
       end
 
-      # The value
-      def field_value
-        value.send(database_value)
-      rescue
-        nil
-      end
-
-      # What the user sees in the text field
-      def field_label
-        value.send(target_resource.class.title)
-      rescue
-        nil
-      end
-
       def options
         ::Avo::Services::AuthorizationService.apply_policy(user, target_resource.class.query_scope).all.map do |model|
           {

data/lib/avo/fields/files_field.rb

@@ -1,15 +1,14 @@
 module Avo
   module Fields
     class FilesField < BaseField
-      attr_accessor :is_audio
       attr_accessor :is_image
       attr_accessor :direct_upload
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        @is_audio = args[:is_audio].present? ? args[:is_audio] : false
         @is_image = args[:is_image].present? ? args[:is_image] : @is_avatar
+        @is_audio = args[:is_audio].present? ? args[:is_audio] : false
         @direct_upload = args[:direct_upload].present? ? args[:direct_upload] : false
       end
 

data/lib/avo/licensing/pro_license.rb

@@ -7,8 +7,7 @@ module Avo
           :custom_tools,
           :custom_fields,
           :global_search,
-          :enhanced_search_results,
-          :searchable_belongs_to,
+          :enhanced_search_results
         ]
       end
     end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.20.2.pre.2"
+  VERSION = "1.21.0.pre.1"
 end