fix(db): Show the only db install guide when the db is already instal…

…led and error is existed while importing file. (#20442) * fix(db): make to show the db error msg when db installed and error is exist * fix(db): make to replace dbinstall str into showDbInstallInstructions (cherry picked from commit 23e62d3)
apache · Jun 28, 2022 · 789f993 · 789f993
1 parent 63229dc
commit 789f993
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 17 deletions.
diff --git a/superset-frontend/src/components/ImportModal/ErrorAlert.tsx b/superset-frontend/src/components/ImportModal/ErrorAlert.tsx
@@ -31,31 +31,39 @@ export const DOCUMENTATION_LINK = supersetTextDocs
 
 export interface IProps {
   errorMessage: string;
+  showDbInstallInstructions: boolean;
 }
 
-const ErrorAlert: FunctionComponent<IProps> = ({ errorMessage }) => (
+const ErrorAlert: FunctionComponent<IProps> = ({
+  errorMessage,
+  showDbInstallInstructions,
+}) => (
   <Alert
     closable={false}
     css={(theme: SupersetTheme) => antdWarningAlertStyles(theme)}
     type="error"
     showIcon
     message={errorMessage}
     description={
-      <>
-        <br />
-        {t(
-          'Database driver for importing maybe not installed. Visit the Superset documentation page for installation instructions:',
-        )}
-        <a
-          href={DOCUMENTATION_LINK}
-          target="_blank"
-          rel="noopener noreferrer"
-          className="additional-fields-alert-description"
-        >
-          {t('here')}
-        </a>
-        .
-      </>
+      showDbInstallInstructions ? (
+        <>
+          <br />
+          {t(
+            'Database driver for importing maybe not installed. Visit the Superset documentation page for installation instructions:',
+          )}
+          <a
+            href={DOCUMENTATION_LINK}
+            target="_blank"
+            rel="noopener noreferrer"
+            className="additional-fields-alert-description"
+          >
+            {t('here')}
+          </a>
+          .
+        </>
+      ) : (
+        ''
+      )
     }
   />
 );

diff --git a/superset-frontend/src/components/ImportModal/index.tsx b/superset-frontend/src/components/ImportModal/index.tsx
@@ -300,7 +300,12 @@ const ImportModelsModal: FunctionComponent<ImportModelsModalProps> = ({
           <Button loading={importingModel}>Select file</Button>
         </Upload>
       </StyledInputContainer>
-      {errorMessage && <ErrorAlert errorMessage={errorMessage} />}
+      {errorMessage && (
+        <ErrorAlert
+          errorMessage={errorMessage}
+          showDbInstallInstructions={passwordFields.length > 0}
+        />
+      )}
       {renderPasswordFields()}
       {renderOverwriteConfirmation()}
     </Modal>