From 97716fbda8ca3997c35ebcac12c10f85d683dc57 Mon Sep 17 00:00:00 2001 From: Adam Osiecki Date: Wed, 15 Jan 2020 20:28:00 +0100 Subject: [PATCH] 0.2.1 (#9) * fix typo * Fixed username was not shown in message in oa:apex:log:delete -a command --- messages/delete.json | 3 +-- messages/sel.json | 5 +++-- package.json | 2 +- src/commands/oa/apex/log/delete.ts | 2 +- src/commands/oa/data/soql/sel.ts | 2 +- test/commands/apex/log/delete.test.ts | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/messages/delete.json b/messages/delete.json index dd627fa..1de7d4d 100644 --- a/messages/delete.json +++ b/messages/delete.json @@ -8,6 +8,5 @@ "jobFinishedMessage": "\nJob is finished", "failedRecordsMessage": "Number of failed records: %i", "successMessage": "All records were deleted sucessfully", - "noLogsMessage": "There are no Apex logs on Your org!", - "errorMessage": "Error is thrown: %s" + "noLogsMessage": "There are no Apex logs on Your org!" } diff --git a/messages/sel.json b/messages/sel.json index 993dbb8..609e1c3 100644 --- a/messages/sel.json +++ b/messages/sel.json @@ -1,5 +1,6 @@ { - "commandDescription": "generate query for all fields from SObject (SEL * FROM SObject)", + "commandDescription": "generate query string for all fields from SObject (SEL * FROM SObject)", "fromFlagDescription": "SObject to generate query for", - "whereFlagDescription": "Add WHERE clause to Your query" + "whereFlagDescription": "Add WHERE clause to Your query", + "successMessage": "Your query was succesfully copied to clipboard:\n + %q" } diff --git a/package.json b/package.json index 6037e2b..8a95ff8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "osiecki-sfdx-plugins", "description": "SFDX plugins by Adam Osiecki", - "version": "0.2.0", + "version": "0.2.1", "author": "Adam Osiecki @osieckiAdam", "bugs": "https://github.com/osieckiAdam/osiecki-sfdx-plugins/issues", "dependencies": { diff --git a/src/commands/oa/apex/log/delete.ts b/src/commands/oa/apex/log/delete.ts index e6cab4e..022f10b 100644 --- a/src/commands/oa/apex/log/delete.ts +++ b/src/commands/oa/apex/log/delete.ts @@ -92,7 +92,7 @@ sfdx oa:apex:log:delete --json' jobId = batchDetails.jobId; this.ux.log(messages.getMessage('jobStartedMessage', [jobId])); if (this.flags.async) { - this.ux.log(messages.getMessage('jobStartedMessageAsync', [jobId, this.flags.targetusername])); + this.ux.log(messages.getMessage('jobStartedMessageAsync', [jobId, this.org.getConnection().getUsername()])); resolve({ numberOfQueriedLogs: totalNumberOfRecords, jobID: jobId }); } else { batch.poll(2000, 10000000); diff --git a/src/commands/oa/data/soql/sel.ts b/src/commands/oa/data/soql/sel.ts index 79dc28c..3e89b9d 100644 --- a/src/commands/oa/data/soql/sel.ts +++ b/src/commands/oa/data/soql/sel.ts @@ -46,7 +46,7 @@ export default class Sel extends SfdxCommand { } else { query += res; ncp.copy(query); - this.ux.log('Your query was succesfully copied to clipbzoard:\n' + query); + this.ux.log(messages.getMessage('successMessage', [query])); } }); return { query }; diff --git a/test/commands/apex/log/delete.test.ts b/test/commands/apex/log/delete.test.ts index 64b1e03..6d61984 100644 --- a/test/commands/apex/log/delete.test.ts +++ b/test/commands/apex/log/delete.test.ts @@ -5,7 +5,7 @@ import * as deleteClass from '../../../../src/commands/oa/apex/log/delete'; class BatchMock extends EventEmitter { public poll() { } } const mockSubscripton = new BatchMock(); -const requestTimeout = 700; +const requestTimeout = 1000; describe('apex:log:delete, 2 records queried', () => { beforeEach(() => {