activeadmin_dynamic_fields 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ec3982ce825b53d7710740218eb71b4d0fe940efd6a0f0bf05fc58d2b736e4a
-  data.tar.gz: d58f6ef07c54556a525fc05c14db397fe09f0740dfa4854e176b9e4f6d6d7121
+  metadata.gz: 97b522ebfcb88c5347507a8db90342028627a4fbadce5878e5c69cc24ca12653
+  data.tar.gz: 5b0e53d191c5a020c4750593a2659d123f7b9a1ecf8ab2393e52086f02e5b0f0
 SHA512:
-  metadata.gz: cbeb94a81ae9c1fce990f132e50afd821c96ce673ab5fab5b1d9e69d45b83d43d468806bd804ca2696f81d27516e5831a89eb226e905a7c2f3cc441833de42f9
-  data.tar.gz: 1d7324b9393e47f9194ee3c86a4cea7c4b0511f19d2823c39fe554275c342ced4ed9cc9dac897ca0aee3eb3dd17ecc53c4f67bcc216addf4220b02f2e4ac6445
+  metadata.gz: 36529da7a2362d72decbb4aae98fae8b19b3a97ef68336a73dc3443eb68c46b7f2176c6573b8b775d464a7c9f7152ce1755ef40d95492b8d4300c1ae15aeb7fa
+  data.tar.gz: 80f0bcd3f053a4701bb04b7d9353e68179caa27285ba9e8b1b606027adea8ca5bf9b10d8c74580c405c9fbee4d056f72be58f6288ea92daf24d787f488725aa0

data/README.md

@@ -1,5 +1,5 @@
 # ActiveAdmin Dynamic Fields
-[![gem version](https://badge.fury.io/rb/activeadmin_dynamic_fields.svg)](https://badge.fury.io/rb/activeadmin_dynamic_fields) [![gem downloads](https://badgen.net/rubygems/dt/activeadmin_dynamic_fields)](https://rubygems.org/gems/activeadmin_dynamic_fields) [![linters](https://github.com/blocknotes/activeadmin_dynamic_fields/actions/workflows/linters.yml/badge.svg)](https://github.com/blocknotes/activeadmin_dynamic_fields/actions/workflows/linters.yml) [![specs](https://github.com/blocknotes/activeadmin_dynamic_fields/actions/workflows/specs.yml/badge.svg)](https://github.com/blocknotes/activeadmin_dynamic_fields/actions/workflows/specs.yml)
+[![gem version](https://badge.fury.io/rb/activeadmin_dynamic_fields.svg)](https://badge.fury.io/rb/activeadmin_dynamic_fields) [![gem downloads](https://badgen.net/rubygems/dt/activeadmin_dynamic_fields)](https://rubygems.org/gems/activeadmin_dynamic_fields) [![linters](https://github.com/blocknotes/activeadmin_dynamic_fields/actions/workflows/linters.yml/badge.svg)](https://github.com/blocknotes/activeadmin_dynamic_fields/actions/workflows/linters.yml) [![specs](https://github.com/blocknotes/activeadmin_dynamic_fields/actions/workflows/specs_rails70.yml/badge.svg)](https://github.com/blocknotes/activeadmin_dynamic_fields/actions/workflows/specs_rails70.yml)
 
 An Active Admin plugin to add dynamic behaviors to some fields.
 
@@ -63,13 +63,14 @@ Actions:
   + **hide**: hides elements (ex. `"data-then": "hide", "data-target": ".errors"`)
   + **slide**: hides elements (using sliding)
   + **fade**: hides elements (using fading)
-  + **addClass**: adds classes (ex. `"data-then": "addClass red"`)
-  + **addStyle**: adds some styles (ex. `"data-then": "addStyle color: #fb1; font-size: 12px"`)
-  + **setText**: set the text of an element (ex. `"data-then": "setText A sample text"`)
-  + **setValue**: set the value of an input element (ex. `"data-then": "setValue A sample value"`)
+  + **addClass**: adds classes (ex. `"data-then": "addClass", "data-args": "red"`)
+  + **addStyle**: adds some styles (ex. `"data-then": "addStyle", "data-args": "color: #fb1; font-size: 12px"`)
+  + **setText**: set the text of an element (ex. `"data-then": "setText", "data-args": "A sample text"`)
+  + **setValue**: set the value of an input element (ex. `"data-then": "setValue", "data-args": "A sample value"`)
   + **callback**: call a function (with arguments: **data-args**) (ex. `"data-then": "callback a_fun"`)
+- **data-args**: arguments passed to the triggered action (or to the callback function)
 - **data-else**: action to trigger when the condition check is not true
-- **data-args**: arguments passed to the callback function
+- **data-else-args**: arguments passed to the triggered else action
 
 Targets:
 
@@ -98,14 +99,14 @@ end
 - Add 3 classes (*first*, *second*, *third*) if a checkbox is not checked, else add "forth" class:
 
 ```rb
-data = { if: 'not_checked', then: 'addClass first second third', target: '.grp1', else: 'addClass forth' }
+data = { if: 'not_checked', then: 'addClass', args: 'first second third', target: '.grp1', else: 'addClass', 'else-args': 'forth' }
 f.input :published, input_html: { data: data }
 ```
 
 - Set another field value if a string field is blank:
 
 ```rb
-f.input :title, input_html: { data: { if: 'blank', then: 'setValue 10', target: '#article_position' } }
+f.input :title, input_html: { data: { if: 'blank', then: 'setValue', args: '10', target: '#article_position' } }
 ```
 
 - Use a custom function for conditional check (*title_not_empty()* must be available on global scope) (with alternative syntax for data attributes):
@@ -234,17 +235,61 @@ end
 
 The link url is loaded via AJAX before opening the dialog.
 
+## Development
+
+Project created by [Mattia Roccoberton](http://blocknot.es), thanks also to the good guys that opened issues and pull requests from time to time.
+
+There 3 ways to interact with this project:
+
+1) Using Docker:
+
+```sh
+# Run rails server on the dummy app (=> http://localhost:3000 to access to ActiveAdmin):
+make up
+# Enter in a Rails console (with the dummy app started):
+make console
+# Enter in a shell (with the dummy app started):
+make shell
+# Run the linter on the project (with the dummy app started):
+make lint
+# Run the test suite (with the dummy app started):
+make specs
+# Remove container and image:
+make cleanup
+# To try different versions of Ruby/Rails/ActiveAdmin edit docker-compose.yml
+# For more commands please check the Makefile
+```
+
+2) Using Appraisal:
+
+```sh
+export RAILS_ENV=development
+# Install dependencies:
+bin/appraisal
+# Run server (or any command):
+bin/appraisal rails s
+# Or with a specific configuration:
+bin/appraisal rails80-activeadmin rails s
+```
+
+3) With a local setup:
+
+```sh
+# Dev setup (set the required envs):
+source extra/dev_setup.sh
+# Install dependencies:
+bundle update
+# Run server (or any command):
+bin/rails s
+# To try different versions of Rails/ActiveAdmin edit extra/dev_setup.sh
+```
+
 ## Do you like it? Star it!
 
 If you use this component just star it. A developer is more motivated to improve a project when there is some interest. My other [Active Admin components](https://github.com/blocknotes?utf8=✓&tab=repositories&q=activeadmin&type=source).
 
 Or consider offering me a coffee, it's a small thing but it is greatly appreciated: [about me](https://www.blocknot.es/about-me).
 
-## Contributors
-
-- [Mattia Roccoberton](http://blocknot.es): author
-- The good guys that opened issues and pull requests from time to time
-
 ## License
 
 The gem is available as open-source under the terms of the [MIT](LICENSE.txt).

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

@@ -1,3 +1,4 @@
+/* global $ */
 (function () {
   'use strict'
 
@@ -12,8 +13,9 @@
       }
     },
     callback: (el, name) => {
-      const cb_function = window.hasOwnProperty(name) ? window[name] : null
-      if (typeof cb_function === 'function') cb_function(el.data('args'))
+      const callbackDefined = Object.prototype.hasOwnProperty.call(window, name)
+      const callbackFunction = callbackDefined ? window[name] : null
+      if (typeof callbackFunction === 'function') callbackFunction(el.data('args'))
       else {
         el.attr('data-df-errors', 'callback function not found')
         console.warn(`activeadmin_dynamic_fields callback function not found: ${name}`)
@@ -33,7 +35,7 @@
   // noinspection EqualityComparisonWithCoercionJS, JSUnusedGlobalSymbols
   const CONDITIONS = {
     blank: el => el.val().length === 0 || !el.val().trim(),
-    changed: _el => true,
+    changed: () => true,
     checked: el => el.is(':checked'),
     eq: (el, value) => el.val() == value,
     match: (el, regexp) => regexp.test(el.val()),
@@ -77,50 +79,71 @@
     }
 
     evaluateAction() {
-      const action = this.el.data('then') || this.el.data('action') || ''
-      const action_name = action.split(' ', 1)[0]
-      const else_action = this.el.data('else') || ''
-      const else_action_name = else_action.split(' ', 1)[0]
+      const dataAction = this.el.data('then') || this.el.data('action') || ''
+      const actionName = dataAction.split(' ', 1)[0]
+      const dataElse = this.el.data('else') || ''
+      const elseActionName = dataElse.split(' ', 1)[0]
 
-      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.action = ACTIONS[actionName]
+      if (actionName == 'callback') {
+        this.action_arg = dataAction.substring(dataAction.indexOf(' ') + 1)
+      } else {
+        this.action_arg = this.el.data('args') || dataAction.substring(dataAction.indexOf(' ') + 1)
+      }
+      this.reverse_action = REVERSE_ACTIONS[actionName]
+      this.else_action = ACTIONS[elseActionName]
+      if (elseActionName == 'callback') {
+        this.else_action_arg = dataElse.substring(dataElse.indexOf(' ') + 1)
+      } else {
+        this.else_action_arg = this.el.data('else-args') || dataElse.substring(dataElse.indexOf(' ') + 1)
+      }
+      this.else_reverse_action = REVERSE_ACTIONS[elseActionName]
 
-      return action_name
+      return actionName
     }
 
     evaluateCondition() {
-      let value
-      if (value = this.el.data('if')) {
+      let value = this.el.data('if')
+      if (value) {
         if (REGEXP_NOT.test(value)) value = 'not_' + value.replace(REGEXP_NOT, '')
+
         return { condition: CONDITIONS[value] }
       }
-      if (value = this.el.data('eq')) {
+
+      value = this.el.data('eq')
+      if (value) {
         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')) {
+
+      value = this.el.data('not')
+      if (value) {
         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')) {
+
+      value = this.el.data('match')
+      if (value) {
         return { condition: CONDITIONS['match'], condition_arg: new RegExp(value) }
       }
-      if (value = this.el.data('mismatch')) {
+
+      value = this.el.data('mismatch')
+      if (value) {
         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 }
+        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}`)
@@ -166,16 +189,17 @@
         data: { data: data },
         method: 'POST',
         url: $(this).data('save-url'),
-        complete: function (_req, _status) {
+        complete: function () {
           $(this).data('loading', '0');
         },
-        success: function (data, _status, _req) {
+        success: function (data) {
           if (data.status === 'error') {
             if ($(this).data('show-errors')) {
               let result = '';
               let message = data.message;
               for (let key in message) {
-                if (message.hasOwnProperty(key) && typeof (message[key]) === 'object') {
+                const keyAvailable = Object.prototype.hasOwnProperty.call(message, key)
+                if (keyAvailable && typeof (message[key]) === 'object') {
                   if (result) result += ' - ';
                   result += key + ': ' + message[key].join('; ');
                 }
@@ -232,10 +256,10 @@
         let title = $(this).attr('title')
         $.ajax({
           url: $(this).attr('href'),
-          complete: function (_req, _status) {
+          complete: function () {
             $('#df-dialog').data('loading', '0')
           },
-          success: function (data, _status, _req) {
+          success: function (data) {
             const dialog = $('#df-dialog')
             if (title) dialog.attr('title', title)
             dialog.html(data)

data/lib/activeadmin/dynamic_fields/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveAdmin
   module DynamicFields
-    VERSION = '0.8.0'
+    VERSION = '0.9.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_dynamic_fields
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-10 00:00:00.000000000 Z
+date: 2025-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Dynamic fields for ActiveAdmin