fix: don't strip last folder from dir when resolving projectDir #660
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
cristiand391
commented
Jul 6, 2022
| @@ -417,7 +417,7 @@ describe('Convert Transaction Constructs', () => { | |||
| state.exampleComponent = component; | |||
| }); | |||
|
|
|||
| const result = await context.nonDecomposition.finalize(nonDecomposed.DEFAULT_DIR, TREE); | |||
| const result = await context.nonDecomposition.finalize(dirname(nonDecomposed.DEFAULT_DIR), TREE); | |||
There was a problem hiding this comment.
Use dirname here to strip force-app from the path dir.
WillieRuemmele
approved these changes
Jul 6, 2022
| @@ -273,7 +273,7 @@ class NonDecompositionFinalizer extends ConvertTransactionFinalizer<NonDecomposi | |||
| */ | |||
| private getAllComponentsOfType(defaultDirectory: string, componentType: string): SourceComponent[] { | |||
| // assumes that defaultDir is one level below project dir | |||
There was a problem hiding this comment.
Is this comment still accurate now?
There was a problem hiding this comment.
yes, the difference now is that it doesn't strip the last member in defaultDirectory, so for force:mdapi:convert -r mdapi -d test1/test2
const defaultDirectory = '/Users/cdominguez/code/sfdx-project/test1/test2';
const projectDir = resolve(defaultDirectory);
// projectDir would equal '/Users/cdominguez/code/sfdx-project/test1/test2'...:thinking: wouldn't this cause SDR fail to find customlabels if you have MPDs in a project? Since projectDir will not be pointing to the root project dir.
this is the only place it's being called:
|
Closed in favor of #666 |
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?
Fixes
NonDecompositionFinalizerfinalizer resolving metadata components from the top-level folder when passing a dir path that is exactly one level below the project dir.When running
sfdx force:mdapi:convert -r mdapi -d srcplugin-source sets the
outputDirectoryto:/Users/cdominguez/code/sfdx-project/srcwhich then in this line:
source-deploy-retrieve/src/convert/convertContext.ts
Line 276 in 7804d44
dirnamestrips the last folder after the last/soand last SDR uses the projectDir to get the compSet from source, which walks the tree, scans customlabels in other folders with other dir (other src, mdapi, etc) and make this line return the wrong parentKey.
source-deploy-retrieve/src/convert/convertContext.ts
Line 215 in 7804d44
What issues does this PR fix or reference?
forcedotcom/cli#1540
@W-11186731@
Functionality Before
NonDecompositionFinalizerscans components in root project dir which causes issues when components are found in other folders (mdapi, etc).Functionality After