Skip to content
Merged
13 changes: 4 additions & 9 deletions src/Umbraco.Cms.Api.Management/Factories/DocumentUrlFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,27 @@ public class DocumentUrlFactory : IDocumentUrlFactory
private readonly UrlProviderCollection _urlProviders;
private readonly IPreviewService _previewService;
private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
private readonly IAbsoluteUrlBuilder _absoluteUrlBuilder;
private readonly ILogger<DocumentUrlFactory> _logger;

public DocumentUrlFactory(
IPublishedUrlInfoProvider publishedUrlInfoProvider,
UrlProviderCollection urlProviders,
IPreviewService previewService,
IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
IAbsoluteUrlBuilder absoluteUrlBuilder,
ILogger<DocumentUrlFactory> logger)
{
_publishedUrlInfoProvider = publishedUrlInfoProvider;
_urlProviders = urlProviders;
_previewService = previewService;
_backOfficeSecurityAccessor = backOfficeSecurityAccessor;
_absoluteUrlBuilder = absoluteUrlBuilder;
_logger = logger;
}

public async Task<IEnumerable<DocumentUrlInfo>> CreateUrlsAsync(IContent content)
{
ISet<UrlInfo> urlInfos = await _publishedUrlInfoProvider.GetAllAsync(content);
return urlInfos
.Select(urlInfo => CreateDocumentUrlInfo(urlInfo, false))
.Select(CreateDocumentUrlInfo)
.ToArray();
}

Expand Down Expand Up @@ -89,18 +86,16 @@ public async Task<IEnumerable<DocumentUrlInfoResponseModel>> CreateUrlSetsAsync(
}
}

return CreateDocumentUrlInfo(previewUrlInfo, previewUrlInfo.IsExternal is false);
return CreateDocumentUrlInfo(previewUrlInfo);
}

private DocumentUrlInfo CreateDocumentUrlInfo(UrlInfo urlInfo, bool ensureAbsoluteUrl)
private DocumentUrlInfo CreateDocumentUrlInfo(UrlInfo urlInfo)
{
var url = urlInfo.Url?.ToString();
return new DocumentUrlInfo
{
Culture = urlInfo.Culture,
Url = ensureAbsoluteUrl && url is not null
? _absoluteUrlBuilder.ToAbsoluteUrl(url).ToString()
: url,
Url = url,
Message = urlInfo.Message,
Provider = urlInfo.Provider,
};
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Core/Routing/NewDefaultUrlProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public virtual IEnumerable<UrlInfo> GetOtherUrls(int id, Uri current)
public Task<UrlInfo?> GetPreviewUrlAsync(IContent content, string? culture, string? segment)
=> Task.FromResult<UrlInfo?>(
UrlInfo.AsUrl(
$"/{Constants.System.UmbracoPathSegment}/preview?id={content.Key}&culture={culture}&segment={segment}",
$"preview?id={content.Key}&culture={culture}&segment={segment}",
Alias,
culture,
isExternal: false));
Expand Down Expand Up @@ -182,7 +182,7 @@ private string GetLegacyRouteFormatById(Guid key, string? culture)
// We have the published content now, so we can check if the culture is published, and thus avoid the DB hit.
string route;
var isDraft = _umbracoContextAccessor.GetRequiredUmbracoContext().InPreviewMode;
if(isDraft is false && string.IsNullOrWhiteSpace(culture) is false && content.Cultures.Any() && content.IsInvariantOrHasCulture(culture) is false)
if (isDraft is false && string.IsNullOrWhiteSpace(culture) is false && content.Cultures.Any() && content.IsInvariantOrHasCulture(culture) is false)
{
route = "#";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import type { UmbDocumentTypeDetailModel } from '@umbraco-cms/backoffice/documen
import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
import type { UmbVariantPropertyGuardRule } from '@umbraco-cms/backoffice/property';
import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
import { UmbLocalizationController } from '@umbraco-cms/backoffice/localization-api';

type ContentModel = UmbDocumentDetailModel;
type ContentTypeModel = UmbDocumentTypeDetailModel;
Expand Down Expand Up @@ -70,6 +71,7 @@ export class UmbDocumentWorkspaceContext
#isTrashedContext = new UmbIsTrashedEntityContext(this);
#documentSegmentRepository = new UmbDocumentSegmentRepository(this);
#actionEventContext?: typeof UMB_ACTION_EVENT_CONTEXT.TYPE;
#localize = new UmbLocalizationController(this);

constructor(host: UmbControllerHost) {
super(host, {
Expand Down Expand Up @@ -350,7 +352,11 @@ export class UmbDocumentWorkspaceContext
}

if (previewUrlData.message) {
umbPeekError(this._host, { color: 'danger', headline: 'Preview error', message: previewUrlData.message });
umbPeekError(this._host, {
color: 'danger',
headline: this.#localize.term('general_preview'),
message: previewUrlData.message,
});
throw new Error(previewUrlData.message);
}
}
Expand Down
Loading