Skip to content

V13/root merge fix#782

Merged
KevinJump merged 8 commits intov13/mainfrom
v13/root-merge-fix
Jul 22, 2025
Merged

V13/root merge fix#782
KevinJump merged 8 commits intov13/mainfrom
v13/root-merge-fix

Conversation

@KevinJump
Copy link
Copy Markdown
Owner

fixes and updates for the root functionality:

  • fix the merging of block elements in datatypes
  • fixes for content type property merging orders (Compositions, tabs and templates).
  • Addition of the ISyncFolder collection (which lets you add folders to uSync's list programatically).

@KevinJump KevinJump requested a review from Copilot July 22, 2025 13:46
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This pull request implements fixes and updates for uSync's root functionality, focusing on improving block element merging in datatypes and content type property merging orders. The changes include merging improvements, new configuration options for backward compatibility, and enhanced folder management through programmatic folder injection.

  • Fixes block element merging logic in datatypes with wildcard path support
  • Adds configuration for content type property merging orders (Compositions, tabs, templates)
  • Introduces ISyncFolder collection for programmatic folder management

Reviewed Changes

Copilot reviewed 14 out of 14 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
uSync.SchemaGenerator/Program.cs Adds optional site path copying functionality for schema files
uSync.SchemaGenerator/Options.cs Adds new site command-line option for schema generator
uSync.Core/Tracking/SyncRootMergerHelper.cs Major refactoring with wildcard path support, improved merging logic, and helper methods
uSync.Core/Tracking/Impliment/ContentTypeBaseTracker.cs Updates tracking configuration for compositions and allowed templates
uSync.Core/Tracking/Impliment/ContentBaseTracker.cs Disables content merging in roots to prevent confusion
uSync.Core/Mapping/Mappers/MemberGroupPickerMapper.cs New mapper for member group picker functionality
uSync.Backoffice.Assets/Controllers/uSyncDashboardApiController.cs Updates settings endpoint to include folder configuration
uSync.BackOffice/uSyncBackOfficeBuilderExtensions.cs Registers new SyncFolderCollection for dependency injection
uSync.BackOffice/SyncHandlers/SyncHandlerRoot.cs Implements legacy root merge configuration and improved export logic
uSync.BackOffice/Configuration/uSyncHandlerSettings.cs Adds LegacyRootMerge configuration option
uSync.BackOffice/Configuration/uSyncConfigService.cs Refactors folder management with ISyncFolder collection support
uSync.BackOffice/Configuration/SyncFolderCollection.cs New collection class for managing sync folders
uSync.BackOffice/Configuration/ISyncfolder.cs New interface for programmatic folder definition
uSync.BackOffice.Targets/appsettings-schema.usync.json Updates JSON schema with new configuration options
Comments suppressed due to low confidence (2)

uSync.BackOffice/Configuration/ISyncfolder.cs:1

  • The filename 'ISyncfolder.cs' should follow C# naming conventions with proper casing: 'ISyncFolder.cs'.
namespace uSync.BackOffice.Configuration;

Comment thread uSync.Core/Tracking/SyncRootMergerHelper.cs Outdated
Comment thread uSync.Core/Tracking/SyncRootMergerHelper.cs
Comment thread uSync.BackOffice/Configuration/uSyncConfigService.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@KevinJump KevinJump merged commit 56fe3d1 into v13/main Jul 22, 2025
3 checks passed
@KevinJump KevinJump deleted the v13/root-merge-fix branch July 22, 2025 13:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants