@salesforce/plugin-deploy-retrieve 2.1.3 → 2.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +23 -20
- package/lib/commands/project/deploy/start.js +1 -1
- package/lib/commands/project/deploy/start.js.map +1 -1
- package/lib/commands/project/retrieve/start.js +1 -1
- package/lib/commands/project/retrieve/start.js.map +1 -1
- package/lib/utils/conflicts.d.ts +1 -1
- package/lib/utils/conflicts.js +3 -0
- package/lib/utils/conflicts.js.map +1 -1
- package/lib/utils/progressBar.d.ts +2 -0
- package/lib/utils/progressBar.js +19 -7
- package/lib/utils/progressBar.js.map +1 -1
- package/oclif.lock +84 -54
- package/oclif.manifest.json +419 -419
- package/package.json +10 -10
package/README.md
CHANGED
|
@@ -141,7 +141,7 @@ FLAG DESCRIPTIONS
|
|
|
141
141
|
If you specify this parameter, don’t specify --metadata or --source-dir.
|
|
142
142
|
```
|
|
143
143
|
|
|
144
|
-
_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.
|
|
144
|
+
_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.2.0/src/commands/project/convert/mdapi.ts)_
|
|
145
145
|
|
|
146
146
|
## `sf project convert source`
|
|
147
147
|
|
|
@@ -153,7 +153,7 @@ USAGE
|
|
|
153
153
|
<value> | -m <value>]
|
|
154
154
|
|
|
155
155
|
FLAGS
|
|
156
|
-
-d, --output-dir=<value> [default:
|
|
156
|
+
-d, --output-dir=<value> [default: metadataPackage_1701213063906] Output directory to store the Metadata
|
|
157
157
|
API–formatted files in.
|
|
158
158
|
-m, --metadata=<value>... Metadata component names to convert.
|
|
159
159
|
-n, --package-name=<value> Name of the package to associate with the metadata-formatted files.
|
|
@@ -213,7 +213,7 @@ FLAG DESCRIPTIONS
|
|
|
213
213
|
Override the api version used for api requests made by this command
|
|
214
214
|
```
|
|
215
215
|
|
|
216
|
-
_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.
|
|
216
|
+
_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.2.0/src/commands/project/convert/source.ts)_
|
|
217
217
|
|
|
218
218
|
## `sf project delete source`
|
|
219
219
|
|
|
@@ -229,7 +229,8 @@ FLAGS
|
|
|
229
229
|
-c, --check-only Validate delete command but don't delete anything from the org or the local project.
|
|
230
230
|
-f, --force-overwrite Ignore conflict warnings and overwrite changes to the org.
|
|
231
231
|
-m, --metadata=<value>... Metadata components to delete.
|
|
232
|
-
-o, --target-org=<value> (required) Username or alias of the target org.
|
|
232
|
+
-o, --target-org=<value> (required) Username or alias of the target org. Not required if the `target-org`
|
|
233
|
+
configuration variable is already set.
|
|
233
234
|
-p, --source-dir=<value>... Source file paths to delete.
|
|
234
235
|
-r, --no-prompt Don't prompt for delete confirmation.
|
|
235
236
|
-t, --track-source If the delete succeeds, update the source tracking information.
|
|
@@ -351,7 +352,7 @@ FLAG DESCRIPTIONS
|
|
|
351
352
|
- Separate the test names with spaces: --tests Test1 Test2 "Test With Space"
|
|
352
353
|
```
|
|
353
354
|
|
|
354
|
-
_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.
|
|
355
|
+
_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.2.0/src/commands/project/delete/source.ts)_
|
|
355
356
|
|
|
356
357
|
## `sf project delete tracking`
|
|
357
358
|
|
|
@@ -362,7 +363,8 @@ USAGE
|
|
|
362
363
|
$ sf project delete tracking -o <value> [--json] [--api-version <value>] [-p]
|
|
363
364
|
|
|
364
365
|
FLAGS
|
|
365
|
-
-o, --target-org=<value> (required) Username or alias of the target org.
|
|
366
|
+
-o, --target-org=<value> (required) Username or alias of the target org. Not required if the `target-org`
|
|
367
|
+
configuration variable is already set.
|
|
366
368
|
-p, --no-prompt Don't prompt for source tracking override confirmation.
|
|
367
369
|
--api-version=<value> Override the api version used for api requests made by this command
|
|
368
370
|
|
|
@@ -386,7 +388,7 @@ EXAMPLES
|
|
|
386
388
|
$ sf project delete tracking --target-org my-scratch
|
|
387
389
|
```
|
|
388
390
|
|
|
389
|
-
_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.
|
|
391
|
+
_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.2.0/src/commands/project/delete/tracking.ts)_
|
|
390
392
|
|
|
391
393
|
## `sf project deploy cancel`
|
|
392
394
|
|
|
@@ -456,7 +458,7 @@ FLAG DESCRIPTIONS
|
|
|
456
458
|
project deploy report".
|
|
457
459
|
```
|
|
458
460
|
|
|
459
|
-
_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.
|
|
461
|
+
_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.2.0/src/commands/project/deploy/cancel.ts)_
|
|
460
462
|
|
|
461
463
|
## `sf project deploy preview`
|
|
462
464
|
|
|
@@ -539,7 +541,7 @@ FLAG DESCRIPTIONS
|
|
|
539
541
|
All child components are included. If you specify this flag, don’t specify --metadata or --source-dir.
|
|
540
542
|
```
|
|
541
543
|
|
|
542
|
-
_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.
|
|
544
|
+
_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.2.0/src/commands/project/deploy/preview.ts)_
|
|
543
545
|
|
|
544
546
|
## `sf project deploy quick`
|
|
545
547
|
|
|
@@ -623,7 +625,7 @@ FLAG DESCRIPTIONS
|
|
|
623
625
|
deploy report".
|
|
624
626
|
```
|
|
625
627
|
|
|
626
|
-
_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.
|
|
628
|
+
_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.2.0/src/commands/project/deploy/quick.ts)_
|
|
627
629
|
|
|
628
630
|
## `sf project deploy report`
|
|
629
631
|
|
|
@@ -718,7 +720,7 @@ FLAG DESCRIPTIONS
|
|
|
718
720
|
--coverage-formatters lcov --coverage-formatters clover
|
|
719
721
|
```
|
|
720
722
|
|
|
721
|
-
_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.
|
|
723
|
+
_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.2.0/src/commands/project/deploy/report.ts)_
|
|
722
724
|
|
|
723
725
|
## `sf project deploy resume`
|
|
724
726
|
|
|
@@ -802,7 +804,7 @@ FLAG DESCRIPTIONS
|
|
|
802
804
|
--coverage-formatters lcov --coverage-formatters clover
|
|
803
805
|
```
|
|
804
806
|
|
|
805
|
-
_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.
|
|
807
|
+
_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.2.0/src/commands/project/deploy/resume.ts)_
|
|
806
808
|
|
|
807
809
|
## `sf project deploy start`
|
|
808
810
|
|
|
@@ -1014,7 +1016,7 @@ FLAG DESCRIPTIONS
|
|
|
1014
1016
|
--coverage-formatters lcov --coverage-formatters clover
|
|
1015
1017
|
```
|
|
1016
1018
|
|
|
1017
|
-
_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.
|
|
1019
|
+
_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.2.0/src/commands/project/deploy/start.ts)_
|
|
1018
1020
|
|
|
1019
1021
|
## `sf project deploy validate`
|
|
1020
1022
|
|
|
@@ -1176,7 +1178,7 @@ FLAG DESCRIPTIONS
|
|
|
1176
1178
|
--coverage-formatters lcov --coverage-formatters clover
|
|
1177
1179
|
```
|
|
1178
1180
|
|
|
1179
|
-
_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.
|
|
1181
|
+
_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.2.0/src/commands/project/deploy/validate.ts)_
|
|
1180
1182
|
|
|
1181
1183
|
## `sf project generate manifest`
|
|
1182
1184
|
|
|
@@ -1251,7 +1253,7 @@ EXAMPLES
|
|
|
1251
1253
|
$ sf project generate manifest --from-org test@myorg.com --include-packages unlocked
|
|
1252
1254
|
```
|
|
1253
1255
|
|
|
1254
|
-
_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.
|
|
1256
|
+
_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.2.0/src/commands/project/generate/manifest.ts)_
|
|
1255
1257
|
|
|
1256
1258
|
## `sf project list ignored`
|
|
1257
1259
|
|
|
@@ -1292,7 +1294,7 @@ EXAMPLES
|
|
|
1292
1294
|
$ sf project list ignored --source-dir package.xml
|
|
1293
1295
|
```
|
|
1294
1296
|
|
|
1295
|
-
_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.
|
|
1297
|
+
_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.2.0/src/commands/project/list/ignored.ts)_
|
|
1296
1298
|
|
|
1297
1299
|
## `sf project reset tracking`
|
|
1298
1300
|
|
|
@@ -1303,7 +1305,8 @@ USAGE
|
|
|
1303
1305
|
$ sf project reset tracking -o <value> [--json] [--api-version <value>] [-r <value>] [-p]
|
|
1304
1306
|
|
|
1305
1307
|
FLAGS
|
|
1306
|
-
-o, --target-org=<value> (required) Username or alias of the target org.
|
|
1308
|
+
-o, --target-org=<value> (required) Username or alias of the target org. Not required if the `target-org`
|
|
1309
|
+
configuration variable is already set.
|
|
1307
1310
|
-p, --no-prompt Don't prompt for source tracking override confirmation.
|
|
1308
1311
|
-r, --revision=<value> SourceMember revision counter number to reset to.
|
|
1309
1312
|
--api-version=<value> Override the api version used for api requests made by this command
|
|
@@ -1339,7 +1342,7 @@ EXAMPLES
|
|
|
1339
1342
|
$ sf project reset tracking --revision 30
|
|
1340
1343
|
```
|
|
1341
1344
|
|
|
1342
|
-
_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.
|
|
1345
|
+
_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.2.0/src/commands/project/reset/tracking.ts)_
|
|
1343
1346
|
|
|
1344
1347
|
## `sf project retrieve preview`
|
|
1345
1348
|
|
|
@@ -1394,7 +1397,7 @@ FLAG DESCRIPTIONS
|
|
|
1394
1397
|
Overrides your default org.
|
|
1395
1398
|
```
|
|
1396
1399
|
|
|
1397
|
-
_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.
|
|
1400
|
+
_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.2.0/src/commands/project/retrieve/preview.ts)_
|
|
1398
1401
|
|
|
1399
1402
|
## `sf project retrieve start`
|
|
1400
1403
|
|
|
@@ -1540,6 +1543,6 @@ FLAG DESCRIPTIONS
|
|
|
1540
1543
|
If you specify this parameter, don’t specify --metadata or --source-dir.
|
|
1541
1544
|
```
|
|
1542
1545
|
|
|
1543
|
-
_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.
|
|
1546
|
+
_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.2.0/src/commands/project/retrieve/start.ts)_
|
|
1544
1547
|
|
|
1545
1548
|
<!-- commandsstop -->
|
|
@@ -226,7 +226,7 @@ export default class DeployMetadata extends SfCommand {
|
|
|
226
226
|
return formatter.getJson();
|
|
227
227
|
}
|
|
228
228
|
catch(error) {
|
|
229
|
-
if (error instanceof SourceConflictError) {
|
|
229
|
+
if (error instanceof SourceConflictError && error.data) {
|
|
230
230
|
if (!this.jsonEnabled()) {
|
|
231
231
|
writeConflictTable(error.data);
|
|
232
232
|
// set the message and add plugin-specific actions
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../src/commands/project/deploy/start.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../src/commands/project/deploy/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -210,7 +210,7 @@ export default class RetrieveMetadata extends SfCommand {
|
|
|
210
210
|
return formatter.getJson();
|
|
211
211
|
}
|
|
212
212
|
catch(error) {
|
|
213
|
-
if (!this.jsonEnabled() && error instanceof SourceConflictError) {
|
|
213
|
+
if (!this.jsonEnabled() && error instanceof SourceConflictError && error.data) {
|
|
214
214
|
writeConflictTable(error.data);
|
|
215
215
|
// set the message and add plugin-specific actions
|
|
216
216
|
return super.catch({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../src/commands/project/retrieve/start.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../src/commands/project/retrieve/start.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/conflicts.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { ConflictResponse } from '@salesforce/source-tracking';
|
|
2
|
-
export declare const writeConflictTable: (conflicts
|
|
2
|
+
export declare const writeConflictTable: (conflicts?: ConflictResponse[]) => void;
|
package/lib/utils/conflicts.js
CHANGED
|
@@ -8,6 +8,9 @@ import { ux } from '@oclif/core';
|
|
|
8
8
|
export const writeConflictTable = (conflicts) => {
|
|
9
9
|
// Interfaces cannot be casted to Record<string, unknown> so we have to cast to unknown first
|
|
10
10
|
// See https://github.com/microsoft/TypeScript/issues/15300
|
|
11
|
+
if (!conflicts || conflicts.length === 0) {
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
11
14
|
ux.table(conflicts.map((c) => ({ state: c.state, fullName: c.fullName, type: c.type, filePath: c.filePath })), {
|
|
12
15
|
state: { header: 'STATE' },
|
|
13
16
|
fullName: { header: 'FULL NAME' },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflicts.js","sourceRoot":"","sources":["../../src/utils/conflicts.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAGjC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"conflicts.js","sourceRoot":"","sources":["../../src/utils/conflicts.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAGjC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,SAA8B,EAAQ,EAAE;IACzE,6FAA6F;IAC7F,2DAA2D;IAC3D,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;QACxC,OAAO;KACR;IACD,EAAE,CAAC,KAAK,CACN,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,EACpG;QACE,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;QAC1B,QAAQ,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE;QACjC,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;QACxB,QAAQ,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE;KAClC,EACD,EAAE,aAAa,EAAE,IAAI,EAAE,CACxB,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -3,7 +3,9 @@ import { Progress } from '@salesforce/sf-plugins-core';
|
|
|
3
3
|
export declare class DeployProgress extends Progress {
|
|
4
4
|
private deploy;
|
|
5
5
|
private static OPTIONS;
|
|
6
|
+
private lifecycle;
|
|
6
7
|
constructor(deploy: MetadataApiDeploy, jsonEnabled?: boolean);
|
|
7
8
|
start(): void;
|
|
9
|
+
private updateTrackingProgress;
|
|
8
10
|
private updateProgress;
|
|
9
11
|
}
|
package/lib/utils/progressBar.js
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import { dirname } from 'node:path';
|
|
8
8
|
import { fileURLToPath } from 'node:url';
|
|
9
|
-
import { envVars as env, EnvironmentVariable, Messages } from '@salesforce/core';
|
|
9
|
+
import { envVars as env, EnvironmentVariable, Lifecycle, Messages } from '@salesforce/core';
|
|
10
10
|
import { Progress } from '@salesforce/sf-plugins-core';
|
|
11
11
|
Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
|
|
12
12
|
const mdTransferMessages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'metadata.transfer');
|
|
@@ -15,7 +15,7 @@ export class DeployProgress extends Progress {
|
|
|
15
15
|
deploy;
|
|
16
16
|
static OPTIONS = {
|
|
17
17
|
title: 'Status',
|
|
18
|
-
format: `%s: {status} ${showBar ? '| {bar} ' : ''}| {value}/{total} Components
|
|
18
|
+
format: `%s: {status} ${showBar ? '| {bar} ' : ''}| {value}/{total} Components{errorInfo}{testInfo}{trackingInfo}`,
|
|
19
19
|
barCompleteChar: '\u2588',
|
|
20
20
|
barIncompleteChar: '\u2591',
|
|
21
21
|
linewrap: true,
|
|
@@ -23,12 +23,15 @@ export class DeployProgress extends Progress {
|
|
|
23
23
|
// they won't get the "bar" but will get the remaining template bits this way
|
|
24
24
|
noTTYOutput: true,
|
|
25
25
|
};
|
|
26
|
+
lifecycle = Lifecycle.getInstance();
|
|
26
27
|
constructor(deploy, jsonEnabled = false) {
|
|
27
28
|
super(!jsonEnabled);
|
|
28
29
|
this.deploy = deploy;
|
|
29
30
|
}
|
|
30
31
|
start() {
|
|
31
|
-
super.start(0, { status: 'Waiting' }, DeployProgress.OPTIONS);
|
|
32
|
+
super.start(0, { status: 'Waiting', trackingInfo: '', testInfo: '' }, DeployProgress.OPTIONS);
|
|
33
|
+
// for sourceMember polling events
|
|
34
|
+
this.lifecycle.on('sourceMemberPollingEvent', (event) => Promise.resolve(this.updateTrackingProgress(event)));
|
|
32
35
|
this.deploy.onUpdate((data) => this.updateProgress(data));
|
|
33
36
|
// any thing else should make one final update, then stop the progress bar
|
|
34
37
|
this.deploy.onFinish((data) => {
|
|
@@ -41,20 +44,29 @@ export class DeployProgress extends Progress {
|
|
|
41
44
|
throw error;
|
|
42
45
|
});
|
|
43
46
|
}
|
|
47
|
+
updateTrackingProgress(data) {
|
|
48
|
+
const { remaining, original } = data;
|
|
49
|
+
this.update(0, {
|
|
50
|
+
status: 'Polling SourceMembers',
|
|
51
|
+
trackingInfo: ` | Tracking: ${original - remaining}/${original}`,
|
|
52
|
+
});
|
|
53
|
+
}
|
|
44
54
|
updateProgress(data) {
|
|
45
55
|
// the numCompTot. isn't computed right away, wait to start until we know how many we have
|
|
46
|
-
const
|
|
47
|
-
|
|
56
|
+
const testInfo = data.numberTestsTotal
|
|
57
|
+
? ` | ${data.numberTestsCompleted ?? 0}/${data.numberTestsTotal ?? 0} Tests${data.numberTestErrors ? `(Errors:${data.numberTestErrors})` : ''}`
|
|
58
|
+
: '';
|
|
59
|
+
const errorInfo = data.numberComponentErrors > 0 ? ` | Errors: ${data.numberComponentErrors}` : '';
|
|
48
60
|
if (data.numberComponentsTotal) {
|
|
49
61
|
this.setTotal(data.numberComponentsTotal);
|
|
50
62
|
this.update(data.numberComponentsDeployed, {
|
|
51
|
-
|
|
63
|
+
errorInfo: data.numberComponentErrors > 0 ? ` | Errors: ${data.numberComponentErrors}` : '',
|
|
52
64
|
status: mdTransferMessages.getMessage(data.status),
|
|
53
65
|
testInfo,
|
|
54
66
|
});
|
|
55
67
|
}
|
|
56
68
|
else {
|
|
57
|
-
this.update(0, {
|
|
69
|
+
this.update(0, { errorInfo, testInfo, status: mdTransferMessages.getMessage(data.status) ?? 'Waiting' });
|
|
58
70
|
}
|
|
59
71
|
}
|
|
60
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progressBar.js","sourceRoot":"","sources":["../../src/utils/progressBar.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,OAAO,IAAI,GAAG,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"progressBar.js","sourceRoot":"","sources":["../../src/utils/progressBar.ts"],"names":[],"mappings":"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"}
|