* insert umb rte block web component in rte * First stab at moving the RTE markup to a nested "markup" property in the property value. * initial work * only rewrite markup * transform RTE into component * parse scope in grid.rte * revert use a fallback instead * block insertion and sync in place * block picker partly impl * remove test of old controller * remove test of old controller * block with block data * proper block with api connection * remove log * styling * Persist blocks data (still a temporary solution) * styling allows for interaction * block actions * tinyMCE styling * paste feature * prevalue display Inline toggle * inline mode in RTE * todo note * fixes wording * preparation for editor communication * remove val-server-match for now * clean up blocks that does not belong in markup * remove blocks not used in the markup * liveEditing * displayAsBlock formatting * clean up * TODO note * Serverside handling for RTE blocks (incl. refactor of Block List and Block Grid) * ensure rich text loads after block editor * trigger resize on block init * Handle RTE blocks output in Delivery API * sanitize ng classes * simplify calls to init blocks * move sanitisation * make validation work * only warn when missing one * clean up * remove validation border as it does not work * more clean up * add unsupported block entry editor * Revert breaking functionality for Block List and Grid * prevent re-inits of blocks * make sure delete blocks triggers an update * Refactor RichTextPropertyIndexValueFactory to index values from blocks + clean up RichTextPropertyEditor dependencies * first working cursor solution * inline element approach * Handle both inline and block level blocks * Fix the RTE block parser regex so it handles multiple inline blocks. * Fix reference and tags tracking, add tests, make the editor backwards compatible and make deploy happy * Use RichTextPropertyEditorHelper serialization in tests * Ensure correct model in Block Grid value converter (incl unit test to prove it) * do not include umbblockpicker in grid * make blocks the new default, instead of macros * only send value of body from DOMParser * Blocks of deleted ElementTypes shows unsupported * do not edit a unsupported block * remove trying to be smart on the init * fix missing culture issue * set dirty * alert when no blocks * Revert "make blocks the new default, instead of macros" This reverts commit 283e8aa473fdfde075197d34aa47e35dfc64a8ae. --------- Co-authored-by: kjac <kja@umbraco.dk>
75 lines
3.0 KiB
C#
75 lines
3.0 KiB
C#
using Microsoft.AspNetCore.Http;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
using Microsoft.AspNetCore.Mvc.Controllers;
|
|
using Microsoft.AspNetCore.Mvc.ModelBinding;
|
|
using Microsoft.AspNetCore.Mvc.Razor;
|
|
using Microsoft.AspNetCore.Mvc.Rendering;
|
|
using Microsoft.AspNetCore.Mvc.ViewEngines;
|
|
using Microsoft.AspNetCore.Mvc.ViewFeatures;
|
|
using Microsoft.AspNetCore.Routing;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Umbraco.Cms.Core.Blocks;
|
|
using Umbraco.Cms.Core.Models.Blocks;
|
|
using Umbraco.Cms.Core.Models.PublishedContent;
|
|
using Umbraco.Cms.Web.Common.Controllers;
|
|
using Umbraco.Extensions;
|
|
|
|
namespace Umbraco.Cms.Web.Common.Blocks;
|
|
|
|
internal sealed class PartialViewBlockEngine : IPartialViewBlockEngine
|
|
{
|
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
|
private readonly IModelMetadataProvider _modelMetadataProvider;
|
|
private readonly ITempDataDictionaryFactory _tempDataDictionaryFactory;
|
|
|
|
public PartialViewBlockEngine(
|
|
IHttpContextAccessor httpContextAccessor,
|
|
IModelMetadataProvider modelMetadataProvider,
|
|
ITempDataDictionaryFactory tempDataDictionaryFactory)
|
|
{
|
|
_httpContextAccessor = httpContextAccessor;
|
|
_modelMetadataProvider = modelMetadataProvider;
|
|
_tempDataDictionaryFactory = tempDataDictionaryFactory;
|
|
}
|
|
|
|
public async Task<string> ExecuteAsync(IBlockReference<IPublishedElement, IPublishedElement> blockReference)
|
|
{
|
|
HttpContext httpContext = _httpContextAccessor.GetRequiredHttpContext();
|
|
RouteData currentRouteData = httpContext.GetRouteData();
|
|
|
|
// Check if there's proxied ViewData (i.e. returned from a SurfaceController)
|
|
ProxyViewDataFeature? proxyViewDataFeature = httpContext.Features.Get<ProxyViewDataFeature>();
|
|
ViewDataDictionary viewData = proxyViewDataFeature?.ViewData
|
|
?? new ViewDataDictionary(_modelMetadataProvider, new ModelStateDictionary());
|
|
viewData.Model = blockReference;
|
|
|
|
ITempDataDictionary tempData = proxyViewDataFeature?.TempData
|
|
?? _tempDataDictionaryFactory.GetTempData(httpContext);
|
|
|
|
var actionContext = new ActionContext(httpContext, currentRouteData, new ControllerActionDescriptor());
|
|
IRazorViewEngine razorViewEngine = httpContext.RequestServices.GetRequiredService<IRazorViewEngine>();
|
|
|
|
var viewPath = $"~/Views/Partials/richtext/Components/{blockReference.Content.ContentType.Alias}.cshtml";
|
|
ViewEngineResult viewResult = razorViewEngine.GetView(null, viewPath, false);
|
|
|
|
if (viewResult.View is null)
|
|
{
|
|
throw new ArgumentException($"{viewPath} does not match any available view");
|
|
}
|
|
|
|
await using var writer = new StringWriter();
|
|
|
|
var viewContext = new ViewContext(
|
|
actionContext,
|
|
viewResult.View,
|
|
viewData,
|
|
tempData,
|
|
writer,
|
|
new HtmlHelperOptions());
|
|
|
|
await viewResult.View.RenderAsync(viewContext);
|
|
|
|
return writer.ToString();
|
|
}
|
|
}
|