fix: Retrieve* Commands Should Update Source Tracking When Used Against Source-tracked Sandboxes #4773
Conversation
klewis-sfdc
force-pushed
the
ken/add-src-trk-to-retrieve-for-src-trk-sboxes
branch
from
2ad6e00 to
72b7af0
Compare
| "@salesforce/salesforcedx-sobjects-faux-generator": "57.9.0", | ||
| "@salesforce/salesforcedx-utils-vscode": "57.9.0", | ||
| "@salesforce/schemas": "^1", | ||
| "@salesforce/source-deploy-retrieve": "7.14.2", | ||
| "@salesforce/source-deploy-retrieve": "^7.14.2", |
There was a problem hiding this comment.
Had to carrot here to get core and utils-vscode to have the same version of @salesforce/source-deploy-retrieve installed.
| @@ -11,7 +11,8 @@ | |||
| ], | |||
| "main": "out/src", | |||
| "dependencies": { | |||
| "@salesforce/core": "^3.31.18", | |||
| "@salesforce/source-tracking": "2.2.24", | |||
| "@salesforce/core": "3.34.6", | |||
There was a problem hiding this comment.
Add source-tracking to the utils-vscode pkg and upgrade core to align version with core pkg
There was a problem hiding this comment.
I think I asked this is in another PR, but I'm losing track haha. Does core need to be consistent across our packages?
There was a problem hiding this comment.
It seems to me that even though the package.json entries are not all exactly the same across the packages, we end up with only two versions of core installed 3.34.6 and 2.37.1 (for Functions):
There was a problem hiding this comment.
A new version of core was released, which resulted in npm i installing 3 versions of @salesforce/core, and then hitting compilation errors. In #4808 all versions of core dependencies in vsce packages were aligned on v 3.34.7 to avoid the compilation errors.
packages/salesforcedx-vscode-core/src/commands/baseDeployRetrieve.ts
Outdated
Show resolved
Hide resolved
packages/salesforcedx-vscode-core/src/commands/baseDeployRetrieve.ts
Outdated
Show resolved
Hide resolved
use stl to update its status but not throw conflict errs in retrieve ops
packages/salesforcedx-utils-vscode/test/jest/services/sourceTrackingService.test.ts
Show resolved
Hide resolved
| pollStatus: jest.fn().mockResolvedValue(dummyRetrieveResult) | ||
| } as any; | ||
|
|
||
| let workspaceContextGetInstanceSpy: jest.SpyInstance; |
There was a problem hiding this comment.
It's used on line 58 below. I added an expect into the test for it so that it is being used in the assertions.
What does this PR do?
What issues does this PR fix or reference?
@W-12971145@
Functionality Before
When connected to a source-tracked Sandbox, SFDX: Retrieve* commands would retrieve metadata components, but would not fix up source tracking correctly.
Functionality After
When connected to a source-tracked Sandbox, SFDX: Retrieve* commands retrieve metadata components and fix up source tracking correctly.
Todos: