From 18370cbd97d5ccd35156078f5817701a8c80063d Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Tue, 5 Jan 2021 17:52:18 +0100
Subject: [PATCH] info about database connection error

---
 packages/api/src/controllers/databaseConnections.js | 8 +++++---
 packages/web/src/widgets/DatabaseWidget.js          | 9 +++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/api/src/controllers/databaseConnections.js b/packages/api/src/controllers/databaseConnections.js
index 37a5a0a9b..f8a322a46 100644
--- a/packages/api/src/controllers/databaseConnections.js
+++ b/packages/api/src/controllers/databaseConnections.js
@@ -7,7 +7,7 @@ const { DatabaseAnalyser } = require('dbgate-tools');
 module.exports = {
   /** @type {import('dbgate-types').OpenedDatabaseConnection[]} */
   opened: [],
-  closed: [],
+  closed: {},
   requests: {},
 
   handle_structure(conid, database, { structure }) {
@@ -39,7 +39,7 @@ module.exports = {
     if (existing) return existing;
     const connection = await connections.get({ conid });
     const subprocess = fork(process.argv[1], ['databaseConnectionProcess']);
-    const lastClosed = this.closed.find((x) => x.conid == conid && x.database == database);
+    const lastClosed = this.closed[`${conid}/${database}`];
     const newOpened = {
       conid,
       database,
@@ -89,6 +89,8 @@ module.exports = {
   async status({ conid, database }) {
     const existing = this.opened.find((x) => x.conid == conid && x.database == database);
     if (existing) return existing.status;
+    const lastClosed = this.closed[`${conid}/${database}`];
+    if (lastClosed) return lastClosed.status;
     return {
       name: 'error',
       message: 'Not connected',
@@ -118,7 +120,7 @@ module.exports = {
       existing.disconnected = true;
       if (kill) existing.subprocess.kill();
       this.opened = this.opened.filter((x) => x.conid != conid || x.database != database);
-      this.closed[conid] = {
+      this.closed[`${conid}/${database}`] = {
         status: {
           ...existing.status,
           name: 'error',
diff --git a/packages/web/src/widgets/DatabaseWidget.js b/packages/web/src/widgets/DatabaseWidget.js
index 9d90ac1a4..a17fe43d8 100644
--- a/packages/web/src/widgets/DatabaseWidget.js
+++ b/packages/web/src/widgets/DatabaseWidget.js
@@ -108,6 +108,15 @@ function SqlObjectList({ conid, database }) {
 
   const inputRef = React.useRef(null);
 
+  if (status && status.name == 'error') {
+    return (
+      <WidgetsInnerContainer>
+        <ErrorInfo message={status.message} icon="img error" />
+        <InlineButton onClick={handleRefreshDatabase}>Refresh</InlineButton>
+      </WidgetsInnerContainer>
+    );
+  }
+
   if (objectList.length == 0 && (status && status.name) != 'pending') {
     return (
       <WidgetsInnerContainer>