Skip to content

Commit

Permalink
fix: only reports and dashboards have this behavior
Browse files Browse the repository at this point in the history
  • Loading branch information
shetzel committed Sep 3, 2024
1 parent 9520084 commit 558bd8a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions src/collections/componentSet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -735,9 +735,10 @@ const splitOnFirstDelimiter = (input: string): [string, string] => {
};

const constructFullName = (registry: RegistryAccess, type: MetadataType, fullName: string): string =>
// InFolder types are different (e.g., Report/ReportFolder). ReportFolders are deployed/retrieved as Reports.
// If a ReportFolder is being added append a "/" so the metadata API can identify it as a folder.
type.folderContentType && !fullName.endsWith('/')
// Some InFolder types are different. e.g., Report/ReportFolder & Dashboard/DashboardFolder.
// 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'].includes(type.name) && !fullName.endsWith('/')
? `${fullName}/`
: registry.getParentType(type.name)?.strategies?.recomposition === 'startEmpty' && fullName.includes('.')
? // they're reassembled like CustomLabels.MyLabel
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Package xmlns="http://soap.sforce.com/2006/04/metadata">
<types>
<members>Top_Level_Folder/</members>
<members>Top_Level_Folder</members>
<members>Top_Level_Folder/Template_in_folder</members>
<members>unfiled$public/Top_level_email</members>
<name>EmailTemplate</name>
Expand Down

2 comments on commit 558bd8a

@svc-cli-bot
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Benchmark

Benchmark suite Current: 558bd8a Previous: f2e9353 Ratio
eda-componentSetCreate-linux 236 ms 228 ms 1.04
eda-sourceToMdapi-linux 2353 ms 2247 ms 1.05
eda-sourceToZip-linux 1867 ms 1893 ms 0.99
eda-mdapiToSource-linux 2859 ms 2954 ms 0.97
lotsOfClasses-componentSetCreate-linux 428 ms 438 ms 0.98
lotsOfClasses-sourceToMdapi-linux 3730 ms 3842 ms 0.97
lotsOfClasses-sourceToZip-linux 3069 ms 3213 ms 0.96
lotsOfClasses-mdapiToSource-linux 3629 ms 3639 ms 1.00
lotsOfClassesOneDir-componentSetCreate-linux 737 ms 761 ms 0.97
lotsOfClassesOneDir-sourceToMdapi-linux 6468 ms 6618 ms 0.98
lotsOfClassesOneDir-sourceToZip-linux 5658 ms 5803 ms 0.98
lotsOfClassesOneDir-mdapiToSource-linux 6405 ms 6583 ms 0.97

This comment was automatically generated by workflow using github-action-benchmark.

@svc-cli-bot
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Benchmark

Benchmark suite Current: 558bd8a Previous: f2e9353 Ratio
eda-componentSetCreate-win32 644 ms 689 ms 0.93
eda-sourceToMdapi-win32 4148 ms 4488 ms 0.92
eda-sourceToZip-win32 2902 ms 3137 ms 0.93
eda-mdapiToSource-win32 5595 ms 6024 ms 0.93
lotsOfClasses-componentSetCreate-win32 1213 ms 1153 ms 1.05
lotsOfClasses-sourceToMdapi-win32 7651 ms 7786 ms 0.98
lotsOfClasses-sourceToZip-win32 4944 ms 5199 ms 0.95
lotsOfClasses-mdapiToSource-win32 7921 ms 8053 ms 0.98
lotsOfClassesOneDir-componentSetCreate-win32 2119 ms 2121 ms 1.00
lotsOfClassesOneDir-sourceToMdapi-win32 13815 ms 14164 ms 0.98
lotsOfClassesOneDir-sourceToZip-win32 9269 ms 9385 ms 0.99
lotsOfClassesOneDir-mdapiToSource-win32 14134 ms 14442 ms 0.98

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.