activeadmin_dynamic_fields 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e095e90e8a67093d377cd4ba64763adead3eaf7f100e7e27a3a6ab60c2851763
-  data.tar.gz: ee22043cb52eea432818add1114b5e08f8b91deb450845c480ee289794f72809
+  metadata.gz: '019f2b81ed1552f13f57b73141860957f4869b10de1f018a289aa8724cc23ec1'
+  data.tar.gz: 4ed1bb60f5b1ddef1a3d870296d8548faa18cc36db5adadb8271f0c655c769f6
 SHA512:
-  metadata.gz: 116395a999d86f0f976a04cd7be8ba1ee994ce6bcb71c21d735e621ed037881aa24b73a57fa75e7be8062acfb6ea178e935da0e03b9d0c82f29ec8f73b7afff5
-  data.tar.gz: 6d7659ba3297a2f218829678bd24ea10a62703ed294822dc94ac5591671f92073d496e9d7432b6c7b80da25bd70238490e4285ef31e42c21e5a60d991c5a8448
+  metadata.gz: b07cc4e73b801ef79ee52b52a6c82117d7e966a2f1eadb0e415e00c608456c02f2c14694c2fc41037ad381c9c0c3bfbf1c0ed96c0c6d13bd0ce3335c38dc1e11
+  data.tar.gz: c0aa33df12ef6ed16927a49bb9b93d0fcffeffc6f20b661f11edb350544f12e550f90fd5fa5870a43154c0097995bbb02f2f80f24e1ff821eddc2d0fa60e613d

data/app/assets/javascripts/activeadmin/dynamic_fields.js

@@ -52,58 +52,70 @@
 
   class Field {
     constructor(el) {
-      const action = el.data('then') || el.data('action') || ''
+      this.el = el
+      const action_name = this.evaluateAction()
+      const result = this.evaluateCondition()
+      this.condition = result.condition
+      this.condition_arg = result.condition_arg
+      this.evaluateTarget(action_name)
+    }
+
+    apply() {
+      if (this.condition(this.el, this.condition_arg)) {
+        if (this.else_reverse_action) this.else_reverse_action(this.target, this.else_action_arg)
+        this.action(this.target, this.action_arg)
+      }
+      else {
+        if (this.reverse_action) this.reverse_action(this.target, this.action_arg)
+        if (this.else_action) this.else_action(this.target, this.else_action_arg)
+      }
+    }
+
+    evaluateAction() {
+      const action = this.el.data('then') || this.el.data('action') || ''
       const action_name = action.split(' ', 1)[0]
-      const else_action = el.data('else') || ''
+      const else_action = this.el.data('else') || ''
       const else_action_name = else_action.split(' ', 1)[0]
 
-      this.el = el
       this.action = ACTIONS[action_name]
       this.action_arg = action.substring(action.indexOf(' ') + 1)
       this.reverse_action = REVERSE_ACTIONS[action_name]
       this.else_action = ACTIONS[else_action_name]
       this.else_action_arg = else_action.substring(else_action.indexOf(' ') + 1)
       this.else_reverse_action = REVERSE_ACTIONS[else_action_name]
-      this.condition = CONDITIONS[el.data('if')]
-      if (!this.condition && el.data('eq')) {
-        [this.condition, this.condition_arg] = [CONDITIONS['eq'], el.data('eq')]
-      }
-      if (!this.condition && el.data('not')) {
-        [this.condition, this.condition_arg] = [CONDITIONS['not'], el.data('not')]
-      }
-      if (!this.condition && el.data('match')) {
-        [this.condition, this.condition_arg] = [CONDITIONS['match'], new RegExp(el.data('match'))]
-      }
-      if (!this.condition && el.data('mismatch')) {
-        [this.condition, this.condition_arg] = [CONDITIONS['mismatch'], new RegExp(el.data('mismatch'))]
-      }
-      this.custom_function = el.data('function')
-      if (!this.condition && this.custom_function) {
-        this.condition = window[this.custom_function]
-        if (!this.condition) {
-          el.attr('data-df-errors', 'custom function not found')
+
+      return action_name
+    }
+
+    evaluateCondition() {
+      let value = CONDITIONS[this.el.data('if')?.trim()]
+      if (value) return { condition: value }
+      if (value = this.el.data('eq')) return { condition: CONDITIONS['eq'], condition_arg: value }
+      if (value = this.el.data('not')) return { condition: CONDITIONS['not'], condition_arg: value }
+      if (value = this.el.data('match')) return { condition: CONDITIONS['match'], condition_arg: new RegExp(value) }
+      if (value = this.el.data('mismatch')) return { condition: CONDITIONS['mismatch'], condition_arg: new RegExp(value) }
+
+      this.custom_function = this.el.data('function')
+      if (this.custom_function) {
+        value = window[this.custom_function]
+        if (value) return { condition: value }
+        else {
+          this.el.attr('data-df-errors', 'custom function not found')
           console.warn(`activeadmin_dynamic_fields custom function not found: ${this.custom_function}`)
         }
       }
 
-      // closest find for has many associations
-      if (el.data('target')) this.target = el.closest('fieldset').find(el.data('target'))
-      else if (el.data('gtarget')) this.target = $(el.data('gtarget'))
-      if (action_name == 'callback') this.target = el
+      return {}
     }
 
-    apply(el) {
-      if (this.condition(el, this.condition_arg)) {
-        if (this.else_reverse_action) this.else_reverse_action(this.target, this.else_action_arg)
-        this.action(this.target, this.action_arg)
-      }
-      else {
-        if (this.reverse_action) this.reverse_action(this.target, this.action_arg)
-        if (this.else_action) this.else_action(this.target, this.else_action_arg)
-      }
+    evaluateTarget(action_name) {
+      // closest find for has many associations
+      if (this.el.data('target')) this.target = this.el.closest('fieldset').find(this.el.data('target'))
+      else if (this.el.data('gtarget')) this.target = $(this.el.data('gtarget'))
+      if (action_name == 'callback') this.target = this.el
     }
 
-    is_valid() {
+    isValid() {
       if (!this.condition) return false
       if (!this.action && !this.custom_function) return false
 
@@ -111,9 +123,9 @@
     }
 
     setup() {
-      if (!this.is_valid()) return
-      if (this.el.data('if') != 'changed') this.apply(this.el)
-      this.el.on('change', () => this.apply(this.el))  
+      if (!this.isValid()) return
+      if (this.el.data('if') != 'changed') this.apply()
+      this.el.on('change', () => this.apply())  
     }
   }
 

data/lib/activeadmin/dynamic_fields/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveAdmin
   module DynamicFields
-    VERSION = '0.4.4'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_dynamic_fields
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-26 00:00:00.000000000 Z
+date: 2020-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin