diff --git a/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj b/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj index df29425..a4f49a2 100644 --- a/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj +++ b/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj @@ -31,22 +31,166 @@ 4 + + ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll + + + ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll + + + ..\packages\UmbracoCms.Core.7.0.1\lib\businesslogic.dll + + + ..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll + + + ..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll + + + ..\packages\UmbracoCms.Core.7.0.1\lib\cms.dll + + + ..\packages\UmbracoCms.Core.7.0.1\lib\controls.dll + + + ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll + + + ..\packages\UmbracoCms.Core.7.0.1\lib\Examine.dll + + + ..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll + + + ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll + + + False + ..\packages\UmbracoCms.Core.7.0.1\lib\interfaces.dll + + + False + ..\packages\UmbracoCms.Core.7.0.1\lib\log4net.dll + + + ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll + + + ..\packages\UmbracoCms.Core.7.0.1\lib\Microsoft.ApplicationBlocks.Data.dll + + + ..\packages\UmbracoCms.Core.7.0.1\lib\Microsoft.Web.Helpers.dll + + + True + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + + + ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll + + + ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll + ..\packages\Moq.4.2.1312.1622\lib\net40\Moq.dll + + ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll + + + ..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll + ..\packages\NUnit.2.6.3\lib\nunit.framework.dll + + ..\packages\UmbracoCms.Core.7.0.1\lib\SQLCE4Umbraco.dll + + + True + ..\packages\UmbracoCms.Core.7.0.1\lib\System.Data.SqlServerCe.dll + + + True + ..\packages\UmbracoCms.Core.7.0.1\lib\System.Data.SqlServerCe.Entity.dll + + + + ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll + + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll + + + ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll + + + ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll + + + True + ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll + + + False + ..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll + True + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll + - + + ..\packages\UmbracoCms.Core.7.0.1\lib\TidyNet.dll + + + ..\packages\UmbracoCms.Core.7.0.1\lib\umbraco.dll + + + False ..\packages\UmbracoCms.Core.7.0.1\lib\Umbraco.Core.dll + + ..\packages\UmbracoCms.Core.7.0.1\lib\umbraco.DataLayer.dll + + + ..\packages\UmbracoCms.Core.7.0.1\lib\umbraco.editorControls.dll + + + ..\packages\UmbracoCms.Core.7.0.1\lib\umbraco.MacroEngines.dll + + + ..\packages\UmbracoCms.Core.7.0.1\lib\umbraco.providers.dll + + + ..\packages\UmbracoCms.Core.7.0.1\lib\Umbraco.Web.UI.dll + + + ..\packages\UmbracoCms.Core.7.0.1\lib\umbraco.XmlSerializers.dll + + + ..\packages\UmbracoCms.Core.7.0.1\lib\UmbracoExamine.dll + + + ..\packages\UmbracoCms.Core.7.0.1\lib\UrlRewritingNet.UrlRewriter.dll + diff --git a/app/Umbraco/Archetype.Tests/PropertyValueConverter/PropertyValueConverterTests.cs b/app/Umbraco/Archetype.Tests/PropertyValueConverter/PropertyValueConverterTests.cs index 710be06..6329a4d 100644 --- a/app/Umbraco/Archetype.Tests/PropertyValueConverter/PropertyValueConverterTests.cs +++ b/app/Umbraco/Archetype.Tests/PropertyValueConverter/PropertyValueConverterTests.cs @@ -24,32 +24,30 @@ namespace Archetype.Tests.PropertyValueConverter } [Test] - public void Returns_Null_When_Data_Is_Null() + [TestCase(null)] + [TestCase("")] + public void Returns_Empty_Archetype_When_Data_Is_Null_Or_Empty(object data) { - var converter = new ArchetypeValueConverter(); - var result = converter.ConvertDataToSource(null, null, false); - - Assert.IsNull(result); - } - - [Test] - public void Returns_Empty_String_When_Data_Is_Empty_String() - { - var data = ""; var converter = new ArchetypeValueConverter(); var result = converter.ConvertDataToSource(null, data, false); - Assert.AreEqual("", result); + Assert.AreEqual(result.GetType(), typeof (Archetype.Umbraco.Models.Archetype)); + + var fieldsets = (Archetype.Umbraco.Models.Archetype) result; + Assert.IsTrue(fieldsets.Count() == 0); } [Test] - public void Returns_Original_String_When_Data_Is_Invalid_Json() + public void Returns_Empty_Archetype_When_Data_Is_Invalid_Json() { var data = "{ invalid"; var converter = new ArchetypeValueConverter(); var result = converter.ConvertDataToSource(null, data, false); - Assert.AreEqual(data, result); + Assert.AreEqual(result.GetType(), typeof (Archetype.Umbraco.Models.Archetype)); + + var fieldsets = (Archetype.Umbraco.Models.Archetype) result; + Assert.IsTrue(fieldsets.Count() == 0); } [Test] diff --git a/app/Umbraco/Archetype.Tests/packages.config b/app/Umbraco/Archetype.Tests/packages.config index c90677c..41531cd 100644 --- a/app/Umbraco/Archetype.Tests/packages.config +++ b/app/Umbraco/Archetype.Tests/packages.config @@ -1,5 +1,26 @@  + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/Umbraco/Umbraco.Archetype/Api/ArchetypeDataTypeController.cs b/app/Umbraco/Umbraco.Archetype/Api/ArchetypeDataTypeController.cs index 6bdb7ce..ef6cf0e 100644 --- a/app/Umbraco/Umbraco.Archetype/Api/ArchetypeDataTypeController.cs +++ b/app/Umbraco/Umbraco.Archetype/Api/ArchetypeDataTypeController.cs @@ -1,4 +1,6 @@ -using System.Net; +using System; +using System.Linq; +using System.Net; using System.Web.Http; using AutoMapper; using Umbraco.Core.Models; @@ -11,9 +13,15 @@ namespace Archetype.Umbraco.Api [PluginController("ArchetypeApi")] public class ArchetypeDataTypeController : UmbracoAuthorizedJsonController { - public object GetById(int id) + public object GetAll() { - var dataType = Services.DataTypeService.GetDataTypeDefinitionById(id); + var dataTypes = Services.DataTypeService.GetAllDataTypeDefinitions(); + return dataTypes.Select(t => new { guid = t.Key, name = t.Name }); + } + + public object GetByGuid(Guid guid) + { + var dataType = Services.DataTypeService.GetDataTypeDefinitionById(guid); if (dataType == null) { throw new HttpResponseException(HttpStatusCode.NotFound); diff --git a/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj b/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj index 05ed8ed..5f6c903 100644 --- a/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj +++ b/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj @@ -136,6 +136,7 @@ False + False ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll diff --git a/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueProperty.cs b/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueProperty.cs index c8c13e4..e2cc12b 100644 --- a/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueProperty.cs +++ b/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueProperty.cs @@ -1,4 +1,5 @@ -using Newtonsoft.Json; +using System; +using Newtonsoft.Json; namespace Archetype.Umbraco.Models { @@ -18,12 +19,9 @@ namespace Archetype.Umbraco.Models [JsonProperty("helpText")] public string HelpText { get; set; } - - [JsonProperty("dataTypeId")] - public int DataTypeId { get; set; } - + [JsonProperty("dataTypeGuid")] - public string DataTypeGuid { get; set; } + public Guid DataTypeGuid { get; set; } [JsonProperty("propertyEditorAlias")] public string PropertyEditorAlias { get; set; } diff --git a/app/Umbraco/Umbraco.Archetype/Models/Property.cs b/app/Umbraco/Umbraco.Archetype/Models/Property.cs index 09605b7..a3c4522 100644 --- a/app/Umbraco/Umbraco.Archetype/Models/Property.cs +++ b/app/Umbraco/Umbraco.Archetype/Models/Property.cs @@ -1,9 +1,11 @@ -using System.Linq; +using System.Collections.Generic; +using System.Linq; using Newtonsoft.Json; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.PropertyEditors; +using Umbraco.Web; namespace Archetype.Umbraco.Models { @@ -30,14 +32,26 @@ namespace Archetype.Umbraco.Models if (Value is T) return (T)Value; - // Umbraco has the concept of a IPropertyEditorValueConverter which it - // also queries for property resolvers. However I'm not sure what these - // are for, nor can I find any implementations in core, so am currently - // just ignoring these when looking up converters. - // NB: IPropertyEditorValueConverter not to be confused with - // IPropertyValueConverter which are the ones most people are creating + // Try Umbraco's PropertyValueConverters + var converters = UmbracoContext.Current != null ? PropertyValueConvertersResolver.Current.Converters : Enumerable.Empty(); + if (converters.Any()) + { + var convertedAttempt = TryConvertWithPropertyValueConverters(Value, converters); + if (convertedAttempt.Success) + return convertedAttempt.Result; + } + + // No PropertyValueConverters matched, so try a regular type conversion + var convertAttempt2 = Value.TryConvertTo(); + if (convertAttempt2.Success) + return convertAttempt2.Result; + + return default(T); + } + + private Attempt TryConvertWithPropertyValueConverters(object value, IEnumerable converters) + { var properyType = CreateDummyPropertyType(DataTypeId, PropertyEditorAlias); - var converters = PropertyValueConvertersResolver.Current.Converters.ToArray(); // In umbraco, there are default value converters that try to convert the // value if all else fails. The problem is, they are also in the list of @@ -49,24 +63,19 @@ namespace Archetype.Umbraco.Models foreach (var converter in converters.Where(x => x.IsConverter(properyType))) { // Convert the type using a found value converter - var value2 = converter.ConvertDataToSource(properyType, Value, false); + var value2 = converter.ConvertDataToSource(properyType, value, false); // If the value is of type T, just return it if (value2 is T) - return (T)value2; + return Attempt.Succeed((T)value2); // Value is not final value type, so try a regular type conversion aswell var convertAttempt = value2.TryConvertTo(); if (convertAttempt.Success) - return convertAttempt.Result; + return Attempt.Succeed(convertAttempt.Result); } - // Value is not final value type, so try a regular type conversion - var convertAttempt2 = Value.TryConvertTo(); - if (convertAttempt2.Success) - return convertAttempt2.Result; - - return default(T); + return Attempt.Fail(); } private PublishedPropertyType CreateDummyPropertyType(int dataTypeId, string propertyEditorAlias) diff --git a/app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs b/app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs index a8bfc8b..95a0411 100644 --- a/app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs +++ b/app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs @@ -1,13 +1,15 @@ -using System; +using System; +using System.Collections.Generic; using System.Linq; using Archetype.Umbraco.Extensions; using Archetype.Umbraco.Models; using Newtonsoft.Json; -using Umbraco.Core; +using Umbraco.Core; +using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Services; - +using Umbraco.Core.Services; + namespace Archetype.Umbraco.PropertyConverters { /* based on the Tim Geyssens sample at: https://github.com/TimGeyssens/MatrixPropEditor/blob/master/SamplePropertyValueConverter/SamplePropertyValueConverter/MatrixValueConverter.cs */ @@ -54,8 +56,9 @@ namespace Archetype.Umbraco.PropertyConverters try { // Get list of configured properties and their types - // and map them to the deserialized archetype model - var preValue = GetArchetypePreValueFromDataTypeId(propertyType.DataTypeId); + // and map them to the deserialized archetype model + var dataTypeCache = new Dictionary(); + var preValue = GetArchetypePreValueFromDataTypeId(propertyType.DataTypeId, dataTypeCache); foreach (var fieldset in preValue.Fieldsets) { var fieldsetAlias = fieldset.Alias; @@ -64,9 +67,9 @@ namespace Archetype.Umbraco.PropertyConverters foreach (var property in fieldset.Properties) { var propertyAlias = property.Alias; - foreach (var propertyInst in fieldsetInst.Properties.Where(x => x.Alias == propertyAlias)) - { - propertyInst.DataTypeId = property.DataTypeId; + foreach (var propertyInst in fieldsetInst.Properties.Where(x => x.Alias == propertyAlias)) + { + propertyInst.DataTypeId = GetDataTypeByGuid(property.DataTypeGuid, dataTypeCache).Id; propertyInst.PropertyEditorAlias = property.PropertyEditorAlias; } } @@ -86,9 +89,9 @@ namespace Archetype.Umbraco.PropertyConverters } return defaultValue; - } - - internal ArchetypePreValue GetArchetypePreValueFromDataTypeId(int dataTypeId) + } + + private ArchetypePreValue GetArchetypePreValueFromDataTypeId(int dataTypeId, IDictionary dataTypeCache) { var preValues = Services.DataTypeService.GetPreValuesCollectionByDataTypeId(dataTypeId); @@ -102,18 +105,22 @@ namespace Archetype.Umbraco.PropertyConverters { foreach (var property in fieldset.Properties) { - // Lookup the properties property editor alias - // (See if we've already looked it up first though to save a database hit) - var propertyWithSameDataType = config.Fieldsets.SelectMany(x => x.Properties) - .FirstOrDefault(x => x.DataTypeId == property.DataTypeId && !string.IsNullOrWhiteSpace(x.PropertyEditorAlias)); - - property.PropertyEditorAlias = propertyWithSameDataType != null - ? propertyWithSameDataType.PropertyEditorAlias - : Services.DataTypeService.GetDataTypeDefinitionById(property.DataTypeId).PropertyEditorAlias; + property.PropertyEditorAlias = GetDataTypeByGuid(property.DataTypeGuid, dataTypeCache).PropertyEditorAlias; } } return config; + } + + private IDataTypeDefinition GetDataTypeByGuid(Guid guid, IDictionary cache) + { + IDataTypeDefinition dataType; + if (cache.TryGetValue(guid, out dataType)) + return dataType; + + dataType = Services.DataTypeService.GetDataTypeDefinitionById(guid); + cache[guid] = dataType; + return dataType; } } } diff --git a/app/controllers/config.controller.js b/app/controllers/config.controller.js index 08c02a8..6dd8ef5 100644 --- a/app/controllers/config.controller.js +++ b/app/controllers/config.controller.js @@ -4,7 +4,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio //console.log($scope.model.value); //define empty items - var newPropertyModel = '{"alias": "", "remove": false, "collapse": false, "label": "", "helpText": "", "dataTypeId": "-88", "value": ""}'; + var newPropertyModel = '{"alias": "", "remove": false, "collapse": false, "label": "", "helpText": "", "dataTypeGuid": "0cc0eba1-9960-42c9-bf9b-60e150b429ae", "value": ""}'; var newFieldsetModel = '{"alias": "", "remove": false, "collapse": false, "labelTemplate": "", "icon": "", "label": "", "properties": [' + newPropertyModel + ']}'; var defaultFieldsetConfigModel = JSON.parse('{"showAdvancedOptions": false, "startWithAddButton": false, "hideFieldsetToolbar": false, "enableMultipleFieldsets": false, "hideFieldsetControls": false, "hidePropertyLabel": false, "maxFieldsets": null, "enableCollapsing": true, "fieldsets": [' + newFieldsetModel + ']}'); @@ -166,12 +166,12 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio return countVisibleProperty(fieldset) > 1; } - $scope.getDataTypeNameById = function (id) { + $scope.getDataTypeNameByGuid = function (guid) { if ($scope.availableDataTypes == null) // Might not be initialized yet? return ""; - + var dataType = _.find($scope.availableDataTypes, function(d) { - return d.id == id; + return d.guid == guid; }); return dataType == null ? "" : dataType.name; diff --git a/app/directives/archetypeproperty.js b/app/directives/archetypeproperty.js index 5286fca..b867e74 100644 --- a/app/directives/archetypeproperty.js +++ b/app/directives/archetypeproperty.js @@ -51,7 +51,7 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c var configFieldsetModel = getFieldsetByAlias(scope.archetypeConfig.fieldsets, scope.fieldset.alias); var view = ""; var label = configFieldsetModel.properties[scope.propertyConfigIndex].label; - var dataTypeId = configFieldsetModel.properties[scope.propertyConfigIndex].dataTypeId; + var dataTypeGuid = configFieldsetModel.properties[scope.propertyConfigIndex].dataTypeGuid; var config = null; var alias = configFieldsetModel.properties[scope.propertyConfigIndex].alias; var defaultValue = configFieldsetModel.properties[scope.propertyConfigIndex].value; @@ -61,7 +61,7 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c defaultValue = jsonOrString(defaultValue, scope.archetypeConfig.developerMode, "defaultValue"); //grab info for the selected datatype, prepare for view - archetypePropertyEditorResource.getDataType(dataTypeId).then(function (data) { + archetypePropertyEditorResource.getDataType(dataTypeGuid).then(function (data) { //transform preValues array into object expected by propertyeditor views var configObj = {}; _.each(data.preValues, function(p) { diff --git a/app/resources/propertyeditor.js b/app/resources/propertyeditor.js index 0a1cc9b..954a6f8 100644 --- a/app/resources/propertyeditor.js +++ b/app/resources/propertyeditor.js @@ -3,16 +3,12 @@ angular.module('umbraco.resources').factory('archetypePropertyEditorResource', f getAllDataTypes: function() { // Hack - grab DataTypes from Tree API, as `dataTypeService.getAll()` isn't implemented yet return umbRequestHelper.resourcePromise( - $http.get("/umbraco/backoffice/UmbracoTrees/DataTypeTree/GetNodes?id=-1&application=developer&tree=&isDialog=false"), 'Failed to retrieve datatypes from tree service' - ).then(function (data) { - return data.map(function(d) { - return { "id": d.id, "name": d.name } - }); - }); + $http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetAll"), 'Failed to retrieve datatypes from tree service' + ); }, - getDataType: function(id) { + getDataType: function(guid) { return umbRequestHelper.resourcePromise( - $http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetById?id=" + id), 'Failed to retrieve datatype' + $http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetByGuid?guid=" + guid), 'Failed to retrieve datatype' ); }, getPropertyEditorMapping: function(alias) { diff --git a/app/views/archetype.config.html b/app/views/archetype.config.html index a5e3b0f..5f769b1 100644 --- a/app/views/archetype.config.html +++ b/app/views/archetype.config.html @@ -37,7 +37,7 @@
- {{property.label}} ({{property.alias}}) - {{getDataTypeNameById(property.dataTypeId)}} + {{property.label}} ({{property.alias}}) - {{getDataTypeNameByGuid(property.dataTypeGuid)}}
@@ -54,7 +54,7 @@
- +