Merge branch 'release/1.7.0'

dawoe · Nov 27, 2018 · cb69535 · cb69535
2 parents 48b5378 + 8e6def9
commit cb69535
Show file tree

Hide file tree

Showing 17 changed files with 84 additions and 65 deletions.
diff --git a/Source/Our.Umbraco.Nexu.Core.Tests/Properties/AssemblyInfo.cs b/Source/Our.Umbraco.Nexu.Core.Tests/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyVersion("1.7.0.0")]
+[assembly: AssemblyFileVersion("1.7.0.0")]
diff --git a/Source/Our.Umbraco.Nexu.Core/BootStrapper.cs b/Source/Our.Umbraco.Nexu.Core/BootStrapper.cs
@@ -1,4 +1,6 @@
-namespace Our.Umbraco.Nexu.Core
+using Umbraco.Core.Logging;
+
+namespace Our.Umbraco.Nexu.Core
 {
     using System;
     using System.Collections.Generic;
@@ -114,7 +116,14 @@ private void ServerVariablesParserParsing(object sender, Dictionary<string, obje
 
         private void ParseContentInBackground(object info)
         {
-            NexuService.Current.ParseContent((IContent)info);
+            try
+            {
+                NexuService.Current.ParseContent((IContent)info);
+            }
+            catch (Exception e)
+            {
+                LogHelper.Error<BootStrapper>("An unhandled exception occurred while parsing content", e);
+            }
         }
     }
 }
diff --git a/Source/Our.Umbraco.Nexu.Core/Interfaces/INexuService.cs b/Source/Our.Umbraco.Nexu.Core/Interfaces/INexuService.cs
@@ -9,7 +9,7 @@
     /// <summary>
     /// The NexuService interface.
     /// </summary>
-    internal interface INexuService
+    public interface INexuService
     {
         /// <summary>
         /// Gets all property parsrs

diff --git a/Source/Our.Umbraco.Nexu.Core/Models/PropertyWithParser.cs b/Source/Our.Umbraco.Nexu.Core/Models/PropertyWithParser.cs
@@ -7,7 +7,7 @@
     /// <summary>
     /// The property with parser.
     /// </summary>
-    internal class PropertyWithParser
+    public class PropertyWithParser
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PropertyWithParser"/> class.

diff --git a/Source/Our.Umbraco.Nexu.Core/NexuService.cs b/Source/Our.Umbraco.Nexu.Core/NexuService.cs
@@ -18,7 +18,7 @@
     /// <summary>
     /// Nexu service
     /// </summary>
-    internal class NexuService : INexuService
+    public class NexuService : INexuService
     {
         /// <summary>
         /// Internal service instance
@@ -60,7 +60,7 @@ internal class NexuService : INexuService
         /// <param name="dataTypeService">
         /// The data Type Service.
         /// </param>
-        public NexuService(
+        internal NexuService(
             ProfilingLogger profiler,
             IRelationService relationService,
             PropertyParserResolver propertyParserResolver,

diff --git a/Source/Our.Umbraco.Nexu.Core/Properties/AssemblyInfo.cs b/Source/Our.Umbraco.Nexu.Core/Properties/AssemblyInfo.cs
@@ -34,7 +34,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyVersion("1.7.0.0")]
+[assembly: AssemblyFileVersion("1.7.0.0")]
 
 
diff --git a/Source/Our.Umbraco.Nexu.Core/WebApi/NexuApiController.cs b/Source/Our.Umbraco.Nexu.Core/WebApi/NexuApiController.cs
@@ -1,4 +1,7 @@
-namespace Our.Umbraco.Nexu.Core.WebApi
+using System;
+using Umbraco.Core.Logging;
+
+namespace Our.Umbraco.Nexu.Core.WebApi
 {
     using System.Collections.Generic;
     using System.Linq;
@@ -188,56 +191,63 @@ public HttpResponseMessage Rebuild(int id = Constants.System.Root)
         /// </param>
         internal void RebuildJob(object id)
         {
-            var rootLevelItems = new List<IContent>();
-
-
-            var attempInt = id.TryConvertTo<int>();
-
-            if (!attempInt.Success)
+            try
             {
-                return;
-            }
+                var rootLevelItems = new List<IContent>();
 
-            // mark rebuild in progress
-            NexuContext.Current.IsProcessing = true;
 
-            if (attempInt.Result == Constants.System.Root)
-            {
-                // get the root level content items
-                rootLevelItems = this.contentService.GetRootContent().ToList();
-            }
-            else
-            {
-                // get the indicated start item
-                var startItem = this.contentService.GetById(attempInt.Result);
+                var attempInt = id.TryConvertTo<int>();
 
-                if (startItem != null)
+                if (!attempInt.Success)
                 {
-                    rootLevelItems.Add(startItem);
+                    return;
                 }
-            }
 
-            // parse content tree
-            foreach (var item in rootLevelItems)
-            {
-                this.ParseContent(item);
-            }
+                // mark rebuild in progress
+                NexuContext.Current.IsProcessing = true;
 
-            // parser recyle bin
-            if (attempInt.Result == Constants.System.Root)
-            {
-                rootLevelItems = this.contentService.GetChildren(Constants.System.RecycleBinContent).ToList();
+                if (attempInt.Result == Constants.System.Root)
+                {
+                    // get the root level content items
+                    rootLevelItems = this.contentService.GetRootContent().ToList();
+                }
+                else
+                {
+                    // get the indicated start item
+                    var startItem = this.contentService.GetById(attempInt.Result);
 
+                    if (startItem != null)
+                    {
+                        rootLevelItems.Add(startItem);
+                    }
+                }
+
+                // parse content tree
                 foreach (var item in rootLevelItems)
                 {
                     this.ParseContent(item);
                 }
-            }
 
-            // reset context variables after processing
-            NexuContext.Current.IsProcessing = false;
-            NexuContext.Current.ItemsProcessed = 0;
-            NexuContext.Current.ItemInProgress = string.Empty;
+                // parser recyle bin
+                if (attempInt.Result == Constants.System.Root)
+                {
+                    rootLevelItems = this.contentService.GetChildren(Constants.System.RecycleBinContent).ToList();
+
+                    foreach (var item in rootLevelItems)
+                    {
+                        this.ParseContent(item);
+                    }
+                }
+
+                // reset context variables after processing
+                NexuContext.Current.IsProcessing = false;
+                NexuContext.Current.ItemsProcessed = 0;
+                NexuContext.Current.ItemInProgress = string.Empty;
+            }
+            catch (Exception e)
+            {
+                LogHelper.Error<NexuApiController>("An unhandled exception occurred while parsing content", e);
+            }
         }
 
         /// <summary>

diff --git a/Source/Our.Umbraco.Nexu.Parsers.Tests/Properties/AssemblyInfo.cs b/Source/Our.Umbraco.Nexu.Parsers.Tests/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyVersion("1.7.0.0")]
+[assembly: AssemblyFileVersion("1.7.0.0")]
diff --git a/Source/Our.Umbraco.Nexu.Parsers/Properties/AssemblyInfo.cs b/Source/Our.Umbraco.Nexu.Parsers/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyVersion("1.7.0.0")]
+[assembly: AssemblyFileVersion("1.7.0.0")]
diff --git a/Source/Our.Umbraco.Nexu.Parsers/PropertyParsers/Community/ArchetypeParser.cs b/Source/Our.Umbraco.Nexu.Parsers/PropertyParsers/Community/ArchetypeParser.cs
@@ -88,11 +88,11 @@ public IEnumerable<ILinkedEntity> GetLinkedEntities(object propertyValue)
             {
                 try
                 {
-                    var parsers = new Dictionary<string, IPropertyParser>();
+                    var parsers = new Dictionary<KeyValuePair<string,string>, IPropertyParser>();
                     var dataTypes = new Dictionary<Guid, IDataTypeDefinition>();
                     var modelFieldSets = model["fieldsets"];
                     if (modelFieldSets.Any())
-                    {                       
+                    {
                         foreach (var fieldset in modelFieldSets)
                         {
                             var items = this._aliasToIdMappings[fieldset["alias"].ToString()];
@@ -112,18 +112,18 @@ public IEnumerable<ILinkedEntity> GetLinkedEntities(object propertyValue)
                                 {
                                     var parser = PropertyParserResolver.Current.Parsers.FirstOrDefault(x => x.IsParserFor(dataType));
                                     if (parser != null)
-                                    {
-                                        parsers.Add(prop.Key, parser);
+                                    {                                       
+                                       parsers.Add(new KeyValuePair<string, string>(prop.Key,fieldset["id"].ToString()), parser);                                            
                                     }
                                 }
                             }
 
-                            foreach (var alias in parsers.Keys)
+                            foreach (var keyValuePair in parsers.Keys)
                             {
-                                var item = fieldset["properties"].FirstOrDefault(x => x["alias"].ToString() == alias);
+                                var item = fieldset["properties"].FirstOrDefault(x=>x["alias"].ToString() == keyValuePair.Key);
                                 if (item != null)
                                 {
-                                    entities.AddRange(parsers[alias].GetLinkedEntities(item["value"]));
+                                    entities.AddRange(parsers[keyValuePair].GetLinkedEntities(item["value"]));
                                 }
                             }
                         }

diff --git a/Source/Our.Umbraco.Nexu.Parsers/PropertyParsers/Community/VortoParser.cs b/Source/Our.Umbraco.Nexu.Parsers/PropertyParsers/Community/VortoParser.cs
@@ -85,7 +85,7 @@ public IEnumerable<ILinkedEntity> GetLinkedEntities(object propertyValue)
                 var vortoDataType = this.dataTypeService.GetDataTypeDefinitionById(new Guid(vortoDataTypeGuid));
 
                 var preValues =
-                    this.dataTypeService.GetPreValuesCollectionByDataTypeId(vortoDataType.Id).PreValuesAsDictionary;
+                    this.dataTypeService.GetPreValuesCollectionByDataTypeId(vortoDataType.Id).FormatAsDictionary();
 
                 var editorDataTypeGuid = JsonConvert.DeserializeObject<JObject>(preValues["dataType"].Value).Value<string>("guid");
 

diff --git a/Source/Our.Umbraco.Nexu.Parsers/PropertyParsers/Core/MultiNodeTreePicker2ContentParser.cs b/Source/Our.Umbraco.Nexu.Parsers/PropertyParsers/Core/MultiNodeTreePicker2ContentParser.cs
@@ -89,7 +89,7 @@ public bool IsParserFor(IDataTypeDefinition dataTypeDefinition)
             }
 
             var prevalues =
-                this.dataTypeService.GetPreValuesCollectionByDataTypeId(dataTypeDefinition.Id).PreValuesAsDictionary;
+                this.dataTypeService.GetPreValuesCollectionByDataTypeId(dataTypeDefinition.Id).FormatAsDictionary();
 
             if (!prevalues.ContainsKey("startNode"))
             {

diff --git a/Source/Our.Umbraco.Nexu.Parsers/PropertyParsers/Core/MultiNodeTreePicker2MediaParser.cs b/Source/Our.Umbraco.Nexu.Parsers/PropertyParsers/Core/MultiNodeTreePicker2MediaParser.cs
@@ -89,7 +89,7 @@ public bool IsParserFor(IDataTypeDefinition dataTypeDefinition)
             }
 
             var prevalues =
-                this.dataTypeService.GetPreValuesCollectionByDataTypeId(dataTypeDefinition.Id).PreValuesAsDictionary;
+                this.dataTypeService.GetPreValuesCollectionByDataTypeId(dataTypeDefinition.Id).FormatAsDictionary();
 
             if (!prevalues.ContainsKey("startNode"))
             {

diff --git a/Source/Our.Umbraco.Nexu.Parsers/PropertyParsers/Core/MultiNodeTreePickerContentParser.cs b/Source/Our.Umbraco.Nexu.Parsers/PropertyParsers/Core/MultiNodeTreePickerContentParser.cs
@@ -62,7 +62,7 @@ public bool IsParserFor(IDataTypeDefinition dataTypeDefinition)
             }
 
             var prevalues =
-                this.dataTypeService.GetPreValuesCollectionByDataTypeId(dataTypeDefinition.Id).PreValuesAsDictionary;
+                this.dataTypeService.GetPreValuesCollectionByDataTypeId(dataTypeDefinition.Id).FormatAsDictionary();
 
             if (!prevalues.ContainsKey("startNode"))
             {

diff --git a/Source/Our.Umbraco.Nexu.Parsers/PropertyParsers/Core/MultiNodeTreePickerMediaParser.cs b/Source/Our.Umbraco.Nexu.Parsers/PropertyParsers/Core/MultiNodeTreePickerMediaParser.cs
@@ -62,7 +62,7 @@ public bool IsParserFor(IDataTypeDefinition dataTypeDefinition)
             }
 
             var prevalues =
-                this.dataTypeService.GetPreValuesCollectionByDataTypeId(dataTypeDefinition.Id).PreValuesAsDictionary;
+                this.dataTypeService.GetPreValuesCollectionByDataTypeId(dataTypeDefinition.Id).FormatAsDictionary();
 
             if (!prevalues.ContainsKey("startNode"))
             {

diff --git a/appveyor.yml b/appveyor.yml
@@ -5,7 +5,7 @@ environment:
 os: Visual Studio 2015
 
 # Version format
-version: 1.6.0.{build}
+version: 1.7.0.{build}
 
 cache:
   - Source\packages -> **\packages.config   # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified

diff --git a/docs/introduction.md b/docs/introduction.md
@@ -53,7 +53,7 @@ From v1.5.0 the dashboard will also list the values from the [configuration opti
 - [Multi Url Picker](https://our.umbraco.org/projects/backoffice-extensions/multi-url-picker/)
 - [ArcheType](https://our.umbraco.org/projects/backoffice-extensions/archetype/)
 - [Stacked Content](https://our.umbraco.org/projects/backoffice-extensions/stacked-content/)
-
+- [Content List](https://our.umbraco.com/projects/backoffice-extensions/content-list/)
 ## Supported grid editors ##
 
 ### Core grid editors ###