fix: force fullName to CustomLabels #427
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mdonnalley
force-pushed
the
mdonnalley/poorly-named-custom-labels
branch
from
dfde4a3 to
879129f
Compare
WillieRuemmele
approved these changes
Aug 17, 2021
src/resolve/sourceComponent.ts
Outdated
| @@ -218,6 +218,9 @@ export class SourceComponent implements MetadataComponent { | |||
| } | |||
|
|
|||
| get fullName(): string { | |||
| if (this.type.ignoreTypeName) { | |||
There was a problem hiding this comment.
NIT: the naming makes this line confusing, if ignoreTypeName is true, we return this.type.name which I wouldn't expect to happen if I set ignoreTypeName=true. From the JSDoc, what if we change ignoreTypeName to ignoreParsedFileName
But I confirmed the change works,
- deploy
CustomLabels.labels-meta.xml - deploys
Labels.labels-meta.xml - deploys
force-app/main/default/myLabels/Labels.labels-meta.xml - retrieves into
myLabels/Labels... - retrieves into
labels/CustomLabels..
There was a problem hiding this comment.
I test this on MPD deploy-retrieve scenarios and did source:convert with it, too.
AnanyaJha
pushed a commit
that referenced
this pull request
Aug 19, 2021
* 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]>
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Adds
ignoreParsedFullNameoption to registry. Whentruethis will ignore the name that was parsed from the file path and use the metadata type instead. Doing so fixes deploy and retrieve for users who have CustomLabels files not namedCustomLabels.labels-meta.xml, e.g.MyLabels.labels-meta.xmlWhat issues does this PR fix or reference?
forcedotcom/cli#1133,
@W-9720198@