@salesforce/plugin-deploy-retrieve 3.12.20-dev.1 → 3.13.1
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 +17 -17
- package/lib/commands/project/delete/source.js +3 -8
- package/lib/commands/project/delete/source.js.map +1 -1
- package/lib/commands/project/deploy/quick.d.ts +2 -0
- package/lib/commands/project/deploy/quick.js +12 -3
- package/lib/commands/project/deploy/quick.js.map +1 -1
- package/lib/commands/project/deploy/report.js +3 -6
- package/lib/commands/project/deploy/report.js.map +1 -1
- package/lib/commands/project/deploy/resume.d.ts +2 -0
- package/lib/commands/project/deploy/resume.js +16 -8
- package/lib/commands/project/deploy/resume.js.map +1 -1
- package/lib/commands/project/deploy/start.d.ts +1 -2
- package/lib/commands/project/deploy/start.js +24 -30
- package/lib/commands/project/deploy/start.js.map +1 -1
- package/lib/commands/project/deploy/validate.d.ts +2 -0
- package/lib/commands/project/deploy/validate.js +15 -9
- package/lib/commands/project/deploy/validate.js.map +1 -1
- package/lib/commands/project/retrieve/start.d.ts +1 -6
- package/lib/commands/project/retrieve/start.js +18 -50
- package/lib/commands/project/retrieve/start.js.map +1 -1
- package/lib/utils/deploy.d.ts +2 -1
- package/lib/utils/deploy.js +4 -0
- package/lib/utils/deploy.js.map +1 -1
- package/lib/utils/progressBar.d.ts +11 -0
- package/lib/utils/progressBar.js +80 -0
- package/lib/utils/progressBar.js.map +1 -0
- package/lib/utils/types.d.ts +2 -0
- package/lib/utils/types.js.map +1 -1
- package/messages/retrieve.start.md +12 -0
- package/oclif.manifest.json +1 -1
- package/package.json +3 -4
- package/schemas/project-deploy-cancel.json +6 -0
- package/schemas/project-deploy-quick.json +6 -0
- package/schemas/project-deploy-report.json +6 -0
- package/schemas/project-deploy-resume.json +6 -0
- package/schemas/project-deploy-start.json +6 -0
- package/schemas/project-deploy-validate.json +6 -0
- package/lib/utils/deployStages.d.ts +0 -29
- package/lib/utils/deployStages.js +0 -166
- package/lib/utils/deployStages.js.map +0 -1
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) 2022, salesforce.com, inc.
|
|
3
|
+
* All rights reserved.
|
|
4
|
+
* Licensed under the BSD 3-Clause license.
|
|
5
|
+
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
|
+
*/
|
|
7
|
+
import { envVars as env, EnvironmentVariable, Lifecycle, Messages, Logger } from '@salesforce/core';
|
|
8
|
+
import { Progress } from '@salesforce/sf-plugins-core';
|
|
9
|
+
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
10
|
+
const mdTransferMessages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'metadata.transfer');
|
|
11
|
+
const showBar = Boolean(process.env.TERM !== 'dumb' && process.stdin.isTTY && env.getBoolean(EnvironmentVariable.SF_USE_PROGRESS_BAR, true));
|
|
12
|
+
const logger = await Logger.child('deploy-progress');
|
|
13
|
+
export class DeployProgress extends Progress {
|
|
14
|
+
deploy;
|
|
15
|
+
static OPTIONS = {
|
|
16
|
+
title: 'Status',
|
|
17
|
+
format: `%s: {status} ${showBar ? '| {bar} ' : ''}| {value}/{total} Components{errorInfo}{testInfo}{trackingInfo}`,
|
|
18
|
+
barCompleteChar: '\u2588',
|
|
19
|
+
barIncompleteChar: '\u2591',
|
|
20
|
+
linewrap: true,
|
|
21
|
+
// people really like to get text output in CI systems
|
|
22
|
+
// they won't get the "bar" but will get the remaining template bits this way
|
|
23
|
+
noTTYOutput: true,
|
|
24
|
+
};
|
|
25
|
+
lifecycle = Lifecycle.getInstance();
|
|
26
|
+
constructor(deploy, jsonEnabled = false) {
|
|
27
|
+
super(!jsonEnabled);
|
|
28
|
+
this.deploy = deploy;
|
|
29
|
+
}
|
|
30
|
+
start() {
|
|
31
|
+
super.start(0, { status: 'Waiting', trackingInfo: '', testInfo: '' }, DeployProgress.OPTIONS);
|
|
32
|
+
// for sourceMember polling events
|
|
33
|
+
this.lifecycle.on('sourceMemberPollingEvent', (event) => Promise.resolve(this.updateTrackingProgress(event)));
|
|
34
|
+
this.deploy.onUpdate((data) => this.updateProgress(data));
|
|
35
|
+
// any thing else should make one final update, then stop the progress bar
|
|
36
|
+
this.deploy.onFinish((data) => {
|
|
37
|
+
this.updateProgress(data.response);
|
|
38
|
+
this.finish({ status: mdTransferMessages.getMessage(data.response.status) });
|
|
39
|
+
});
|
|
40
|
+
this.deploy.onCancel(() => this.stop());
|
|
41
|
+
this.deploy.onError((error) => {
|
|
42
|
+
this.stop();
|
|
43
|
+
throw error;
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
updateTrackingProgress(data) {
|
|
47
|
+
const { remaining, original } = data;
|
|
48
|
+
this.update(0, {
|
|
49
|
+
status: 'Polling SourceMembers',
|
|
50
|
+
trackingInfo: ` | Tracking: ${original - remaining}/${original}`,
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
updateProgress(data) {
|
|
54
|
+
// the numCompTot. isn't computed right away, wait to start until we know how many we have
|
|
55
|
+
const testInfo = data.numberTestsTotal
|
|
56
|
+
? ` | ${data.numberTestsCompleted ?? 0}/${data.numberTestsTotal ?? 0} Tests${data.numberTestErrors ? `(Errors:${data.numberTestErrors})` : ''}`
|
|
57
|
+
: '';
|
|
58
|
+
const errorInfo = data.numberComponentErrors > 0 ? ` | Errors: ${data.numberComponentErrors}` : '';
|
|
59
|
+
if (data.numberComponentsTotal) {
|
|
60
|
+
this.setTotal(data.numberComponentsTotal);
|
|
61
|
+
this.update(data.numberComponentsDeployed, {
|
|
62
|
+
errorInfo: data.numberComponentErrors > 0 ? ` | Errors: ${data.numberComponentErrors}` : '',
|
|
63
|
+
status: mdTransferMessages.getMessage(data.status),
|
|
64
|
+
testInfo,
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
let status;
|
|
69
|
+
try {
|
|
70
|
+
status = mdTransferMessages.getMessage(data.status);
|
|
71
|
+
}
|
|
72
|
+
catch (e) {
|
|
73
|
+
logger.debug(`data.status message lookup failed for: ${data.status}`);
|
|
74
|
+
status = 'Waiting';
|
|
75
|
+
}
|
|
76
|
+
this.update(0, { errorInfo, testInfo, status });
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
//# sourceMappingURL=progressBar.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"progressBar.js","sourceRoot":"","sources":["../../src/utils/progressBar.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/types.d.ts
CHANGED
|
@@ -21,6 +21,7 @@ export type AsyncDeployResultJson = Omit<Partial<MetadataApiDeployStatus>, 'stat
|
|
|
21
21
|
files: FileResponse[];
|
|
22
22
|
zipSize?: number;
|
|
23
23
|
zipFileCount?: number;
|
|
24
|
+
deployUrl?: string;
|
|
24
25
|
};
|
|
25
26
|
type ConvertEntry = {
|
|
26
27
|
fullName: string;
|
|
@@ -48,6 +49,7 @@ export type DeployResultJson = (MetadataApiDeployStatus & {
|
|
|
48
49
|
replacements?: Record<string, string[]>;
|
|
49
50
|
zipSize?: number;
|
|
50
51
|
zipFileCount?: number;
|
|
52
|
+
deployUrl?: string;
|
|
51
53
|
}) | AsyncDeployResultJson;
|
|
52
54
|
export type MetadataRetrieveResultJson = Omit<MetadataApiRetrieveStatus, 'zipFile'> & {
|
|
53
55
|
zipFilePath: string;
|
package/lib/utils/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,eAAe,GAShB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;AAEnE,MAAM,CAAN,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,oCAAuB,CAAA;IACvB,oDAAuC,CAAA;IACvC,4CAA+B,CAAA;IAC/B,kDAAqC,CAAA;AACvC,CAAC,EALW,SAAS,KAAT,SAAS,QAKpB;AAED,MAAM,CAAN,IAAY,GAGX;AAHD,WAAY,GAAG;IACb,oBAAa,CAAA;IACb,oBAAa,CAAA;AACf,CAAC,EAHW,GAAG,KAAH,GAAG,QAGd;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,eAAe,GAShB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;AAEnE,MAAM,CAAN,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,oCAAuB,CAAA;IACvB,oDAAuC,CAAA;IACvC,4CAA+B,CAAA;IAC/B,kDAAqC,CAAA;AACvC,CAAC,EALW,SAAS,KAAT,SAAS,QAKpB;AAED,MAAM,CAAN,IAAY,GAGX;AAHD,WAAY,GAAG;IACb,oBAAa,CAAA;IACb,oBAAa,CAAA;AACf,CAAC,EAHW,GAAG,KAAH,GAAG,QAGd;AAmED,oEAAoE;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAiB,EAAyB,EAAE,CAC5E,QAAQ,CAAC,EAAE,CAAC;IACZ,MAAM,IAAI,EAAE;IACZ,OAAO,EAAE,CAAC,IAAI,KAAK,QAAQ;IAC3B,EAAE,CAAC,IAAI,KAAK,IAAI;IAChB,MAAM,IAAI,EAAE,CAAC,IAAI;IACjB,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ;IAChC,UAAU,IAAI,EAAE;IAChB,aAAa,IAAI,EAAE;IACnB,0EAA0E;IAC1E,OAAO,EAAE,CAAC,QAAQ,KAAK,QAAQ,CAAC;AAElC,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,EAAiB,EAA2C,EAAE,CACrG,iBAAiB,CAAC,EAAE,CAAC,IAAI,KAAK,IAAI,EAAE,IAAI,OAAO,EAAE,CAAC,GAAG,KAAK,QAAQ,CAAC;AAErE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,YAA0B,EAAuC,EAAE,CAC9F,YAAY,CAAC,KAAK,KAAK,eAAe,CAAC,MAAM,CAAC;AAEhD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,YAA0B,EAAuC,EAAE,CAC9F,YAAY,CAAC,KAAK,KAAK,eAAe,CAAC,MAAM,CAAC;AAEhD,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,YAAiC,EAAW,EAAE,CAClF,YAAY,CAAC,KAAK,KAAK,eAAe,CAAC,OAAO,CAAC;AAEjD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAI,KAAS,EAAc,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC"}
|
|
@@ -145,6 +145,18 @@ Extract all files from the retrieved zip file.
|
|
|
145
145
|
|
|
146
146
|
File name to use for the retrieved zip file.
|
|
147
147
|
|
|
148
|
+
# spinner.start
|
|
149
|
+
|
|
150
|
+
Preparing retrieve request
|
|
151
|
+
|
|
152
|
+
# spinner.sending
|
|
153
|
+
|
|
154
|
+
Sending request to org
|
|
155
|
+
|
|
156
|
+
# spinner.polling
|
|
157
|
+
|
|
158
|
+
Waiting for the org to respond
|
|
159
|
+
|
|
148
160
|
# error.Conflicts
|
|
149
161
|
|
|
150
162
|
There are changes in your local files that conflict with the org changes you're trying to retrieve.
|
package/oclif.manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/plugin-deploy-retrieve",
|
|
3
3
|
"description": "deploy and retrieve commands for sf",
|
|
4
|
-
"version": "3.
|
|
4
|
+
"version": "3.13.1",
|
|
5
5
|
"author": "Salesforce",
|
|
6
6
|
"bugs": "https://github.com/forcedotcom/cli/issues",
|
|
7
7
|
"dependencies": {
|
|
8
8
|
"@oclif/core": "^4.0.28",
|
|
9
|
-
"@oclif/multi-stage-output": "^0.7.7",
|
|
10
9
|
"@salesforce/apex-node": "^8.1.9",
|
|
11
10
|
"@salesforce/core": "^8.6.1",
|
|
12
11
|
"@salesforce/kit": "^3.2.3",
|
|
@@ -251,7 +250,7 @@
|
|
|
251
250
|
"exports": "./lib/index.js",
|
|
252
251
|
"type": "module",
|
|
253
252
|
"sfdx": {
|
|
254
|
-
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/3.
|
|
255
|
-
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/3.
|
|
253
|
+
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/3.13.1.crt",
|
|
254
|
+
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/3.13.1.sig"
|
|
256
255
|
}
|
|
257
256
|
}
|
|
@@ -106,6 +106,9 @@
|
|
|
106
106
|
},
|
|
107
107
|
"stateDetail": {
|
|
108
108
|
"type": "string"
|
|
109
|
+
},
|
|
110
|
+
"deployUrl": {
|
|
111
|
+
"type": "string"
|
|
109
112
|
}
|
|
110
113
|
},
|
|
111
114
|
"required": [
|
|
@@ -574,6 +577,9 @@
|
|
|
574
577
|
"stateDetail": {
|
|
575
578
|
"type": "string"
|
|
576
579
|
},
|
|
580
|
+
"deployUrl": {
|
|
581
|
+
"type": "string"
|
|
582
|
+
},
|
|
577
583
|
"id": {
|
|
578
584
|
"type": "string"
|
|
579
585
|
},
|
|
@@ -106,6 +106,9 @@
|
|
|
106
106
|
},
|
|
107
107
|
"stateDetail": {
|
|
108
108
|
"type": "string"
|
|
109
|
+
},
|
|
110
|
+
"deployUrl": {
|
|
111
|
+
"type": "string"
|
|
109
112
|
}
|
|
110
113
|
},
|
|
111
114
|
"required": [
|
|
@@ -580,6 +583,9 @@
|
|
|
580
583
|
"success": {
|
|
581
584
|
"type": "boolean"
|
|
582
585
|
},
|
|
586
|
+
"deployUrl": {
|
|
587
|
+
"type": "string"
|
|
588
|
+
},
|
|
583
589
|
"done": {
|
|
584
590
|
"type": "boolean"
|
|
585
591
|
}
|
|
@@ -106,6 +106,9 @@
|
|
|
106
106
|
},
|
|
107
107
|
"stateDetail": {
|
|
108
108
|
"type": "string"
|
|
109
|
+
},
|
|
110
|
+
"deployUrl": {
|
|
111
|
+
"type": "string"
|
|
109
112
|
}
|
|
110
113
|
},
|
|
111
114
|
"required": [
|
|
@@ -574,6 +577,9 @@
|
|
|
574
577
|
"stateDetail": {
|
|
575
578
|
"type": "string"
|
|
576
579
|
},
|
|
580
|
+
"deployUrl": {
|
|
581
|
+
"type": "string"
|
|
582
|
+
},
|
|
577
583
|
"id": {
|
|
578
584
|
"type": "string"
|
|
579
585
|
},
|
|
@@ -106,6 +106,9 @@
|
|
|
106
106
|
},
|
|
107
107
|
"stateDetail": {
|
|
108
108
|
"type": "string"
|
|
109
|
+
},
|
|
110
|
+
"deployUrl": {
|
|
111
|
+
"type": "string"
|
|
109
112
|
}
|
|
110
113
|
},
|
|
111
114
|
"required": [
|
|
@@ -582,6 +585,9 @@
|
|
|
582
585
|
},
|
|
583
586
|
"done": {
|
|
584
587
|
"type": "boolean"
|
|
588
|
+
},
|
|
589
|
+
"deployUrl": {
|
|
590
|
+
"type": "string"
|
|
585
591
|
}
|
|
586
592
|
},
|
|
587
593
|
"required": ["files", "status"]
|
|
@@ -106,6 +106,9 @@
|
|
|
106
106
|
},
|
|
107
107
|
"stateDetail": {
|
|
108
108
|
"type": "string"
|
|
109
|
+
},
|
|
110
|
+
"deployUrl": {
|
|
111
|
+
"type": "string"
|
|
109
112
|
}
|
|
110
113
|
},
|
|
111
114
|
"required": [
|
|
@@ -574,6 +577,9 @@
|
|
|
574
577
|
"stateDetail": {
|
|
575
578
|
"type": "string"
|
|
576
579
|
},
|
|
580
|
+
"deployUrl": {
|
|
581
|
+
"type": "string"
|
|
582
|
+
},
|
|
577
583
|
"id": {
|
|
578
584
|
"type": "string"
|
|
579
585
|
},
|
|
@@ -71,6 +71,9 @@
|
|
|
71
71
|
"errorStatusCode": {
|
|
72
72
|
"type": "string"
|
|
73
73
|
},
|
|
74
|
+
"deployUrl": {
|
|
75
|
+
"type": "string"
|
|
76
|
+
},
|
|
74
77
|
"ignoreWarnings": {
|
|
75
78
|
"type": "boolean"
|
|
76
79
|
},
|
|
@@ -574,6 +577,9 @@
|
|
|
574
577
|
"stateDetail": {
|
|
575
578
|
"type": "string"
|
|
576
579
|
},
|
|
580
|
+
"deployUrl": {
|
|
581
|
+
"type": "string"
|
|
582
|
+
},
|
|
577
583
|
"id": {
|
|
578
584
|
"type": "string"
|
|
579
585
|
},
|
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
import { MetadataApiDeploy, MetadataApiDeployStatus } from '@salesforce/source-deploy-retrieve';
|
|
2
|
-
import { SourceMemberPollingEvent } from '@salesforce/source-tracking';
|
|
3
|
-
type Options = {
|
|
4
|
-
title: string;
|
|
5
|
-
jsonEnabled: boolean;
|
|
6
|
-
};
|
|
7
|
-
type Data = {
|
|
8
|
-
mdapiDeploy: MetadataApiDeployStatus;
|
|
9
|
-
sourceMemberPolling: SourceMemberPollingEvent;
|
|
10
|
-
status: string;
|
|
11
|
-
message: string;
|
|
12
|
-
username: string;
|
|
13
|
-
id: string;
|
|
14
|
-
deploySize: number;
|
|
15
|
-
deployFileCount: number;
|
|
16
|
-
};
|
|
17
|
-
export declare class DeployStages {
|
|
18
|
-
private mso;
|
|
19
|
-
constructor({ title, jsonEnabled }: Options);
|
|
20
|
-
start({ username, deploy }: {
|
|
21
|
-
username?: string | undefined;
|
|
22
|
-
deploy: MetadataApiDeploy;
|
|
23
|
-
}, initialData?: Partial<Data>): void;
|
|
24
|
-
update(data: Partial<Data>): void;
|
|
25
|
-
stop(): void;
|
|
26
|
-
error(): void;
|
|
27
|
-
done(data?: Partial<Data>): void;
|
|
28
|
-
}
|
|
29
|
-
export {};
|
|
@@ -1,166 +0,0 @@
|
|
|
1
|
-
/*
|
|
2
|
-
* Copyright (c) 2024, salesforce.com, inc.
|
|
3
|
-
* All rights reserved.
|
|
4
|
-
* Licensed under the BSD 3-Clause license.
|
|
5
|
-
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
|
-
*/
|
|
7
|
-
import { MultiStageOutput } from '@oclif/multi-stage-output';
|
|
8
|
-
import { Lifecycle, Messages } from '@salesforce/core';
|
|
9
|
-
import { RequestStatus } from '@salesforce/source-deploy-retrieve';
|
|
10
|
-
import { getZipFileSize } from './output.js';
|
|
11
|
-
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
12
|
-
const mdTransferMessages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'metadata.transfer');
|
|
13
|
-
function round(value, precision) {
|
|
14
|
-
const multiplier = Math.pow(10, precision || 0);
|
|
15
|
-
return Math.round(value * multiplier) / multiplier;
|
|
16
|
-
}
|
|
17
|
-
function formatProgress(current, total) {
|
|
18
|
-
if (total === 0) {
|
|
19
|
-
return '0/0 (0%)';
|
|
20
|
-
}
|
|
21
|
-
return `${current}/${total} (${round((current / total) * 100, 0)}%)`;
|
|
22
|
-
}
|
|
23
|
-
export class DeployStages {
|
|
24
|
-
mso;
|
|
25
|
-
constructor({ title, jsonEnabled }) {
|
|
26
|
-
this.mso = new MultiStageOutput({
|
|
27
|
-
title,
|
|
28
|
-
stages: [
|
|
29
|
-
'Preparing',
|
|
30
|
-
'Waiting for the org to respond',
|
|
31
|
-
'Deploying Metadata',
|
|
32
|
-
'Running Tests',
|
|
33
|
-
'Updating Source Tracking',
|
|
34
|
-
'Done',
|
|
35
|
-
],
|
|
36
|
-
jsonEnabled,
|
|
37
|
-
preStagesBlock: [
|
|
38
|
-
{
|
|
39
|
-
type: 'message',
|
|
40
|
-
get: (data) => data?.message,
|
|
41
|
-
},
|
|
42
|
-
],
|
|
43
|
-
postStagesBlock: [
|
|
44
|
-
{
|
|
45
|
-
label: 'Status',
|
|
46
|
-
get: (data) => data?.status,
|
|
47
|
-
bold: true,
|
|
48
|
-
type: 'dynamic-key-value',
|
|
49
|
-
},
|
|
50
|
-
{
|
|
51
|
-
label: 'Deploy ID',
|
|
52
|
-
get: (data) => data?.id,
|
|
53
|
-
type: 'static-key-value',
|
|
54
|
-
neverCollapse: true,
|
|
55
|
-
},
|
|
56
|
-
{
|
|
57
|
-
label: 'Target Org',
|
|
58
|
-
get: (data) => data?.username,
|
|
59
|
-
type: 'static-key-value',
|
|
60
|
-
},
|
|
61
|
-
{
|
|
62
|
-
label: 'Size',
|
|
63
|
-
get: (data) => data?.deploySize ? `${getZipFileSize(data.deploySize)} of ~39 MB limit` : undefined,
|
|
64
|
-
type: 'static-key-value',
|
|
65
|
-
},
|
|
66
|
-
{
|
|
67
|
-
label: 'Files',
|
|
68
|
-
get: (data) => data?.deployFileCount ? `${data.deployFileCount} of 10,000 limit` : undefined,
|
|
69
|
-
type: 'static-key-value',
|
|
70
|
-
},
|
|
71
|
-
],
|
|
72
|
-
stageSpecificBlock: [
|
|
73
|
-
{
|
|
74
|
-
label: 'Components',
|
|
75
|
-
get: (data) => data?.mdapiDeploy?.numberComponentsTotal
|
|
76
|
-
? formatProgress(data?.mdapiDeploy?.numberComponentsDeployed ?? 0, data?.mdapiDeploy?.numberComponentsTotal)
|
|
77
|
-
: undefined,
|
|
78
|
-
stage: 'Deploying Metadata',
|
|
79
|
-
type: 'dynamic-key-value',
|
|
80
|
-
},
|
|
81
|
-
{
|
|
82
|
-
label: 'Tests',
|
|
83
|
-
get: (data) => data?.mdapiDeploy?.numberTestsTotal && data?.mdapiDeploy?.numberTestsCompleted
|
|
84
|
-
? formatProgress(data?.mdapiDeploy?.numberTestsCompleted, data?.mdapiDeploy?.numberTestsTotal)
|
|
85
|
-
: undefined,
|
|
86
|
-
stage: 'Running Tests',
|
|
87
|
-
type: 'dynamic-key-value',
|
|
88
|
-
},
|
|
89
|
-
{
|
|
90
|
-
label: 'Members',
|
|
91
|
-
get: (data) => data?.sourceMemberPolling?.original
|
|
92
|
-
? formatProgress(data.sourceMemberPolling.original - data.sourceMemberPolling.remaining, data.sourceMemberPolling.original)
|
|
93
|
-
: undefined,
|
|
94
|
-
stage: 'Updating Source Tracking',
|
|
95
|
-
type: 'dynamic-key-value',
|
|
96
|
-
},
|
|
97
|
-
],
|
|
98
|
-
});
|
|
99
|
-
}
|
|
100
|
-
start({ username, deploy }, initialData) {
|
|
101
|
-
const lifecycle = Lifecycle.getInstance();
|
|
102
|
-
if (initialData)
|
|
103
|
-
this.mso.updateData(initialData);
|
|
104
|
-
this.mso.skipTo('Preparing', { username, id: deploy.id });
|
|
105
|
-
// for sourceMember polling events
|
|
106
|
-
lifecycle.on('sourceMemberPollingEvent', (event) => {
|
|
107
|
-
if (event.original > 0) {
|
|
108
|
-
return Promise.resolve(this.mso.skipTo('Updating Source Tracking', { sourceMemberPolling: event }));
|
|
109
|
-
}
|
|
110
|
-
return Promise.resolve();
|
|
111
|
-
});
|
|
112
|
-
deploy.onUpdate((data) => {
|
|
113
|
-
if (data.numberComponentsDeployed === data.numberComponentsTotal &&
|
|
114
|
-
data.numberTestsTotal > 0 &&
|
|
115
|
-
data.numberComponentsDeployed > 0) {
|
|
116
|
-
this.mso.skipTo('Running Tests', { mdapiDeploy: data, status: mdTransferMessages.getMessage(data?.status) });
|
|
117
|
-
}
|
|
118
|
-
else if (data.status === RequestStatus.Pending) {
|
|
119
|
-
this.mso.skipTo('Waiting for the org to respond', {
|
|
120
|
-
mdapiDeploy: data,
|
|
121
|
-
status: mdTransferMessages.getMessage(data?.status),
|
|
122
|
-
});
|
|
123
|
-
}
|
|
124
|
-
else {
|
|
125
|
-
this.mso.skipTo('Deploying Metadata', {
|
|
126
|
-
mdapiDeploy: data,
|
|
127
|
-
status: mdTransferMessages.getMessage(data?.status),
|
|
128
|
-
});
|
|
129
|
-
}
|
|
130
|
-
});
|
|
131
|
-
deploy.onFinish((data) => {
|
|
132
|
-
this.mso.updateData({ mdapiDeploy: data.response, status: mdTransferMessages.getMessage(data.response.status) });
|
|
133
|
-
if (data.response.status === RequestStatus.Failed) {
|
|
134
|
-
this.mso.error();
|
|
135
|
-
}
|
|
136
|
-
else {
|
|
137
|
-
this.mso.skipTo('Done');
|
|
138
|
-
this.mso.stop();
|
|
139
|
-
}
|
|
140
|
-
});
|
|
141
|
-
deploy.onCancel((data) => {
|
|
142
|
-
this.mso.updateData({ mdapiDeploy: data, status: mdTransferMessages.getMessage(data?.status ?? 'Canceled') });
|
|
143
|
-
this.mso.error();
|
|
144
|
-
});
|
|
145
|
-
deploy.onError((error) => {
|
|
146
|
-
if (error.message.includes('client has timed out')) {
|
|
147
|
-
this.mso.updateData({ status: 'Client Timeout' });
|
|
148
|
-
}
|
|
149
|
-
this.mso.error();
|
|
150
|
-
throw error;
|
|
151
|
-
});
|
|
152
|
-
}
|
|
153
|
-
update(data) {
|
|
154
|
-
this.mso.updateData(data);
|
|
155
|
-
}
|
|
156
|
-
stop() {
|
|
157
|
-
this.mso.stop();
|
|
158
|
-
}
|
|
159
|
-
error() {
|
|
160
|
-
this.mso.error();
|
|
161
|
-
}
|
|
162
|
-
done(data) {
|
|
163
|
-
this.mso.skipTo('Done', data);
|
|
164
|
-
}
|
|
165
|
-
}
|
|
166
|
-
//# sourceMappingURL=deployStages.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"deployStages.js","sourceRoot":"","sources":["../../src/utils/deployStages.ts"],"names":[],"mappings":"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"}
|