avo 1.22.1.pre.2 → 1.22.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f3877093b6d069865155c2f545765fbf70abec721d0795e87894979c80c29a6
-  data.tar.gz: c7df311af825024a23ee29dadf8e2ee427a7e6ba162ef3e7d29d419164afcc23
+  metadata.gz: '0638fa0ab76323be01a732489a1ba96def10bde4897fd4231c7a1f4c41ece424'
+  data.tar.gz: 394c86583f0219b3f9c5d2cf1017db4348105ae8bc26cfbac1f5ca56e9ace62a
 SHA512:
-  metadata.gz: 94fab6c8ddef7e55d5c2f659c3ffecec573839a25d4171c389355b677b92ff922ad1ffe5d5bd2c907bcabddaaa5b1696572f315588cebc28702a94d844dd959d
-  data.tar.gz: d813448938980e0f16f62dc5bf9688da849849b8f2e3b141b9fcb27dc098bf0128fabffb8d35faca9b01f6831aca92d0d585e6a69c639d09299f991907ac757d
+  metadata.gz: 292f817a4cc4498a4db69268def16be6ac719e5eee1178deb8cad7a26181aacb73ec5cbd9145fea1a0dc627a52f4bc7b9a3e61e5e6099946148239227b313e4d
+  data.tar.gz: bad4042ec546cb0c56e209a8c42b59a74a655a5bd8278c7f98baf5025f81d3457b566316fc4f7247d51e68d4add071d6207996e922449106ce3627357e1a2545

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.22.1.pre.2)
+    avo (1.22.3)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -230,8 +230,6 @@ GEM
     nokogiri (1.13.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.3-x86_64-linux)
-      racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport

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']

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'

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/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_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/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.22.1.pre.2"
+  VERSION = "1.22.3"
 end