Merge branch 'develop' into fix/parsing-number

Author: BennuFire

src/chart/graph/util/RecordUtils.ts

@@ -1,6 +1,6 @@
 import { evaluateRulesOnNode, evaluateRulesOnLink } from '../../../extensions/styling/StyleRuleEvaluator';
 import { extractNodePropertiesFromRecords, mergeNodePropsFieldsLists } from '../../../report/ReportRecordProcessing';
-import { valueIsArray, valueIsNode, valueIsRelationship, valueIsPath } from '../../ChartUtils';
+import { valueIsArray, valueIsNode, valueIsRelationship, valueIsPath, toNumber } from '../../ChartUtils';
 import { GraphChartVisualizationProps } from '../GraphChartVisualization';
 import { assignCurvatureToLink } from './RelUtils';
 import { isNode } from 'neo4j-driver-core/lib/graph-types.js';
@@ -49,7 +49,9 @@ function extractGraphEntitiesFromField(
     nodes[value.identity.low] = {
       id: value.identity.low,
       labels: value.labels,
-      size: value.properties[nodeSizeProperty] ? value.properties[nodeSizeProperty] : defaultNodeSize,
+      size: !Number.isNaN(value.properties[nodeSizeProperty])
+        ? toNumber(value.properties[nodeSizeProperty])
+        : defaultNodeSize,
       properties: value.properties,
       mainLabel: value.labels[value.labels.length - 1],
     };
@@ -67,7 +69,9 @@ function extractGraphEntitiesFromField(
       source: value.start.low,
       target: value.end.low,
       type: value.type,
-      width: value.properties[relWidthProperty] ? value.properties[relWidthProperty] : defaultRelWidth,
+      width: !Number.isNaN(value.properties[relWidthProperty])
+        ? toNumber(value.properties[relWidthProperty])
+        : defaultRelWidth,
       color: value.properties[relColorProperty] ? value.properties[relColorProperty] : defaultRelColor,
       properties: value.properties,
     });

src/chart/parameter/component/DateParameterSelect.tsx

@@ -55,7 +55,7 @@ const DatePickerParameterSelectComponent = (props: ParameterSelectProps) => {
           setInputDate(newValue);
 
           // Check whether the user has inputted a valid year. If not, do not update the parameter.
-          if (!newValue || isNaN(newValue.$y) || isNaN(newValue.$m) || isNaN(newValue.$d)) {
+          if (!newValue || Number.isNaN(newValue.$y) || Number.isNaN(newValue.$m) || Number.isNaN(newValue.$d)) {
             return;
           }
           if (newValue == null && clearParameterOnFieldClear) {

src/extensions/advancedcharts/chart/gauge/GaugeChart.tsx

@@ -42,7 +42,7 @@ const NeoGaugeChart = (props: ChartProps) => {
   const chartId = createUUID();
   let score = records && records[0] && records[0]._fields && records[0]._fields[0] ? records[0]._fields[0] : '';
 
-  if (isNaN(score)) {
+  if (Number.isNaN(score)) {
     return <NoDrawableDataErrorMessage />;
   }
   if (score.low != undefined) {

src/extensions/advancedcharts/chart/radar/RadarChart.tsx

@@ -67,7 +67,7 @@ const NeoRadarChart = (props: ChartProps) => {
     const entry = {};
     selection.values.concat([selection.index]).forEach((k) => {
       const fieldIndex = r._fieldLookup[k];
-      if (k !== selection.index && isNaN(r._fields[fieldIndex])) {
+      if (k !== selection.index && Number.isNaN(r._fields[fieldIndex])) {
         valid = false;
       }
       entry[k] = `${r._fields[fieldIndex]}`;

src/extensions/advancedcharts/chart/sankey/SankeyChart.tsx

@@ -86,7 +86,7 @@ const NeoSankeyChart = (props: ChartProps) => {
           properties: value.properties,
           value: 1,
         });
-      } else if (value.properties[labelProperty] !== undefined && !isNaN(value.properties[labelProperty])) {
+      } else if (value.properties[labelProperty] !== undefined && !Number.isNaN(value.properties[labelProperty])) {
         addItem(links[`${value.start.low},${value.end.low}`], {
           id: value.identity.low,
           source: value.start.low,