activeadmin_dynamic_fields 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '019f2b81ed1552f13f57b73141860957f4869b10de1f018a289aa8724cc23ec1'
-  data.tar.gz: 4ed1bb60f5b1ddef1a3d870296d8548faa18cc36db5adadb8271f0c655c769f6
+  metadata.gz: 64bede8d2c37bae18d72078be390d20e182035f02496f797a30acf02bf025329
+  data.tar.gz: 5629d5a20bc6e9f36f1873127971d01cbaf979159fac4e81c62b7e60f4eb5c7c
 SHA512:
-  metadata.gz: b07cc4e73b801ef79ee52b52a6c82117d7e966a2f1eadb0e415e00c608456c02f2c14694c2fc41037ad381c9c0c3bfbf1c0ed96c0c6d13bd0ce3335c38dc1e11
-  data.tar.gz: c0aa33df12ef6ed16927a49bb9b93d0fcffeffc6f20b661f11edb350544f12e550f90fd5fa5870a43154c0097995bbb02f2f80f24e1ff821eddc2d0fa60e613d
+  metadata.gz: f9e4f26043ed9970de78044eda0ab671b005b92b612efcc6912604cefb46078dcac839f75f004982e501bd079167caf58ecf35be7a68cbdf2968a7e98fd9907a
+  data.tar.gz: 62888b36a03b0945c7fb7e9defae7ea429570158c6cc70b2e171ccf5de65bd85301838ff88c864ba5faad1cfc5f6e1d32e00541f18a8ee3f77d369151fb75198

data/README.md

@@ -208,9 +208,9 @@ end
 The link url is loaded via AJAX before opening the dialog.
 
 ## 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.
+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).
 
-Take a look at [other ActiveAdmin components](https://github.com/blocknotes?utf8=✓&tab=repositories&q=activeadmin&type=source) that I made if you are curious.
+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

data/Rakefile

@@ -1,3 +1,16 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+
+begin
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    # t.ruby_opts = %w[-w]
+    t.rspec_opts = ['--color', '--format documentation']
+  end
+
+  task default: :spec
+rescue LoadError
+  puts '! LoadError: no RSpec available'
+end

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

@@ -1,6 +1,7 @@
 (function () {
   'use strict'
 
+  // noinspection JSUnusedGlobalSymbols
   const ACTIONS = {
     addClass: (el, name) => el.addClass(name),
     addStyle: (el, extra_style) => {
@@ -11,7 +12,8 @@
       }
     },
     callback: (el, name) => {
-      if (window[name]) window[name](el.data('args'))
+      const cb_function = window.hasOwnProperty(name) ? window[name] : null
+      if (typeof cb_function === 'function') cb_function(el.data('args'))
       else {
         el.attr('data-df-errors', 'callback function not found')
         console.warn(`activeadmin_dynamic_fields callback function not found: ${name}`)
@@ -21,13 +23,14 @@
     hide: el => el.hide(),
     setText: (el, text) => el.text(text),
     setValue: (el, value) => {
-      if (el.attr('type') == 'checkbox') el.prop('checked', value == '1')
+      if (el.attr('type') === 'checkbox') el.prop('checked', value === '1')
       else el.val(value)
       el.trigger('change')
     },
     slide: el => el.slideUp()
   }
 
+  // noinspection EqualityComparisonWithCoercionJS, JSUnusedGlobalSymbols
   const CONDITIONS = {
     blank: el => el.val().length === 0 || !el.val().trim(),
     changed: _el => true,
@@ -90,10 +93,18 @@
     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) }
+
+      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) }
 
       this.custom_function = this.el.data('function')
       if (this.custom_function) {
@@ -112,32 +123,30 @@
       // 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
+      if (action_name === 'callback') this.target = this.el
     }
 
     isValid() {
       if (!this.condition) return false
-      if (!this.action && !this.custom_function) return false
-
-      return true
+      return (this.action || this.custom_function)
     }
 
     setup() {
       if (!this.isValid()) return
-      if (this.el.data('if') != 'changed') this.apply()
+      if (this.el.data('if') !== 'changed') this.apply()
       this.el.on('change', () => this.apply())  
     }
   }
 
-  // Inline update - must be called binded on the editing element
+  // Inline update - must be called bound on the editing element
   function dfUpdateField() {
-    if ($(this).data('loading') != '1') {
+    if ($(this).data('loading') !== '1') {
       $(this).data('loading', '1');
       let _this = $(this);
       let type = $(this).data('field-type');
       let new_value;
-      if (type == 'boolean') new_value = !$(this).data('field-value');
-      else if (type == 'select') new_value = $(this).val();
+      if (type === 'boolean') new_value = !$(this).data('field-value');
+      else if (type === 'select') new_value = $(this).val();
       else new_value = $(this).text();
       let data = {};
       data[$(this).data('field')] = new_value;
@@ -146,16 +155,16 @@
         data: { data: data },
         method: 'POST',
         url: $(this).data('save-url'),
-        complete: function (req, status) {
+        complete: function (_req, _status) {
           $(this).data('loading', '0');
         },
-        success: function (data, status, req) {
-          if (data.status == 'error') {
+        success: function (data, _status, _req) {
+          if (data.status === 'error') {
             if ($(this).data('show-errors')) {
               let result = '';
               let message = data.message;
               for (let key in message) {
-                if (typeof (message[key]) === 'object') {
+                if (message.hasOwnProperty(key) && typeof (message[key]) === 'object') {
                   if (result) result += ' - ';
                   result += key + ': ' + message[key].join('; ');
                 }
@@ -181,8 +190,7 @@
     }
   }
 
-  // Init
-  $(document).ready(function () {
+  function dfInit() {
     // Setup dynamic fields
     const selectors = '.active_admin .input [data-if], .active_admin .input [data-eq], .active_admin .input [data-not], .active_admin .input [data-match], .active_admin .input [data-mismatch], .active_admin .input [data-function]'
     $(selectors).each(function () {
@@ -205,20 +213,23 @@
     $('.active_admin [data-df-dialog]').on('click', function (event) {
       event.preventDefault()
       $(this).blur()
-      if ($('#df-dialog').data('loading') != '1') {
-        $('#df-dialog').data('loading', '1')
-        if ($('#df-dialog').length == 0) $('body').append('<div id="df-dialog"></div>')
+      const df_dialog = $('#df-dialog')
+
+      if (df_dialog.data('loading') !== '1') {
+        df_dialog.data('loading', '1')
+        if (df_dialog.length === 0) $('body').append('<div id="df-dialog"></div>')
         let title = $(this).attr('title')
         $.ajax({
           url: $(this).attr('href'),
-          complete: function (req, status) {
+          complete: function (_req, _status) {
             $('#df-dialog').data('loading', '0')
           },
-          success: function (data, status, req) {
-            if (title) $('#df-dialog').attr('title', title)
-            $('#df-dialog').html(data)
-            $('#df-dialog').dialog({ modal: true })
-          },
+          success: function (data, _status, _req) {
+            const dialog = $('#df-dialog')
+            if (title) dialog.attr('title', title)
+            dialog.html(data)
+            dialog.dialog({ modal: true })
+          }
         })
       }
     })
@@ -231,11 +242,14 @@
       $(this).data('field-value', $(this).text())
       let fnUpdate = $.proxy(dfUpdateField, $(this))
       $(this).on('blur', function () {
-        if ($(this).data('field-value') != $(this).text()) fnUpdate()
+        if ($(this).data('field-value') !== $(this).text()) fnUpdate()
       })
     })
     $('[data-field][data-field-type="select"][data-save-url]').each(function () {
       $(this).on('change', $.proxy(dfUpdateField, $(this)))
     })
-  })
+  }
+
+  $(document).ready(dfInit)
+  $(document).on('turbolinks:load', dfInit)
 })()

data/lib/activeadmin/dynamic_fields/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_dynamic_fields
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-04 00:00:00.000000000 Z
+date: 2021-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -30,126 +30,154 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3.2
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3.2
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.33.0
+        version: '3.33'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.33.0
+        version: '3.33'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.5
+        version: '4.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.5
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.90.0
+        version: '0.90'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.90.0
+        version: '0.90'
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.142.7
+        version: '3.142'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.142'
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.142.7
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '1.4'
 description: An Active Admin plugin to add dynamic behaviors to fields
 email: mat@blocknot.es
 executables: []
@@ -183,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Dynamic fields for ActiveAdmin