Skip to content

Commit 3467e40

Browse files
feat: suggest use and db commands VSCODE-380 (#491)
* feat: suggest use and db commands VSCODE-380 * refactor: proper english
1 parent 20ad75b commit 3467e40

22 files changed

+127
-68
lines changed

src/connectionController.ts

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ export default class ConnectionController {
155155
} catch (error) {
156156
// Here we're lenient when loading connections in case their
157157
// connections have become corrupted.
158-
log.error(`Connection migration failed: ${formatError(error).message}`);
158+
log.error('Migrating previously saved connections failed', error);
159159
return;
160160
}
161161
}
@@ -164,7 +164,7 @@ export default class ConnectionController {
164164
// Return saved connection as it is.
165165
if (!ext.keytarModule) {
166166
log.error(
167-
'Load saved connections failed: VSCode extension keytar module is undefined.'
167+
'Getting connection info with secrets failed because VSCode extension keytar module is undefined'
168168
);
169169
return savedConnectionInfo as StoreConnectionInfoWithConnectionOptions;
170170
}
@@ -197,9 +197,7 @@ export default class ConnectionController {
197197
} catch (error) {
198198
// Here we're lenient when loading connections in case their
199199
// connections have become corrupted.
200-
log.error(
201-
`Merging connection with secrets failed: ${formatError(error).message}`
202-
);
200+
log.error('Getting connection info with secrets failed', error);
203201
return;
204202
}
205203
}
@@ -301,7 +299,7 @@ export default class ConnectionController {
301299
async addNewConnectionStringAndConnect(
302300
connectionString: string
303301
): Promise<boolean> {
304-
log.info('Trying to connect to a new connection configuration');
302+
log.info('Trying to connect to a new connection configuration...');
305303

306304
const connectionStringData = new ConnectionString(connectionString);
307305

@@ -313,7 +311,7 @@ export default class ConnectionController {
313311
);
314312

315313
try {
316-
const connectResult = await this.saveNewConnectionAndConnect(
314+
const connectResult = await this.saveNewConnectionFromFormAndConnect(
317315
{
318316
id: uuidv4(),
319317
connectionOptions: {
@@ -326,11 +324,10 @@ export default class ConnectionController {
326324
return connectResult.successfullyConnected;
327325
} catch (error) {
328326
const printableError = formatError(error);
329-
log.error('Failed to connect', printableError);
327+
log.error('Failed to connect with a connection string', error);
330328
void vscode.window.showErrorMessage(
331329
`Unable to connect: ${printableError.message}`
332330
);
333-
334331
return false;
335332
}
336333
}
@@ -391,7 +388,7 @@ export default class ConnectionController {
391388
return savedConnectionInfo;
392389
}
393390

394-
async saveNewConnectionAndConnect(
391+
async saveNewConnectionFromFormAndConnect(
395392
originalConnectionInfo: ConnectionInfo,
396393
connectionType: ConnectionTypes
397394
): Promise<ConnectionAttemptResult> {
@@ -412,9 +409,7 @@ export default class ConnectionController {
412409
connectionOptions: originalConnectionInfo.connectionOptions, // The connection options with secrets.
413410
};
414411

415-
log.info(
416-
`Connect called to connect to instance: ${savedConnectionInfo.name}`
417-
);
412+
log.info('Connect called to connect to instance', savedConnectionInfo.name);
418413

419414
return this._connect(savedConnectionInfo.id, connectionType);
420415
}
@@ -539,19 +534,18 @@ export default class ConnectionController {
539534

540535
return true;
541536
} catch (error) {
537+
log.error('Failed to connect by a connection id', error);
542538
const printableError = formatError(error);
543-
log.error('Failed to connect', printableError);
544539
void vscode.window.showErrorMessage(
545540
`Unable to connect: ${printableError.message}`
546541
);
547-
548542
return false;
549543
}
550544
}
551545

552546
async disconnect(): Promise<boolean> {
553547
log.info(
554-
'Disconnect called, currently connected to:',
548+
'Disconnect called, currently connected to',
555549
this._currentConnectionId
556550
);
557551

src/editors/editorsController.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ export default class EditorsController {
113113
codeActionProvider: PlaygroundSelectedCodeActionProvider,
114114
editDocumentCodeLensProvider: EditDocumentCodeLensProvider
115115
) {
116-
log.info('activating...');
117-
118116
this._connectionController = connectionController;
119117
this._playgroundController = playgroundController;
120118
this._context = context;
@@ -152,8 +150,6 @@ export default class EditorsController {
152150

153151
this._documentIdStore.removeByDocumentIdReference(documentIdReference);
154152
});
155-
156-
log.info('activated.');
157153
}
158154

159155
async openMongoDBDocument(data: EditDocumentInfo): Promise<boolean> {
@@ -262,7 +258,7 @@ export default class EditorsController {
262258
}
263259

264260
async onViewCollectionDocuments(namespace: string): Promise<boolean> {
265-
log.info('view collection documents', namespace);
261+
log.info('View collection documents', namespace);
266262

267263
const operationId =
268264
this._collectionDocumentsOperationsStore.createNewOperation();
@@ -294,7 +290,7 @@ export default class EditorsController {
294290
connectionId: string,
295291
namespace: string
296292
): Promise<boolean> {
297-
log.info('view more collection documents', namespace);
293+
log.info('View more collection documents', namespace);
298294

299295
// A user might click to fetch more documents multiple times,
300296
// this ensures it only performs one fetch at a time.

src/editors/mongoDBDocumentService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export default class MongoDBDocumentService {
6060
newDocument: EJSON.SerializableTypes;
6161
source: DocumentSource;
6262
}): Promise<void> {
63-
log.info('replace document in MongoDB', data);
63+
log.info('Replace document in MongoDB', data);
6464

6565
const { documentId, namespace, connectionId, newDocument, source } = data;
6666
const activeConnectionId =
@@ -107,7 +107,7 @@ export default class MongoDBDocumentService {
107107
async fetchDocument(
108108
data: EditDocumentInfo
109109
): Promise<EJSON.SerializableTypes | void> {
110-
log.info('fetch document from MongoDB', data);
110+
log.info('Fetch document from MongoDB', data);
111111

112112
const { documentId, namespace, connectionId } = data;
113113
const activeConnectionId =

src/editors/playgroundController.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ export default class PlaygroundController {
462462

463463
return progressResult;
464464
} catch (error) {
465-
log.error('Evaluate playground with cancel modal error', error);
465+
log.error('Evaluating playground with cancel modal failed', error);
466466

467467
return {
468468
outputLines: undefined,
@@ -752,7 +752,7 @@ export default class PlaygroundController {
752752
const { selectedText, importStatements, driverSyntax, builders, language } =
753753
this._exportToLanguageCodeLensProvider._exportToLanguageAddons;
754754

755-
log.info(`Start export to ${language} language`);
755+
log.info(`Exporting to the '${language}' language...`);
756756

757757
try {
758758
const transpiledContent = await this.getTranspiledContent();
@@ -782,7 +782,10 @@ export default class PlaygroundController {
782782
language,
783783
};
784784

785-
log.info(`Export to ${language} language result`, this._playgroundResult);
785+
log.info(
786+
`Exported to the '${language}' language`,
787+
this._playgroundResult
788+
);
786789

787790
/* eslint-disable camelcase */
788791
if (
@@ -817,8 +820,8 @@ export default class PlaygroundController {
817820

818821
await this._openPlaygroundResult();
819822
} catch (error) {
823+
log.error(`Export to the '${language}' language failed`, error);
820824
const printableError = formatError(error);
821-
log.error(`Export to ${language} language error`, printableError);
822825
void vscode.window.showErrorMessage(
823826
`Unable to export to ${language} language: ${printableError.message}`
824827
);

src/explorer/documentListTreeItem.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import TreeItemParent from './treeItemParentInterface';
99
import type { DataService } from 'mongodb-data-service';
1010

1111
const path = require('path');
12-
const log = createLogger('tree view document list');
12+
const log = createLogger('documents tree item');
1313

1414
// We fetch 1 more than this in order to see if there are more to fetch.
1515
// Each time `show more` is clicked, the collection item increases the amount
@@ -244,7 +244,9 @@ export default class DocumentListTreeItem
244244
}
245245

246246
onShowMoreClicked(): void {
247-
log.info('show more clicked');
247+
log.info(
248+
`Show more documents clicked for the '${this.namespace}' namespace`
249+
);
248250

249251
this._maxDocumentsToShow += MAX_DOCUMENTS_VISIBLE;
250252
this.cacheIsUpToDate = false;

src/explorer/explorerController.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ export default class ExplorerController {
1515
private _treeView?: vscode.TreeView<vscode.TreeItem>;
1616

1717
constructor(connectionController: ConnectionController) {
18-
log.info('activate explorer controller');
19-
2018
this._connectionController = connectionController;
2119
this._treeController = new ExplorerTreeController(connectionController);
2220
}
@@ -40,12 +38,14 @@ export default class ExplorerController {
4038
};
4139

4240
activateConnectionsTreeView(): void {
41+
log.info('Activating explorer controller...');
4342
// Listen for a change in connections to occur before we create the tree
4443
// so that we show the `viewsWelcome` before any connections are added.
4544
this._connectionController.addEventListener(
4645
DataServiceEventTypes.CONNECTIONS_DID_CHANGE,
4746
this.createTreeView
4847
);
48+
log.info('Explorer controller activated');
4949
}
5050

5151
deactivate(): void {

src/explorer/explorerTreeController.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { DOCUMENT_LIST_ITEM, CollectionTypes } from './documentListTreeItem';
1111
import EXTENSION_COMMANDS from '../commands';
1212
import { sortTreeItemsByLabel } from './treeItemUtils';
1313

14-
const log = createLogger('explorer controller');
14+
const log = createLogger('explorer tree controller');
1515

1616
export default class ExplorerTreeController
1717
implements vscode.TreeDataProvider<vscode.TreeItem>
@@ -48,7 +48,7 @@ export default class ExplorerTreeController
4848
treeView: vscode.TreeView<vscode.TreeItem>
4949
): void => {
5050
treeView.onDidCollapseElement((event: any) => {
51-
log.info('Tree item was collapsed:', event.element.label);
51+
log.info('Tree item was collapsed', event.element.label);
5252

5353
if (event.element.onDidCollapse) {
5454
event.element.onDidCollapse();
@@ -64,7 +64,7 @@ export default class ExplorerTreeController
6464
});
6565

6666
treeView.onDidExpandElement(async (event: any): Promise<void> => {
67-
log.info('Tree item was expanded:', event.element.label);
67+
log.info('Tree item was expanded', event.element.label);
6868

6969
if (!event.element.onDidExpand) {
7070
return;

src/explorer/helpExplorer.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,27 @@ import HelpTree from './helpTree';
33
import { createLogger } from '../logging';
44
import { TelemetryService } from '../telemetry';
55

6-
const log = createLogger('help and info explorer controller');
6+
const log = createLogger('help and info explorer');
77

88
export default class HelpExplorer {
99
_treeController: HelpTree;
1010
_treeView?: vscode.TreeView<vscode.TreeItem>;
1111

1212
constructor() {
13-
log.info('activate help explorer');
1413
this._treeController = new HelpTree();
1514
}
1615

1716
activateHelpTreeView(telemetryService: TelemetryService): void {
1817
if (!this._treeView) {
18+
log.info('Activating help explorer...');
1919
this._treeView = vscode.window.createTreeView('mongoDBHelpExplorer', {
2020
treeDataProvider: this._treeController,
2121
});
2222
this._treeController.activateTreeViewEventHandlers(
2323
this._treeView,
2424
telemetryService
2525
);
26+
log.info('Help explorer activated');
2627
}
2728
}
2829

src/explorer/playgroundsExplorer.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ import * as vscode from 'vscode';
22
import PlaygroundsTree from './playgroundsTree';
33
import { createLogger } from '../logging';
44

5-
const log = createLogger('explorer controller');
5+
const log = createLogger('playgrounds explorer');
66

77
export default class PlaygroundsExplorer {
88
private _treeController: PlaygroundsTree;
99
private _treeView?: vscode.TreeView<vscode.TreeItem>;
1010

1111
constructor() {
12-
log.info('activate playgrounds explorer');
1312
this._treeController = new PlaygroundsTree();
1413
}
1514

@@ -26,7 +25,9 @@ export default class PlaygroundsExplorer {
2625
};
2726

2827
public activatePlaygroundsTreeView(): void {
28+
log.info('Activating playgrounds explorer...');
2929
this.createPlaygroundsTreeView();
30+
log.info('Playgrounds explorer activated');
3031
}
3132

3233
public deactivate(): void {

src/explorer/playgroundsTree.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import PlaygroundsTreeItem from './playgroundsTreeItem';
66
import EXTENSION_COMMANDS from '../commands';
77
import { getPlaygrounds } from '../utils/playground';
88

9-
const log = createLogger('playgrounds tree controller');
9+
const log = createLogger('playgrounds tree');
1010

1111
export default class PlaygroundsTree
1212
implements vscode.TreeDataProvider<vscode.TreeItem>
@@ -34,7 +34,7 @@ export default class PlaygroundsTree
3434
treeView: vscode.TreeView<vscode.TreeItem>
3535
): void => {
3636
treeView.onDidCollapseElement((event: any) => {
37-
log.info('Tree item was collapsed:', event.element.label);
37+
log.info('Tree item was collapsed', event.element.label);
3838

3939
if (event.element.onDidCollapse) {
4040
event.element.onDidCollapse();
@@ -50,7 +50,7 @@ export default class PlaygroundsTree
5050
});
5151

5252
treeView.onDidExpandElement(async (event: any): Promise<void> => {
53-
log.info('Tree item was expanded:', event.element.label);
53+
log.info('Tree item was expanded', event.element.label);
5454

5555
if (!event.element.onDidExpand) {
5656
return;

0 commit comments

Comments
 (0)