kanaui 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c74b8f72b208b13b20e079654c00f793b3d0c663cd33f9dbb4957aa6fd420e6
-  data.tar.gz: 859e32a01514363bb64f4c3772c0d6b70b2ed72fb0daa0d4bda8facef7bba877
+  metadata.gz: 42c66ccd44ece7ec950473fb78babede09820bc172266b706dae65bc8c6a918a
+  data.tar.gz: 479b475c455f7206e5b6dc9cee937d2233024fb6315ba45707f849026ed492b0
 SHA512:
-  metadata.gz: 52219b23e1cdd624809a26bc71ab8ea903d3c649ff5e5e6d3fe74538c850341680a189d9e50f1c19097df907430b49dc27009f63319a27f110635b3a4afa6589
-  data.tar.gz: 2606b237d12c8e5f4ecf5bcca19bed63ef34eb38c0adb862f4924f3e3d6afe898fdccf53474d328d49cbaa9026d38253f88e4306f5049937c9fd46ccb4601336
+  metadata.gz: 349c9dfbd70cef4a3a99416dfba1320850cb9e006d062f5bb2b6002b1dfa03b3b9b20c91e5473a292f57138ad69c5792793ffa699d5023442409defdd6bb1624
+  data.tar.gz: edaeac825ea58a5a349853cbe1b5a74a583cc147f75118d14b99a31cc118d547c51e9fc863e22d710eea6b00c6b95d515ae24cb89cd266fffe14625b2c8346f3

data/app/assets/javascripts/kanaui/kiddo/kiddo_initialize.js

@@ -21,57 +21,240 @@
     );
   }
 
+  // Workaround for a MariaDB JDBC connector v3.x parser bug in the bundled
+  // analytics plugin: any request that contains a `^dimension:` clause causes
+  // the plugin to generate a `CASE ... END AS \`field\`` expression that the
+  // driver mangles, returning a 500 ("near '' at line N").
+  //
+  // The same data can be obtained by issuing one `^filter:(field=value)`
+  // request per dimension value and stitching the single-series payloads
+  // together client-side. Filter-only requests don't trigger the bug.
+  //
+  // Returns an array of { path, label } objects. When no dimension is present,
+  // returns a single entry with the original path and a null label.
+  function expandDimensionToFilters(reportsPath) {
+    var url;
+    try {
+      url = new URL(reportsPath, window.location.origin);
+    } catch (e) {
+      return [{ path: reportsPath, label: null }];
+    }
+
+    var nameParam = url.searchParams.get("name");
+    if (!nameParam) {
+      return [{ path: reportsPath, label: null }];
+    }
+
+    var parts = nameParam.split("^");
+    var baseName = parts[0];
+    var clauses = parts.slice(1);
+
+    var dimensionField = null;
+    var dimensionValues = [];
+    var otherClauses = [];
+
+    clauses.forEach(function (c) {
+      var m = c.match(/^dimension:([^(]+)\(([^)]+)\)$/);
+      if (m && dimensionField === null) {
+        dimensionField = m[1];
+        dimensionValues = m[2].split("|");
+      } else {
+        otherClauses.push(c);
+      }
+    });
+
+    if (dimensionField === null || dimensionValues.length === 0) {
+      return [{ path: reportsPath, label: null }];
+    }
+
+    // If there is also a filter on the same field (e.g. filter:(currency=USD|EUR)),
+    // intersect it with the dimension values so the filter still narrows the
+    // displayed series. Otherwise we'd silently re-introduce values the user
+    // filtered out.
+    var sameFieldFilterValues = null;
+    otherClauses.forEach(function (c) {
+      var fm = c.match(/^filter:\((.+)\)$/);
+      if (!fm) {
+        return;
+      }
+      // Filter syntax is repeated `field=value` pairs joined by `|`,
+      // e.g. `currency=USD|currency=EUR` (NOT `currency=USD|EUR`).
+      var pairs = fm[1].split("|");
+      var values = [];
+      var matched = false;
+      for (var i = 0; i < pairs.length; i++) {
+        var eq = pairs[i].indexOf("=");
+        if (eq === -1) {
+          continue;
+        }
+        var field = pairs[i].substring(0, eq);
+        var value = pairs[i].substring(eq + 1);
+        if (field === dimensionField) {
+          matched = true;
+          values.push(value);
+        }
+      }
+      if (matched) {
+        sameFieldFilterValues = (sameFieldFilterValues || []).concat(values);
+      }
+    });
+
+    if (sameFieldFilterValues) {
+      dimensionValues = dimensionValues.filter(function (v) {
+        return sameFieldFilterValues.indexOf(v) !== -1;
+      });
+      if (dimensionValues.length === 0) {
+        // Filter excluded every dimension value — nothing to render.
+        return [];
+      }
+    }
+
+    return dimensionValues.map(function (value) {
+      // Drop the same-field filter clause — we replace it with a single-value
+      // filter for this fan-out request. Filters on other fields are kept.
+      var preservedClauses = otherClauses.filter(function (c) {
+        var fm = c.match(/^filter:\((.+)\)$/);
+        if (!fm) {
+          return true;
+        }
+        return fm[1].indexOf(dimensionField + "=") === -1;
+      });
+
+      preservedClauses.push("filter:(" + dimensionField + "=" + value + ")");
+
+      var newName = baseName + "^" + preservedClauses.join("^");
+      var newUrl = new URL(url.toString());
+      newUrl.searchParams.set("name", newName);
+
+      return { path: newUrl.toString(), label: value };
+    });
+  }
+
+  // Merge an array of single-series plugin responses (one per dimension value)
+  // into a single multi-series payload compatible with the existing renderer.
+  function mergeFanOutResults(results) {
+    var firstValid = null;
+    for (var i = 0; i < results.length; i++) {
+      var r = results[i];
+      if (r && r.json && r.json[0]) {
+        firstValid = r;
+        break;
+      }
+    }
+    if (!firstValid) {
+      return null;
+    }
+
+    var merged = {
+      name: firstValid.json[0].name,
+      type: firstValid.json[0].type,
+      data: [],
+    };
+
+    results.forEach(function (r) {
+      if (!r || !r.json || !r.json[0] || !r.json[0].data) {
+        return;
+      }
+      r.json[0].data.forEach(function (series) {
+        merged.data.push({
+          // Use the dimension value as the series name so the chart legend
+          // distinguishes USD vs EUR vs GBP etc.
+          name: r.label || series.name,
+          values: series.values,
+          value: series.value,
+        });
+      });
+    });
+
+    return merged;
+  }
+
+  function renderPayload(data) {
+    var renderer = new Kiddo.Renderer("#chartAnchor");
+
+    if (data === undefined || data.data === undefined || data.data.length == 0) {
+      return renderer.noData();
+    }
+
+    try {
+      switch (data.type) {
+        case "COUNTERS":
+          renderer.pieChart(data);  
+          break;
+        case "TIMELINE":
+          renderer.lineChart(data);
+          // Date controls only make sense for timelines
+          $("#date-controls").show();
+          break;
+        case "TABLE":
+          renderer.table(data);
+          break;
+        default:
+          console.log("No such type implemented: " + data.type);
+          renderer.noData();
+      }
+    } catch (ex) {
+      console.log(ex);
+      renderer.noData();
+    }
+  }
+
   $(document).ready(function () {
     if ($("#chartAnchor").length == 0) {
       return;
     }
 
-    d3.json($("#chartAnchor").data("reports-path")).then(function (json) {
+    var reportsPath = $("#chartAnchor").data("reports-path");
+    var requests = expandDimensionToFilters(reportsPath);
+
+    if (window.console && console.info) {
+      console.info(
+        "[kanaui] dimension fan-out:",
+        requests.length,
+        "request(s)",
+        requests.map(function (r) {
+          return r.label;
+        })
+      );
+    }
+
+    if (requests.length === 0) {
       $("#loading-spinner").remove();
+      return new Kiddo.Renderer("#chartAnchor").noData();
+    }
 
-      var renderer = new Kiddo.Renderer("#chartAnchor");
+    var fetchAll = Promise.all(
+      requests.map(function (req) {
+        return d3.json(req.path).then(function (json) {
+          return { label: req.label, json: json };
+        });
+      })
+    );
 
-      var data = json[0];
+    fetchAll
+      .then(function (results) {
+        $("#loading-spinner").remove();
 
-      if (
-        data === undefined ||
-        data.data === undefined ||
-        data.data.length == 0
-      ) {
-        return renderer.noData();
-      }
+        var data;
+        if (results.length === 1 && results[0].label === null) {
+          // No dimension fan-out — preserve original single-request behavior.
+          data = results[0].json && results[0].json[0];
+        } else {
+          data = mergeFanOutResults(results);
+        }
 
-      var render = function (type) {
-        switch (type) {
-          case "COUNTERS":
-            renderer.pieChart(data);
-            break;
-          case "TIMELINE":
-            renderer.lineChart(data);
-            // Date controls only make sense for timelines
-            $("#date-controls").show();
-            break;
-          case "TABLE":
-            renderer.table(data);
-            break;
-          default:
-            console.log("No such type implemented: " + type);
-            renderer.noData();
+        if (!data) {
+          return new Kiddo.Renderer("#chartAnchor").noData();
         }
-      };
 
-      try {
-        render(data.type);
-      } catch (ex) {
-        console.log(ex);
-        renderer.noData();
-      }
-    }).catch(function (error) {
-      $("#loading-spinner").remove();
+        renderPayload(data);
+      })
+      .catch(function (error) {
+        $("#loading-spinner").remove();
 
-      var renderer = new Kiddo.Renderer("#chartAnchor");
-      renderError(errorMessage(error));
-      return renderer.noData();
-    });
+        var renderer = new Kiddo.Renderer("#chartAnchor");
+        renderError(errorMessage(error));
+        return renderer.noData();
+      });
   });
 })(d3, jQuery, window, document);

data/lib/kanaui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kanaui
-  VERSION = '5.0.2'
+  VERSION = '5.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanaui
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-03 00:00:00.000000000 Z
+date: 2026-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-datepicker-rails
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: spinjs-rails
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="