feat(chart): add support for context variables inside SQL query (#1028)

Author: VincentMolinie

package.json

@@ -28,7 +28,7 @@
     "@babel/runtime": "7.15.4",
     "bluebird": "2.9.25",
     "core-js": "3.6.5",
-    "forest-express": "10.0.0-beta.3",
+    "forest-express": "10.0.0",
     "http-errors": "1.6.1",
     "lodash": "4.17.21",
     "moment": "2.29.4",

src/services/query-stat-getter.js

@@ -1,18 +1,19 @@
 
 function QueryStatGetter(params, opts) {
-  const QUERY_OPTIONS_SELECT = { type: opts.Sequelize.QueryTypes.SELECT };
-
   this.perform = function perform() {
     let rawQuery = params.query.trim();
+    const bind = params.contextVariables || {};
 
-
-    if (params.record_id) {
-      rawQuery = rawQuery.replace(new RegExp('\\?', 'g'), params.record_id);
+    if (bind.recordId && !rawQuery.includes('$recordId')) {
+      rawQuery = rawQuery.replace(/\?/g, '$recordId');
     }
 
     // WARNING: Choosing the first connection might generate issues if the model
     //          does not belongs to this database.
-    return Object.values(opts.connections)[0].query(rawQuery, QUERY_OPTIONS_SELECT);
+    return Object.values(opts.connections)[0].query(rawQuery, {
+      type: opts.Sequelize.QueryTypes.SELECT,
+      bind,
+    });
   };
 }
 

yarn.lock

@@ -1199,10 +1199,10 @@
   resolved "https://registry.yarnpkg.com/@forestadmin/context/-/context-1.31.0.tgz#b4b5a3b589e52d337a1f45807db22c2860e640a7"
   integrity sha512-RQkDBkq+6ySMv+YNezz9VWSyCsqD7fj/+bXrXhQ6lJ62nbRUIUheH7ApvXwfnwFR1u55oT6Yhar11t6DaiE9Ig==
 
-"@forestadmin/[email protected]-alpha.3":
-  version "1.0.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/@forestadmin/forestadmin-client/-/forestadmin-client-1.0.0-alpha.3.tgz#1dfb5beba8a201d36d218ca804f8af3e47307691"
-  integrity sha512-aEcIgwGRVDJbMzkI2Io3bpQqDEHp039r2jlOs5aFjvpycAc+Y2NYwBmUbepBy2L89lQ3Cw732hDsah9AvlUM/A==
+"@forestadmin/[email protected]":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@forestadmin/forestadmin-client/-/forestadmin-client-1.0.0.tgz#37a452b290187e415633c9ca4494a3a81457434a"
+  integrity sha512-o2F5ChAQ2NJbk8PrYdc7hzo04nmZwvHv/axaBASvvoer5HDMoSaQ3GZjqfw1kkdalfRDq9HnNps4Zm+8T0qUUg==
   dependencies:
     jsonwebtoken "^8.5.1"
     lru-cache "^7.3.1"
@@ -4599,14 +4599,14 @@ for-in@^1.0.2:
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
-[email protected]-beta.3:
-  version "10.0.0-beta.3"
-  resolved "https://registry.yarnpkg.com/forest-express/-/forest-express-10.0.0-beta.3.tgz#3873934dd8acf06003c18ce4f01ba5da61b2596f"
-  integrity sha512-IJsVd4YsARTs6ix+/apHDBXUMcB5R9Sq1am8i/rI2Qi/zii2Z6JrTtHfkeNadNQXU4TZVOrXvIvPHuiMkpVLWQ==
+[email protected]:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/forest-express/-/forest-express-10.0.0.tgz#10f76f9617739340ffa0b3fabaddf5998d3482bd"
+  integrity sha512-qtrs988yfyW23Od6OSnwxGstRhVWgOO5Z6edJ42IiU4dUvrGHq8o9NbZpSd9kfv7JROzURews6gsoAvJ8IInnA==
   dependencies:
     "@babel/runtime" "7.19.0"
     "@forestadmin/context" "1.31.0"
-    "@forestadmin/forestadmin-client" "1.0.0-alpha.3"
+    "@forestadmin/forestadmin-client" "1.0.0"
     base32-encode "1.1.1"
     bitwise-xor "0.0.0"
     bluebird "3.7.1"