fix(core/reports): chart.js plugin option formalae are not correctly …

…evaluated
gnucoop · Feb 12, 2020 · 626a10c · 626a10c
1 parent 9281e05
commit 626a10c
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/core/reports/utils/widgets-instances/widget-to-widget-instance.ts b/src/core/reports/utils/widgets-instances/widget-to-widget-instance.ts
@@ -117,15 +117,16 @@ export function widgetToWidgetInstance(
       const plugins = cw.options.plugins;
       const pluginNames = Object.keys(plugins);
       pluginNames.forEach((pluginName) => {
-        const pluginOptions = Object.keys(plugins[pluginName]);
-        pluginOptions.forEach((pluginOptionLabel: string) => {
-          const pluginOption = plugins[pluginName][pluginOptionLabel];
+        const plugin = plugins[pluginName];
+        const pluginOptions = Object.keys(plugin);
+        pluginOptions.forEach((pluginOptionName: string) => {
+          const pluginOption = plugin[pluginOptionName];
           if (
             typeof pluginOption !== 'string' &&
             pluginOption != null &&
-            pluginOption.formula != null) {
-            plugins[pluginName][pluginOption] =
-            evaluateExpression(plugins[pluginName][pluginOption].formula, context);
+            pluginOption.formula != null
+          ) {
+            plugin[pluginOptionName] = evaluateExpression(pluginOption.formula, context);
           }
         });
       });