Update LICENSE

Fix #385

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Imulus
+Copyright (c) 2016 Kevin Giszewski LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

app/Umbraco/Archetype.Tests/Archetype.Tests.csproj

@@ -263,6 +263,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyValueConverter\PropertyValueConverterTests.cs" />
     <Compile Include="PublishedContent\ArchetypePublishedContentTests.cs" />
+    <Compile Include="PublishedContent\TypeConverterTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

app/Umbraco/Archetype.Tests/PublishedContent/TypeConverterTests.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Archetype.Models;
+using Archetype.PropertyConverters;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+
+namespace Archetype.Tests.PublishedContent
+{
+    [TestFixture]
+    public class TypeConverterTests
+    {
+        private ArchetypeModel _archetype;
+
+        [TestFixtureSetUp]
+        public void Init()
+        {
+            var archetypeJson = System.IO.File.ReadAllText("..\\..\\Data\\sample-1.json");
+            var converter = new ArchetypeValueConverter();
+
+            _archetype = (ArchetypeModel)converter.ConvertDataToSource(null, archetypeJson, false);
+        }
+
+        [TestCase(typeof(ArchetypeModel), true)]
+        [TestCase(typeof(ArchetypePublishedContentSet), true)]
+        [TestCase(typeof(IEnumerable<IPublishedContent>), true)]
+        [TestCase(typeof(string), true)]
+        [TestCase(typeof(int), false)]
+        [TestCase(typeof(ArchetypeFieldsetModel), false)]
+        public void ArchetypeModel_ConvertsTo_EnumerablePublishedContent(Type destinationType, bool expected)
+        {
+            Assert.IsNotNull(_archetype);
+
+            var attempt = _archetype.TryConvertTo(destinationType);
+
+            Assert.That(attempt.Success, Is.EqualTo(expected));
+
+            if (attempt.Success)
+            {
+                Assert.IsNotNull(attempt.Result);
+                Assert.That(attempt.Result, Is.InstanceOf(destinationType));
+            }
+        }
+
+        [TestCase(typeof(ArchetypeFieldsetModel), true)]
+        [TestCase(typeof(ArchetypePublishedContent), true)]
+        [TestCase(typeof(IPublishedContent), true)]
+        [TestCase(typeof(string), true)]
+        [TestCase(typeof(int), false)]
+        [TestCase(typeof(ArchetypeModel), false)]
+        public void ArchetypeFieldsetModel_ConvertsTo_PublishedContent(Type destinationType, bool expected)
+        {
+            CollectionAssert.IsNotEmpty(_archetype.Fieldsets);
+
+            var attempt = _archetype.First().TryConvertTo(destinationType);
+
+            Assert.That(attempt.Success, Is.EqualTo(expected));
+
+            if (attempt.Success)
+            {
+                Assert.IsNotNull(attempt.Result);
+                Assert.That(attempt.Result, Is.InstanceOf(destinationType));
+            }
+        }
+    }
+}

app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj

@@ -252,6 +252,8 @@
     <Compile Include="Properties\VersionInfo.cs" />
     <Compile Include="PropertyConverters\ArchetypeValueConverter.cs" />
     <Compile Include="PropertyEditors\ArchetypePropertyEditor.cs" />
+    <Compile Include="TypeConverters\ArchetypeFieldsetModelConverter.cs" />
+    <Compile Include="TypeConverters\ArchetypeModelConverter.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

app/Umbraco/Umbraco.Archetype/Extensions/ArchetypeHelper.cs

@@ -98,7 +98,7 @@ namespace Archetype.Extensions
 
                 return archetype;
             }
-            catch
+            catch (Exception ex)
             {
                 return new ArchetypeModel();
             }

app/Umbraco/Umbraco.Archetype/Models/ArchetypeFieldsetModel.cs

@@ -1,15 +1,18 @@
+using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Web.Security;
+using Archetype.TypeConverters;
 using Newtonsoft.Json;
 using Umbraco.Core;
-using System;
 
 namespace Archetype.Models
 {
     /// <summary>
     /// Model that represents a fieldset stored as content JSON.
     /// </summary>
+    [TypeConverter(typeof(ArchetypeFieldsetModelConverter))]
     public class ArchetypeFieldsetModel
     {
         [JsonProperty("alias")]
@@ -63,7 +66,7 @@ namespace Archetype.Models
         {
             var property = GetProperty(propertyAlias);
 
-            if (IsEmptyProperty(property)) 
+            if (IsEmptyProperty(property))
             {
                 return default(T);
             }
@@ -87,7 +90,7 @@ namespace Archetype.Models
         {
             var property = GetProperty(propertyAlias);
 
-            if (IsEmptyProperty(property)) 
+            if (IsEmptyProperty(property))
             {
                 return defaultValue;
             }
@@ -100,7 +103,7 @@ namespace Archetype.Models
         /// </summary>
         /// <param name="property">The property.</param>
         /// <returns></returns>
-        private bool IsEmptyProperty(ArchetypePropertyModel property) 
+        private bool IsEmptyProperty(ArchetypePropertyModel property)
         {
             return (property == null || property.Value == null || string.IsNullOrEmpty(property.Value.ToString()));
         }
@@ -145,24 +148,24 @@ namespace Archetype.Models
         /// <returns>true if this fieldset is disabled, false otherwise</returns>
         internal bool IsAvailable()
         {
-			// explicitly disabled or implicitly disabled through publishing?
-	        var disabled = Disabled
+            // explicitly disabled or implicitly disabled through publishing?
+            var disabled = Disabled
                    || (ReleaseDate.HasValue && ReleaseDate > DateTime.UtcNow)
                    || (ExpireDate.HasValue && DateTime.UtcNow > ExpireDate);
-	        if(disabled)
-	        {
-	            // yes - the fieldset is not available
-	            return false;
-	        }
-	        // limitation on member group access?
-	        if(string.IsNullOrEmpty(AllowedMemberGroups))
-	        {
-	            // no - the fieldset is available
-	            return true;
-	        }
-	        // maybe - the fieldset is available if the current member is a member of the configured member groups
-	        var currentUserGroups = Roles.GetRolesForUser() ?? new string[0];
-	        return currentUserGroups.ContainsAny(AllowedMemberGroups.Split(','));
+            if (disabled)
+            {
+                // yes - the fieldset is not available
+                return false;
+            }
+            // limitation on member group access?
+            if (string.IsNullOrEmpty(AllowedMemberGroups))
+            {
+                // no - the fieldset is available
+                return true;
+            }
+            // maybe - the fieldset is available if the current member is a member of the configured member groups
+            var currentUserGroups = Roles.GetRolesForUser() ?? new string[0];
+            return currentUserGroups.ContainsAny(AllowedMemberGroups.Split(','));
         }
 
         #endregion

app/Umbraco/Umbraco.Archetype/Models/ArchetypeModel.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
+using Archetype.TypeConverters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -11,6 +13,7 @@ namespace Archetype.Models
     /// Model that represents an entire Archetype.
     /// </summary>
     [JsonObject]
+    [TypeConverter(typeof(ArchetypeModelConverter))]
     public class ArchetypeModel : IEnumerable<ArchetypeFieldsetModel>
     {
         [JsonProperty("fieldsets")]

app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.13.0")]
-[assembly: AssemblyFileVersion("1.13.0")]
+[assembly: AssemblyVersion("1.13.1")]
+[assembly: AssemblyFileVersion("1.13.1")]

app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs

@@ -206,7 +206,7 @@ namespace Archetype.PropertyEditors
 								else if (propDef.EditorState != null && propDef.EditorState.FileNames != null && propDef.EditorState.FileNames.Any())
 								{
 									// pass the uploaded files that belongs to this property (if any) to the value editor
-									var propertyFiles = propDef.EditorState.FileNames.Select(f => uploadedFiles.FirstOrDefault(u => u.FileName == f)).Where(f => f != null).ToList();
+									var propertyFiles = propDef.EditorState.FileNames.Select(f => uploadedFiles.FirstOrDefault(u => u.FileName != null && u.FileName.Equals(f, StringComparison.OrdinalIgnoreCase))).Where(f => f != null).ToList();
 									if(propertyFiles.Any())
 									{
 										additionalData["files"] = propertyFiles;

app/Umbraco/Umbraco.Archetype/TypeConverters/ArchetypeFieldsetModelConverter.cs

@@ -0,0 +1,39 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using Archetype.Extensions;
+using Archetype.Models;
+using Umbraco.Core.Models;
+
+namespace Archetype.TypeConverters
+{
+    public class ArchetypeFieldsetModelConverter : TypeConverter
+    {
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(IPublishedContent) ||
+                destinationType == typeof(ArchetypePublishedContent))
+            {
+                return true;
+            }
+
+            if (destinationType == typeof(string))
+            {
+                // NOTE: The converter needs to return false here, otherwise `ArchetypeHelper.DeserializeJsonToArchetype` fails.
+                return false;
+            }
+
+            return base.CanConvertTo(context, destinationType);
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (value is ArchetypeFieldsetModel && (destinationType == typeof(IPublishedContent) || destinationType == typeof(ArchetypePublishedContent)))
+            {
+                return ((ArchetypeFieldsetModel)value).ToPublishedContent();
+            }
+
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+    }
+}

app/Umbraco/Umbraco.Archetype/TypeConverters/ArchetypeModelConverter.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using Archetype.Extensions;
+using Archetype.Models;
+using Umbraco.Core.Models;
+
+namespace Archetype.TypeConverters
+{
+    public class ArchetypeModelConverter : TypeConverter
+    {
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(ArchetypePublishedContentSet) ||
+                destinationType == typeof(IEnumerable<IPublishedContent>))
+            {
+                return true;
+            }
+
+            return base.CanConvertTo(context, destinationType);
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (value is ArchetypeModel && (destinationType == typeof(ArchetypePublishedContentSet) || destinationType == typeof(IEnumerable<IPublishedContent>)))
+            {
+                return ((ArchetypeModel)value).ToPublishedContentSet();
+            }
+
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+    }
+}

app/controllers/controller.js

@@ -211,6 +211,16 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
 
     }
 
+    // Checks if the specified array of fieldsets contains the specified fieldset.
+    function arrayContainsFieldset(fieldset, fieldsets) {
+        for (var i = 0; i < fieldsets.length; i++) {
+            if (fieldsets[i] === fieldset) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     // Confirms that an array of properties is a subset of another array of properties.
     function arePropertiesSubset(subset, superset) {
 
@@ -323,6 +333,11 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
             $scope.$broadcast("archetypeAddFieldset", {index: $index, visible: countVisible()});
 
             newFieldset.collapse = $scope.model.config.enableCollapsing ? true : false;
+
+            // If the fieldset is not collapsed, it should be instantly loaded.
+            if (!newFieldset.collapse) {
+                $scope.loadedFieldsets.push(newFieldset);
+            }
             
             $scope.focusFieldset(newFieldset);
         }
@@ -356,6 +371,12 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
                 $scope.setDirty();
 
                 newFieldset.collapse = $scope.model.config.enableCollapsing ? true : false;
+
+                // If the fieldset is not collapsed, it should be instantly loaded.
+                if (!newFieldset.collapse) {
+                    $scope.loadedFieldsets.push(newFieldset);
+                }
+
                 $scope.focusFieldset(newFieldset);
             }
         }
@@ -554,10 +575,10 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
     {
         if(typeof fieldset.collapse === "undefined")
         {
-            fieldset.collapse = true;
+            fieldset.collapse = $scope.model.config.enableCollapsing ? true : false;
         }
         return fieldset.collapse;
-    }
+    };
 
     // added to track loaded fieldsets 
     $scope.loadedFieldsets = [];
@@ -601,6 +622,12 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
     //ini the fieldset expand/collapse
     $scope.focusFieldset();
 
+    // Fieldsets which cannot be collapsed should start expanded.
+    _.each($scope.model.value.fieldsets, function(fieldset) {
+        fieldset.collapse = $scope.model.config.enableCollapsing;
+    });
+    $scope.loadedFieldsets = _.where($scope.model.value.fieldsets, { collapse: false });
+
     //developerMode helpers
     $scope.model.value.toString = stringify;
 
@@ -652,6 +679,9 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
         $scope.activeSubmitWatcher = 0;
 
         // init loaded fieldsets tracking
+        _.each($scope.model.value.fieldsets, function (fieldset) {
+            fieldset.collapse = $scope.model.config.enableCollapsing ? true : false;
+        });
         $scope.loadedFieldsets = _.where($scope.model.value.fieldsets, { collapse: false });
 
         // create properties needed for the backoffice to work (data that is not serialized to DB)
@@ -837,12 +867,15 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
     // The source scope is the scope of the fieldset being dragged.
     // The target scope is the scope of the Archetype to drop into.
     function canMove(sourceScope, targetScope) {
-        var targetFieldsets = targetScope.model.config.fieldsets;
+        var targetFieldsetConfigs = targetScope.model.config.fieldsets;
+        var targetFieldsets = targetScope.model.value.fieldsets;
+        var sourceFieldset = sourceScope.fieldset;
+        var sameArchetype = arrayContainsFieldset(sourceFieldset, targetFieldsets);
         var model = sourceScope.fieldsetConfigModel;
         var canRemove = sourceScope.canRemove();
         var canAdd = targetScope.canAdd();
-        var valid = canRemove && canAdd;
-        valid = valid && modelMatchesAnyFieldset(model, targetFieldsets);
+        var valid = sameArchetype || (canRemove && canAdd);
+        valid = valid && modelMatchesAnyFieldset(model, targetFieldsetConfigs);
         return valid;
     }
 

app/directives/archetypeproperty.js

@@ -123,16 +123,17 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
                     });
 
                     scope.$on('archetypeFormSubmitting', function (ev, args) {
-                        if(args.action !== 'save') {
-                            // validate all fieldset properties
-                            _.each(scope.fieldset.properties, function (property) {
-                                archetypeService.validateProperty(scope.fieldset, property, configFieldsetModel);
-                            });
+                        // #385 - revert the changes made in #311 to avoid publishing invalid fieldsets (leaving the code from #311 here, in case we figure out how to re-introduce "save as draft")
+                        // if(args.action !== 'save') {
+                        // validate all fieldset properties
+                        _.each(scope.fieldset.properties, function (property) {
+                            archetypeService.validateProperty(scope.fieldset, property, configFieldsetModel);
+                        });
 
-                            var validationKey = "validation-f" + scope.fieldsetIndex;
+                        var validationKey = "validation-f" + scope.fieldsetIndex;
 
-                            ngModelCtrl.$setValidity(validationKey, scope.fieldset.isValid);
-                        }
+                        ngModelCtrl.$setValidity(validationKey, scope.fieldset.isValid);
+                        // }
 
                         // did the value change (if it did, it most likely did so during the "formSubmitting" event)
                         var property = archetypeService.getFieldsetProperty(scope);

app/helpers/sampleLabelHelpers.js

@@ -13,7 +13,7 @@ var ArchetypeSampleLabelTemplates = (function() {
                 var id = value.split(",")[0];
 
                 if (id) {
-                    var entity = scope.services.archetypeLabelService.getEntityById(scope, id, args.entityType);
+                    var entity = scope.services.archetypeCacheService.getEntityById(scope, id, args.entityType);
 
                     if(entity) {
                         return entity[args.propertyName];
@@ -34,13 +34,13 @@ var ArchetypeSampleLabelTemplates = (function() {
             switch (value.type) {
                 case "content":
                     if(value.typeData.contentId) {
-                        entity = scope.services.archetypeLabelService.getEntityById(scope, value.typeData.contentId, "Document");
+                        entity = scope.services.archetypeCacheService.getEntityById(scope, value.typeData.contentId, "Document");
                     }
                     break;
 
                 case "media":
                     if(value.typeData.mediaId) {
-                        entity = scope.services.archetypeLabelService.getEntityById(scope, value.typeData.mediaId, "Media");
+                        entity = scope.services.archetypeCacheService.getEntityById(scope, value.typeData.mediaId, "Media");
                     }
                     break;
 

app/services/archetypeService.js

@@ -2,7 +2,7 @@ angular.module('umbraco.services').factory('archetypeService', function () {
 
     // Variables.
     var draggedRteArchetype;
-    var rteClass = ".umb-rte textarea";
+    var rteClass = ".archetypeEditor .umb-rte textarea";
     var editorSettings = {};
     var disabledSortables = [];
 
@@ -75,10 +75,12 @@ angular.module('umbraco.services').factory('archetypeService', function () {
             return reversed.join("-");
         },
         getFieldset: function(scope) {
-            return scope.archetypeRenderModel.fieldsets[scope.fieldsetIndex];
+            var renderModel = scope.archetypeRenderModel;
+            return renderModel ? renderModel.fieldsets[scope.fieldsetIndex] : null;
         },
         getFieldsetProperty: function (scope) {
-            return this.getFieldset(scope).properties[scope.renderModelPropertyIndex];
+            var fieldset = this.getFieldset(scope);
+            return fieldset ? fieldset.properties[scope.renderModelPropertyIndex] : null;
         },
         setFieldsetValidity: function (fieldset) {
             // mark the entire fieldset as invalid if there are any invalid properties in the fieldset, otherwise mark it as valid
@@ -146,10 +148,10 @@ angular.module('umbraco.services').factory('archetypeService', function () {
                 // Get the property's temporary ID.
                 var scope = angular.element(this).scope().$parent;
                 var property = self.getFieldsetProperty(scope);
-                var tempId = property.editorState.temporaryId;
+                var tempId = property ? property.editorState.temporaryId : null;
 
                 // Store the editor settings by the temporary ID?
-                if (editor && editor.settings) {
+                if (editor && editor.settings && tempId) {
                     editorSettings[tempId] = editor.settings;
                 }
 
@@ -180,12 +182,14 @@ angular.module('umbraco.services').factory('archetypeService', function () {
                 // Get the stored editor settings.
                 var scope = angular.element(this).scope().$parent;
                 var property = self.getFieldsetProperty(scope);
-                var tempId = property.editorState.temporaryId;
+                var tempId = property ? property.editorState.temporaryId : null;
                 var settings = editorSettings[tempId];
 
                 // Remove and reinitialize the editor.
-                tinyMCE.execCommand("mceRemoveEditor", false, id);
-                tinyMCE.init(settings);
+                if (settings) {
+                    tinyMCE.execCommand("mceRemoveEditor", false, id);
+                    tinyMCE.init(settings);
+                }
 
             });
 

config/meta.json

@@ -1,6 +1,6 @@
 {
 	"name": "Archetype",
-	"version": "1.13.0",
+	"version": "1.13.1",
 	"url": "http://github.com/imulus/archetype/",
 	"author": "Imulus - Kevin Giszewski - Tom Fulton - Lee Kelleher - Matt Brailsford - Kenn Jacobsen - Et. Al.",
 	"authorUrl": "http://imulus.com/",