Skip to content

Commit 7d732ae

Browse files
committed
fix: add spinner and fix perserve file location msg
@W-11644909@
1 parent ab11694 commit 7d732ae

File tree

4 files changed

+26
-11
lines changed

4 files changed

+26
-11
lines changed

messages/package_version_create.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,4 +303,12 @@ The %s value "%s" from the command line or sfdx-project.json is not in the corre
303303

304304
# requestInProgress
305305

306-
Request in progress. Sleeping %s seconds. Will wait a total of %s more seconds before timing out. Current Status=%s.
306+
Version create.
307+
308+
# packageVersionCreateWaitingStatus
309+
310+
%d minutes remaining until timeout. Create version status: %s
311+
312+
# packageVersionCreateFinalStatus
313+
314+
Create version status: %s

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"@salesforce/command": "^5.2.6",
1111
"@salesforce/core": "^3.26.2",
1212
"@salesforce/kit": "^1.6.0",
13-
"@salesforce/packaging": "^0.0.25",
13+
"@salesforce/packaging": "^0.0.27",
1414
"tslib": "^2",
1515
"chalk": "^4.1.2"
1616
},

src/commands/force/package/beta/version/create.ts

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,18 @@ export class PackageVersionCreateCommand extends SfdxCommand {
159159
// eslint-disable-next-line @typescript-eslint/require-await
160160
Lifecycle.getInstance().on('in-progress', async (data: PackageVersionCreateReportProgress) => {
161161
if (data.Status !== Package2VersionStatus.success && data.Status !== Package2VersionStatus.error) {
162-
this.ux.log(
163-
messages.getMessage('requestInProgress', [frequency.seconds, data.remainingWaitTime.seconds, data.Status])
162+
this.ux.setSpinnerStatus(
163+
messages.getMessage('packageVersionCreateWaitingStatus', [data.remainingWaitTime.minutes, data.Status])
164164
);
165165
}
166166
});
167+
Lifecycle.getInstance().on(
168+
'packageVersionCreate:preserveFiles',
169+
// eslint-disable-next-line @typescript-eslint/require-await
170+
async (data: { location: string; message: string }) => {
171+
this.ux.log(messages.getMessage('tempFileLocation', [data.location]));
172+
}
173+
);
167174

168175
// resolve the package id from the --package flag, first checking if it's an alias, then using the flag (an id), and then looking for the package name from the --path flag
169176
let packageName: string;
@@ -179,18 +186,18 @@ export class PackageVersionCreateCommand extends SfdxCommand {
179186
const packageId = getPackageIdFromAlias(packageName, this.project);
180187

181188
const pv = new PackageVersion({ project: this.project, connection: this.hubOrg.getConnection() });
189+
this.ux.startSpinner(messages.getMessage('requestInProgress'));
182190
const result = await pv.create(
183191
{ ...this.flags, ...{ packageId } },
184192
{
185193
timeout: this.flags.wait as Duration,
186194
frequency,
187195
}
188196
);
189-
197+
this.ux.stopSpinner(messages.getMessage('packageVersionCreateFinalStatus', [result.Status]));
190198
switch (result.Status) {
191199
case 'Error':
192-
this.ux.log(messages.getMessage('unknownError', [result.Error.join('\n')]));
193-
break;
200+
throw messages.createError('unknownError', [result.Error.join('\n')]);
194201
case 'Success':
195202
this.ux.log(
196203
messages.getMessage(result.Status, [

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,10 +1150,10 @@
11501150
shx "^0.3.3"
11511151
tslib "^2.2.0"
11521152

1153-
"@salesforce/packaging@^0.0.25":
1154-
version "0.0.25"
1155-
resolved "https://registry.yarnpkg.com/@salesforce/packaging/-/packaging-0.0.25.tgz#6004d86c46a13076dd8bc3e4404205d1add1cf5f"
1156-
integrity sha512-SQ8NuoTjXZ3Qnja1e2xODDdX32181AGZo+KhcedJQozKO1a09/wkbkNJqxAI/db4+TEJUM4nlT6D73cpY1SywA==
1153+
"@salesforce/packaging@^0.0.27":
1154+
version "0.0.27"
1155+
resolved "https://registry.yarnpkg.com/@salesforce/packaging/-/packaging-0.0.27.tgz#4db9480024288a26f2549e4f3b7a7ddc20e62808"
1156+
integrity sha512-1hMGLD32zH/VCEik5wLVPXqQ7y6NHwvTsC5uKurCdvqjLjP3NuJQaSTXInaP3uXSttgmsy+XIsDlmp4f3aLtpw==
11571157
dependencies:
11581158
"@salesforce/core" "^3.26.2"
11591159
"@salesforce/kit" "^1.6.0"

0 commit comments

Comments
 (0)