Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: forceIgnore does not work for SFDX: Retrieve Source in Manifest from Org in vscode extension #413

Merged
merged 12 commits into from
Aug 18, 2021

Conversation

violetyao
Copy link
Contributor

@violetyao violetyao commented Aug 3, 2021

What does this PR do?

  1. When users use the SFDX: Retrieve Source in Manifest from Org command in vscode extension, 1) files in .forceIgnore are not printed in channelService (which is the expected behavior) 2) however, files in .forceIgnore are still retrieved and they overwrite the local version (which is not the expected behavior).

This PR fixes the issue where forceIgnore does not work for SFDX: Retrieve Source in Manifest from Org in vscode extension, by keeping track of a list of forceIgnoredPaths explored in resolver and skip those forceIgnoredPaths during writing.

  1. This PR also fixes @W-9682706@ where forceIgnored matchingContent files are retrieved to force-app/main/default/classes/ApexClassExample.cls, while their original paths are force-app/main/default/classes/subfolder/ApexClassExample.cls.

What issues does this PR fix or reference?

forcedotcom/salesforcedx-vscode#3236, @W-9293630@, @W-9682706@

Functionality Before

.forceIgnore did not work for retrieving a componentSet constructed from ComponentSet.fromManifest.

Functionality After

.forceIgnore works for retrieving a componentSet constructed from ComponentSet.fromManifest.

@violetyao violetyao requested review from a team as code owners August 3, 2021 21:05
@violetyao violetyao requested a review from xyc August 3, 2021 21:05
src/convert/types.ts Outdated Show resolved Hide resolved
src/convert/streams.ts Outdated Show resolved Hide resolved
@violetyao violetyao merged commit af52e37 into develop Aug 18, 2021
@violetyao violetyao deleted the violet/force-ignore branch August 18, 2021 22:40
AnanyaJha pushed a commit that referenced this pull request Aug 19, 2021
… from Org` in vscode extension (#413)

* fix: forceIgnore does not work with retrieve manifest

* fix: matchingContent subfolder
shetzel added a commit that referenced this pull request Aug 20, 2021
* fix: export all public TS types and interfaces (#423)

* fix: making exports in the right format

@W-9727845@

* chore: removing yarn changes

* fix: xml nodes might not be arrays (#424)

Co-authored-by: Willie Ruemmele <[email protected]>

* fix: throw an error for unexpected child types (#426)

* fix: throw an error for unexpected child types

* fix: throw better error when transforming invalid child

* fix: ensure valid children during retrieve

Co-authored-by: Willie Ruemmele <[email protected]>

* fix: force fullName to CustomLabels (#427)

* fix: force fullName to CustomLabels

* chore: update prop name

* fix: backward support for toolbelt suffix differences

* Revert "fix: backward support for toolbelt suffix differences"

This reverts commit 9cf9505.

Co-authored-by: mshanemc <[email protected]>
Co-authored-by: Willie Ruemmele <[email protected]>

* fix: forceIgnore does not work for `SFDX: Retrieve Source in Manifest from Org` in vscode extension (#413)

* fix: forceIgnore does not work with retrieve manifest

* fix: matchingContent subfolder

* Wr/content type of undefined (#429)

* chore: initial pass on preventing improperly structured static resources

* chore: added error message

Co-authored-by: Shane McLaughlin <[email protected]>

* fix: support toolbelt suffixes (#428)

* fix: force fullName to CustomLabels

* chore: update prop name

* fix: backward support for toolbelt suffix differences

* Revert "fix: backward support for toolbelt suffix differences"

This reverts commit 9cf9505.

* fix: support toolbelt suffixes

* feat: support legacy suffix conversion

Co-authored-by: Mike Donnalley <[email protected]>
Co-authored-by: Willie Ruemmele <[email protected]>

Co-authored-by: vamsimundra <[email protected]>
Co-authored-by: Shane McLaughlin <[email protected]>
Co-authored-by: Willie Ruemmele <[email protected]>
Co-authored-by: Steve Hetzel <[email protected]>
Co-authored-by: Mike Donnalley <[email protected]>
Co-authored-by: Violet Yao <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants