activeadmin_dynamic_fields 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a0aa1741561ea938be8cfdfb7d75df0b85ba24dcdf303639ac3824ffc6ddd4f
-  data.tar.gz: 208287487042b2ef3de93b20f9a733383e470e44473c40b398b3600ec18f11bc
+  metadata.gz: c205fcaf09eb8f64858be70e3edad674abbf894ee2f65c2c236258bb8f43af86
+  data.tar.gz: 488ce2f3f4ed09165839398014614b198e23d830df8c2fcbb63b4dd1547eba0d
 SHA512:
-  metadata.gz: 6817a8dccfb3691bf61cfe2f8a30d0dd51fb45b40becc20fab9b36fe9b8c573e9f78f68dc12e6c8a0e91c34d2416d773f5f3a1d62359b32e2888e68b2d19113a
-  data.tar.gz: 0f15dcb8b29b7cbf73ba0e6932b6a0dd42a91ca883357ea0024da13b5b65867c2cf22bcae0458967ec37f70a7667607c0cb65be8aa43b17319b83595c2ee8cbd
+  metadata.gz: 371d705fc20dc6e2062b54bd81a480979c70e8473727579da8282a06581f7826c80a50f71a3202e695f01b5cd272e3d3e564f626304db35d8ad4e9aa19af8a45
+  data.tar.gz: 48d1c6a52aa51b417eb1f55cc61fad9287d263c922b224f08b40492517edf9b0af35af5b49089eaa330f347d1466cf5d90700d77bfb482369942c29705a3af33

data/README.md

@@ -47,12 +47,12 @@ Conditions:
 
 - **data-if**: check a condition, values:
   + **checked**: check if a checkbox is checked (ex. `"data-if": "checked"`)
-  + **not_checked**: check if a checkbox is not checked
+  + **not_checked**: check if a checkbox is not checked (equivalent to `"data-if": "!checked"`)
   + **blank**: check if a field is blank
   + **not_blank**: check if a field is not blank
   + **changed**: check if the value of an input is changed (dirty)
-- **data-eq**: check if a field has a specific value (ex. `"data-eq": "42"`)
-- **data-not**: check if a field has not a specific value
+- **data-eq**: check if a field has a specific value (ex. `"data-eq": "42"` or `"data-eq": "!5"`)
+- **data-not**: check if a field has not a specific value (equivalent to `"data-eq": "!something"`)
 - **data-match**: check if a field match a regexp
 - **data-mismatch**: check if a field doesn't match a regexp (ex. `"data-mismatch": "^\d+$"`)
 - **data-function**: check the return value of a custom function (ex. `"data-function": "my_check"`)

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

@@ -39,8 +39,8 @@
     match: (el, regexp) => regexp.test(el.val()),
     mismatch: (el, regexp) => !regexp.test(el.val()),
     not: (el, value) => el.val() != value,
-    not_blank: el => el.val().trim(),
-    not_checked: el => !el.is(':checked')
+    not_blank: el => !CONDITIONS.blank(el),
+    not_checked: el => !CONDITIONS.checked(el)
   }
 
   const REVERSE_ACTIONS = {
@@ -53,6 +53,8 @@
     slide: el => el.slideDown()
   }
 
+  const REGEXP_NOT = /^!\s*/
+
   class Field {
     constructor(el) {
       this.el = el
@@ -91,21 +93,29 @@
     }
 
     evaluateCondition() {
-      let data_if = this.el.data('if')
-      let value = data_if ? CONDITIONS[data_if.trim()] : null
-      if (value) return { condition: value }
-
-      value = this.el.data('eq')
-      if (value) return { condition: CONDITIONS['eq'], condition_arg: value }
-
-      value = this.el.data('not')
-      if (value) return { condition: CONDITIONS['not'], condition_arg: value }
-
-      value = this.el.data('match')
-      if (value) return { condition: CONDITIONS['match'], condition_arg: new RegExp(value) }
-
-      value = this.el.data('mismatch')
-      if (value) return { condition: CONDITIONS['mismatch'], condition_arg: new RegExp(value) }
+      let value
+      if (value = this.el.data('if')) {
+        if (REGEXP_NOT.test(value)) value = 'not_' + value.replace(REGEXP_NOT, '')
+        return { condition: CONDITIONS[value] }
+      }
+      if (value = this.el.data('eq')) {
+        if (REGEXP_NOT.test(value)) {
+          return { condition: CONDITIONS['not'], condition_arg: value.replace(REGEXP_NOT, '') }
+        }
+        return { condition: CONDITIONS['eq'], condition_arg: value }
+      }
+      if (value = this.el.data('not')) {
+        if (REGEXP_NOT.test(value)) {
+          return { condition: CONDITIONS['eq'], condition_arg: value.replace(REGEXP_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) {

data/lib/activeadmin/dynamic_fields/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveAdmin
   module DynamicFields
-    VERSION = '0.6.4'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_dynamic_fields
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-09 00:00:00.000000000 Z
+date: 2022-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin