diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml index 9892f945..cba58e52 100644 --- a/i18n/en_US.yaml +++ b/i18n/en_US.yaml @@ -893,6 +893,10 @@ ui: installed_description: >- You appear to have already installed. To reinstall please clear your old database tables first. + db_failed: Database connection failed + db_failed_description: >- + This either means that the database information in your <1>config.yaml file is incorrect or that contact with the database server could not be established. This could mean your host’s database server is down. + page_404: description: 'Unfortunately, this page doesn''t exist.' back_home: Back to homepage diff --git a/ui/src/pages/Install/index.tsx b/ui/src/pages/Install/index.tsx index c78e0adf..0cfbb7ee 100644 --- a/ui/src/pages/Install/index.tsx +++ b/ui/src/pages/Install/index.tsx @@ -29,7 +29,10 @@ const Index: FC = () => { const [errorData, setErrorData] = useState<{ [propName: string]: any }>({ msg: '', }); - const [tableExist, setTableExist] = useState(false); + const [checkData, setCheckData] = useState({ + db_table_exist: false, + db_connection_success: false, + }); const [formData, setFormData] = useState({ lang: { @@ -200,17 +203,24 @@ const Index: FC = () => { const handleInstallNow = (e) => { e.preventDefault(); - if (tableExist) { - setStep(7); + if (checkData.db_connection_success) { + if (checkData.db_table_exist) { + setStep(8); + } else { + setStep(4); + } } else { - setStep(4); + setStep(7); } }; const configYmlCheck = () => { checkConfigFileExists() .then((res) => { - setTableExist(res?.db_table_exist); + setCheckData({ + db_table_exist: res.data.db_table_exist, + db_connection_success: res.data.db_connection_success, + }); if (res && res.config_file_exist) { setStep(6); } @@ -283,6 +293,15 @@ const Index: FC = () => { )} {step === 7 && ( +
+
{t('db_failed')}
+

+ }} /> +

+
+ )} + + {step === 8 && (
{t('installed')}

{t('installed_description')}