From 0ecfb40f5e1fca42c414804227d53bbe2d833bf9 Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Wed, 22 Apr 2020 06:17:26 -0400 Subject: [PATCH] Add variable to API endpoint Allow API to retrun max_connections for frontend database page --- app/Transformers/Api/Client/DatabaseTransformer.php | 1 + resources/scripts/api/server/getServerDatabases.ts | 2 ++ resources/scripts/components/server/databases/DatabaseRow.tsx | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Transformers/Api/Client/DatabaseTransformer.php b/app/Transformers/Api/Client/DatabaseTransformer.php index feb6002eb..8d420ea83 100644 --- a/app/Transformers/Api/Client/DatabaseTransformer.php +++ b/app/Transformers/Api/Client/DatabaseTransformer.php @@ -58,6 +58,7 @@ class DatabaseTransformer extends BaseClientTransformer 'name' => $model->database, 'username' => $model->username, 'connections_from' => $model->remote, + 'max_connections' => $model->max_connections, ]; } diff --git a/resources/scripts/api/server/getServerDatabases.ts b/resources/scripts/api/server/getServerDatabases.ts index 835964c27..8ae6542aa 100644 --- a/resources/scripts/api/server/getServerDatabases.ts +++ b/resources/scripts/api/server/getServerDatabases.ts @@ -6,6 +6,7 @@ export interface ServerDatabase { username: string; connectionString: string; allowConnectionsFrom: string; + maxConnections: string; password?: string; } @@ -15,6 +16,7 @@ export const rawDataToServerDatabase = (data: any): ServerDatabase => ({ username: data.username, connectionString: `${data.host.address}:${data.host.port}`, allowConnectionsFrom: data.connections_from, + maxConnections: data.max_connections, password: data.relationships && data.relationships.password ? data.relationships.password.attributes.password : undefined, }); diff --git a/resources/scripts/components/server/databases/DatabaseRow.tsx b/resources/scripts/components/server/databases/DatabaseRow.tsx index f58d69461..b1d549113 100644 --- a/resources/scripts/components/server/databases/DatabaseRow.tsx +++ b/resources/scripts/components/server/databases/DatabaseRow.tsx @@ -152,7 +152,7 @@ export default ({ database, className }: Props) => {

Username

-

{database.max_connections}

+

{database.maxConnections}

Max Connections