avo 1.22.1 → 1.22.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '04783e6660bd1ebada3544318b2f48082e3e43eb4bc7ee3df2986a9951d04090'
-  data.tar.gz: 6e997ae6e0dbb4eaa7828b669b73efd811370c0cfb5213d405f15bdd41bb9240
+  metadata.gz: 472b0c4d748a2cc35c595170f3abd2c83e8ef62ea2f41ec15ba2fac1b4fba4eb
+  data.tar.gz: 28de6b788064fb476e80234f058e192dae5bc1866bb544c7db197a53adf801dd
 SHA512:
-  metadata.gz: d61380b2f4c216d4ff1bd4e3e2f882500ba5e09835712d0661e8a79afd505f4b308ab7f30b41fcd95750e061003ca79a25b826e94eb9d007ba786923ce18740c
-  data.tar.gz: 383afdfdc9eaaa92e00b6b91895a1b14ebff2d1655e3c605e39838e6640e9ff9f74eebef1f0322d2eedd402b11060b2b02d4d933a7823edbd7343f47e3a5cd35
+  metadata.gz: a89890b81a8d26b13f7ace5e3854b21b503bf7ae3e61c08e4ba0a52257b4644cb29f3c8a03789726aa9e4479b2a0c5f334163536198f8685f9df516539191467
+  data.tar.gz: 14402ad63c9918b69789dd0161124a06f74829f400138ff8cf972a36df7ac677b9d62319355b26f6a8da9db38c686d28728431a4d6c81ab3202e7df3c4779df3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.22.1)
+    avo (1.22.4)
       active_link_to
       addressable
       breadcrumbs_on_rails

data/app/components/avo/navigation_link_component.rb

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

data/app/controllers/avo/application_controller.rb

@@ -13,6 +13,7 @@ module Avo
     protect_from_forgery with: :exception
     before_action :init_app
     before_action :check_avo_license
+    before_action :set_locale
     before_action :set_authorization
     before_action :_authenticate!
     before_action :set_container_classes
@@ -245,5 +246,11 @@ module Avo
     def model_param_key
       @resource.form_scope
     end
+
+    def set_locale
+      I18n.locale = params[:locale] || I18n.default_locale
+
+      I18n.default_locale = I18n.locale
+    end
   end
 end

data/app/controllers/avo/base_controller.rb

@@ -84,7 +84,6 @@ 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)

data/app/javascript/js/application.js

@@ -1,4 +1,4 @@
-import { Application } from 'stimulus'
+import { Application } from '@hotwired/stimulus'
 
 const application = Application.start()
 

data/app/javascript/js/controllers/action_controller.js

@@ -1,4 +1,4 @@
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 import { castBoolean } from '../helpers/cast_boolean'
 
 export default class extends Controller {

data/app/javascript/js/controllers/actions_picker_controller.js

@@ -1,5 +1,5 @@
 import { AttributeObserver } from '@stimulus/mutation-observers'
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 
 export default class extends Controller {
   static targets = ['resourceAction', 'standaloneAction']

data/app/javascript/js/controllers/alerts_controller.js

@@ -1,4 +1,4 @@
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 
 export default class extends Controller {
   static targets = ['container']

data/app/javascript/js/controllers/attachments_controller.js

@@ -1,4 +1,4 @@
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 
 export default class extends Controller {
   static targets = ['form']

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

@@ -1,4 +1,4 @@
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 
 export default class extends Controller {
   static targets = ['select', 'type', 'loadAssociationLink'];

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

@@ -14,7 +14,7 @@ import 'codemirror/mode/vue/vue'
 import 'codemirror/mode/xml/xml'
 import 'codemirror/mode/yaml/yaml'
 
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 import CodeMirror from 'codemirror'
 
 import { castBoolean } from '../../helpers/cast_boolean'

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

@@ -1,4 +1,4 @@
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 import { DateTime } from 'luxon'
 import flatpickr from 'flatpickr'
 

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

@@ -1,5 +1,5 @@
 /* eslint-disable max-len */
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 import { castBoolean } from '../../helpers/cast_boolean'
 
 export default class extends Controller {
@@ -39,7 +39,7 @@ export default class extends Controller {
 
   deleteRow(event) {
     if (this.options.disable_deleting_rows || !this.options.editable) return
-    const { index } = event.target.dataset
+    const { index } = event.params
     this.fieldValue.splice(index, 1)
     this.updateTextareaInput()
     this.updateKeyValueComponent()
@@ -93,7 +93,7 @@ export default class extends Controller {
     if (this.options.editable) {
       result += `<a
   href="javascript:void(0);"
-  data-index="${index}"
+  data-key-value-index-param="${index}"
   data-action="click->key-value#deleteRow"
   title="${this.options.delete_text}"
   data-tippy="tooltip"

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

@@ -1,4 +1,4 @@
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 import SimpleMDE from 'simplemde'
 
 export default class extends Controller {

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

@@ -1,5 +1,5 @@
 import 'trix'
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 import { castBoolean } from '../../helpers/cast_boolean'
 
 export default class extends Controller {

data/app/javascript/js/controllers/filter_controller.js

@@ -1,4 +1,4 @@
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 import URI from 'urijs'
 
 export default class extends Controller {
@@ -26,16 +26,12 @@ export default class extends Controller {
     // then we convert the percent encodings into raw bytes which
     // can be fed into btoa.
     return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g,
-      function toSolidBytes(match, p1) {
-        return String.fromCharCode('0x' + p1);
-      }));
+      (match, p1) => String.fromCharCode(`0x${p1}`)))
   }
 
   b64DecodeUnicode(str) {
     // Going backwards: from bytestream, to percent-encoding, to original string.
-    return decodeURIComponent(atob(str).split('').map(function(c) {
-      return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
-    }).join(''));
+    return decodeURIComponent(atob(str).split('').map((c) => `%${(`00${c.charCodeAt(0).toString(16)}`).slice(-2)}`).join(''))
   }
 
   changeFilter() {

data/app/javascript/js/controllers/hidden_input_controller.js

@@ -1,4 +1,4 @@
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 
 export default class extends Controller {
   static targets = ['content']

data/app/javascript/js/controllers/item_select_all_controller.js

@@ -1,20 +1,20 @@
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 
 export default class extends Controller {
-  static targets = [ "itemCheckbox", "checkbox" ]
+  static targets = ['itemCheckbox', 'checkbox']
 
   connect() {
     this.resourceName = this.element.dataset.resourceName
   }
 
   toggle(event) {
-    var value = !!event.target.checked
+    const value = !!event.target.checked
     document.querySelectorAll(`[data-controller="item-selector"][data-resource-name="${this.resourceName}"] input[type=checkbox]`)
       .forEach((checkbox) => checkbox.checked != value && checkbox.click())
   }
 
   update() {
-    var allSelected = true
+    let allSelected = true
     this.itemCheckboxTargets.forEach((checkbox) => allSelected = allSelected && checkbox.checked)
     this.checkboxTarget.checked = allSelected
   }

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

@@ -1,4 +1,4 @@
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 
 export default class extends Controller {
   static targets = ['panel'];

data/app/javascript/js/controllers/loading_button_controller.js

@@ -1,4 +1,4 @@
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 
 export default class extends Controller {
   spinnerMarkup = `<div class="button-spinner">

data/app/javascript/js/controllers/modal_controller.js

@@ -1,4 +1,4 @@
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 
 export default class extends Controller {
   static targets = ['modal']
@@ -8,4 +8,13 @@ export default class extends Controller {
 
     document.dispatchEvent(new Event('actions-modal:close'))
   }
+
+  delayedClose() {
+    const vm = this
+
+    setTimeout(() => {
+      vm.modalTarget.remove()
+      document.dispatchEvent(new Event('actions-modal:close'))
+    }, 500)
+  }
 }

data/app/javascript/js/controllers/per_page_controller.js

@@ -1,4 +1,4 @@
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 
 export default class extends Controller {
   static targets = ['selector']

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

@@ -1,6 +1,6 @@
 /* eslint-disable no-underscore-dangle */
 import * as Mousetrap from 'mousetrap'
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 import { Turbo } from '@hotwired/turbo-rails'
 import { autocomplete } from '@algolia/autocomplete-js'
 import URI from 'urijs'
@@ -177,11 +177,16 @@ export default class extends Controller {
       openOnFocus: true,
       detachedMediaQuery: '',
       getSources: ({ query }) => {
+        document.body.classList.add('search-loading')
         const endpoint = that.searchUrl(query)
 
         return that
           .debouncedFetch(endpoint)
-          .then((response) => response.json())
+          .then((response) => {
+            document.body.classList.remove('search-loading')
+
+            return response.json()
+          })
           .then((data) => Object.keys(data).map((resourceName) => that.addSource(resourceName, data[resourceName])))
       },
     })

data/app/javascript/js/controllers/tippy_controller.js

@@ -1,4 +1,4 @@
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 import tippy from 'tippy.js'
 
 export default class extends Controller {

data/app/javascript/js/controllers/toggle_panel_controller.js

@@ -1,4 +1,4 @@
-import { Controller } from 'stimulus'
+import { Controller } from '@hotwired/stimulus'
 import { useClickOutside } from 'stimulus-use'
 
 export default class extends Controller {

data/app/views/avo/actions/show.html.erb

@@ -7,7 +7,11 @@
     data-resource-id="<%= params[:id] %>"
     class="hidden text-slate-800"
   >
-    <%= form_with model: @model, scope: 'fields', url: "#{@resource.records_path}/actions/#{@action.param_id}", data: {'turbo-frame': '_top', 'action-target': 'form'} do |form| %>
+    <%= form_with model: @model,
+      scope: 'fields',
+      url: "#{@resource.records_path}/actions/#{@action.param_id}",
+      data: @action.class.form_data_attributes do |form|
+    %>
       <%= render Avo::ModalComponent.new do |c| %>
         <% c.heading do %>
           <%= @action.action_name %>
@@ -26,8 +30,8 @@
         <% end %>
 
         <% c.controls do %>
-          <%= a_button @action.cancel_button_label, 'data-action': 'click->modal#close', size: :sm %>
-          <%= a_button @action.confirm_button_label, type: :submit, color: :green, size: :sm %>
+          <%= a_button @action.cancel_button_label, data: { action: 'click->modal#close' }, size: :sm %>
+          <%= a_button @action.confirm_button_label, type: :submit, color: :green, size: :sm, data: @action.class.submit_button_data_attributes %>
         <% end %>
       <% end %>
     <% end %>

data/db/factories.rb

@@ -42,11 +42,11 @@ FactoryBot.define do
   end
 
   factory :comment do
-    body { Faker::Lorem.paragraphs(number: rand(4...10)) }
+    body { Faker::Lorem.paragraphs(number: rand(4...10)).join(' ') }
   end
 
   factory :review do
-    body { Faker::Lorem.paragraphs(number: rand(4...10)) }
+    body { Faker::Lorem.paragraphs(number: rand(4...10)).join(' ') }
   end
 
   factory :person do

data/lib/avo/base_action.rb

@@ -15,6 +15,7 @@ module Avo
     class_attribute :fields
     class_attribute :standalone, default: false
     class_attribute :visible
+    class_attribute :may_download_file, default: false
 
     attr_accessor :response
     attr_accessor :model
@@ -22,6 +23,26 @@ module Avo
     attr_accessor :user
     attr_accessor :fields_loader
 
+    class << self
+      def form_data_attributes
+        # We can't respond with a file download from Turbo se we disable it on the form
+        if may_download_file
+          { 'turbo': false }
+        else
+          { 'turbo-frame': '_top', 'action-target': 'form' }
+        end
+      end
+
+      # We can't respond with a file download from Turbo se we disable close the modal manually after a while (it's a hack, we know)
+      def submit_button_data_attributes
+        if may_download_file
+          { action: 'click->modal#delayedClose' }
+        else
+          {}
+        end
+      end
+    end
+
     def action_name
       return name if name.present?
 

data/lib/avo/base_resource.rb

@@ -127,23 +127,29 @@ module Avo
           field.visible?
         end
         .select do |field|
+          is_valid = true
+
           # Strip out the reflection field in index queries with a parent association.
           if reflection.present?
-            if reflection.options.present? &&
-                field.respond_to?(:polymorphic_as) &&
-                field.polymorphic_as.to_s == reflection.options[:as].to_s
-              next
-            end
-
-            if field.respond_to?(:foreign_key) &&
-                reflection.respond_to?(:foreign_key) &&
-                reflection.foreign_key != field.foreign_key &&
-                @params[:resource_name] == field.resource.model_key
-              next
+            # regular non-polymorphic association
+            # we're matching the reflection inverse_of foriegn key with the field's foreign_key
+            if field.is_a?(Avo::Fields::BelongsToField)
+              if field.respond_to?(:foreign_key) &&
+                reflection.inverse_of.foreign_key == field.foreign_key
+                is_valid = false
+              end
+
+              # polymorphic association
+              if field.respond_to?(:foreign_key) &&
+                field.is_polymorphic? &&
+                reflection.respond_to?(:polymorphic?) &&
+                reflection.inverse_of.foreign_key == field.reflection.foreign_key
+                is_valid = false
+              end
             end
           end
 
-          true
+          is_valid
         end
 
       if panel.present?

data/lib/avo/fields/belongs_to_field.rb

@@ -136,6 +136,8 @@ module Avo
 
       def is_polymorphic?
         polymorphic_as.present?
+      rescue
+        false
       end
 
       def foreign_key
@@ -154,6 +156,13 @@ module Avo
         nil
       end
 
+      # Get the model reflection instance
+      def reflection
+        reflection_for_key(id)
+      rescue
+        nil
+      end
+
       def relation_model_class
         @resource.model_class
       end

data/lib/avo/licensing/h_q.rb

@@ -23,6 +23,12 @@ module Avo
 
         begin
           perform_and_cache_request
+        rescue Errno::EHOSTUNREACH => exception
+          cache_and_return_error "HTTP host not reachable error.", exception.message
+        rescue Errno::ECONNRESET => exception
+          cache_and_return_error "HTTP connection reset error.", exception.message
+        rescue Errno::ECONNREFUSED => exception
+          cache_and_return_error "HTTP connection refused error.", exception.message
         rescue HTTParty::Error => exception
           cache_and_return_error "HTTP client error.", exception.message
         rescue Net::OpenTimeout => exception
@@ -71,7 +77,55 @@ module Avo
           environment: Rails.env,
           ip: current_request.ip,
           host: current_request.host,
-          port: current_request.port
+          port: current_request.port,
+          app_name: app_name
+        }
+      end
+
+      def app_name
+        Rails.application.class.to_s.split("::").first
+      rescue
+        nil
+      end
+
+      def avo_metadata
+        resources = App.resources
+        field_definitions = resources.map(&:get_field_definitions)
+        fields_count = field_definitions.map(&:count).sum
+        fields_per_resource = sprintf("%0.01f", fields_count / (resources.count + 0.0))
+
+        field_types = {}
+        custom_fields_count = 0
+        field_definitions.each do |fields|
+          fields.each do |field|
+            field_types[field.type] ||= 0
+            field_types[field.type] += 1
+
+            custom_fields_count += 1 if field.custom?
+          end
+        end
+
+        {
+          resources_count: resources.count,
+          fields_count: fields_count,
+          fields_per_resource: fields_per_resource,
+          custom_fields_count: custom_fields_count,
+          field_types: field_types,
+          **other_metadata(:actions),
+          **other_metadata(:filters),
+        }
+      end
+
+      def other_metadata(type = :actions)
+        resources = App.resources
+
+        types = resources.map(&:"get_#{type}")
+        type_count = types.flatten.uniq.count
+        type_per_resource = sprintf("%0.01f", types.map(&:count).sum / (resources.count + 0.0))
+
+        {
+          "#{type}_count": type_count,
+          "#{type}_per_resource": type_per_resource,
         }
       end
 

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.22.1"
+  VERSION = "1.22.4"
 end