five-two-nw-olivander 0.2.0.10 → 0.2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b9bf0db992977ea25a96b2782b638d482dc5c27333d2795f512496c306459ba
-  data.tar.gz: dadf2e11e29a241abee39db51583771ab16d825a38f1a57426b7a3fcff44af57
+  metadata.gz: 53428f87f834a6688a74a6cf57a397a782a2db6564323e553bf2b6ee8bc2c5b7
+  data.tar.gz: 9c9806f86484aac3c3ae2ea0c507cec257c70441b9e8c75898a3357a410c9f38
 SHA512:
-  metadata.gz: 344259001e8aab4349e3e27b65f7879c7600b14e6a3540933a2ac1b108e1b6ba439a4c593450176322a8dc1eaf16efd1b5cfc392039141ad80ed34d87bda6c92
-  data.tar.gz: 36925ee8e38aa720174e0c99bdbf457c87e4374b8b0f2ac5bd50932cbbf0f3c21c88a6755721421bd97433ef6ad2bff6c2d45a1a93c91047f2a68c3c0618f8c9
+  metadata.gz: bbdfe42a7b0334f2d9982ce924a87705013a3a23efc028464aeb3939b4eada997e21ed58d6b32136de9189a09bf215329bab2ab4b75d046e4359c480fb26ef79
+  data.tar.gz: 2092202bf22b34e041d672ff7b407b7f7556b1b879f917d81ee153ebc8f6c507e5490af8e8a294a67a098130933abb1c69316ab39c1592ae77e0b47b1a1ae0b2

data/app/assets/javascripts/controllers/datatable_index_charts_controller.js

@@ -6,18 +6,19 @@ export default class extends Controller {
     var self = this
 
     $(".effective-datatable").on("draw.dt", function(e, dt, type, indexes) {
-      var jsonCharts = dt.json.charts
-      for (var chart in jsonCharts) {
-        var chartkickChart = Chartkick.charts[chart]
-        chartkickChart.updateData(self.transformData(jsonCharts[chart]))
-        chartkickChart.redraw()
+      if (dt && dt.json && dt.json.charts) {
+        var jsonCharts = dt.json.charts
+        for (var chart in jsonCharts) {
+          var chartkickChart = Chartkick.charts[chart]
+          chartkickChart.updateData(self.transformData(jsonCharts[chart]))
+          chartkickChart.redraw()
+        }
       }
     });
   }
 
   transformData(chart) {
     var self = this
-    console.log("let's transform some data")
     if (chart.as == 'LineChart') {
       // we don't know what to do
       return chart.data

data/app/assets/javascripts/controllers/input_control_association_controller.js

@@ -6,9 +6,11 @@ export default class extends Controller {
     var self = this,
         el = self.element;
 
+    console.log('did we do anything')
     if (!$(el).hasClass("select2-hidden-accessible")) {
       $(el).select2({
         dropdownParent: $(el).parent(),
+        minimumInputLength: el.dataset.minimumInputLength || 0,
         tags: el.dataset.taggable == 'true',
         createTag: function (tag) {
           return {
@@ -20,8 +22,20 @@ export default class extends Controller {
         ajax: {
           url: el.dataset.collectionPath,
           delay: 250,
-          minimumInputLength: 2,
           dataType: 'json',
+          data: function(params) {
+            console.log(params)
+            var hash = {
+              term: params.term,
+              _type: params._type,
+            }
+
+            if (el.dataset.tagParentId) {
+              hash[el.dataset.tagParentSearch] = el.dataset.tagParentId
+            }
+
+            return hash;
+          },
           processResults: function(data) {
             return { results: data.map(function(map) {
               return {
@@ -40,6 +54,7 @@ export default class extends Controller {
               data = new FormData()
           data.append("authenticity_token", document.querySelector('meta[name="csrf-token"]').content)
           data.append(el.dataset.tagFieldName, tag.text)
+          data.append(el.dataset.tagParentField, el.dataset.tagParentId)
           fetch(el.dataset.collectionPath, {
             method: 'POST',
             headers: {

data/app/views/layouts/olivander/adminlte/_head.html.haml

@@ -8,5 +8,6 @@
   %link{ rel: 'stylesheet', href: 'https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700&display=fallback' }
   = javascript_include_tag "https://www.gstatic.com/charts/loader.js"
   = stylesheet_link_tag "adminlte", "data-turbo-track": "reload"
+  = stylesheet_link_tag "application", "data-turbo-track": "reload"
   = javascript_include_tag "adminlte", "data-turbo-track": "reload"
   = javascript_importmap_tags

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = '0.2.0.10'.freeze
+  VERSION = '0.2.0.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.2.0.10
+  version: 0.2.0.12
 platform: ruby
 authors:
 - Eric Dennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-27 00:00:00.000000000 Z
+date: 2024-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick