rondo_form 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab7c415b1a97a538742b84ffd41f05acb28e60dc6bb5721d059670c4b69e5e91
-  data.tar.gz: e953952e1955dd4a8194b96ea28aff09aa6e0990ce5113648f4d94f846f55335
+  metadata.gz: 6ee9d8f4d7737a47f8e756a02d3dab153a2f8e162b8b5141755976c381470114
+  data.tar.gz: 2d1b339d1a473c7336ecf5fe3182b23591ab409f5cffe580fabd62b1f0c3ed1b
 SHA512:
-  metadata.gz: 680cb74e9d615f9e1d3444363796a2cc8ec8d25dbc3caf2504bcee3188cb88c4001b911259cb256bb236d6bbaf6e0238edc71570fee7894996fd68ffc08cfe6b
-  data.tar.gz: 1331fec9838d555ba6742f28aa74259644acbe7a019716a99118413eecb069fd69926f31a21db89e78a9d710e080caa2a0a62f56cd570344ff1e0194c4dbc96c
+  metadata.gz: 10b686a87cb7e4de4cd13616d9b85d875d36db630209989c5bb40ae19d23fa66ee0b6153b4220a42c6e4479289b0515f427917d0385ccea5a7f5c44741504d71
+  data.tar.gz: 76fcdce9be21925c0f1aba373fd19f996e7c9fbac7d4e3e952df969ebf4b3a6ed3eb232d47a8326161ad0f627f61267afbcc146c465f1e1dbbc2df6906e72e96

data/lib/generators/rondo_form/templates/cocoon_controller.js

@@ -4,32 +4,38 @@ export default class extends Controller {
   static targets = ["template"]
 
   addField(e) {
-    e.preventDefault()
-    let assoc = e.target.dataset.association
-    let newField = this.buildNewAssociation(assoc)
-    let insertionNode = this.templateTarget.parentElement
-    insertionNode.insertAdjacentHTML("beforebegin", newField)
+    e.preventDefault();
+
+    let assoc = e.target.dataset.association;
+    let newField = this.buildNewAssociation(assoc);
+    let insertionNode = this.templateTarget.parentElement;
+    insertionNode.insertAdjacentHTML("beforebegin", newField);
   }
 
   removeField(e) {
-    e.preventDefault()
-    let closestField = e.target.closest(".nested-fields")
+    e.preventDefault();
+
+    let wrapperClass = this.data.get("wrapperClass") || "nested-fields";
+    let wrapperField = e.target.closest("." + wrapperClass);
     if(e.target.matches('.dynamic')) {
-      closestField.remove()
+      wrapperField.remove();
     } else {
-      closestField.style.display = "none"
+      wrapperField.querySelector("input[name*='_destroy']").value = 1;
+      wrapperField.style.display = "none";
     }
   }
 
   buildNewAssociation(assoc) {
     let content  = this.templateTarget.innerHTML;
-    let regexp_braced = new RegExp('\\[new_' + assoc + '\\]', 'g');
-    let new_id  = new Date().getTime();
-    let new_content = content.replace(regexp_braced, '[' + new_id + ']');
-    if (new_content == content) {
-      regexp_braced = new RegExp('\\[new_' + assoc + 's\\]', 'g');
-      new_content = content.replace(regexp_braced, '[' + new_id + ']');
+    let regexpBraced = new RegExp('\\[new_' + assoc + '\\]', 'g');
+    let newId  = new Date().getTime();
+    let newContent = content.replace(regexpBraced, '[' + newId + ']');
+
+    if (newContent == content) {
+      // assoc can be singular or plural 
+      regexpBraced = new RegExp('\\[new_' + assoc + 's\\]', 'g');
+      newContent = content.replace(regexpBraced, '[' + newId + ']');
     }
-    return new_content
+    return newContent;
   }
 }

data/lib/rondo_form/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RondoForm
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/rondo_form/view_helpers.rb

@@ -1,5 +1,6 @@
 module RondoForm
   module ViewHelpers
+
     # this will show a link to remove the current association. This should be placed inside the partial.
     # either you give
     # - *name* : the text of the link
@@ -18,9 +19,8 @@ module RondoForm
         name         = capture(&block)
         link_to_remove_association(name, f, html_options)
       else
-        name         = args[0]
-        f            = args[1]
-        html_options = args[2] || {}
+        name, f, html_options = *args
+        html_options ||= {}
 
         is_dynamic = f.object.new_record?
         html_options[:class] = [html_options[:class], "remove_fields #{is_dynamic ? 'dynamic' : 'existing'}"].compact.join(' ')
@@ -29,32 +29,22 @@ module RondoForm
       end
     end
 
-    # :nodoc:
-    def render_association(association, f, new_object)
-      f.fields_for(association, new_object, :child_index => "new_#{association}") do |builder|
-        render(association.to_s.singularize + "_fields", :f => builder, :dynamic => true)
-      end
-    end
-
     # shows a link that will allow to dynamically add a new associated object.
     #
     # - *name* :         the text to show in the link
-    # - *f* :            the form this should come in (the formtastic form)
+    # - *f* :            the form this should come in
     # - *association* :  the associated objects, e.g. :tasks, this should be the name of the <tt>has_many</tt> relation.
     # - *html_options*:  html options to be passed to <tt>link_to</tt> (see <tt>link_to</tt>)
     # - *&block*:        see <tt>link_to</tt>
 
     def link_to_add_association(*args, &block)
       if block_given?
-        f            = args[0]
-        association  = args[1]
-        html_options = args[2] || {}
+        f, association, html_options = *args
+        html_options ||= {}
         link_to_add_association(capture(&block), f, association, html_options)
       else
-        name         = args[0]
-        f            = args[1]
-        association  = args[2]
-        html_options = args[3] || {}
+        name, f, association, html_options = *args
+        html_options ||= {}
 
         html_options[:class] = [html_options[:class], "add_fields"].compact.join(' ')
         html_options[:'data-association'] = association.to_s.singularize
@@ -68,5 +58,12 @@ module RondoForm
       end
       hidden_div.html_safe + link_to(name, '', html_options )
     end
+
+    # :nodoc:
+    def render_association(association, f, new_object)
+      f.fields_for(association, new_object, :child_index => "new_#{association}") do |builder|
+        render(association.to_s.singularize + "_fields", :f => builder, :dynamic => true)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rondo_form
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - hungle00
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-13 00:00:00.000000000 Z
+date: 2023-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties