avo 1.6.0 → 1.6.3.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e23dcd11fb8a2c14c28dbc870d0fdba61e3fc8b8d7dfab30951c99f09efca8e2
-  data.tar.gz: c7965d1d7e75025d3f385d404988374ad171d279737cd107cab55f94c40ed922
+  metadata.gz: 223442cb4814fbbdbac19b17f00ccfd5db95c1020137010e9393aa24898a7d35
+  data.tar.gz: fcec7fbe1391bd73ef39b8f8f58643a473c0c9c0349ddddfd0e737e3fcaa0f4f
 SHA512:
-  metadata.gz: f8ee298228beec756ad7b78fbc792c1c13e84a14e189c87376f6936d2371ade820b0b26fa4a8124ec9d821334954e3f4f568e70e2be51c1623d94ac5d84a4aaa
-  data.tar.gz: bcc4e5da23176fa624743f05a9d2c1b9736c91869b263239868156f940bd85bd72b6f5ef362503200a7b005cd2c203b65c3a584c0454360918a9d2b39f4cc3ef
+  metadata.gz: ed74295ce9b330ff686202d2ad75ec0120d32ccbc43437ea6eb1a81a365895fb7b43948d734221d0a71b8a987fd8670b0951020ad22107167760548c52a020d0
+  data.tar.gz: 2b826242331414096f2260d62fb25749456d9f7e2ccaa02a6a467d2de146e77224f462ea17dec59c492b9997fad36d5ffa1f036066859f5fea0f177c7e8a863e

data/Gemfile

@@ -30,7 +30,7 @@ gem "rails", "~> 6.0.2", ">= 6.0.2.2"
 # Use postgresql as the database for Active Record
 gem "pg", ">= 0.18", "< 2.0"
 # Use Puma as the app server
-gem "puma", "~> 4.3.5"
+gem "puma", "~> 5.3.1"
 # Use SCSS for stylesheets
 gem "sass-rails", ">= 6"
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.6.0)
+    avo (1.6.3.pre.3)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -184,10 +184,10 @@ GEM
     msgpack (1.4.2)
     multi_xml (0.6.0)
     nio4r (2.5.7)
-    nokogiri (1.11.3)
+    nokogiri (1.11.5)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    nokogiri (1.11.3-x86_64-linux)
+    nokogiri (1.11.5-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (3.13.0)
@@ -196,7 +196,7 @@ GEM
       ast (~> 2.4.1)
     pg (1.2.3)
     public_suffix (4.0.6)
-    puma (4.3.6)
+    puma (5.3.1)
       nio4r (~> 2.0)
     pundit (2.1.0)
       activesupport (>= 3.0.0)
@@ -333,7 +333,7 @@ GEM
       thread_safe (~> 0.1)
     unicode-display_width (2.0.0)
     unicode_utils (1.4.0)
-    view_component (2.28.0)
+    view_component (2.32.0)
       activesupport (>= 5.0.0, < 7.0)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -394,7 +394,7 @@ DEPENDENCIES
   manifester
   meta-tags
   pg (>= 0.18, < 2.0)
-  puma (~> 4.3.5)
+  puma (~> 5.3.1)
   pundit
   rails (~> 6.0.2, >= 6.0.2.2)
   rails-controller-testing

data/app/components/avo/edit/field_wrapper_component.html.erb

@@ -1,7 +1,7 @@
 <div class="flex items-center py-0 leading-tight <%= @classes %> min-h-16" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
   <div class="h-16 flex self-start items-center text-blue-gray-800">
     <div class="<% if @displayed_in_modal %> md:w-48 <% else %> md:w-64 <% end %> w-48 px-8 flex" data-slot="label">
-      <%= @form.label @field.id, @field.name %> <% if @field.required %> <span class="text-red-600">*</span> <% end %>
+      <%= @form.label @field.id, label %> <% if @field.required %> <span class="text-red-600">*</span> <% end %>
     </div>
   </div>
   <div class="flex-1 flex flex-row min-h-inherit">

data/app/components/avo/edit/field_wrapper_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Avo::Edit::FieldWrapperComponent < ViewComponent::Base
-  def initialize(field: nil, dash_if_blank: true, full_width: false, displayed_in_modal: false, form: nil, resource: {}, **args)
+  def initialize(field: nil, dash_if_blank: true, full_width: false, displayed_in_modal: false, form: nil, resource: {}, label: nil, **args)
     @field = field
     @dash_if_blank = dash_if_blank
     @classes = args[:class].present? ? args[:class] : ""
@@ -11,9 +11,14 @@ class Avo::Edit::FieldWrapperComponent < ViewComponent::Base
     @resource = resource
     @model = resource.present? ? resource.model : nil
     @full_width = full_width
+    @label = label
 
     if (@index != 0) || @displayed_in_modal
       @classes += " border-t"
     end
   end
+
+  def label
+    @label || @field.name
+  end
 end

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

@@ -1,18 +1,68 @@
-<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
-  <%= @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 @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.humanize, type.to_s] },
+        {
+          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#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
+      %>
+        <%= @form.hidden_field "#{@field.foreign_key}_type" %>
+      <% end %>
+    <% end %>
+    <% @field.types.each do |type| %>
+      <div class="hidden"
+        data-belongs-to-field-target="type"
+        data-type="<%= type %>"
+      >
+        <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal, label: type.to_s do %>
+          <%= @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>
+    <% end %>
+  </div>
+<% else %>
+  <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
+    <%= @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
     %>
-  <%
-    # 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.foreign_key %>
+    <% end %>
   <% end %>
 <% end %>

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

@@ -3,7 +3,7 @@
 class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
   def disabled
     return true if @field.readonly
-    return true if @field.target_resource.model_class.name == params[:via_resource_class]
+    return true if @field.target_resource.present? && @field.target_resource.model_class.name == params[:via_resource_class]
     return true if @field.id.to_s == params[:via_relation].to_s
 
     false

data/app/controllers/avo/application_controller.rb

@@ -52,11 +52,11 @@ module Avo
         if @license.lacks(:custom_tools) || @license.invalid?
           if Rails.env.development? || Rails.env.test?
             @custom_tools_alert_visible = true
+          elsif @license.lacks_with_trial(:custom_tools)
+            # Raise error in non-development environments.
+            raise Avo::LicenseInvalidError, "Your license is invalid or doesn't support custom tools."
           end
         end
-
-        # Raise error in non-development environments.
-        raise Avo::LicenseInvalidError, "Your license is invalid or doesn't support custom tools." if @license.lacks_with_trial(:custom_tools)
       end
     end
 
@@ -277,11 +277,11 @@ module Avo
     end
 
     def on_resources_path
-      request.original_url.match?(/.*\/#{Avo.configuration.namespace}\/resources\/.*/)
+      request.original_url.match?(/.*#{Avo.configuration.root_path}\/resources\/.*/)
     end
 
     def on_api_path
-      request.original_url.match?(/.*\/#{Avo.configuration.namespace}\/avo_api\/.*/)
+      request.original_url.match?(/.*#{Avo.configuration.root_path}\/avo_api\/.*/)
     end
   end
 end

data/app/controllers/avo/base_controller.rb

@@ -167,6 +167,14 @@ module Avo
 
     def permitted_params
       @resource.get_field_definitions.select(&:updatable).map(&:to_permitted_param)
+      # ppp = []
+
+      # @resource.get_field_definitions.select(&:updatable).each do |param|
+      #   ppp.push(*param.to_permitted_param)
+      # end
+      # # abort ppp.inspect
+      # puts [':ppp ->', ppp].inspect
+      # ppp
     end
 
     def cast_nullable(params)

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

@@ -0,0 +1,65 @@
+import { Controller } from 'stimulus'
+
+export default class extends Controller {
+  static targets = ['select', 'type']
+
+  get selectedType() {
+    return this.selectTarget.value
+  }
+
+  connect() {
+    this.setValidNames()
+    this.changedType()
+  }
+
+  setValidNames() {
+    this.typeTargets.forEach((target) => {
+      const { type } = target.dataset
+      const select = target.querySelector('select')
+      const name = select.getAttribute('name')
+
+      select.setAttribute('valid-name', name)
+      if (this.selectedType !== type) {
+        select.selectedIndex = 0
+      }
+    })
+  }
+
+  changedType() {
+    this.hideAllTypeTargets()
+    this.enableType(this.selectTarget.value)
+  }
+
+  hideAllTypeTargets() {
+    this.typeTargets.forEach((target) => {
+      this.hideTarget(target)
+      this.invalidateTarget(target)
+    })
+  }
+
+  hideTarget(target) {
+    target.classList.add('hidden')
+  }
+
+  invalidateTarget(target) {
+    const select = target.querySelector('select')
+
+    select.setAttribute('name', '')
+  }
+
+  validateTarget(target) {
+    const select = target.querySelector('select')
+    const validName = select.getAttribute('valid-name')
+
+    select.setAttribute('name', validName)
+  }
+
+  enableType(type) {
+    const target = this.typeTargets.find((typeTarget) => typeTarget.dataset.type === type)
+
+    if (target) {
+      target.classList.remove('hidden')
+      this.validateTarget(target)
+    }
+  }
+}

data/db/factories.rb

@@ -40,4 +40,8 @@ FactoryBot.define do
     meta { [{foo: "bar", hey: "hi"}, {bar: "baz"}, {hoho: "hohoho"}].sample }
     progress { Faker::Number.between(from: 0, to: 100) }
   end
+
+  factory :comment do
+    body { Faker::Lorem.paragraphs(number: rand(4...10)).join("\n") }
+  end
 end

data/lib/avo/base_resource.rb

@@ -87,20 +87,31 @@ module Avo
     end
 
     def get_fields(panel: nil, reflection: nil)
-      fields = get_field_definitions.select do |field|
-        field.send("show_on_#{@view}")
-      end
+      fields = get_field_definitions
+        .select do |field|
+          field.send("show_on_#{@view}")
+        end
         .select do |field|
-                 field.visible?
-               end
+          field.visible?
+        end
         .select do |field|
-        unless field.respond_to?(:foreign_key) &&
-            reflection.present? &&
-            reflection.respond_to?(:foreign_key) &&
-            reflection.foreign_key == field.foreign_key
+          # Strip out the reflection field in index queries with a parent association.
+          if reflection.present? &&
+              reflection.options.present? &&
+              field.respond_to?(:polymorphic_as) &&
+              field.polymorphic_as.to_s == reflection.options[:as].to_s
+            next
+          end
+          # if !field.respond_to?(:polymorphic_as) &&
+          #     field.respond_to?(:foreign_key) &&
+          #     reflection.present? &&
+          #     reflection.respond_to?(:foreign_key) &&
+          #     reflection.foreign_key != field.foreign_key
+          #   next
+          # end
+
           true
         end
-      end
 
       if panel.present?
         fields = fields.select do |field|
@@ -250,14 +261,17 @@ module Avo
         .reject do |field|
           field.computed
         end
-        .map { |field| [field.database_id(model).to_s, field] }.to_h
+        .map do |field|
+          [field.database_id(model).to_s, field]
+        end
+        .to_h
 
       params.each do |key, value|
         field = fields_by_database_id[key]
 
         next unless field.present?
 
-        model = field.fill_field model, key, value
+        model = field.fill_field model, key, value, params
       end
 
       model
@@ -295,19 +309,22 @@ module Avo
 
     # We will not overwrite any attributes that come pre-filled in the model.
     def hydrate_model_with_default_values
-      default_values = get_fields.select do |field|
-        !field.computed
-      end
+      default_values = get_fields
+        .select do |field|
+          !field.computed
+        end
         .map do |field|
           id = field.id
           value = field.value
 
-          if field.respond_to? :foreign_key
+          if field.type == "belongs_to"
             id = field.foreign_key.to_sym
 
             reflection = @model._reflections[@params[:via_relation]]
 
-            if reflection.present? && reflection.foreign_key.present? && field.id.to_s == @params[:via_relation].to_s
+            if field.polymorphic_as.present? && field.types.map(&:to_s).include?(@params["via_relation_class"])
+              value = @params["via_relation_class"].safe_constantize.find(@params[:via_resource_id])
+            elsif reflection.present? && reflection.foreign_key.present? && field.id.to_s == @params[:via_relation].to_s
               value = @params[:via_resource_id]
             end
           end
@@ -316,8 +333,8 @@ module Avo
         end
         .to_h
         .select do |id, value|
-        value.present?
-      end
+          value.present?
+        end
 
       default_values.each do |id, value|
         if @model.send(id).nil?

data/lib/avo/configuration.rb

@@ -1,6 +1,6 @@
 module Avo
   class Configuration
-    attr_accessor :root_path
+    attr_writer :root_path
     attr_accessor :app_name
     attr_accessor :timezone
     attr_accessor :per_page
@@ -93,6 +93,12 @@ module Avo
     def namespace
       root_path.delete "/"
     end
+
+    def root_path
+      return "" if @root_path === "/"
+
+      @root_path
+    end
   end
 
   def self.configuration

data/lib/avo/fields/base_field.rb

@@ -91,9 +91,11 @@ module Avo
         end
       end
 
-      def value
+      def value(property = nil)
+        property ||= id
+
         # Get model value
-        final_value = @model.send(id) if (model_or_class(@model) == "model") && @model.respond_to?(id)
+        final_value = @model.send(property) if (model_or_class(@model) == "model") && @model.respond_to?(property)
 
         if (@view === :new) || @action.present?
           final_value = if default.present? && default.respond_to?(:call)
@@ -114,7 +116,7 @@ module Avo
         final_value
       end
 
-      def fill_field(model, key, value)
+      def fill_field(model, key, value, params)
         return model unless model.methods.include? key.to_sym
 
         model.send("#{key}=", value)