Backward compat : Dependency Fixes

KevinJump · Jul 15, 2020 · 1f365a8 · 1f365a8
1 parent f55a4aa
commit 1f365a8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/uSync8.BackOffice/SyncHandlers/SyncHandlerRoot.cs b/uSync8.BackOffice/SyncHandlers/SyncHandlerRoot.cs
@@ -139,8 +139,8 @@ public SyncHandlerRoot(
             this.itemFactory = itemFactory ?? Current.Factory.GetInstance<ISyncItemFactory>();
 
             this.serializer = serializer;
-            this.trackers = itemFactory.GetTrackers<TObject>().ToList();
-            this.dependencyCheckers = itemFactory.GetCheckers<TObject>().ToList();
+            this.trackers = this.itemFactory.GetTrackers<TObject>().ToList();
+            this.dependencyCheckers = this.itemFactory.GetCheckers<TObject>().ToList();
 
             this.syncFileService = syncFileService;
 

diff --git a/uSync8.ContentEdition/Checkers/ContentBaseChecker.cs b/uSync8.ContentEdition/Checkers/ContentBaseChecker.cs
@@ -1,5 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
+
+using Serilog.Core;
+
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
@@ -14,7 +17,7 @@ public abstract class ContentBaseChecker
     {
         protected readonly IEntityService entityService;
         private UmbracoObjectTypes contentTypeObjectType;
-        private SyncValueMapperCollection mappers;
+        private SyncValueMapperCollection mapperCollection;
 
         public UmbracoObjectTypes ObjectType { get; protected set; } = UmbracoObjectTypes.Unknown;
 
@@ -25,7 +28,7 @@ public ContentBaseChecker(IEntityService entityService,
             this.entityService = entityService;
             this.contentTypeObjectType = contentTypeObjectType;
 
-            this.mappers = mappers;
+            this.mapperCollection = mappers;
         }
 
         protected uSyncDependency CalcDocTypeDependency(IContentBase item, DependencyFlags flags)
@@ -155,14 +158,14 @@ protected IEnumerable<uSyncDependency> GetPropertyDependencies(IContentBase item
             foreach (var property in item.Properties)
             {
                 var editorAlias = property.PropertyType.PropertyEditorAlias;
-                var valueMappers = mappers.GetSyncMappers(editorAlias);
+                var valueMappers = mapperCollection.GetSyncMappers(editorAlias);
                 if (valueMappers.Any())
                 {
                     foreach(var value in property.Values)
                     {
                         if (value.EditedValue == null) continue;
 
-                        foreach (var mapper in mappers)
+                        foreach (var mapper in valueMappers)
                         {
                             var linkedDependencies = mapper.GetDependencies(value.EditedValue, editorAlias, propertyFlags);
 

diff --git a/uSync8.ContentEdition/Mapping/Mappers/GridMapper.cs b/uSync8.ContentEdition/Mapping/Mappers/GridMapper.cs
@@ -142,7 +142,7 @@ private IEnumerable<uSyncDependency> ProcessControl(JObject control, DependencyF
             if (value == null) return Enumerable.Empty<uSyncDependency>();
 
             var (alias, mappers) = FindMappers(editor);
-            if (!mappers.Any()) return Enumerable.Empty<uSyncDependency>();
+            if (mappers == null || !mappers.Any()) return Enumerable.Empty<uSyncDependency>();
 
             var dependencies = new List<uSyncDependency>();