fix [UIE-8007] DBaaS Summary tab display correct user and readonly host

linode · Sep 23, 2024 · e7f11d0 · e7f11d0
1 parent 3a82669
commit e7f11d0
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 15 deletions.
diff --git a/packages/api-v4/.changeset/pr-10989-fixed-1727118907870.md b/packages/api-v4/.changeset/pr-10989-fixed-1727118907870.md
@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Fixed
+---
+
+standby field returned by the API ([#10989](https://github.com/linode/manager/pull/10989))
diff --git a/packages/api-v4/src/databases/types.ts b/packages/api-v4/src/databases/types.ts
@@ -54,7 +54,8 @@ export interface DatabaseCredentials {
 
 interface DatabaseHosts {
   primary: string;
-  secondary: string;
+  secondary?: string;
+  standby?: string;
 }
 
 export interface SSLFields {

diff --git a/packages/manager/.changeset/pr-10989-fixed-1727118993352.md b/packages/manager/.changeset/pr-10989-fixed-1727118993352.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+Summary tab display of username and read-only host ([#10989](https://github.com/linode/manager/pull/10989))
diff --git a/packages/manager/src/factories/databases.ts b/packages/manager/src/factories/databases.ts
@@ -180,10 +180,17 @@ export const databaseInstanceFactory = Factory.Sync.makeFactory<DatabaseInstance
     ),
     created: '2021-12-09T17:15:12',
     engine: Factory.each((i) => ['mysql', 'postgresql'][i % 2] as Engine),
-    hosts: {
-      primary: 'db-mysql-primary-0.b.linodeb.net',
-      secondary: 'db-mysql-secondary-0.b.linodeb.net',
-    },
+    hosts: Factory.each((i) =>
+      adb10(i)
+        ? {
+            primary: 'db-mysql-primary-0.b.linodeb.net',
+            secondary: 'db-mysql-secondary-0.b.linodeb.net',
+          }
+        : {
+            primary: 'db-mysql-primary-0.b.linodeb.net',
+            standby: 'db-mysql-secondary-0.b.linodeb.net',
+          }
+    ),
     id: Factory.each((i) => i),
     instance_uri: '',
     label: Factory.each((i) => `example.com-database-${i}`),
@@ -213,10 +220,17 @@ export const databaseFactory = Factory.Sync.makeFactory<Database>({
   created: '2021-12-09T17:15:12',
   encrypted: false,
   engine: 'mysql',
-  hosts: {
-    primary: 'db-mysql-primary-0.b.linodeb.net',
-    secondary: 'db-mysql-secondary-0.b.linodeb.net',
-  },
+  hosts: Factory.each((i) =>
+    adb10(i)
+      ? {
+          primary: 'db-mysql-primary-0.b.linodeb.net',
+          secondary: 'db-mysql-secondary-0.b.linodeb.net',
+        }
+      : {
+          primary: 'db-mysql-primary-0.b.linodeb.net',
+          standby: 'db-mysql-secondary-0.b.linodeb.net',
+        }
+  ),
   id: Factory.each((i) => i),
   label: Factory.each((i) => `database-${i}`),
   members: {

diff --git a/...rc/features/Databases/DatabaseDetail/DatabaseSummary/DatabaseSummaryConnectionDetails.tsx b/...rc/features/Databases/DatabaseDetail/DatabaseSummary/DatabaseSummaryConnectionDetails.tsx
@@ -146,6 +146,13 @@ export const DatabaseSummaryConnectionDetails = (props: Props) => {
     refetch: getDatabaseCredentials,
   } = useDatabaseCredentialsQuery(database.engine, database.id);
 
+  const username =
+    database.platform === 'rdbms-default'
+      ? 'akmadmin'
+      : database.engine === 'postgresql'
+      ? 'linpostgres'
+      : DB_ROOT_USERNAME;
+
   const password =
     showCredentials && credentials ? credentials?.password : '••••••••••';
 
@@ -191,7 +198,7 @@ export const DatabaseSummaryConnectionDetails = (props: Props) => {
 
   const disableShowBtn = ['failed', 'provisioning'].includes(database.status);
   const disableDownloadCACertificateBtn = database.status === 'provisioning';
-  // const connectionDetailsCopy = `username = ${credentials?.username}\npassword = ${credentials?.password}\nhost = ${database.host}\nport = ${database.port}\ssl = ${ssl}`;
+  const readOnlyHost = database?.hosts?.standby || database?.hosts?.secondary;
 
   const credentialsBtn = (handleClick: () => void, btnText: string) => {
     return (
@@ -235,8 +242,7 @@ export const DatabaseSummaryConnectionDetails = (props: Props) => {
       </Typography>
       <Box className={classes.connectionDetailsCtn} data-qa-connection-details>
         <Typography>
-          <span>username</span> ={' '}
-          {database.engine === 'postgresql' ? 'linpostgres' : DB_ROOT_USERNAME}
+          <span>username</span> = {username}
         </Typography>
         <Box display="flex">
           <Typography>
@@ -356,19 +362,19 @@ export const DatabaseSummaryConnectionDetails = (props: Props) => {
             </>
           )}
         </Box>
-        {database.hosts.secondary ? (
+        {readOnlyHost ? (
           <Box alignItems="center" display="flex" flexDirection="row">
             <Typography>
               {database.platform === 'rdbms-default' ? (
                 <span>read-only host</span>
               ) : (
                 <span>private network host</span>
               )}
-              = {database.hosts.secondary}
+              = {readOnlyHost}
             </Typography>
             <CopyTooltip
               className={classes.inlineCopyToolTip}
-              text={database.hosts.secondary}
+              text={readOnlyHost}
             />
             <TooltipIcon
               status="help"