V16/multiple nodes per file#829
Conversation
…want to slow down existing imports).
…en using a single import file.
There was a problem hiding this comment.
Pull Request Overview
Adds support for “production” merged files that contain multiple items per handler, improves progress callbacks, and introduces configuration for folder modes (Normal/Root/Production) including an API to generate merged exports.
- Enable import/report of multiple nodes from a single XML file per handler.
- Add “production mode” settings and folder resolution logic.
- Introduce API endpoint and service methods to merge exports; enhance progress callbacks.
Reviewed Changes
Copilot reviewed 20 out of 21 changed files in this pull request and generated 10 comments.
Show a summary per file
| File | Description |
|---|---|
| uSync.Core/uSyncConstants.cs | Adds Empty serialization constant documentation for “action-only” files. |
| uSync.Core/Serialization/SyncSerializerRoot.cs | Uses constant for “Empty” marker; no functional issues. |
| uSync.Backoffice.Management.Client/.../settings.element.ts | Fixes localization key for export-on-save label. |
| uSync.Backoffice.Management.Api/Controllers/Actions/SyncFolderController.cs | Adds MergeExport endpoint to generate merged production files. |
| uSync.BackOffice/uSyncBackOfficeBuilderExtensions.cs | Adjusts FolderMode to Root when IsRootSite is true and mode is Normal. |
| uSync.BackOffice/SyncHandlers/SyncHandlerRoot.cs | Adds multi-element import/report paths and new progress callbacks; exposes serializer type/tracker; minor doc typos. |
| uSync.BackOffice/SyncHandlers/SyncHandlerContainerBase.cs | Optimizes delete processing for merged files; adds XPath selection for “Empty” nodes. |
| uSync.BackOffice/SyncHandlers/Interfaces/ISyncHandler.cs | Adds optional methods to expose serializer type and base tracker. |
| uSync.BackOffice/SyncHandlers/Handlers/DataTypeHandler.cs | Removes redundant post-import override; minor using added. |
| uSync.BackOffice/Services/SyncService_Handlers.cs | Adds import/report paths for merged “production” files. |
| uSync.BackOffice/Services/SyncService_Files.cs | Adds MergeExportFolder and MakeSingleExportFromFolders; tweaks XML settings. |
| uSync.BackOffice/Services/SyncService.cs | Moves callback delegate to Hubs. |
| uSync.BackOffice/Services/ISyncService.cs | Declares MergeExportFolder API. |
| uSync.BackOffice/Services/ISyncFileService.cs | Declares MakeSingleExportFromFolders. |
| uSync.BackOffice/Hubs/uSyncCallbacks.cs | Centralizes callback delegates; adds range/incremental updates; minor typo and unused using. |
| uSync.BackOffice/Hubs/HubClientService.cs | Implements range/incremental callback handling. |
| uSync.BackOffice/Configuration/uSyncSettings.cs | Adds FolderMode and ProductionFolder settings; updates notification suppression docs. |
| uSync.BackOffice/Configuration/SyncConfigService.cs | Resolves folders according to FolderMode. |
| uSync.BackOffice.Targets/appsettings-schema.usync.json | Updates schema with FolderMode and ProductionFolder; fixes “Suppress” spelling. |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
There was a problem hiding this comment.
Pull Request Overview
Copilot reviewed 20 out of 21 changed files in this pull request and generated 5 comments.
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
There was a problem hiding this comment.
Pull Request Overview
Copilot reviewed 20 out of 21 changed files in this pull request and generated 4 comments.
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
There was a problem hiding this comment.
Pull Request Overview
Copilot reviewed 20 out of 21 changed files in this pull request and generated 6 comments.
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
[//]: # (dependabot-start)⚠️ **Dependabot is rebasing this PR**⚠️ Rebasing might not happen immediately, so don't worry if this takes some time. Note: if you make any changes to this PR yourself, they will take precedence over the rebase. --- [//]: # (dependabot-end) Updated [uSync](https://github.com/KevinJump/uSync) from 16.0.5 to 16.1.0. <details> <summary>Release notes</summary> _Sourced from [uSync's releases](https://github.com/KevinJump/uSync/releases)._ ## 16.1.0 This is a minor update to uSync for Umbraco v16, it contains feature updates to how BlockList/Grid merges are reported and the ability to merge uSync files for multiple items into single files so they can be read in one block from the server (no UI for this, feature will likely be enabled via the uSync.Cli). ## What's Changed * V16/block converters two by @KevinJump in KevinJump/uSync#822 * pass latest content version between passes. by @KevinJump in KevinJump/uSync#823 * V16/firstboot on startup conflict fix by @KevinJump in KevinJump/uSync#824 * Add operation security filter so swagger auth is allowed. by @KevinJump in KevinJump/uSync#825 * Share second pass actions across commonn IContentBase objects by @KevinJump in KevinJump/uSync#826 * Rix #827 - Removal's code was trying to modify array inside loop of array by @KevinJump in KevinJump/uSync#828 * V16/multiple nodes per file by @KevinJump in KevinJump/uSync#829 **Full Changelog**: KevinJump/uSync@v16.0.8...v16.1.0 This will be the last 'feature' release of uSync for Umbraco v16 as we move on to supporting and targeting Umbraco v17 (see https://docs.jumoo.co.uk/SupportLifecycles#Short-Term-Support-STS-Releases) ## 16.0.8 This is a patch release of uSync for Umbraco, it contains some fixes issues around imports on startup and UI messages. ## What's Changed * update package.json dependencies. by @KevinJump in KevinJump/uSync#819 * Offer more granular updates to the ordering process by @KevinJump in KevinJump/uSync#820 * Get Correct Content version on second pass events. by @KevinJump in KevinJump/uSync#821 **Full Changelog**: KevinJump/uSync@v16.0.7...v16.0.8 ## 16.0.7 This is a patch release for uSync for Umbraco v16 - it contains some fixes and updates based on reported issues. ## What's Changed * Some string changes to reduce some allocations here and there. by @KevinJump in KevinJump/uSync#808 * Fix #803 (again) ensure the self referencing nodes are removed by @KevinJump in KevinJump/uSync#809 * only check for legacy when the default folder hasn't been changed. by @KevinJump in KevinJump/uSync#810 * V16/dashboard tweaks by @KevinJump in KevinJump/uSync#811 * normalize string media paths into JSON croppers for consistancy. by @KevinJump in KevinJump/uSync#812 * Fix: Compiled Views Content by @KevinJump in KevinJump/uSync#813 * move away from uui-table-row by @KevinJump in KevinJump/uSync#814 * v16 fix of #815 by @KevinJump in KevinJump/uSync#818 **Full Changelog**: KevinJump/uSync@v16.0.5...v16.0.7 Commits viewable in [compare view](KevinJump/uSync@v16.0.5...v16.1.0). </details> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) You can trigger a rebase of this PR by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> > **Note** > Automatic rebases have been disabled on this pull request as it has been open for over 30 days. Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Allows uSync to import files that contain multiple individual node items from a folder.
As of yet there is no ui to create the merged files, we will probably put it in the uSync command line. as really it needs to be part of CI/CD to be consistent and expected by the servers.