* 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>
79 lines
3.2 KiB
C#
79 lines
3.2 KiB
C#
using System.Linq.Expressions;
|
|
using Umbraco.Cms.Core.Models.PublishedContent;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Extensions;
|
|
|
|
namespace Umbraco.Cms.Infrastructure.ModelsBuilder;
|
|
|
|
/// <summary>
|
|
/// This is called from within the generated model classes
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// DO NOT REMOVE - although there are not code references this is used directly by the generated models.
|
|
/// </remarks>
|
|
public static class PublishedModelUtility
|
|
{
|
|
// looks safer but probably useless... ppl should not call these methods directly
|
|
// and if they do... they have to take care about not doing stupid things
|
|
|
|
// public static PublishedPropertyType GetModelPropertyType2<T>(Expression<Func<T, object>> selector)
|
|
// where T : PublishedContentModel
|
|
// {
|
|
// var type = typeof (T);
|
|
// var s1 = type.GetField("ModelTypeAlias", BindingFlags.Public | BindingFlags.Static);
|
|
// var alias = (s1.IsLiteral && s1.IsInitOnly && s1.FieldType == typeof(string)) ? (string)s1.GetValue(null) : null;
|
|
// var s2 = type.GetField("ModelItemType", BindingFlags.Public | BindingFlags.Static);
|
|
// var itemType = (s2.IsLiteral && s2.IsInitOnly && s2.FieldType == typeof(PublishedItemType)) ? (PublishedItemType)s2.GetValue(null) : 0;
|
|
|
|
// var contentType = PublishedContentType.Get(itemType, alias);
|
|
// // etc...
|
|
// }
|
|
public static IPublishedContentType? GetModelContentType(
|
|
IPublishedContentTypeCache contentTypeCache,
|
|
PublishedItemType itemType,
|
|
string alias)
|
|
{
|
|
switch (itemType)
|
|
{
|
|
case PublishedItemType.Content:
|
|
return contentTypeCache.Get(PublishedItemType.Content, alias);
|
|
case PublishedItemType.Element:
|
|
return contentTypeCache.Get(PublishedItemType.Element, alias);
|
|
case PublishedItemType.Media:
|
|
return contentTypeCache.Get(PublishedItemType.Media, alias);
|
|
case PublishedItemType.Member:
|
|
return contentTypeCache.Get(PublishedItemType.Member, alias);
|
|
default:
|
|
throw new ArgumentOutOfRangeException(nameof(itemType));
|
|
}
|
|
}
|
|
|
|
public static IPublishedPropertyType? GetModelPropertyType<TModel, TValue>(
|
|
IPublishedContentType contentType,
|
|
Expression<Func<TModel, TValue>> selector)
|
|
|
|
// where TModel : PublishedContentModel // TODO: PublishedContentModel _or_ PublishedElementModel
|
|
{
|
|
// TODO therefore, missing a check on TModel here
|
|
if (selector.Body is not MemberExpression expr)
|
|
{
|
|
throw new ArgumentException("Not a property expression.", nameof(selector));
|
|
}
|
|
|
|
// there _is_ a risk that contentType and T do not match
|
|
// see note above : accepted risk...
|
|
ImplementPropertyTypeAttribute? attr = expr.Member
|
|
.GetCustomAttributes(typeof(ImplementPropertyTypeAttribute), false)
|
|
.OfType<ImplementPropertyTypeAttribute>()
|
|
.SingleOrDefault();
|
|
|
|
if (string.IsNullOrWhiteSpace(attr?.Alias))
|
|
{
|
|
throw new InvalidOperationException(
|
|
$"Could not figure out property alias for property \"{expr.Member.Name}\".");
|
|
}
|
|
|
|
return contentType.GetPropertyType(attr.Alias);
|
|
}
|
|
}
|