fix: be more resilient with invalid types

`dlv` doesn't support `undefined` as a key.
cheminfo · Feb 25, 2025 · cb369fc · cb369fc
1 parent 176c5bb
commit cb369fc
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/src/component/panels/multipleAnalysisPanel/AnalysisChart.tsx b/src/component/panels/multipleAnalysisPanel/AnalysisChart.tsx
@@ -110,13 +110,21 @@ export function getPlotDataAsString(
       for (const col of spectraPanelPreferences.columns) {
         if (col.visible && 'jpath' in col) {
           const jpath = (col as JpathTableColumn)?.jpath;
-          const value = dlv(spectrum, jpath, `null`);
+          const value = jpath ? dlv(spectrum, jpath, 'null') : 'null';
           cellsValues.push(value);
         }
       }
 
-      const x = xData ? xData[spectrum.id] : dlv(spectrum, xPathKeys, index);
-      const y = yData ? yData[spectrum.id] : dlv(spectrum, yPathKeys, index);
+      const x = xData
+        ? xData[spectrum.id]
+        : xPathKeys
+          ? dlv(spectrum, xPathKeys, index)
+          : index;
+      const y = yData
+        ? yData[spectrum.id]
+        : yPathKeys
+          ? dlv(spectrum, yPathKeys, index)
+          : index;
 
       cellsValues.push(x, y);
 
@@ -161,8 +169,16 @@ function usePlotData(
     plotOption,
   );
   return spectra.map((spectrum, index) => {
-    const x = xData ? xData[spectrum.id] : dlv(spectrum, xPathKeys, index);
-    const y = yData ? yData[spectrum.id] : dlv(spectrum, yPathKeys, index);
+    const x = xData
+      ? xData[spectrum.id]
+      : xPathKeys
+        ? dlv(spectrum, xPathKeys, index)
+        : index;
+    const y = yData
+      ? yData[spectrum.id]
+      : yPathKeys
+        ? dlv(spectrum, yPathKeys, index)
+        : index;
     return {
       x,
       y,