Merge branch 'master' into enxdev/fix/save-dataset

superset-frontend/packages/superset-ui-core/src/query/getClientErrorObject.ts

@@ -126,13 +126,17 @@ export function parseErrorJson(responseJson: JsonObject): ClientErrorObject {
     error.error = error.description = error.errors[0].message;
     error.link = error.errors[0]?.extra?.link;
   }
-  // Marshmallow field validation returns the error message in the format
-  // of { message: { field1: [msg1, msg2], field2: [msg], } }
+  // Marshmallow field validation returns { field1: [msg1, msg2], ... },
+  // but some validators attach a bare string instead of a list.
   if (!error.error && error.message) {
     if (typeof error.message === 'object') {
+      const firstFieldMessage = Object.values(
+        error.message as Record<string, string[] | string>,
+      )[0];
       error.error =
-        Object.values(error.message as Record<string, string[]>)[0]?.[0] ||
-        t('Invalid input');
+        (Array.isArray(firstFieldMessage)
+          ? firstFieldMessage[0]
+          : firstFieldMessage) || t('Invalid input');
     }
     if (typeof error.message === 'string') {
       if (checkForHtml(error.message)) {

superset-frontend/packages/superset-ui-core/test/query/getClientErrorObject.test.ts

@@ -244,6 +244,24 @@ test('parseErrorJson with message', () => {
   });
 });
 
+test('parseErrorJson with a field message that is a plain string', () => {
+  // A bare string value shouldn't get double-indexed into its own chars.
+  expect(
+    parseErrorJson({
+      message: {
+        'metrics.0.expression':
+          'Custom SQL fields cannot be parsed as a single SQL statement.',
+      },
+    }),
+  ).toEqual({
+    message: {
+      'metrics.0.expression':
+        'Custom SQL fields cannot be parsed as a single SQL statement.',
+    },
+    error: 'Custom SQL fields cannot be parsed as a single SQL statement.',
+  });
+});
+
 test('parseErrorJson with HTML message', () => {
   expect(
     parseErrorJson({