para 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1faf348515d9fd8b67b0d7f5622a0c20939dd67
-  data.tar.gz: 64ba7fd8be6fd5f0afc1a1f71c5f7bc7ef753ffa
+  metadata.gz: 70788bd2854ce638f71aa879f8d511eda524bd13
+  data.tar.gz: fbd1da0da3c7e6f20cfd2972fb4c65e5a66b057c
 SHA512:
-  metadata.gz: da890d70c6a6f205954003a65971aafd1dcc365c96658a18658b5b0422a6af83e69b10c6f9f79f8502d0a9104eff2e6eeb64299fedd0e906c1eacdff6e9c4afc
-  data.tar.gz: 8f8e638e0a9744381b5dafc6f7228b0fc31d4a094efd8e0d34432698b8a7df26dbd7a48a815fa98bc8986eb1d8217807abd0ba785a120df1719b2c8f584e0af5
+  metadata.gz: fa5d051fe408fabd83d66d3e28aa5d22820f5227f047ac2a7097f721dd66ef928ee4bbc88b996211dfb9e682ef755bce6ead4aac74f513a56e107251411b06fe
+  data.tar.gz: 2d71c0e5bab1e298f6a25b99192b828f866898e4e6b5a3e84c02e5c39e2ae9393995937baf775a8a7602f05b69821a5f1beb9a46f0ed10adc63417d12fe14ab4

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

@@ -1,14 +1,12 @@
 .nested-one-field
   = form.simple_fields_for attribute_name, resource, nested_attribute_name: attribute_name do |nested_form|
     - if defined?(collapsible) && collapsible
-      .panel.panel-default.form-fields
-        .panel-heading
-          %h3.panel-title
-            = link_to "##{ nested_form.nested_resource_dom_id }", class: "nested-input-title collapsed#{ (' has-error' if nested_form.object.errors.any?) }", data: { toggle: 'collapse', :'open-on-insert' => true } do
-              = nested_form.nested_resource_name
-              %i.fa.fa-angle-up
+      - if resource
+        .nested-one-container{ id: dom_identifier }
+          = 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 }
 
-        .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: form.object }.merge(nested_locals)
     - else
       = render partial: find_partial_for(model, :fields), 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 }

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

@@ -0,0 +1,10 @@
+.add-button.nested-one-inset-add-button.dropdown
+  %button.btn.btn-shadow.dropdown-toggle{ class: add_button_class, type: 'button', data: { toggle: 'dropdown' } }
+    = add_button_label
+    %i.fa.fa-angle-down
+
+  %ul.dropdown-menu
+    - subclasses.each do |submodel|
+      %li
+        = link_to_add_association form, attribute_name, wrap_object: proc { submodel.new }, partial: find_partial_for(submodel, 'nested_one/container', partial_dir: 'inputs'), form_name: 'form', class: 'dropdown-link', data: { :'association-insertion-node' => "##{ dom_identifier }", :'association-insertion-method' => 'append' }, render_options: { nested_attribute_name: attribute_name, locals: { form: form, model: submodel, subclass: subclass, nested_locals: nested_locals } } do
+          = submodel.model_name.human

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

@@ -0,0 +1,9 @@
+.panel.panel-default.form-fields
+  .panel-heading
+    %h3.panel-title
+      = link_to "##{ form.nested_resource_dom_id }", class: "nested-input-title collapsed#{ (' has-error' if form.object.errors.any?) }", data: { toggle: 'collapse', :'open-on-insert' => true } do
+        = form.nested_resource_name
+        %i.fa.fa-angle-up
+
+  .panel-body.panel-collapse.form-inputs.collapse{ id: form.nested_resource_dom_id }
+    = render partial: find_partial_for(model, :fields), locals: { form: form, parent: form.object }.merge(nested_locals)

data/lib/para/inputs/nested_base_input.rb

@@ -5,6 +5,35 @@ module Para
 
       private
 
+      def dom_identifier
+        @dom_identifier ||= begin
+          name = 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('-')
+        end
+      end
+
+      def subclass
+        @subclass ||= options.fetch(:subclass, subclasses.presence)
+      end
+
+      def subclasses
+        options.fetch(
+          :subclasses,
+          (model.try(:descendants) || []).sort_by { |m| m.model_name.human }
+        )
+      end
+      
+      def add_button_label
+        options.fetch(:add_button_label) { I18n.t('para.form.nested.add') }
+      end
+
+      def add_button_class
+        options.fetch(:add_button_class) { 'btn-primary' }
+      end
+
       # This allows to access the parent nested field from a child nested field
       # and fetch some of its data. This is useful for deeply nested cocoon
       # fields.

data/lib/para/inputs/nested_many_input.rb

@@ -29,9 +29,9 @@ module Para
               nested_locals: locals,
               subclass: subclass,
               subclasses: subclasses,
-              inset: inset?,
               add_button_label: add_button_label,
               add_button_class: add_button_class,
+              inset: inset?,
               render_partial: render_partial?,
               remote_partial_params: remote_partial_params
             }
@@ -47,39 +47,10 @@ module Para
         @model ||= parent_model.reflect_on_association(attribute_name).klass
       end
 
-      def dom_identifier
-        @dom_identifier ||= begin
-          name = 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('-')
-        end
-      end
-
-      def subclass
-        @subclass ||= options.fetch(:subclass, subclasses.presence)
-      end
-
-      def subclasses
-        options.fetch(
-          :subclasses,
-          (model.try(:descendants) || []).sort_by { |m| m.model_name.human }
-        )
-      end
-
       def inset?
         options.fetch(:inset, false)
       end
-
-      def add_button_label
-        options.fetch(:add_button_label) { I18n.t('para.form.nested.add') }
-      end
-
-      def add_button_class
-        options.fetch(:add_button_class) { 'btn-primary' }
-      end
-
+      
       def render_partial?
         options[:render_partial] || object.errors.any? || (object.persisted? && inset?)
       end

data/lib/para/inputs/nested_one_input.rb

@@ -1,6 +1,8 @@
 module Para
   module Inputs
     class NestedOneInput < NestedBaseInput
+      attr_reader :model
+      
       def input(wrapper_options = nil)
         input_html_options[:class] << "nested-one"
 
@@ -9,7 +11,7 @@ module Para
         relation = parent_model.reflect_on_association(attribute_name)
 
         resource = object.send(attribute_name)
-        model = (resource && resource.class) || relation.klass
+        @model = (resource && resource.class) || relation.klass
 
         unless resource
           # Build association without trying to save the new record
@@ -33,7 +35,12 @@ module Para
             resource: resource,
             attribute_name: attribute_name,
             nested_locals: locals,
-            collapsible: collapsible
+            collapsible: collapsible || subclass,
+            dom_identifier: dom_identifier,
+            subclass: subclass,
+            subclasses: subclasses,
+            add_button_label: add_button_label,
+            add_button_class: add_button_class
           }
         )
       end

data/lib/para/version.rb

@@ -1,3 +1,3 @@
 module Para
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -651,6 +651,8 @@ files:
 - app/views/para/inputs/nested_many/_add.html.haml
 - app/views/para/inputs/nested_many/_add_with_subclasses.html.haml
 - app/views/para/inputs/nested_many/_container.html.haml
+- app/views/para/inputs/nested_one/_add_with_subclasses.html.haml
+- app/views/para/inputs/nested_one/_container.html.haml
 - app/views/shared/_breadcrumbs.html.haml
 - config/locales/en.yml
 - config/locales/fr.yml