diff --git a/src/collections/componentSet.ts b/src/collections/componentSet.ts index 622a71a4a3..b2fc40a439 100644 --- a/src/collections/componentSet.ts +++ b/src/collections/componentSet.ts @@ -739,7 +739,7 @@ const constructFullName = (registry: RegistryAccess, type: MetadataType, fullNam // ReportFolders are deployed/retrieved as Reports. If a ReportFolder is being added append // a "/" so the metadata API can identify it as a folder. ['DashboardFolder', 'ReportFolder', 'EmailTemplateFolder'].includes(type.name) && !fullName.endsWith('/') - ? `${fullName}/` + ? `${fullName}` : registry.getParentType(type.name)?.strategies?.recomposition === 'startEmpty' && fullName.includes('.') ? // they're reassembled like CustomLabels.MyLabel fullName.split('.')[1] diff --git a/test/resolve/manifestResolver.test.ts b/test/resolve/manifestResolver.test.ts index cb24f02344..0ce6049cf1 100644 --- a/test/resolve/manifestResolver.test.ts +++ b/test/resolve/manifestResolver.test.ts @@ -204,8 +204,8 @@ describe('ManifestResolver', () => { data: Buffer.from(` - foo/ - foo/subfoo/ + foo + foo/subfoo foo/subfoo/MySubFooReport1 foo/subfoo/MySubFooReport2 bar/MyBarReport1 diff --git a/test/snapshot/sampleProjects/nestedFolders/__snapshots__/verify-md-files.expected/package.xml b/test/snapshot/sampleProjects/nestedFolders/__snapshots__/verify-md-files.expected/package.xml index b5b7eb05af..db55d26cfe 100644 --- a/test/snapshot/sampleProjects/nestedFolders/__snapshots__/verify-md-files.expected/package.xml +++ b/test/snapshot/sampleProjects/nestedFolders/__snapshots__/verify-md-files.expected/package.xml @@ -7,8 +7,8 @@ EmailTemplate - TopFolder/ - TopFolder/ChildFolder/ + TopFolder + TopFolder/ChildFolder TopFolder/ChildFolder/Report_in_Child_Folder_qz4 TopFolder/Copy_of_Top_level_report_DOj unfiled$public/Top_level_report_cZJ