fix: improve disconnected action error messages VSCODE-112 (#453)

mongodb-js · Dec 7, 2022 · 18504a2 · 18504a2
1 parent 2fed1fd
commit 18504a2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/editors/collectionDocumentsProvider.ts b/src/editors/collectionDocumentsProvider.ts
@@ -60,12 +60,15 @@ export default class CollectionViewProvider
     // Ensure we're still connected to the correct connection.
     if (connectionId !== this._connectionController.getActiveConnectionId()) {
       operation.isCurrentlyFetchingMoreDocuments = false;
+      const oldConnectionName =
+        this._connectionController.getSavedConnectionName(connectionId || '') ||
+        'the database';
       void vscode.window.showErrorMessage(
-        `Unable to list documents: no longer connected to ${connectionId}`
+        `Unable to list documents: no longer connected to ${oldConnectionName}`
       );
 
       throw new Error(
-        `Unable to list documents: no longer connected to ${connectionId}`
+        `Unable to list documents: no longer connected to ${oldConnectionName}`
       );
     }
 
@@ -74,7 +77,7 @@ export default class CollectionViewProvider
     const dataservice = this._connectionController.getActiveDataService();
 
     if (dataservice === null) {
-      const errorMessage = `Unable to list documents: no longer connected to ${connectionId}`;
+      const errorMessage = 'Unable to list documents: no longer connected';
 
       void vscode.window.showErrorMessage(errorMessage);
 

diff --git a/src/editors/editorsController.ts b/src/editors/editorsController.ts
@@ -309,8 +309,12 @@ export default class EditorsController {
 
     // Ensure we're still connected to the correct connection.
     if (connectionId !== this._connectionController.getActiveConnectionId()) {
+      const oldConnectionName =
+        this._connectionController.getSavedConnectionName(connectionId || '') ||
+        'the database';
+
       void vscode.window.showErrorMessage(
-        `Unable to view more documents: no longer connected to ${connectionId}`
+        `Unable to view more documents: no longer connected to ${oldConnectionName}`
       );
 
       return Promise.resolve(false);

diff --git a/src/editors/mongoDBDocumentService.ts b/src/editors/mongoDBDocumentService.ts
@@ -114,7 +114,7 @@ export default class MongoDBDocumentService {
       this._connectionController.getActiveConnectionId();
     const connectionName = connectionId
       ? this._connectionController.getSavedConnectionName(connectionId)
-      : '';
+      : 'the database';
 
     if (activeConnectionId !== connectionId) {
       return this._fetchDocumentFailed(