Merge branch 'dev-v7.7' into temp-content-blueprints

src/Umbraco.Web/Models/DetachedPublishedContent.cs

@@ -0,0 +1,166 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+
+namespace Umbraco.Web.Models
+{
+    public class DetachedPublishedContent : PublishedContentWithKeyBase
+    {
+        private readonly Guid _key;
+        private readonly string _name;
+        private readonly PublishedContentType _contentType;
+        private readonly IEnumerable<IPublishedProperty> _properties;
+        private readonly int _sortOrder;
+        private readonly bool _isPreviewing;
+        private readonly IPublishedContent _containerNode;
+
+        public DetachedPublishedContent(
+            Guid key,
+            string name,
+            PublishedContentType contentType,
+            IEnumerable<IPublishedProperty> properties,
+            IPublishedContent containerNode = null,
+            int sortOrder = 0,
+            bool isPreviewing = false)
+        {
+            _key = key;
+            _name = name;
+            _contentType = contentType;
+            _properties = properties;
+            _sortOrder = sortOrder;
+            _isPreviewing = isPreviewing;
+            _containerNode = containerNode;
+        }
+
+        public override Guid Key
+        {
+            get { return _key; }
+        }
+
+        public override int Id
+        {
+            get { return 0; }
+        }
+
+        public override string Name
+        {
+            get { return _name; }
+        }
+
+        public override bool IsDraft
+        {
+            get { return _isPreviewing; }
+        }
+
+        public override PublishedItemType ItemType
+        {
+            get { return PublishedItemType.Content; }
+        }
+
+        public override PublishedContentType ContentType
+        {
+            get { return _contentType; }
+        }
+
+        public override string DocumentTypeAlias
+        {
+            get { return _contentType.Alias; }
+        }
+
+        public override int DocumentTypeId
+        {
+            get { return _contentType.Id; }
+        }
+
+        public override ICollection<IPublishedProperty> Properties
+        {
+            get { return _properties.ToArray(); }
+        }
+
+        public override IPublishedProperty GetProperty(string alias)
+        {
+            return _properties.FirstOrDefault(x => x.PropertyTypeAlias.InvariantEquals(alias));
+        }
+
+        public override IPublishedProperty GetProperty(string alias, bool recurse)
+        {
+            if (recurse)
+                throw new NotSupportedException();
+
+            return GetProperty(alias);
+        }
+
+        public override IPublishedContent Parent
+        {
+            get { return null; }
+        }
+
+        public override IEnumerable<IPublishedContent> Children
+        {
+            get { return Enumerable.Empty<IPublishedContent>(); }
+        }
+
+        public override int TemplateId
+        {
+            get { return 0; }
+        }
+
+        public override int SortOrder
+        {
+            get { return _sortOrder; }
+        }
+
+        public override string UrlName
+        {
+            get { return null; }
+        }
+
+        public override string WriterName
+        {
+            get { return _containerNode != null ? _containerNode.WriterName : null; }
+        }
+
+        public override string CreatorName
+        {
+            get { return _containerNode != null ? _containerNode.CreatorName : null; }
+        }
+
+        public override int WriterId
+        {
+            get { return _containerNode != null ? _containerNode.WriterId : 0; }
+        }
+
+        public override int CreatorId
+        {
+            get { return _containerNode != null ? _containerNode.CreatorId : 0; }
+        }
+
+        public override string Path
+        {
+            get { return null; }
+        }
+
+        public override DateTime CreateDate
+        {
+            get { return _containerNode != null ? _containerNode.CreateDate : DateTime.MinValue; }
+        }
+
+        public override DateTime UpdateDate
+        {
+            get { return _containerNode != null ? _containerNode.UpdateDate : DateTime.MinValue; }
+        }
+
+        public override Guid Version
+        {
+            get { return _containerNode != null ? _containerNode.Version : Guid.Empty; }
+        }
+
+        public override int Level
+        {
+            get { return 0; }
+        }
+    }
+}

src/Umbraco.Web/Models/DetachedPublishedProperty.cs

@@ -0,0 +1,52 @@
+using System;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+
+namespace Umbraco.Web.Models
+{
+    internal class DetachedPublishedProperty : IPublishedProperty
+    {
+        private readonly PublishedPropertyType _propertyType;
+        private readonly object _rawValue;
+        private readonly Lazy<object> _sourceValue;
+        private readonly Lazy<object> _objectValue;
+        private readonly Lazy<object> _xpathValue;
+        private readonly bool _isPreview;
+
+        public DetachedPublishedProperty(PublishedPropertyType propertyType, object value)
+            : this(propertyType, value, false)
+        {
+        }
+
+        public DetachedPublishedProperty(PublishedPropertyType propertyType, object value, bool isPreview)
+        {
+            _propertyType = propertyType;
+            _isPreview = isPreview;
+
+            _rawValue = value;
+
+            _sourceValue = new Lazy<object>(() => _propertyType.ConvertDataToSource(_rawValue, _isPreview));
+            _objectValue = new Lazy<object>(() => _propertyType.ConvertSourceToObject(_sourceValue.Value, _isPreview));
+            _xpathValue = new Lazy<object>(() => _propertyType.ConvertSourceToXPath(_sourceValue.Value, _isPreview));
+        }
+
+        public string PropertyTypeAlias
+        {
+            get
+            {
+                return _propertyType.PropertyTypeAlias;
+            }
+        }
+
+        public bool HasValue
+        {
+            get { return DataValue != null && DataValue.ToString().Trim().Length > 0; }
+        }
+
+        public object DataValue { get { return _rawValue; } }
+
+        public object Value { get { return _objectValue.Value; } }
+
+        public object XPathValue { get { return _xpathValue.Value; } }
+    }
+}