V15: Remove Nucache (#17166)
* Remove nucache reference from Web.Common * Get tests building-ish * Move ReservedFieldNamesService to the right project * Remove IPublishedSnapshotStatus * Added functionality to the INavigationQueryService to get root keys * Fixed issue with navigation * Remove IPublishedSnapshot from UmbracoContext * Begin removing usage of IPublishedSnapshot from PublishedContentExtensions * Fix PublishedContentExtensions.cs * Don't use snapshots in delivery media api * Use IPublishedMediaCache in QueryMediaApiController * Remove more usages of IPublishedSnapshotAccessor * Comment out tests * Remove more usages of PublishedSnapshotAccessor * Remove PublishedSnapshot from property * Fixed test build * Fix errors * Fix some tests * Delete NuCache 🎉 * Implement DatabaseCacheRebuilder * Remove usage of IPublishedSnapshotService * Remove IPublishedSnapshotService * Remove TestPublishedSnapshotAccessor and make tests build * Don't test Snapshot cachelevel It's no longer supported * Fix BlockEditorConverter Element != Element document type * Remember to set cachemanager * Fix RichTextParserTests * Implement TryGetLevel on INavigationQueryService * Fake level and obsolete it in PublishedContent * Remove ChildrenForAllCultures * Hack Path property on PublishedContent * Remove usages of IPublishedSnapshot in tests * More ConvertersTests * Add hybrid cache to integration tests We can actually do this now because we no longer save files on disk * Rename IPublishedSnapshotRebuilder to ICacheRebuilder * Comment out tests * V15: Replacing the usages of Parent (navigation data) from IPublishedContent (#17125) * Fix .Parent references in PublishedContentExtensions * Add missing methods to FriendlyPublishedContentExtensions (ones that you were able to call on the content directly as they now require extra params) * Fix references from the extension methods * Fix dependencies in tests * Replace IPublishedSnapshotAccessor with the content cache in tests * Resolving more .Parent references * Fix unit tests * Obsolete and use extension methods * Remove private method and use extension instead * Moving code around * Fix tests * Fix more references * Cleanup * Fix more usages * Resolve merge conflict * Fix tests * Cleanup * Fix more tests * Fixed unit tests * Cleanup * Replace last usages --------- Co-authored-by: Bjarke Berg <mail@bergmania.dk> * Remove usage of IPublishedSnapshotAccessor from IRequestItemProvider * Post merge fixup * Remo IPublishedSnapshot * Add HasAny to IDocumentUrlService * Fix TextBuilder * Fix modelsbuilder tests * Use explicit types * Implement GetByContentType * Support element types in PublishedContentTypeCache * Run enlistments before publishing notifications * Fix elements cache refreshing * Implement GetByUdi * Implement GetAtRoot * Implement GetByRoute * Reimplement GetRouteById * Fix blocks unit tests * Initialize domain cache on boot * Only return routes with domains on non default lanauges * V15: Replacing the usages of `Children` (navigation data) from `IPublishedContent` (#17159) * Update params in PublishedContentExtensions to the general interfaces for the published cache and navigation service, so that we can use the extension methods on both documents and media * Introduce GetParent() which uses the right services * Fix obsolete message on .Parent * Obsolete .Children * Fix usages of Children for ApiMediaQueryService * Fix usage in internal * Fix usages in views * Fix indentation * Fix issue with delete language * Update nuget pacakges * Clear elements cache when content is deleted instead of trying to update it * Reset publishedModelFactory * Fixed publishing --------- Co-authored-by: Bjarke Berg <mail@bergmania.dk> Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Co-authored-by: kjac <kja@umbraco.dk>
This commit is contained in:
Mole
@@ -1,16 +1,13 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Umbraco.Cms.Core.Models;
|
||||
using Umbraco.Cms.Core.Strings;
|
||||
using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
|
||||
using Umbraco.Cms.Infrastructure.HybridCache;
|
||||
using Umbraco.Cms.Tests.Common.Builders.Extensions;
|
||||
using Umbraco.Cms.Tests.Common.Builders.Interfaces;
|
||||
using Umbraco.Extensions;
|
||||
|
||||
namespace Umbraco.Cms.Tests.Common.Builders;
|
||||
|
||||
public class ContentDataBuilder : BuilderBase<ContentData>, IWithNameBuilder
|
||||
internal class ContentDataBuilder : BuilderBase<ContentData>, IWithNameBuilder
|
||||
{
|
||||
private Dictionary<string, CultureVariation> _cultureInfos;
|
||||
private string _name;
|
||||
|
||||
@@ -1,95 +1,95 @@
|
||||
using System;
|
||||
using Umbraco.Cms.Infrastructure.PublishedCache;
|
||||
using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
|
||||
|
||||
namespace Umbraco.Cms.Tests.Common.Builders;
|
||||
|
||||
public class ContentNodeKitBuilder : BuilderBase<ContentNodeKit>
|
||||
{
|
||||
private ContentNode _contentNode;
|
||||
private int _contentTypeId;
|
||||
private ContentData _draftData;
|
||||
private ContentData _publishedData;
|
||||
|
||||
public ContentNodeKitBuilder WithContentNode(ContentNode contentNode)
|
||||
{
|
||||
_contentNode = contentNode;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ContentNodeKitBuilder WithContentNode(int id, Guid uid, int level, string path, int sortOrder, int parentContentId, DateTime createDate, int creatorId)
|
||||
{
|
||||
_contentNode = new ContentNode(id, uid, level, path, sortOrder, parentContentId, createDate, creatorId);
|
||||
return this;
|
||||
}
|
||||
|
||||
public ContentNodeKitBuilder WithContentTypeId(int contentTypeId)
|
||||
{
|
||||
_contentTypeId = contentTypeId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ContentNodeKitBuilder WithDraftData(ContentData draftData)
|
||||
{
|
||||
_draftData = draftData;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ContentNodeKitBuilder WithPublishedData(ContentData publishedData)
|
||||
{
|
||||
_publishedData = publishedData;
|
||||
return this;
|
||||
}
|
||||
|
||||
public override ContentNodeKit Build()
|
||||
{
|
||||
var data = new ContentNodeKit(_contentNode, _contentTypeId, _draftData, _publishedData);
|
||||
return data;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Creates a ContentNodeKit
|
||||
/// </summary>
|
||||
/// <param name="contentTypeId"></param>
|
||||
/// <param name="id"></param>
|
||||
/// <param name="path"></param>
|
||||
/// <param name="sortOrder"></param>
|
||||
/// <param name="level">
|
||||
/// Optional. Will get calculated based on the path value if not specified.
|
||||
/// </param>
|
||||
/// <param name="parentContentId">
|
||||
/// Optional. Will get calculated based on the path value if not specified.
|
||||
/// </param>
|
||||
/// <param name="creatorId"></param>
|
||||
/// <param name="uid"></param>
|
||||
/// <param name="createDate"></param>
|
||||
/// <param name="draftData"></param>
|
||||
/// <param name="publishedData"></param>
|
||||
/// <returns></returns>
|
||||
public static ContentNodeKit CreateWithContent(
|
||||
int contentTypeId,
|
||||
int id,
|
||||
string path,
|
||||
int? sortOrder = null,
|
||||
int? level = null,
|
||||
int? parentContentId = null,
|
||||
int creatorId = -1,
|
||||
Guid? uid = null,
|
||||
DateTime? createDate = null,
|
||||
ContentData draftData = null,
|
||||
ContentData publishedData = null)
|
||||
{
|
||||
var pathParts = path.Split(',');
|
||||
if (pathParts.Length >= 2)
|
||||
{
|
||||
parentContentId ??= int.Parse(pathParts[^2]);
|
||||
}
|
||||
|
||||
return new ContentNodeKitBuilder()
|
||||
.WithContentTypeId(contentTypeId)
|
||||
.WithContentNode(id, uid ?? Guid.NewGuid(), level ?? pathParts.Length - 1, path, sortOrder ?? 0, parentContentId.Value, createDate ?? DateTime.Now, creatorId)
|
||||
.WithDraftData(draftData)
|
||||
.WithPublishedData(publishedData)
|
||||
.Build();
|
||||
}
|
||||
}
|
||||
// using System;
|
||||
// using Umbraco.Cms.Infrastructure.HybridCache;
|
||||
//
|
||||
// namespace Umbraco.Cms.Tests.Common.Builders;
|
||||
//
|
||||
// FIXME: Reintroduce if relevant
|
||||
// internal class ContentNodeKitBuilder : BuilderBase<ContentCacheNode>
|
||||
// {
|
||||
// private ContentNode _contentNode;
|
||||
// private int _contentTypeId;
|
||||
// private ContentData _draftData;
|
||||
// private ContentData _publishedData;
|
||||
//
|
||||
// public ContentNodeKitBuilder WithContentNode(ContentNode contentNode)
|
||||
// {
|
||||
// _contentNode = contentNode;
|
||||
// return this;
|
||||
// }
|
||||
//
|
||||
// public ContentNodeKitBuilder WithContentNode(int id, Guid uid, int level, string path, int sortOrder, int parentContentId, DateTime createDate, int creatorId)
|
||||
// {
|
||||
// _contentNode = new ContentNode(id, uid, level, path, sortOrder, parentContentId, createDate, creatorId);
|
||||
// return this;
|
||||
// }
|
||||
//
|
||||
// public ContentNodeKitBuilder WithContentTypeId(int contentTypeId)
|
||||
// {
|
||||
// _contentTypeId = contentTypeId;
|
||||
// return this;
|
||||
// }
|
||||
//
|
||||
// public ContentNodeKitBuilder WithDraftData(ContentData draftData)
|
||||
// {
|
||||
// _draftData = draftData;
|
||||
// return this;
|
||||
// }
|
||||
//
|
||||
// public ContentNodeKitBuilder WithPublishedData(ContentData publishedData)
|
||||
// {
|
||||
// _publishedData = publishedData;
|
||||
// return this;
|
||||
// }
|
||||
//
|
||||
// public override ContentNodeKit Build()
|
||||
// {
|
||||
// var data = new ContentNodeKit(_contentNode, _contentTypeId, _draftData, _publishedData);
|
||||
// return data;
|
||||
// }
|
||||
//
|
||||
// /// <summary>
|
||||
// /// Creates a ContentNodeKit
|
||||
// /// </summary>
|
||||
// /// <param name="contentTypeId"></param>
|
||||
// /// <param name="id"></param>
|
||||
// /// <param name="path"></param>
|
||||
// /// <param name="sortOrder"></param>
|
||||
// /// <param name="level">
|
||||
// /// Optional. Will get calculated based on the path value if not specified.
|
||||
// /// </param>
|
||||
// /// <param name="parentContentId">
|
||||
// /// Optional. Will get calculated based on the path value if not specified.
|
||||
// /// </param>
|
||||
// /// <param name="creatorId"></param>
|
||||
// /// <param name="uid"></param>
|
||||
// /// <param name="createDate"></param>
|
||||
// /// <param name="draftData"></param>
|
||||
// /// <param name="publishedData"></param>
|
||||
// /// <returns></returns>
|
||||
// public static ContentNodeKit CreateWithContent(
|
||||
// int contentTypeId,
|
||||
// int id,
|
||||
// string path,
|
||||
// int? sortOrder = null,
|
||||
// int? level = null,
|
||||
// int? parentContentId = null,
|
||||
// int creatorId = -1,
|
||||
// Guid? uid = null,
|
||||
// DateTime? createDate = null,
|
||||
// ContentData draftData = null,
|
||||
// ContentData publishedData = null)
|
||||
// {
|
||||
// var pathParts = path.Split(',');
|
||||
// if (pathParts.Length >= 2)
|
||||
// {
|
||||
// parentContentId ??= int.Parse(pathParts[^2]);
|
||||
// }
|
||||
//
|
||||
// return new ContentNodeKitBuilder()
|
||||
// .WithContentTypeId(contentTypeId)
|
||||
// .WithContentNode(id, uid ?? Guid.NewGuid(), level ?? pathParts.Length - 1, path, sortOrder ?? 0, parentContentId.Value, createDate ?? DateTime.Now, creatorId)
|
||||
// .WithDraftData(draftData)
|
||||
// .WithPublishedData(publishedData)
|
||||
// .Build();
|
||||
// }
|
||||
// }
|
||||
|
||||
@@ -1,29 +1,30 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
|
||||
|
||||
namespace Umbraco.Cms.Tests.Common.Builders;
|
||||
|
||||
public class PropertyDataBuilder : BuilderBase<Dictionary<string, PropertyData[]>>
|
||||
{
|
||||
private readonly Dictionary<string, List<PropertyData>> _properties = new();
|
||||
|
||||
public PropertyDataBuilder WithPropertyData(string alias, PropertyData propertyData)
|
||||
{
|
||||
if (!_properties.TryGetValue(alias, out var propertyDataCollection))
|
||||
{
|
||||
propertyDataCollection = new List<PropertyData>();
|
||||
_properties[alias] = propertyDataCollection;
|
||||
}
|
||||
|
||||
propertyDataCollection.Add(propertyData);
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
public PropertyDataBuilder WithPropertyData(string alias, object value, string? culture = null, string? segment = null)
|
||||
=> WithPropertyData(alias, new PropertyData { Culture = culture ?? string.Empty, Segment = segment ?? string.Empty, Value = value });
|
||||
|
||||
public override Dictionary<string, PropertyData[]> Build()
|
||||
=> _properties.ToDictionary(x => x.Key, x => x.Value.ToArray());
|
||||
}
|
||||
// using System.Collections.Generic;
|
||||
// using System.Linq;
|
||||
// using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
|
||||
//
|
||||
// namespace Umbraco.Cms.Tests.Common.Builders;
|
||||
//
|
||||
// FIXME: Reintroduce if relevant
|
||||
// public class PropertyDataBuilder : BuilderBase<Dictionary<string, PropertyData[]>>
|
||||
// {
|
||||
// private readonly Dictionary<string, List<PropertyData>> _properties = new();
|
||||
//
|
||||
// public PropertyDataBuilder WithPropertyData(string alias, PropertyData propertyData)
|
||||
// {
|
||||
// if (!_properties.TryGetValue(alias, out var propertyDataCollection))
|
||||
// {
|
||||
// propertyDataCollection = new List<PropertyData>();
|
||||
// _properties[alias] = propertyDataCollection;
|
||||
// }
|
||||
//
|
||||
// propertyDataCollection.Add(propertyData);
|
||||
//
|
||||
// return this;
|
||||
// }
|
||||
//
|
||||
// public PropertyDataBuilder WithPropertyData(string alias, object value, string? culture = null, string? segment = null)
|
||||
// => WithPropertyData(alias, new PropertyData { Culture = culture ?? string.Empty, Segment = segment ?? string.Empty, Value = value });
|
||||
//
|
||||
// public override Dictionary<string, PropertyData[]> Build()
|
||||
// => _properties.ToDictionary(x => x.Key, x => x.Value.ToArray());
|
||||
// }
|
||||
|
||||
@@ -1,148 +1,149 @@
|
||||
// Copyright (c) Umbraco.
|
||||
// See LICENSE for more details.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Xml.Linq;
|
||||
using System.Xml.XPath;
|
||||
using Moq;
|
||||
using Umbraco.Cms.Core.Models;
|
||||
using Umbraco.Cms.Core.PropertyEditors;
|
||||
using Umbraco.Cms.Core.Strings;
|
||||
using Umbraco.Cms.Infrastructure.PublishedCache;
|
||||
using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
|
||||
using Umbraco.Cms.Infrastructure.PublishedCache.Persistence;
|
||||
using Umbraco.Cms.Infrastructure.Serialization;
|
||||
using Umbraco.Cms.Tests.Common.Builders;
|
||||
using Umbraco.Cms.Tests.Common.Builders.Extensions;
|
||||
using Umbraco.Extensions;
|
||||
|
||||
namespace Umbraco.Cms.Tests.Common.Published;
|
||||
|
||||
/// <summary>
|
||||
/// Converts legacy Umbraco XML structures to NuCache <see cref="ContentNodeKit" /> collections
|
||||
/// to populate a test implementation of <see cref="INuCacheContentService" />
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// This does not support variant data because the XML structure doesn't support variant data.
|
||||
/// </remarks>
|
||||
public static class PublishedContentXmlAdapter
|
||||
{
|
||||
/// <summary>
|
||||
/// Generate a collection of <see cref="ContentNodeKit" /> based on legacy umbraco XML
|
||||
/// </summary>
|
||||
/// <param name="xml">The legacy umbraco XML</param>
|
||||
/// <param name="shortStringHelper"></param>
|
||||
/// <param name="contentTypes">Dynamically generates a list of <see cref="ContentType" />s based on the XML data</param>
|
||||
/// <param name="dataTypes">Dynamically generates a list of <see cref="DataType" /> for tests</param>
|
||||
/// <returns></returns>
|
||||
public static IEnumerable<ContentNodeKit> GetContentNodeKits(
|
||||
string xml,
|
||||
IShortStringHelper shortStringHelper,
|
||||
out ContentType[] contentTypes,
|
||||
out DataType[] dataTypes)
|
||||
{
|
||||
// use the label data type for all data for these tests except in the case
|
||||
// where a property is named 'content', in which case use the RTE.
|
||||
var serializer = new SystemTextConfigurationEditorJsonSerializer();
|
||||
var labelDataType =
|
||||
new DataType(new VoidEditor("Label", Mock.Of<IDataValueEditorFactory>()), serializer) { Id = 3 };
|
||||
var rteDataType = new DataType(new VoidEditor("RTE", Mock.Of<IDataValueEditorFactory>()), serializer) { Id = 4 };
|
||||
dataTypes = new[] { labelDataType, rteDataType };
|
||||
|
||||
var kitsAndXml = new List<(ContentNodeKit kit, XElement node)>();
|
||||
|
||||
var xDoc = XDocument.Parse(xml);
|
||||
var nodes = xDoc.XPathSelectElements("//*[@isDoc]");
|
||||
foreach (var node in nodes)
|
||||
{
|
||||
var id = node.AttributeValue<int>("id");
|
||||
var key = node.AttributeValue<Guid?>("key") ?? id.ToGuid();
|
||||
|
||||
var propertyElements = node.Elements().Where(x => x.Attribute("id") == null);
|
||||
var properties = new Dictionary<string, PropertyData[]>();
|
||||
foreach (var propertyElement in propertyElements)
|
||||
{
|
||||
properties[propertyElement.Name.LocalName] = new[]
|
||||
{
|
||||
// TODO: builder?
|
||||
new PropertyData {Culture = string.Empty, Segment = string.Empty, Value = propertyElement.Value}
|
||||
};
|
||||
}
|
||||
|
||||
var contentData = new ContentDataBuilder()
|
||||
.WithName(node.AttributeValue<string>("nodeName"))
|
||||
.WithProperties(properties)
|
||||
.WithPublished(true)
|
||||
.WithTemplateId(node.AttributeValue<int>("template"))
|
||||
.WithUrlSegment(node.AttributeValue<string>("urlName"))
|
||||
.WithVersionDate(node.AttributeValue<DateTime>("updateDate"))
|
||||
.WithWriterId(node.AttributeValue<int>("writerID"))
|
||||
.Build();
|
||||
|
||||
var kit = ContentNodeKitBuilder.CreateWithContent(
|
||||
node.AttributeValue<int>("nodeType"),
|
||||
id,
|
||||
node.AttributeValue<string>("path"),
|
||||
node.AttributeValue<int>("sortOrder"),
|
||||
node.AttributeValue<int>("level"),
|
||||
node.AttributeValue<int>("parentID"),
|
||||
node.AttributeValue<int>("creatorID"),
|
||||
key,
|
||||
node.AttributeValue<DateTime>("createDate"),
|
||||
contentData,
|
||||
contentData);
|
||||
|
||||
kitsAndXml.Add((kit, node));
|
||||
}
|
||||
|
||||
// put together the unique content types
|
||||
var contentTypesIdToType = new Dictionary<int, ContentType>();
|
||||
foreach ((var kit, var node) in kitsAndXml)
|
||||
{
|
||||
if (!contentTypesIdToType.TryGetValue(kit.ContentTypeId, out var contentType))
|
||||
{
|
||||
contentType = new ContentType(shortStringHelper, -1)
|
||||
{
|
||||
Id = kit.ContentTypeId,
|
||||
Alias = node.Name.LocalName
|
||||
};
|
||||
SetContentTypeProperties(shortStringHelper, labelDataType, rteDataType, kit, contentType);
|
||||
contentTypesIdToType[kit.ContentTypeId] = contentType;
|
||||
}
|
||||
else
|
||||
{
|
||||
// we've already created it but might need to add properties
|
||||
SetContentTypeProperties(shortStringHelper, labelDataType, rteDataType, kit, contentType);
|
||||
}
|
||||
}
|
||||
|
||||
contentTypes = contentTypesIdToType.Values.ToArray();
|
||||
|
||||
return kitsAndXml.Select(x => x.kit);
|
||||
}
|
||||
|
||||
private static void SetContentTypeProperties(
|
||||
IShortStringHelper shortStringHelper,
|
||||
DataType labelDataType,
|
||||
DataType rteDataType,
|
||||
ContentNodeKit kit,
|
||||
ContentType contentType)
|
||||
{
|
||||
foreach (var property in kit.DraftData.Properties)
|
||||
{
|
||||
var propertyType = new PropertyType(shortStringHelper, labelDataType, property.Key);
|
||||
|
||||
if (!contentType.PropertyTypeExists(propertyType.Alias))
|
||||
{
|
||||
if (propertyType.Alias == "content")
|
||||
{
|
||||
propertyType.DataTypeId = rteDataType.Id;
|
||||
}
|
||||
|
||||
contentType.AddPropertyType(propertyType);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// // Copyright (c) Umbraco.
|
||||
// // See LICENSE for more details.
|
||||
//
|
||||
// using System;
|
||||
// using System.Collections.Generic;
|
||||
// using System.Linq;
|
||||
// using System.Xml.Linq;
|
||||
// using System.Xml.XPath;
|
||||
// using Moq;
|
||||
// using Umbraco.Cms.Core.Models;
|
||||
// using Umbraco.Cms.Core.PropertyEditors;
|
||||
// using Umbraco.Cms.Core.Strings;
|
||||
// using Umbraco.Cms.Infrastructure.PublishedCache;
|
||||
// using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
|
||||
// using Umbraco.Cms.Infrastructure.PublishedCache.Persistence;
|
||||
// using Umbraco.Cms.Infrastructure.Serialization;
|
||||
// using Umbraco.Cms.Tests.Common.Builders;
|
||||
// using Umbraco.Cms.Tests.Common.Builders.Extensions;
|
||||
// using Umbraco.Extensions;
|
||||
//
|
||||
// namespace Umbraco.Cms.Tests.Common.Published;
|
||||
// FIXME: Reintroduce if relevant
|
||||
//
|
||||
// /// <summary>
|
||||
// /// Converts legacy Umbraco XML structures to NuCache <see cref="ContentNodeKit" /> collections
|
||||
// /// to populate a test implementation of <see cref="INuCacheContentService" />
|
||||
// /// </summary>
|
||||
// /// <remarks>
|
||||
// /// This does not support variant data because the XML structure doesn't support variant data.
|
||||
// /// </remarks>
|
||||
// public static class PublishedContentXmlAdapter
|
||||
// {
|
||||
// /// <summary>
|
||||
// /// Generate a collection of <see cref="ContentNodeKit" /> based on legacy umbraco XML
|
||||
// /// </summary>
|
||||
// /// <param name="xml">The legacy umbraco XML</param>
|
||||
// /// <param name="shortStringHelper"></param>
|
||||
// /// <param name="contentTypes">Dynamically generates a list of <see cref="ContentType" />s based on the XML data</param>
|
||||
// /// <param name="dataTypes">Dynamically generates a list of <see cref="DataType" /> for tests</param>
|
||||
// /// <returns></returns>
|
||||
// public static IEnumerable<ContentNodeKit> GetContentNodeKits(
|
||||
// string xml,
|
||||
// IShortStringHelper shortStringHelper,
|
||||
// out ContentType[] contentTypes,
|
||||
// out DataType[] dataTypes)
|
||||
// {
|
||||
// // use the label data type for all data for these tests except in the case
|
||||
// // where a property is named 'content', in which case use the RTE.
|
||||
// var serializer = new SystemTextConfigurationEditorJsonSerializer();
|
||||
// var labelDataType =
|
||||
// new DataType(new VoidEditor("Label", Mock.Of<IDataValueEditorFactory>()), serializer) { Id = 3 };
|
||||
// var rteDataType = new DataType(new VoidEditor("RTE", Mock.Of<IDataValueEditorFactory>()), serializer) { Id = 4 };
|
||||
// dataTypes = new[] { labelDataType, rteDataType };
|
||||
//
|
||||
// var kitsAndXml = new List<(ContentNodeKit kit, XElement node)>();
|
||||
//
|
||||
// var xDoc = XDocument.Parse(xml);
|
||||
// var nodes = xDoc.XPathSelectElements("//*[@isDoc]");
|
||||
// foreach (var node in nodes)
|
||||
// {
|
||||
// var id = node.AttributeValue<int>("id");
|
||||
// var key = node.AttributeValue<Guid?>("key") ?? id.ToGuid();
|
||||
//
|
||||
// var propertyElements = node.Elements().Where(x => x.Attribute("id") == null);
|
||||
// var properties = new Dictionary<string, PropertyData[]>();
|
||||
// foreach (var propertyElement in propertyElements)
|
||||
// {
|
||||
// properties[propertyElement.Name.LocalName] = new[]
|
||||
// {
|
||||
// // TODO: builder?
|
||||
// new PropertyData {Culture = string.Empty, Segment = string.Empty, Value = propertyElement.Value}
|
||||
// };
|
||||
// }
|
||||
//
|
||||
// var contentData = new ContentDataBuilder()
|
||||
// .WithName(node.AttributeValue<string>("nodeName"))
|
||||
// .WithProperties(properties)
|
||||
// .WithPublished(true)
|
||||
// .WithTemplateId(node.AttributeValue<int>("template"))
|
||||
// .WithUrlSegment(node.AttributeValue<string>("urlName"))
|
||||
// .WithVersionDate(node.AttributeValue<DateTime>("updateDate"))
|
||||
// .WithWriterId(node.AttributeValue<int>("writerID"))
|
||||
// .Build();
|
||||
//
|
||||
// var kit = ContentNodeKitBuilder.CreateWithContent(
|
||||
// node.AttributeValue<int>("nodeType"),
|
||||
// id,
|
||||
// node.AttributeValue<string>("path"),
|
||||
// node.AttributeValue<int>("sortOrder"),
|
||||
// node.AttributeValue<int>("level"),
|
||||
// node.AttributeValue<int>("parentID"),
|
||||
// node.AttributeValue<int>("creatorID"),
|
||||
// key,
|
||||
// node.AttributeValue<DateTime>("createDate"),
|
||||
// contentData,
|
||||
// contentData);
|
||||
//
|
||||
// kitsAndXml.Add((kit, node));
|
||||
// }
|
||||
//
|
||||
// // put together the unique content types
|
||||
// var contentTypesIdToType = new Dictionary<int, ContentType>();
|
||||
// foreach ((var kit, var node) in kitsAndXml)
|
||||
// {
|
||||
// if (!contentTypesIdToType.TryGetValue(kit.ContentTypeId, out var contentType))
|
||||
// {
|
||||
// contentType = new ContentType(shortStringHelper, -1)
|
||||
// {
|
||||
// Id = kit.ContentTypeId,
|
||||
// Alias = node.Name.LocalName
|
||||
// };
|
||||
// SetContentTypeProperties(shortStringHelper, labelDataType, rteDataType, kit, contentType);
|
||||
// contentTypesIdToType[kit.ContentTypeId] = contentType;
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// // we've already created it but might need to add properties
|
||||
// SetContentTypeProperties(shortStringHelper, labelDataType, rteDataType, kit, contentType);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// contentTypes = contentTypesIdToType.Values.ToArray();
|
||||
//
|
||||
// return kitsAndXml.Select(x => x.kit);
|
||||
// }
|
||||
//
|
||||
// private static void SetContentTypeProperties(
|
||||
// IShortStringHelper shortStringHelper,
|
||||
// DataType labelDataType,
|
||||
// DataType rteDataType,
|
||||
// ContentNodeKit kit,
|
||||
// ContentType contentType)
|
||||
// {
|
||||
// foreach (var property in kit.DraftData.Properties)
|
||||
// {
|
||||
// var propertyType = new PropertyType(shortStringHelper, labelDataType, property.Key);
|
||||
//
|
||||
// if (!contentType.PropertyTypeExists(propertyType.Alias))
|
||||
// {
|
||||
// if (propertyType.Alias == "content")
|
||||
// {
|
||||
// propertyType.DataTypeId = rteDataType.Id;
|
||||
// }
|
||||
//
|
||||
// contentType.AddPropertyType(propertyType);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
// Copyright (c) Umbraco.
|
||||
// See LICENSE for more details.
|
||||
|
||||
using Umbraco.Cms.Core.PublishedCache;
|
||||
|
||||
namespace Umbraco.Cms.Tests.Common;
|
||||
|
||||
public class TestPublishedSnapshotAccessor : IPublishedSnapshotAccessor
|
||||
{
|
||||
private IPublishedSnapshot _snapshot;
|
||||
|
||||
public bool TryGetPublishedSnapshot(out IPublishedSnapshot publishedSnapshot)
|
||||
{
|
||||
publishedSnapshot = _snapshot;
|
||||
return _snapshot != null;
|
||||
}
|
||||
|
||||
public void SetCurrent(IPublishedSnapshot snapshot) => _snapshot = snapshot;
|
||||
}
|
||||
Reference in New Issue
Block a user