para 0.8.12 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cd266c603b5629183643836cce701deb33e3322af0a98f021fb48f6922127c6
-  data.tar.gz: 36ff9796de7371559684be64fdb6f402acd5267997e94fb9f739e294d508a6d3
+  metadata.gz: 36e1d56aa604b3827cc9e483a65deb72827424890f9125ee83cb43ca5d7e34ed
+  data.tar.gz: bf514778435313e925dbd1222bd85393f842416ac7a58833a21d02d45edc4eb9
 SHA512:
-  metadata.gz: ddab0a864ddf77239b958c1d03fc5a67c69bfbf551893c45fd000c8b2970f14d865e01b71c786935d0dd27907149c090335ec13413365805f29f25658bb5949e
-  data.tar.gz: f288a5bd00b8bea61093546d9d5ce9ff649c18165564f3fa5876cedfe856f486604ef6ad46b1b57155dc62c21859e4de24936f65169428386da5b42f5b64044b
+  metadata.gz: eb0433062dd44b4b6f4b1278604e94cc751c586bee5196118cab5d7feaba6fe011df5e0900410ce1f2a65e78e88723e6e7cee8d22c82864dce99a52d2866d95c
+  data.tar.gz: 1d4fabf4b0160ae3e7fdbc238a8c047a93c7d1c69a8d07c89d4f1f565ba61d1cf452f17baa4db52e8180036bcae99df775d714fabc876208bd36d518ff6f927e

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

@@ -5,7 +5,7 @@ class Para.NestedManyField
     @initializeOrderable()
     @initializeCocoon()
 
-    @$field.on 'shown.bs.collapse', $.proxy(@collapseShown, this)
+    @$field.on 'shown.bs.collapse', @stoppingPropagation(@collapseShown)
 
   initializeOrderable: ->
     @orderable = @$field.hasClass('orderable')
@@ -21,11 +21,17 @@ class Para.NestedManyField
       $(el).find('.resource-position-field').val(i)
 
   initializeCocoon: ->
-    @$fieldsList.on 'cocoon:after-insert', $.proxy(@afterInsertField, this)
-    @$fieldsList.on 'cocoon:before-remove', $.proxy(@beforeRemoveField, this)
-    @$fieldsList.on 'cocoon:after-remove', $.proxy(@afterRemoveField, this)
+    @$fieldsList.on 'cocoon:after-insert', @afterInsertField
+    @$fieldsList.on 'cocoon:before-remove', @beforeRemoveField
+    @$fieldsList.on 'cocoon:after-remove', @afterRemoveField
 
-  afterInsertField: (e, $element) ->
+  stoppingPropagation: (callback) =>
+    (e, args...) =>
+      e.stopPropagation()
+      callback(e, args...)
+
+
+  afterInsertField: (e, $element) =>
     if ($collapsible = $element.find('[data-open-on-insert="true"]')).length
       @openInsertedField($collapsible)
 
@@ -36,21 +42,21 @@ class Para.NestedManyField
 
     $element.simpleForm()
 
-  beforeRemoveField: (e, $element) ->
+  beforeRemoveField: (e, $element) =>
     $nextEl = $element.next()
     # Remove attributes mappings field for new records since it will try to
     # create an empty nested resource otherwise
     $nextEl.remove() if $nextEl.is('[data-attributes-mappings]') and not $element.is('[data-persisted]')
 
   # When a sub field is removed, update every sub field position
-  afterRemoveField: ->
+  afterRemoveField: =>
     @handleOrderingUpdated();
 
   openInsertedField: ($field) ->
     $target = $($field.attr('href'))
     $target.collapse('show')
 
-  collapseShown: (e) ->
+  collapseShown: (e) =>
     $target = $(e.target)
 
     if $target.is("[data-rendered]") or $target.data("rendered")

data/app/controllers/para/admin/nested_forms_controller.rb

@@ -5,6 +5,7 @@ module Para
         @model = params[:model_name].constantize
         @object = params[:id] ? @model.find(params[:id]) : @model.new
         @object_name = params[:object_name]
+        @builder_options = params[:builder_options]&.permit! || {}
 
         render layout: false
       end

data/app/helpers/para/admin/components_helper.rb

@@ -5,8 +5,10 @@ module Para
     #
     def admin_component_sections
       @admin_component_sections ||= begin
-        Para::ComponentSection.ordered.includes(:components).tap do |sections|
-          sections.flat_map(&:components).each(&method(:decorate))
+        sections = Para::ComponentSection.ordered.includes(:components, :parent_component)
+
+        sections.tap do |loaded_sections|
+          loaded_sections.flat_map(&:components).each(&method(:decorate))
         end
       end
     end
@@ -23,5 +25,11 @@ module Para
       config = Para.components.component_configuration_for(component.identifier)
       !config.shown_if || instance_exec(&config.shown_if)
     end
+
+    def current_component_or_parent?(component)
+      return false unless @component
+
+      @component == component || @component.parent_component == component
+    end
   end
 end

data/app/helpers/para/tag_helper.rb

@@ -19,9 +19,13 @@ module Para
       attributes = model_field_mappings(model).fields
       relation = options.fetch(:relation, model.name.to_s.underscore.pluralize)
       allow_adding_resource = options.fetch(:addable, true)
+      force_list = options.fetch(:force_list, false)
 
-      partial = :list
-      partial = :tree if model.respond_to?(:roots) && can?(:tree, model)
+      partial = if !force_list && model.respond_to?(:roots) && can?(:tree, model)
+        :tree
+      else
+        :list
+      end
 
       render(
         partial: find_partial_for(relation, partial),

data/app/views/para/admin/nested_forms/show.html.haml

@@ -1,6 +1,15 @@
 - nested_form = nil
 
-- para_form_for(@object, url: "") do |form|
+-# Initialize an unredered form builder that will only be used to create the nested fields
+-# by using the yielded block form builder argument.
+-#
+-# The form's object name is set through the provided :object_name param to ensure that
+-# the form inputs are named correctly in the loading form.
+-#
+-# Builder options allow to customize the options passed to the form builder to customize
+-# the rendered partials.
+-#
+- para_form_for(@object, @builder_options.merge(url: "")) do |form|
   - form.object_name = @object_name
   - nested_form = capture do
     = render(partial: find_partial_for(@model, :remote_nested_form), locals: { form: form, model: @model, object: @object, object_name: @object_name })

data/app/views/para/admin/resources/_remote_nested_form.html.haml

@@ -1 +1 @@
-= render partial: find_partial_for(model, :fields), locals: { form: form }
+= render partial: find_partial_for(model, form.nested_fields_partial_name), locals: { form: form }

data/app/views/para/admin/shared/_navigation.html.haml

@@ -15,7 +15,7 @@
           %ul.component-section-list-items.collapse.in{ id: "collapse-section-#{index}" }
             - component_section.components.each do |component|
               - if can?(:manage, component) && show_component?(component)
-                %li.component-item{ class: (@component == component) && 'active' }
+                %li.component-item{ class: ('active' if current_component_or_parent?(component)) }
                   = link_to component.main_navigation_name, component.path
 
     - else

data/app/views/para/inputs/_nested_many.html.haml

@@ -2,6 +2,7 @@
   .fields-list{ id: dom_identifier }
     = form.simple_fields_for attribute_name, resources, nested_attribute_name: attribute_name, orderable: orderable, track_attribute_mappings: render_partial do |nested_form|
       = render partial: find_partial_for(model, 'nested_many/container', partial_dir: 'inputs'), locals: { form: nested_form, model: nested_form.object.class, subclass: subclass, nested_locals: nested_locals, inset: inset, uncollapsed: uncollapsed, render_partial: render_partial, remote_partial_params: remote_partial_params }
+
   -# Add button
   - if add_button
     - if subclass

data/app/views/para/inputs/_nested_one.html.haml

@@ -6,7 +6,7 @@
           = render partial: find_partial_for(model, 'nested_one/container', partial_dir: 'inputs'), locals: { nested_form: nested_form, form: form, model: nested_form.object.class, subclass: subclass, nested_locals: nested_locals }
 
     - else
-      = render partial: find_partial_for(model, :fields), locals: { form: nested_form, parent: form.object }.merge(nested_locals)
+      = render partial: find_partial_for(model, form.nested_fields_partial_name), locals: { form: nested_form, parent: form.object }.merge(nested_locals)
 
   - if defined?(subclass) && subclass
-    = render partial: 'para/inputs/nested_one/add_with_subclasses', locals: { form: form, model: model, dom_identifier: dom_identifier, nested_locals: nested_locals, attribute_name: attribute_name, subclasses: subclasses, add_button_label: add_button_label, add_button_class: add_button_class, subclass: subclass }
+    = render partial: 'para/inputs/nested_one/add_with_subclasses', locals: { form: form, model: model, dom_identifier: dom_identifier, nested_locals: nested_locals, attribute_name: attribute_name, subclasses: subclasses, add_button_label: add_button_label, add_button_class: add_button_class, subclass: subclass }

data/app/views/para/inputs/nested_many/_container.html.haml

@@ -14,7 +14,7 @@
   .panel-collapse.form-inputs.collapse{ id: form.nested_resource_dom_id, class: ('in' if uncollapsed && form.object.persisted?), data: { rendered: render_partial, render_path: @component.path(remote_partial_params), id: form.object.id, :"object-name" => form.object_name, :"model-name" => model.name } }
     .panel-body{ data: { :"nested-form-container" => true } }
       - if render_partial
-        = render partial: find_partial_for(model, :fields), locals: { form: form }.merge(nested_locals)
+        = render partial: find_partial_for(model, form.nested_fields_partial_name), locals: { form: form }.merge(nested_locals)
       - else
         = fa_icon "spinner spin"
 

data/app/views/para/inputs/nested_one/_container.html.haml

@@ -6,4 +6,4 @@
         %i.fa.fa-angle-up
 
   .panel-body.panel-collapse.form-inputs.collapse{ id: nested_form.nested_resource_dom_id }
-    = render partial: find_partial_for(model, :fields), locals: { form: nested_form, parent: nested_form.object }.merge(nested_locals)
+    = render partial: find_partial_for(model, form.nested_fields_partial_name), locals: { form: nested_form, parent: nested_form.object }.merge(nested_locals)

data/config/locales/en.yml

@@ -13,14 +13,14 @@ en:
           error: "Could not delete %{model}"
         clone:
           success: "%{model} cloned"
-          error: "Could not clone %{model}"  
-    
+          error: "Could not clone %{model}"
+
     jobs:
       para/importer/base:
         progressing: "The file is being imported, please wait a few moments ..."
         success: "The import of the file was successfully completed"
         success_with_errors: |
-          The import of the file was done, but some lines 
+          The import of the file was done, but some lines
           were not taken into account due to errors :
         other_errors: "<br>And <b>%{count}</b> others errors ..."
         error: "The selected file contains errors and could not be imported"
@@ -40,9 +40,6 @@ en:
     confirmation:
       shared:
         destroy: 'Are you sure that you want to delete %{model} ?'
-    
-    component:
-      none_created: "No components yet ..."
 
     component:
       create: "Create a component"
@@ -146,7 +143,7 @@ en:
         type: "Type"
         model_type: "Resource"
         namespaced: "Only list component's resources"
-  
+
   activemodel:
     models:
       settings_rails/form:

data/lib/para/form_builder/nested_form.rb

@@ -76,6 +76,14 @@ module Para
         nested? && options[:parent_builder].object
       end
 
+      # Returns the partial name to be looked up for rendering used inside the nested
+      # fields partials, for the nested fields container and the remote nested fields
+      # partial.
+      #
+      def nested_fields_partial_name
+        :fields
+      end
+
       private
 
       def default_resource_name

data/lib/para/inputs/nested_many_input.rb

@@ -3,7 +3,7 @@ module Para
     class NestedManyInput < NestedBaseInput
       attr_reader :resource
 
-      def input(wrapper_options = nil)
+      def input(_wrapper_options = nil)
         input_html_options[:class] << "nested-many"
 
         orderable = options.fetch(:orderable, model.orderable?)
@@ -40,6 +40,8 @@ module Para
         end
       end
 
+      private
+
       def parent_model
         @parent_model ||= @builder.object.class
       end

data/lib/para/markup/resources_table.rb

@@ -92,9 +92,9 @@ module Para
         end
 
         content_tag(:th, options) do
-          if (sort = options.delete(:sort))
+          if search && (sort = options.delete(:sort))
             view.sort_link(search, *sort, label, hide_indicator: true)
-          elsif searchable?(field_name)
+          elsif search && searchable?(field_name)
             view.sort_link(search, field_name, label, hide_indicator: true)
           else
             label

data/lib/para/version.rb

@@ -1,3 +1,3 @@
 module Para
-  VERSION = '0.8.12'
+  VERSION = '0.9.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.9.2
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '4.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -152,16 +152,22 @@ dependencies:
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -334,16 +340,22 @@ dependencies:
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement