From e040fd1ebd5bce62ea28834cdbf9b5b9265dffd4 Mon Sep 17 00:00:00 2001
From: DaneEveritt <dane@daneeveritt.com>
Date: Sat, 17 Sep 2022 11:50:40 -0700
Subject: [PATCH] Fix display of database rows when password is not available

closes #4381
---
 .../api/server/databases/getServerDatabases.ts     |  3 +--
 .../components/server/databases/DatabaseRow.tsx    | 14 ++++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/resources/scripts/api/server/databases/getServerDatabases.ts b/resources/scripts/api/server/databases/getServerDatabases.ts
index 373c6c1c2..a03eb30a9 100644
--- a/resources/scripts/api/server/databases/getServerDatabases.ts
+++ b/resources/scripts/api/server/databases/getServerDatabases.ts
@@ -15,8 +15,7 @@ export const rawDataToServerDatabase = (data: any): ServerDatabase => ({
     username: data.username,
     connectionString: `${data.host.address}:${data.host.port}`,
     allowConnectionsFrom: data.connections_from,
-    password:
-        data.relationships && data.relationships.password ? data.relationships.password.attributes.password : undefined,
+    password: data.relationships.password?.attributes?.password,
 });
 
 export default (uuid: string, includePassword = true): Promise<ServerDatabase[]> => {
diff --git a/resources/scripts/components/server/databases/DatabaseRow.tsx b/resources/scripts/components/server/databases/DatabaseRow.tsx
index 87b3463b8..1b486959e 100644
--- a/resources/scripts/components/server/databases/DatabaseRow.tsx
+++ b/resources/scripts/components/server/databases/DatabaseRow.tsx
@@ -34,6 +34,10 @@ export default ({ database, className }: Props) => {
     const appendDatabase = ServerContext.useStoreActions((actions) => actions.databases.appendDatabase);
     const removeDatabase = ServerContext.useStoreActions((actions) => actions.databases.removeDatabase);
 
+    const jdbcConnectionString = `jdbc:mysql://${database.username}${
+        database.password ? `:${database.password}` : ''
+    }@${database.connectionString}/${database.name}`;
+
     const schema = object().shape({
         confirm: string()
             .required('The database name must be provided.')
@@ -122,14 +126,8 @@ export default ({ database, className }: Props) => {
                 </Can>
                 <div css={tw`mt-6`}>
                     <Label>JDBC Connection String</Label>
-                    <CopyOnClick
-                        text={`jdbc:mysql://${database.username}:${database.password}@${database.connectionString}/${database.name}`}
-                    >
-                        <Input
-                            type={'text'}
-                            readOnly
-                            value={`jdbc:mysql://${database.username}:${database.password}@${database.connectionString}/${database.name}`}
-                        />
+                    <CopyOnClick text={jdbcConnectionString}>
+                        <Input type={'text'} readOnly value={jdbcConnectionString} />
                     </CopyOnClick>
                 </div>
                 <div css={tw`mt-6 text-right`}>