final edits

apache · Dec 2, 2022 · 3a1eadf · 3a1eadf
1 parent 5730d3b
commit 3a1eadf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx
@@ -212,12 +212,11 @@ export default function ErrorAlert({
           }
         >
           <>
-            {subtitle && (
-              <>
-                <p>{subtitle}</p>
-                <br />
-              </>
-            )}
+            <p>{subtitle}</p>
+            {/* This break was in the original design of the modal but
+            the spacing looks really off if there is only
+            subtitle or a body */}
+            {subtitle && body && <br />}
             {body}
           </>
         </ErrorModal>

diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -1156,6 +1156,13 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
           : typeof dbErrors === 'string'
           ? [dbErrors]
           : [];
+    } else if (
+      !isEmpty(validationErrors) &&
+      validationErrors?.error_type === 'GENERIC_DB_ENGINE_ERROR'
+    ) {
+      alertErrors = [
+        validationErrors?.description || validationErrors?.message,
+      ];
     }
     if (alertErrors.length) {
       return (
@@ -1165,9 +1172,8 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
             description={t(
               'We are unable to connect to your database. Click "See more" for database-provided information that may help troubleshoot the issue.',
             )}
-            stackTrace={alertErrors?.[0]}
+            subtitle={alertErrors?.[0] || validationErrors?.description}
             copyText={validationErrors?.description}
-            subtitle={validationErrors?.description}
           />
         </ErrorAlertContainer>
       );