avo 1.21.1.pre.1 → 1.22.1.pre.2

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

@@ -8,15 +8,22 @@
   <div class="relative w-full" autocomplete="off">
     <%= @form.text_field @field.foreign_key,
       value: field_label,
-      class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)), 'data-search-target': 'button clearValue',
+      class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
       placeholder: @field.placeholder,
+      'data-search-target': 'button clearValue',
+      # This instructs the search_controller if it should enable/disabled this field when the user switches polymorphic associations
+      # It should not enable the field if the record is being created through an association
+      'data-should-be-disabled': @disabled,
       disabled: true %>
-    <div class="absolute top-1/2 left-auto right-3 mr-px -mt-2 cursor-pointer hidden text-gray-500"
-      data-tippy="tooltip"
-      data-search-target="clearButton"
-      title="<%= I18n.translate 'avo.clear_value' %>"
-      data-action="click->search#clearValue"
-      ><%= helpers.svg 'x', class: 'h-4' %></div>
+    <% unless @disabled %>
+      <div class="absolute top-1/2 left-auto right-3 mr-px -mt-2 cursor-pointer hidden text-gray-500"
+        data-tippy="tooltip"
+        data-search-target="clearButton"
+        title="<%= I18n.translate 'avo.clear_value' %>"
+        data-action="click->search#clearValue"
+        ><%= helpers.svg 'x', class: 'h-4' %>
+      </div>
+    <% end %>
   </div>
   <%= @form.hidden_field @foreign_key, value: field_value, 'data-search-target': 'hiddenId clearValue' %>
 </div>

data/app/components/avo/fields/belongs_to_field/autocomplete_component.rb

@@ -1,33 +1,77 @@
 # frozen_string_literal: true
 
 class Avo::Fields::BelongsToField::AutocompleteComponent < ViewComponent::Base
-  def initialize(form:, field:, type: nil, model_key:, foreign_key:)
+  def initialize(form:, field:, model_key:, foreign_key:, disabled:, type: nil, resource: nil, polymorphic_record: nil)
     @form = form
     @field = field
     @type = type
     @model_key = model_key
     @foreign_key = foreign_key
+    @resource = resource
+    @disabled = disabled
+    @polymorphic_record = polymorphic_record
   end
 
   def field_label
-    if searchable?
-      @field.value&.class == @type ? @field.field_label : nil
-    else
-      @field.field_label
+    result = @field.field_label
+
+    # New records won't have the value (instantiated model) present but the polymorphic_type and polymorphic_id prefilled
+    if should_prefill?
+      result = @field.value&.class == @type ? @field.field_label : nil
     end
+
+    result
   end
 
   def field_value
-    if searchable?
-      @field.value&.class == @type ? @field.field_value : nil
-    else
-      @field.field_value
+    result = @field.field_value
+
+    # New records won't have the value (instantiated model) present but the polymorphic_type and polymorphic_id prefilled
+    if should_prefill?
+      result = @field.value&.class == @type ? @field.field_value : nil
     end
+
+    result
   end
 
   private
 
+  def should_prefill?
+    @field.is_polymorphic? && searchable? && !(new_record? && has_polymorphic_association?)
+  end
+
   def searchable?
-    @type.present?
+    @field.searchable
+  end
+
+  def new_record?
+    @resource.model.new_record?
+  end
+
+  def has_polymorphic_association?
+    polymorphic_class.present? && polymorphic_id.present?
+  end
+
+  # Get the polymorphic class
+  def polymorphic_class
+    @resource.model["#{@field.foreign_key}_type"]
+  end
+
+  # Get the polymorphic id
+  def polymorphic_id
+    @resource.model["#{@field.foreign_key}_id"]
+  end
+
+  # Get the resource for that polymorphic class
+  def polymorphic_resource
+    ::Avo::App.get_resource_by_model_name polymorphic_class
+  end
+
+  # Extract the needed fields to identify the record for polymorphic associations
+  def polymorphic_fields
+    {
+      id: polymorphic_resource.id,
+      label: polymorphic_resource.title
+    }
   end
 end

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

@@ -1,5 +1,5 @@
 <%
-  if @field.types.present? # It's a polymorphic association
+  if is_polymorphic?
 
   # Set the model keys so we can pass them over
   model_keys = @field.types.map do |type|
@@ -13,7 +13,7 @@
     data-association-class="<%= @field&.target_resource&.model_class || nil %>"
   >
   <%= 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] },
+    <%= @form.select @field.type_input_foreign_key, @field.types.map { |type| [type.to_s.underscore.humanize, type.to_s] },
       {
         value: @field.value,
         include_blank: @field.placeholder,
@@ -29,7 +29,7 @@
         # 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}_type" %>
+      <%= @form.hidden_field @field.type_input_foreign_key %>
     <% end %>
   <% end %>
   <% @field.types.each do |type| %>
@@ -39,10 +39,20 @@
       >
       <%= 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" %>
+          <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: @form,
+            field: @field,
+            type: type,
+            model_key: model_keys[type.to_s],
+            foreign_key: @field.id_input_foreign_key,
+            resource: @resource,
+            disabled: disabled,
+            polymorphic_record: polymorphic_record
+          %>
         <% else %>
-          <%= @form.select "#{@field.foreign_key}_id", options_for_select(@field.values_for_type(type), @field.value&.class == type ? @field.field_value : nil),
+          <%= @form.select @field.id_input_foreign_key,
+            options_for_select(@field.values_for_type(type), @resource.present? && @resource.model.present? ? @resource.model[@field.id_input_foreign_key] : nil),
             {
+              value: @resource.model[@field.id_input_foreign_key].to_s,
               include_blank: @field.placeholder,
             },
             {
@@ -50,6 +60,12 @@
               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.id_input_foreign_key %>
+            <% end %>
         <% end %>
       <% end %>
     </div>
@@ -58,11 +74,18 @@
 <% 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 %>
+      <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: @form,
+        field: @field,
+        model_key: @field.target_resource&.model_key,
+        foreign_key: @field.id_input_foreign_key,
+        resource: @resource,
+        disabled: disabled
+      %>
     <% else %>
-      <%= @form.select @field.foreign_key, @field.options.map { |o| [o[:label], o[:value]] },
+      <%= @form.select @field.id_input_foreign_key, @field.options,
         {
           include_blank: @field.placeholder,
+          value: @field.value
         },
         {
           class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
@@ -73,7 +96,7 @@
         # 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 %>
+        <%= @form.hidden_field @field.id_input_foreign_key %>
       <% end %>
     <% end %>
   <% end %>

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

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
 class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
+  def initialize(field: nil, resource: nil, index: 0, form: nil, displayed_in_modal: false)
+    super field: field, resource: resource, index: index, form: form, displayed_in_modal: displayed_in_modal
+
+    @polymorphic_record = nil
+  end
+
   def disabled
     return true if @field.readonly
     return true if @field.target_resource.present? && @field.target_resource.model_class.name == params[:via_resource_class]
@@ -8,4 +14,35 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
 
     false
   end
+
+  def is_polymorphic?
+    @field.types.present?
+  end
+
+  def has_polymorphic_association?
+    polymorphic_class.present? && polymorphic_id.present?
+  end
+
+  # Get the polymorphic class
+  def polymorphic_class
+    @resource.model["#{@field.foreign_key}_type"]
+  end
+
+  # Get the polymorphic id
+  def polymorphic_id
+    @resource.model["#{@field.foreign_key}_id"]
+  end
+
+  # Get the actual resource
+  def polymorphic_record
+    return unless has_polymorphic_association?
+
+    return unless is_polymorphic?
+
+    return @polymorphic_record if @polymorphic_record.present?
+
+    @polymorphic_record = polymorphic_class.safe_constantize.find polymorphic_id
+
+    @polymorphic_record
+  end
 end

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

@@ -1,6 +1,6 @@
 <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
   <%= @form.select @field.id, @field.options_for_select, { selected: @field.value, prompt: @field.placeholder }, {
-      class: helpers.input_classes(' w-full', has_error: @field.model_errors.include?(@field.id)),
-      disabled: @field.readonly,
-      value: @field.model.present? ? @field.model[@field.id] : @field.value } %>
+    class: helpers.input_classes(' w-full', has_error: @field.model_errors.include?(@field.id)),
+    disabled: @field.readonly,
+    value: @field.model.present? ? @field.model[@field.id] : @field.value } %>
 <% end %>

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

@@ -1,3 +1,3 @@
-<%= active_link_to @path, class: 'text-gray-800 py-2 px-4 block font-normal hover:bg-gray-100 rounded-md mb-1 mx-3 text-sm leading-none', active: @active do %>
+<%= active_link_to @path, class: 'text-gray-800 py-2 px-4 block font-normal hover:bg-gray-100 rounded-md mb-1 mx-3 text-sm leading-none', active: @active, target: @target do %>
   <div class="w-4"></div> <%= @label %>
 <% end %>

data/app/components/avo/navigation_link_component.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 class Avo::NavigationLinkComponent < ViewComponent::Base
-  def initialize(label: nil, path: nil, active: :inclusive, size: :md)
+  def initialize(label: nil, path: nil, active: :inclusive, size: :md, target: "_self")
     @label = label
     @path = path
     @active = active
     @size = size
+    @target = target
   end
 end

data/app/controllers/avo/application_controller.rb

@@ -1,6 +1,11 @@
 module Avo
   class ApplicationController < ::ActionController::Base
-    include Pundit
+    if defined?(Pundit::Authorization)
+      include Pundit::Authorization
+    else
+      include Pundit
+    end
+
     include Pagy::Backend
     include Avo::ApplicationHelper
     include Avo::UrlHelpers
@@ -111,7 +116,12 @@ module Avo
     end
 
     def fill_model
-      @model = @resource.fill_model(@model_to_fill, cast_nullable(model_params))
+      # 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?
+
+      unless is_attach_action
+        @model = @resource.fill_model(@model_to_fill, cast_nullable(model_params))
+      end
     end
 
     def hydrate_resource
@@ -187,18 +197,6 @@ 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
@@ -243,5 +241,9 @@ 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,6 +7,7 @@ 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
@@ -83,6 +84,7 @@ module Avo
     def new
       @model = @resource.model_class.new
       @resource = @resource.hydrate(model: @model, view: :new, user: _current_user)
+      # abort @model.course.inspect
 
       @page_title = @resource.default_panel_name
       add_breadcrumb resource_name.humanize, resources_path(resource: @resource)
@@ -112,7 +114,6 @@ 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,7 +167,6 @@ 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)
 
@@ -194,8 +194,6 @@ 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

@@ -37,10 +37,7 @@ module Avo
       query = @authorization.apply_policy @attachment_class
 
       @options = query.all.map do |model|
-        {
-          value: model.id,
-          label: model.send(@attachment_resource.class.title)
-        }
+        [model.send(@attachment_resource.class.title), model.id]
       end
     end
 

data/app/javascript/avo.js

@@ -59,6 +59,7 @@ document.addEventListener('turbo:before-fetch-response', (e) => {
 })
 document.addEventListener('turbo:visit', () => document.body.classList.add('turbo-loading'))
 document.addEventListener('turbo:submit-start', () => document.body.classList.add('turbo-loading'))
+document.addEventListener('turbo:submit-end', () => document.body.classList.remove('turbo-loading'))
 document.addEventListener('turbo:before-cache', () => {
   document.querySelectorAll('[data-turbo-remove-before-cache]').forEach((element) => element.remove())
 })

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

@@ -58,22 +58,16 @@ export default class extends Controller {
 
       if (this.isSearchable) {
         const textInput = target.querySelector('input[type="text"]')
-        if (textInput) {
-          textInput.setAttribute('valid-name', textInput.getAttribute('name'))
-        }
+        if (textInput) this.nameToValidName(textInput)
 
         const hiddenInput = target.querySelector('input[type="hidden"]')
-        if (hiddenInput) {
-          hiddenInput.setAttribute(
-            'valid-name',
-            hiddenInput.getAttribute('name'),
-          )
-        }
+        if (hiddenInput) this.nameToValidName(hiddenInput)
       } else {
         const select = target.querySelector('select')
-        if (select) {
-          select.setAttribute('valid-name', select.getAttribute('name'))
-        }
+        if (select) this.nameToValidName(select)
+
+        const hiddenInput = target.querySelector('input[type="hidden"]')
+        if (hiddenInput) this.nameToValidName(hiddenInput)
 
         if (this.selectedType !== type) {
           select.selectedIndex = 0
@@ -101,11 +95,16 @@ export default class extends Controller {
       const textInput = target.querySelector('input[type="text"]')
       const hiddenInput = target.querySelector('input[type="hidden"]')
 
-      textInput.setAttribute('name', textInput.getAttribute('valid-name'))
-      hiddenInput.setAttribute('name', hiddenInput.getAttribute('valid-name'))
+      this.validNameToName(textInput)
+      this.validNameToName(hiddenInput)
     } else {
       const select = target.querySelector('select')
-      select.setAttribute('name', select.getAttribute('valid-name'))
+      const hiddenInput = target.querySelector('input[type="hidden"]')
+      this.validNameToName(select)
+
+      if (hiddenInput) {
+        this.validNameToName(hiddenInput)
+      }
     }
   }
 
@@ -122,7 +121,16 @@ export default class extends Controller {
     } else if (target) {
       try {
         target.querySelector('select').setAttribute('name', '')
+        target.querySelector('input[type="hidden"]').setAttribute('name', '')
       } catch (error) {}
     }
   }
+
+  validNameToName(target) {
+    target.setAttribute('name', target.getAttribute('valid-name'))
+  }
+
+  nameToValidName(target) {
+    target.setAttribute('valid-name', target.getAttribute('name'))
+  }
 }

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

@@ -1,8 +1,14 @@
 import { Controller } from 'stimulus'
 import { DateTime } from 'luxon'
-import { castBoolean } from '../../helpers/cast_boolean'
 import flatpickr from 'flatpickr'
 
+import { castBoolean } from '../../helpers/cast_boolean'
+
+// Get the DateTime with the TZ offset applied.
+function universalTimestamp(timestampStr) {
+  return new Date(new Date(timestampStr).getTime() + (new Date(timestampStr).getTimezoneOffset() * 60 * 1000))
+}
+
 export default class extends Controller {
   static targets = ['input']
 
@@ -43,7 +49,9 @@ export default class extends Controller {
       // this.timezone = Intl.DateTimeFormat().resolvedOptions().timeZone
       options.appTimezone = this.inputTarget.dataset.timezone
     } else {
-      currentValue = new Date(this.inputTarget.value)
+      // Because the browser treats the date like a timestamp and updates it ot 00:00 hour, when on a western timezone the date will be converted with one day offset.
+      // Ex: 2022-01-30 will render as 2022-01-29 on an American timezone
+      currentValue = universalTimestamp(this.inputTarget.value)
     }
 
     options.defaultDate = currentValue

data/app/javascript/js/controllers/item_selector_controller.js

@@ -1,9 +1,9 @@
 import { Controller } from 'stimulus'
 
 export default class extends Controller {
-  static targets = ['panel']
+  static targets = ['panel'];
 
-  checkbox = {}
+  checkbox = {};
 
   get actionsPanelPresent() {
     return this.actionsButtonElement !== null
@@ -17,6 +17,12 @@ export default class extends Controller {
     }
   }
 
+  get actionLinks() {
+    return document.querySelectorAll(
+      '.js-actions-dropdown a[data-actions-picker-target="resourceAction"]',
+    )
+  }
+
   set currentIds(value) {
     this.stateHolderElement.dataset.selectedResources = JSON.stringify(value)
 
@@ -32,8 +38,12 @@ export default class extends Controller {
   connect() {
     this.resourceName = this.element.dataset.resourceName
     this.resourceId = this.element.dataset.resourceId
-    this.actionsButtonElement = document.querySelector(`[data-actions-dropdown-button="${this.resourceName}"]`)
-    this.stateHolderElement = document.querySelector(`[data-selected-resources-name="${this.resourceName}"]`)
+    this.actionsButtonElement = document.querySelector(
+      `[data-actions-dropdown-button="${this.resourceName}"]`,
+    )
+    this.stateHolderElement = document.querySelector(
+      `[data-selected-resources-name="${this.resourceName}"]`,
+    )
   }
 
   addToSelected() {
@@ -45,7 +55,9 @@ export default class extends Controller {
   }
 
   removeFromSelected() {
-    this.currentIds = this.currentIds.filter((item) => item.toString() !== this.resourceId)
+    this.currentIds = this.currentIds.filter(
+      (item) => item.toString() !== this.resourceId,
+    )
   }
 
   toggle(event) {
@@ -59,22 +71,20 @@ export default class extends Controller {
   }
 
   enableResourceActions() {
-    (document.querySelectorAll('.js-actions-dropdown a[data-actions-picker-target="resourceAction"]'))
-      .forEach((link) => {
-        link.classList.add('text-gray-700')
-        link.classList.remove('text-gray-500')
-        link.setAttribute('data-href', link.getAttribute('href'))
-        link.dataset.disabled = false
-      })
+    this.actionLinks.forEach((link) => {
+      link.classList.add('text-gray-700')
+      link.classList.remove('text-gray-500')
+      link.setAttribute('data-href', link.getAttribute('href'))
+      link.dataset.disabled = false
+    })
   }
 
   disableResourceActions() {
-    (document.querySelectorAll('.js-actions-dropdown a[data-actions-picker-target="resourceAction"]'))
-      .forEach((link) => {
-        link.classList.remove('text-gray-700')
-        link.classList.add('text-gray-500')
-        link.setAttribute('href', link.getAttribute('data-href'))
-        link.dataset.disabled = true
-      })
+    this.actionLinks.forEach((link) => {
+      link.classList.remove('text-gray-700')
+      link.classList.add('text-gray-500')
+      link.setAttribute('href', link.getAttribute('data-href'))
+      link.dataset.disabled = true
+    })
   }
 }

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

@@ -82,7 +82,9 @@ export default class extends Controller {
 
       document.querySelector('.aa-DetachedOverlay').remove()
 
-      this.clearButtonTarget.classList.remove('hidden')
+      if (this.hasClearButtonTarget) {
+        this.clearButtonTarget.classList.remove('hidden')
+      }
     } else {
       Turbo.visit(item._url, { action: 'advance' })
     }
@@ -157,7 +159,7 @@ export default class extends Controller {
     this.buttonTarget.onclick = () => this.showSearchPanel()
 
     this.clearValueTargets.forEach((target) => {
-      if (target.getAttribute('value')) {
+      if (target.getAttribute('value') && this.hasClearButtonTarget) {
         this.clearButtonTarget.classList.remove('hidden')
       }
     })
@@ -184,6 +186,9 @@ export default class extends Controller {
       },
     })
 
-    this.buttonTarget.removeAttribute('disabled')
+    // When using search for belongs-to
+    if (this.buttonTarget.dataset.shouldBeDisabled !== 'true') {
+      this.buttonTarget.removeAttribute('disabled')
+    }
   }
 }

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

@@ -1 +1,3 @@
-<%= image_tag '/avo-assets/logo.png', class: 'h-full', title: 'Avo' %>
+<%= link_to root_path, class: 'logo-placeholder h-16 bg-white p-2 flex justify-center' do %>
+  <%= image_tag '/avo-assets/logo.png', class: 'h-full', title: 'Avo' %>
+<% end %>

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

@@ -1,3 +1,9 @@
 <% if name.present? %><turbo-frame id="<%= name %>"><% end %>
-<%= yield %>
+  <%
+    # When rendering the frames the flashed content gets lost.
+    # By including the alerts partial, the stimulus will pick them up and display them to the user.
+  %>
+  <%= render partial: 'avo/partials/alerts' if flash.present? && name.present? %>
+
+  <%= yield %>
 <% if name.present? %></turbo-frame><% end %>

data/app/views/avo/relations/new.html.erb

@@ -11,7 +11,7 @@
 
       <div class="flex-1 flex items-center justify-center px-8 text-lg mt-8 mb-12">
         <div class="flex-1 flex flex-col items-center justify-center px-24 text-base">
-          <%= form.select :related_id, options_for_select(@options.map { |o| [o[:label], o[:value]] }, nil),
+          <%= form.select :related_id, options_for_select(@options, nil),
             {
               include_blank: t('avo.choose_an_option'),
             },

data/app/views/avo/sidebar/_sidebar.html.erb

@@ -1,8 +1,6 @@
 <div class="application-sidebar flex h-full bg-white text-white w-56 z-50 border-r border-gray-300">
   <div class="flex flex-col w-full">
-    <%= link_to root_path, class: 'logo-placeholder h-16 bg-white p-2 flex justify-center' do %>
-      <%= render partial: "avo/partials/logo" %>
-    <% end %>
+    <%= render partial: "avo/partials/logo" %>
 
     <div class="flex-1 flex flex-col justify-between">
       <div class="tools py-4">