From b8714d80a1ede761042ab469110edf552a74ac6b Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Sat, 17 Dec 2022 20:53:57 -0800
Subject: [PATCH] Fixed: Prevent unexpected data breaking Series Import

---
 .../ImportSeries/Import/ImportSeriesFooter.js | 20 ++++++++++++-------
 .../SelectFolder/ImportSeriesSelectFolder.js  | 20 ++++++++++++-------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/frontend/src/AddSeries/ImportSeries/Import/ImportSeriesFooter.js b/frontend/src/AddSeries/ImportSeries/Import/ImportSeriesFooter.js
index a4b530451..9f1911432 100644
--- a/frontend/src/AddSeries/ImportSeries/Import/ImportSeriesFooter.js
+++ b/frontend/src/AddSeries/ImportSeries/Import/ImportSeriesFooter.js
@@ -249,13 +249,19 @@ class ImportSeriesFooter extends Component {
                   body={
                     <ul>
                       {
-                        importError.responseJSON.map((error, index) => {
-                          return (
-                            <li key={index}>
-                              {error.errorMessage}
-                            </li>
-                          );
-                        })
+                        Array.isArray(importError.responseJSON) ?
+                          importError.responseJSON.map((error, index) => {
+                            return (
+                              <li key={index}>
+                                {error.errorMessage}
+                              </li>
+                            );
+                          }) :
+                          <li>
+                            {
+                              JSON.stringify(importError.responseJSON)
+                            }
+                          </li>
                       }
                     </ul>
                   }
diff --git a/frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesSelectFolder.js b/frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesSelectFolder.js
index 0f7f20a33..742cb2c4f 100644
--- a/frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesSelectFolder.js
+++ b/frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesSelectFolder.js
@@ -118,13 +118,19 @@ class ImportSeriesSelectFolder extends Component {
 
                       <ul>
                         {
-                          saveError.responseJSON.map((e, index) => {
-                            return (
-                              <li key={index}>
-                                {e.errorMessage}
-                              </li>
-                            );
-                          })
+                          Array.isArray(saveError.responseJSON) ?
+                            saveError.responseJSON.map((e, index) => {
+                              return (
+                                <li key={index}>
+                                  {e.errorMessage}
+                                </li>
+                              );
+                            }) :
+                            <li>
+                              {
+                                JSON.stringify(saveError.responseJSON)
+                              }
+                            </li>
                         }
                       </ul>
                     </Alert> :