* 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>
285 lines
10 KiB
C#
285 lines
10 KiB
C#
using System.Text;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.DependencyInjection;
|
|
using Umbraco.Cms.Core.Exceptions;
|
|
using Umbraco.Cms.Core.Models;
|
|
using Umbraco.Cms.Core.Models.PublishedContent;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Core.Services.Navigation;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Extensions;
|
|
|
|
namespace Umbraco.Cms.Infrastructure.HybridCache;
|
|
|
|
internal class PublishedContent : PublishedContentBase
|
|
{
|
|
private IPublishedProperty[] _properties;
|
|
private readonly ContentNode _contentNode;
|
|
private IReadOnlyDictionary<string, PublishedCultureInfo>? _cultures;
|
|
private readonly string? _urlSegment;
|
|
private readonly IReadOnlyDictionary<string, CultureVariation>? _cultureInfos;
|
|
private readonly string _contentName;
|
|
private readonly bool _published;
|
|
|
|
public PublishedContent(
|
|
ContentNode contentNode,
|
|
bool preview,
|
|
IElementsCache elementsCache,
|
|
IVariationContextAccessor variationContextAccessor)
|
|
: base(variationContextAccessor)
|
|
{
|
|
VariationContextAccessor = variationContextAccessor;
|
|
_contentNode = contentNode;
|
|
ContentData? contentData = preview ? _contentNode.DraftModel : _contentNode.PublishedModel;
|
|
if (contentData is null)
|
|
{
|
|
throw new ArgumentNullException(nameof(contentData));
|
|
}
|
|
|
|
_cultureInfos = contentData.CultureInfos;
|
|
_contentName = contentData.Name;
|
|
_urlSegment = contentData.UrlSegment;
|
|
_published = contentData.Published;
|
|
|
|
var properties = new IPublishedProperty[_contentNode.ContentType.PropertyTypes.Count()];
|
|
var i = 0;
|
|
foreach (IPublishedPropertyType propertyType in _contentNode.ContentType.PropertyTypes)
|
|
{
|
|
// add one property per property type - this is required, for the indexing to work
|
|
// if contentData supplies pdatas, use them, else use null
|
|
contentData.Properties.TryGetValue(propertyType.Alias, out PropertyData[]? propertyDatas); // else will be null
|
|
properties[i++] = new PublishedProperty(propertyType, this, propertyDatas, elementsCache, propertyType.CacheLevel);
|
|
}
|
|
|
|
_properties = properties;
|
|
|
|
Id = contentNode.Id;
|
|
Key = contentNode.Key;
|
|
CreatorId = contentNode.CreatorId;
|
|
CreateDate = contentNode.CreateDate;
|
|
SortOrder = contentNode.SortOrder;
|
|
WriterId = contentData.WriterId;
|
|
TemplateId = contentData.TemplateId;
|
|
UpdateDate = contentData.VersionDate;
|
|
}
|
|
|
|
public override IPublishedContentType ContentType => _contentNode.ContentType;
|
|
|
|
public override Guid Key { get; }
|
|
|
|
public override IEnumerable<IPublishedProperty> Properties => _properties;
|
|
|
|
public override int Id { get; }
|
|
|
|
public override int SortOrder { get; }
|
|
|
|
[Obsolete]
|
|
public override string Path
|
|
{
|
|
get
|
|
{
|
|
IDocumentNavigationQueryService documentNavigationQueryService = StaticServiceProvider.Instance.GetRequiredService<IDocumentNavigationQueryService>();
|
|
IIdKeyMap idKeyMap = StaticServiceProvider.Instance.GetRequiredService<IIdKeyMap>();
|
|
|
|
|
|
if (documentNavigationQueryService.TryGetAncestorsOrSelfKeys(Key, out var ancestorsOrSelfKeys))
|
|
{
|
|
var sb = new StringBuilder("-1");
|
|
foreach (Guid ancestorsOrSelfKey in ancestorsOrSelfKeys.Reverse())
|
|
{
|
|
Attempt<int> idAttempt = idKeyMap.GetIdForKey(ancestorsOrSelfKey, GetObjectType());
|
|
if (idAttempt.Success)
|
|
{
|
|
sb.AppendFormat(",{0}", idAttempt.Result);
|
|
}
|
|
}
|
|
|
|
return sb.ToString();
|
|
}
|
|
|
|
return string.Empty;
|
|
}
|
|
}
|
|
|
|
private UmbracoObjectTypes GetObjectType()
|
|
{
|
|
switch (ItemType)
|
|
{
|
|
case PublishedItemType.Content:
|
|
return UmbracoObjectTypes.Document;
|
|
case PublishedItemType.Media:
|
|
return UmbracoObjectTypes.Media;
|
|
case PublishedItemType.Member:
|
|
return UmbracoObjectTypes.Member;
|
|
default:
|
|
return UmbracoObjectTypes.Unknown;
|
|
}
|
|
}
|
|
|
|
public override int? TemplateId { get; }
|
|
|
|
public override int CreatorId { get; }
|
|
|
|
public override DateTime CreateDate { get; }
|
|
|
|
public override int WriterId { get; }
|
|
|
|
public override DateTime UpdateDate { get; }
|
|
|
|
public bool IsPreviewing { get; } = false;
|
|
|
|
// Needed for publishedProperty
|
|
internal IVariationContextAccessor VariationContextAccessor { get; }
|
|
|
|
[Obsolete("Use the INavigationQueryService instead, scheduled for removal in v17")]
|
|
public override int Level
|
|
{
|
|
get
|
|
{
|
|
INavigationQueryService? navigationQueryService = null;
|
|
switch (_contentNode.ContentType.ItemType)
|
|
{
|
|
case PublishedItemType.Content:
|
|
navigationQueryService = StaticServiceProvider.Instance.GetRequiredService<IDocumentNavigationQueryService>();
|
|
break;
|
|
case PublishedItemType.Media:
|
|
navigationQueryService = StaticServiceProvider.Instance.GetRequiredService<IMediaNavigationQueryService>();
|
|
break;
|
|
default:
|
|
throw new NotImplementedException("Level is not implemented for " + _contentNode.ContentType.ItemType);
|
|
}
|
|
|
|
navigationQueryService.TryGetLevel(Key, out int level);
|
|
return level;
|
|
}
|
|
}
|
|
|
|
[Obsolete("Please use TryGetParentKey() on IDocumentNavigationQueryService or IMediaNavigationQueryService instead. Scheduled for removal in V16.")]
|
|
public override IPublishedContent? Parent => GetParent();
|
|
|
|
/// <inheritdoc />
|
|
public override IReadOnlyDictionary<string, PublishedCultureInfo> Cultures
|
|
{
|
|
get
|
|
{
|
|
if (_cultures != null)
|
|
{
|
|
return _cultures;
|
|
}
|
|
|
|
if (!ContentType.VariesByCulture())
|
|
{
|
|
return _cultures = new Dictionary<string, PublishedCultureInfo>
|
|
{
|
|
{ string.Empty, new PublishedCultureInfo(string.Empty, _contentName, _urlSegment, CreateDate) },
|
|
};
|
|
}
|
|
|
|
if (_cultureInfos == null)
|
|
{
|
|
throw new PanicException("_contentDate.CultureInfos is null.");
|
|
}
|
|
|
|
|
|
return _cultures = _cultureInfos
|
|
.ToDictionary(
|
|
x => x.Key,
|
|
x => new PublishedCultureInfo(x.Key, x.Value.Name, x.Value.UrlSegment, x.Value.Date),
|
|
StringComparer.OrdinalIgnoreCase);
|
|
}
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public override PublishedItemType ItemType => _contentNode.ContentType.ItemType;
|
|
|
|
public override IPublishedProperty? GetProperty(string alias)
|
|
{
|
|
var index = _contentNode.ContentType.GetPropertyIndex(alias);
|
|
if (index < 0)
|
|
{
|
|
return null; // happens when 'alias' does not match a content type property alias
|
|
}
|
|
|
|
// should never happen - properties array must be in sync with property type
|
|
if (index >= _properties.Length)
|
|
{
|
|
throw new IndexOutOfRangeException(
|
|
"Index points outside the properties array, which means the properties array is corrupt.");
|
|
}
|
|
|
|
IPublishedProperty property = _properties[index];
|
|
return property;
|
|
}
|
|
|
|
public override bool IsDraft(string? culture = null)
|
|
{
|
|
// if this is the 'published' published content, nothing can be draft
|
|
if (_published)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// not the 'published' published content, and does not vary = must be draft
|
|
if (!ContentType.VariesByCulture())
|
|
{
|
|
return true;
|
|
}
|
|
|
|
// handle context culture
|
|
culture ??= VariationContextAccessor?.VariationContext?.Culture ?? string.Empty;
|
|
|
|
// not the 'published' published content, and varies
|
|
// = depends on the culture
|
|
return _cultureInfos is not null && _cultureInfos.TryGetValue(culture, out CultureVariation? cvar) && cvar.IsDraft;
|
|
}
|
|
|
|
public override bool IsPublished(string? culture = null)
|
|
{
|
|
// whether we are the 'draft' or 'published' content, need to determine whether
|
|
// there is a 'published' version for the specified culture (or at all, for
|
|
// invariant content items)
|
|
|
|
// if there is no 'published' published content, no culture can be published
|
|
if (!_contentNode.HasPublished)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// if there is a 'published' published content, and does not vary = published
|
|
if (!ContentType.VariesByCulture())
|
|
{
|
|
return true;
|
|
}
|
|
|
|
// handle context culture
|
|
culture ??= VariationContextAccessor.VariationContext?.Culture ?? string.Empty;
|
|
|
|
// there is a 'published' published content, and varies
|
|
// = depends on the culture
|
|
return _contentNode.HasPublishedCulture(culture);
|
|
}
|
|
|
|
private IPublishedContent? GetParent()
|
|
{
|
|
INavigationQueryService? navigationQueryService;
|
|
IPublishedCache? publishedCache;
|
|
|
|
switch (ContentType.ItemType)
|
|
{
|
|
case PublishedItemType.Content:
|
|
publishedCache = StaticServiceProvider.Instance.GetRequiredService<IPublishedContentCache>();
|
|
navigationQueryService = StaticServiceProvider.Instance.GetRequiredService<IDocumentNavigationQueryService>();
|
|
break;
|
|
case PublishedItemType.Media:
|
|
publishedCache = StaticServiceProvider.Instance.GetRequiredService<IPublishedMediaCache>();
|
|
navigationQueryService = StaticServiceProvider.Instance.GetRequiredService<IMediaNavigationQueryService>();
|
|
break;
|
|
default:
|
|
throw new NotImplementedException("Level is not implemented for " + ContentType.ItemType);
|
|
}
|
|
|
|
return this.Parent<IPublishedContent>(publishedCache, navigationQueryService);
|
|
}
|
|
}
|