para 0.11.0 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c76f7d6a88963d8cc0a3cbdf1214aceadc51b1e92d5affd0f1dc92e97286c0b7
-  data.tar.gz: 063fac75f6067c5386c3d285bc46f91c29ac19f86581e7b7a4f81c17721ae659
+  metadata.gz: 6f6fa00155104b2a8b6557c6ec04c3c64ae456eaeea26605757f0b4fef347fcc
+  data.tar.gz: 91243a2554514c1acbffec0d730276ffe5db4063b21723b91f0ed842b9ccb228
 SHA512:
-  metadata.gz: 64b31416475e321d7efc81cb37ec1a942d722458758c12e73f99deda94a1e32ff3864443f9923d2bae8fc5cf588091500219bf05f30182a70d266a84570b5860
-  data.tar.gz: e44dc74e75bdf99038c340c7e26f41c66166c60c121e29ae581a4a8851378d9ed7dcca96935ee2fcd829acacb7293eef7652d1ce8cb96796cf1288430d5956eb
+  metadata.gz: 6842f6aa0f5ed769519fe0ce471ea9cb5bde60458974debc956ba094f93eb799dfbb4d0f9d6a0728e2131c3376088ecf7cd904130a228345b9d204664fdf8a7b
+  data.tar.gz: 9de0c468a9e29066ca22a2cd0f2d5f600c0d4d7397b63034ab8a9a53784aa255901f1ea95e3f9759103a2a411d3f163c3a3bdb763b6e02e1c76008f90e29c2d3

data/app/assets/javascripts/para/inputs/nested_many.coffee

@@ -17,8 +17,15 @@ class Para.NestedManyField
       onUpdate: $.proxy(@handleOrderingUpdated, this)
 
   handleOrderingUpdated: ->
-    @$fieldsList.find('.form-fields:visible').each (i, el) ->
-      $(el).find('.resource-position-field').val(i)
+    formFields = []
+
+    @$fieldsList.find('.form-fields:visible').each (_i, el) ->
+      isNestedField = $parent.find(el).length for $parent in formFields
+      return if isNestedField
+
+      $el = $(el)
+      $el.find('.resource-position-field:eq(0)').val(formFields.length)
+      formFields.push($el)
 
   initializeCocoon: ->
     @$fieldsList.on 'cocoon:after-insert', @stoppingPropagation(@afterInsertField)
@@ -30,7 +37,6 @@ class Para.NestedManyField
       e.stopPropagation()
       callback(e, args...)
 
-
   afterInsertField: (e, $element) =>
     if ($collapsible = $element.find('[data-open-on-insert="true"]')).length
       @openInsertedField($collapsible)

data/lib/para/inputs/nested_base_input.rb

@@ -1,14 +1,14 @@
 module Para
   module Inputs
     class NestedBaseInput < SimpleForm::Inputs::Base
-      GLOBAL_NESTED_FIELD_KEY = "para.nested_field.parent"
+      GLOBAL_NESTED_FIELD_KEY = 'para.nested_field.parent'
 
       private
 
       def dom_identifier
         @dom_identifier ||= begin
           name = attribute_name
-          id = @builder.object.id || "_new_#{ parent_nested_field&.attribute_name }_"
+          id = @builder.object.id || "_new_#{parent_nested_field&.attribute_name}_"
           time = (Time.now.to_f * 1000).to_i
           random = (rand * 1000).to_i
           [name, id, time, random].join('-')
@@ -22,7 +22,7 @@ module Para
       def subclasses
         options.fetch(:subclasses, [])
       end
-      
+
       def add_button_label
         options.fetch(:add_button_label) { I18n.t('para.form.nested.add') }
       end
@@ -39,13 +39,13 @@ module Para
         @parent_nested_field = RequestStore.store[GLOBAL_NESTED_FIELD_KEY]
         RequestStore.store[GLOBAL_NESTED_FIELD_KEY] = self
 
-        block.call.tap do
-          RequestStore.store[GLOBAL_NESTED_FIELD_KEY] = @parent_nested_field
-        end
+        block.call
+      ensure
+        RequestStore.store[GLOBAL_NESTED_FIELD_KEY] = @parent_nested_field
       end
 
-      def parent_nested_field
-        @parent_nested_field || RequestStore.store[GLOBAL_NESTED_FIELD_KEY]
+      def parent_nested_field(fallback_to_self: true)
+        @parent_nested_field || (RequestStore.store[GLOBAL_NESTED_FIELD_KEY] if fallback_to_self)
       end
     end
   end

data/lib/para/inputs/nested_many_input.rb

@@ -4,7 +4,7 @@ module Para
       attr_reader :resource
 
       def input(_wrapper_options = nil)
-        input_html_options[:class] << "nested-many"
+        input_html_options[:class] << 'nested-many'
 
         orderable = options.fetch(:orderable, model.orderable?)
         add_button = options.fetch(:add_button, true)
@@ -40,6 +40,15 @@ module Para
         end
       end
 
+      protected
+
+      def render_partial?
+        options[:render_partial] ||
+          object.errors.any? ||
+          (object.persisted? && uncollapsed?) ||
+          parent_nested_field(fallback_to_self: false)&.render_partial?
+      end
+
       private
 
       def parent_model
@@ -58,10 +67,6 @@ module Para
         inset? && Para.config.uncollapse_inset_nested_fields
       end
 
-      def render_partial?
-        options[:render_partial] || object.errors.any? || (object.persisted? && uncollapsed?)
-      end
-
       def remote_partial_params
         @remote_partial_params ||= options.fetch(:remote_partial_params, {}).merge(
           namespace: :nested_form

data/lib/para/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Para
-  VERSION = '0.11.0'
+  VERSION = '0.11.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.2
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-06 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_decorator
@@ -862,7 +862,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.2
+rubygems_version: 3.4.4
 signing_key:
 specification_version: 4
 summary: Rails admin engine