NodeHandler

Author: BennuFire

src/card/view/CardViewHeader.tsx

@@ -15,6 +15,7 @@ import ImageIcon from '@material-ui/icons/Image';
 import CloseIcon from '@material-ui/icons/Close';
 import ReactMarkdown from 'react-markdown';
 import gfm from 'remark-gfm';
+import { replaceDashboardParameters } from '../../chart/ChartUtils';
 
 const NeoCardViewHeader = ({
   title,
@@ -37,13 +38,8 @@ const NeoCardViewHeader = ({
   const [descriptionModalOpen, setDescriptionModalOpen] = React.useState(false);
 
   function replaceParamsOnString(s, p) {
-    let parsed = `${s} `;
-    for (const [key, value] of Object.entries(p)) {
-      // TODO: make this a regex.
-      parsed = parsed.replace(`$${key} `, `${value} `);
-      parsed = parsed.replace(`$${key},`, `${value},`);
-      parsed = parsed.replace(`$${key}.`, `${value}.`);
-    }
+    let parsed: string;
+    parsed = replaceDashboardParameters(s, p);
     return parsed;
   }
 

src/chart/ChartUtils.ts

@@ -208,7 +208,11 @@ export function replaceDashboardParameters(str, parameters) {
   let newString = str.replace(rx, parameterElementReplacer);
 
   Object.keys(parameters).forEach((key) => {
-    newString = newString.replaceAll(`$${key}`, parameters[key] !== null ? parameters[key] : '');
+    let valueRender = RenderSubValue(parameters[key]);
+    newString = newString.replaceAll(`$${key}`, `${valueRender} `);
+    newString = newString.replaceAll(`$${key},`, `${valueRender},`);
+    newString = newString.replaceAll(`$${key}.`, `${valueRender}.`);
+    newString = newString.replaceAll(`$${key})`, `${valueRender})`);
   });
 
   return newString;

src/settings/SettingsThunks.ts

@@ -1,6 +1,6 @@
 import { setSessionParameters } from '../application/ApplicationActions';
 import { hardResetCardSettings } from '../card/CardActions';
-import { castToNeo4jDate, isCastableToNeo4jDate } from '../chart/ChartUtils';
+import { castToNeo4jDate, isCastableToNeo4jDate, valueIsNode } from '../chart/ChartUtils';
 import { createNotificationThunk } from '../page/PageThunks';
 import { updateDashboardSetting } from './SettingsActions';
 
@@ -29,7 +29,8 @@ export const updateGlobalParameterThunk = (key, value) => (dispatch: any, getSta
     const { settings } = getState().dashboard;
     const parameters = settings.parameters ? settings.parameters : {};
     if (value !== undefined) {
-      parameters[key] = value;
+      let valueFinal = valueIsNode(value) ? Object.assign({}, value) : value;
+      parameters[key] = valueFinal;
     } else {
       delete parameters[key];
     }