commite0aa430d4cAuthor: Paul Johnson <pmj@umbraco.com> Date: Thu May 19 10:00:57 2022 +0100 Fix typo in pipeline yaml commit2ec450f2d6Author: Paul Johnson <pmj@umbraco.com> Date: Thu May 19 09:14:47 2022 +0100 Fix yaml conditions commitc2d548039aAuthor: Paul Johnson <pmj@umbraco.com> Date: Thu May 19 09:02:50 2022 +0100 Azure pipeline refactor (#12428) * Skip symbols for Umbraco.Templates * Resolve some test issues + Fixed whitespace dependant tests to pass regardless of build OS vs run OS. + Snap dictionary tests were failing when Configuration was release + Removed hardcoded baseUrl from one of the acceptance tests * Move docfx setup to ./build and fix * Update UI docs title * Added dockerfile that can be used when running the acceptance tests. * Take explicit dependency on System.Security.Cryptography.Pkcs * Refactor ci/cd pipeline commitee8359af75Author: Mole <nikolajlauridsen@protonmail.ch> Date: Thu May 19 09:57:21 2022 +0200 V10: Reintroduce appsettings-schema.json (#12416) * Reintroduce language files tests (#12367) * Reintroducing language files tests * Fix casing * Update tests/Umbraco.Tests.UnitTests/Umbraco.Core/EmbeddedResources/LanguageXmlTests.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Change Umbraco.Cms and Umbraco.Templates nuspecs to csproj * Remove Umbraco.Templates from VerifyNuGet step * Remove duplicate and unnecessary properties * Generate json schema on build * Add targets file * Gitignore auto generated appsettings schema * Fix build not copying file * Use the new path in appsettings * Update copy message * Build json schema as release * Update json schema options Otherwise just running the project will put the file in the wrong place * Generate schema if it doesn't exist in Web.Ui * Update json schema options Otherwise just running the project will put the file in the wrong place Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Co-authored-by: Ronald Barendse <ronald@barend.se> commitdd617ede80Author: Ronald Barendse <ronald@barend.se> Date: Thu May 19 09:51:11 2022 +0200 v10: Change Umbraco.Cms and Umbraco.Templates nuspecs to csproj (#12413) * Reintroduce language files tests (#12367) * Reintroducing language files tests * Fix casing * Update tests/Umbraco.Tests.UnitTests/Umbraco.Core/EmbeddedResources/LanguageXmlTests.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Change Umbraco.Cms and Umbraco.Templates nuspecs to csproj * Remove Umbraco.Templates from VerifyNuGet step * Remove duplicate and unnecessary properties Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> commitb83216876fAuthor: Ronald Barendse <ronald@barend.se> Date: Thu May 19 08:36:04 2022 +0200 v10: Project template database/connection string improvements (#12407) * Add new connection-string-provider-name parameter * Use template value forms to correctly encode JSON values * Add new development-database-type parameter * Update package template and fix App_Plugins directory rename * Remove conflicting short parameter name * Lowercase framework parameter to align with MS templates * Cleanup default template settings * Write unattended install parameters when either connection string or development database is set * Include RootNamespace in UmbracoPackage template * Update Umbraco specific gitignore rules * Revert "Lowercase framework parameter to align with MS templates" This reverts commit 22de389272a7e119df569ec2e54190265f6d0ae0. * Add exclude-gitignore parameter * Update template schemas * Add minimal-gitignore parameter commite40049dcf1Author: Mole <nikolajlauridsen@protonmail.ch> Date: Wed May 18 15:22:51 2022 +0200 Fix domain for invariant content nodes (#12405) Co-authored-by: Elitsa Marinovska <elm@umbraco.dk> commita3692b887aAuthor: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Date: Mon May 9 11:42:10 2022 +0200 Use SnippetCollection to when working with snippets (#12355) * Introducing a new Snippet type * Adding a SnippetCollection and SnippetCollectionBuilder * Using snippetCollection to get the snippets instead of fileService * Fixed fetching the correct content * Make ISnippet non-discoverable * Split the SnippetCollection into PartialViewSnippetCollection and PartialViewMacroSnippetCollection * Update CodeFileController to use the 2 snippet collections * Display the names with Empty.cshtml on top * Remove merging embedded snippets with custom snippets from ~\Umbraco.Web.UI\umbraco\PartialViewMacros\Templates folder for the Partial View Collection * Fix naming * Fix another naming * Cleanup + Use base items Co-authored-by: Bjarke Berg <mail@bergmania.dk> (cherry picked from commit9326cc5fc6) commit4f48a4937bAuthor: patrickdemooij9 <patrickdemooij98@hotmail.com> Date: Fri Oct 8 11:18:00 2021 +0200 Cherry picked from4c08b44684commit4fdbfee597Author: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com> Date: Wed May 11 00:51:37 2022 +0200 Show nicer overlay when clicking block card for deleted element type (#12140) * Show nicer overlay when clicking block card for deleted element type * Cleanup * Remove stop-scrolling container * Use flex-start instead on start * Remove legacy flexbox fallback * Remove unnecessary hack * Use standard gap property instead * Localization of message * Fix translation * End sentence with a dot (cherry picked from commitebb1dc21a9) commit3856bf8288Author: Henk Jan Pluim <henkjan.pluim@greenchoice.nl> Date: Mon Apr 25 10:02:06 2022 +0200 #fix 12254 return emptyresult (cherry picked from commit7993d19c1b) commit7087c3d9f6Author: Ronald Barendse <ronald@barend.se> Date: Tue May 17 12:59:01 2022 +0200 v10: Use ForceCreateDatabase during unattended install and extend GetUmbracoConnectionString extension methods (#12397) * Add extension methods to get the Umbraco connection string/provider name from configuration * Added tests for configuration extension methods. * Fix issue with InstallMissingDatabase and ForceCreateDatabase * Fix comments * Revert casing change in GenerateConnectionString * Re-add AddOptions (without config binding) to fix test * Update src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs Co-authored-by: Ronald Barendse <ronald@barend.se> * Update src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs * Update src/Umbraco.Infrastructure/Runtime/RuntimeState.cs * Whitespace and documentation updates * Add DatabaseProviderMetadataExtensions * Filter before ordering * Replace DataDirectory placeholder when setting connection string Co-authored-by: Andy Butland <abutland73@gmail.com> Co-authored-by: Bjarke Berg <mail@bergmania.dk> (cherry picked from commit8e6e262c7f) commite90bf26577Author: Ronald Barendse <ronald@barend.se> Date: Tue May 17 07:33:54 2022 +0200 v10: Support System.Data.SqlClient provider name (#12408) * Add support for System.Data.SqlClient provider name * Only update connection string when required (cherry picked from commite82bcb1b76) commitfd0637c96dAuthor: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Date: Mon May 16 14:23:59 2022 +0200 Reintroduce language files tests (#12367) * Reintroducing language files tests * Fix casing * Update tests/Umbraco.Tests.UnitTests/Umbraco.Core/EmbeddedResources/LanguageXmlTests.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> (cherry picked from commit2ed71a64ec)
153 lines
6.6 KiB
C#
153 lines
6.6 KiB
C#
using System;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.AspNetCore.Authorization;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
using Microsoft.AspNetCore.Mvc.ViewEngines;
|
|
using Microsoft.Extensions.Options;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.Configuration.Models;
|
|
using Umbraco.Cms.Core.Editors;
|
|
using Umbraco.Cms.Core.Features;
|
|
using Umbraco.Cms.Core.Hosting;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Cms.Core.Security;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Core.Web;
|
|
using Umbraco.Cms.Core.WebAssets;
|
|
using Umbraco.Cms.Infrastructure.WebAssets;
|
|
using Umbraco.Cms.Web.BackOffice.ActionResults;
|
|
using Umbraco.Cms.Web.BackOffice.Filters;
|
|
using Umbraco.Cms.Web.Common.Authorization;
|
|
using Umbraco.Cms.Web.Common.Filters;
|
|
using Umbraco.Extensions;
|
|
|
|
namespace Umbraco.Cms.Web.BackOffice.Controllers
|
|
{
|
|
[DisableBrowserCache]
|
|
[Area(Constants.Web.Mvc.BackOfficeArea)]
|
|
public class PreviewController : Controller
|
|
{
|
|
private readonly UmbracoFeatures _features;
|
|
private readonly GlobalSettings _globalSettings;
|
|
private readonly IPublishedSnapshotService _publishedSnapshotService;
|
|
private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
|
|
private readonly ILocalizationService _localizationService;
|
|
private readonly IHostingEnvironment _hostingEnvironment;
|
|
private readonly ICookieManager _cookieManager;
|
|
private readonly IRuntimeMinifier _runtimeMinifier;
|
|
private readonly ICompositeViewEngine _viewEngines;
|
|
private readonly IUmbracoContextAccessor _umbracoContextAccessor;
|
|
|
|
public PreviewController(
|
|
UmbracoFeatures features,
|
|
IOptionsSnapshot<GlobalSettings> globalSettings,
|
|
IPublishedSnapshotService publishedSnapshotService,
|
|
IBackOfficeSecurityAccessor backofficeSecurityAccessor,
|
|
ILocalizationService localizationService,
|
|
IHostingEnvironment hostingEnvironment,
|
|
ICookieManager cookieManager,
|
|
IRuntimeMinifier runtimeMinifier,
|
|
ICompositeViewEngine viewEngines,
|
|
IUmbracoContextAccessor umbracoContextAccessor)
|
|
{
|
|
_features = features;
|
|
_globalSettings = globalSettings.Value;
|
|
_publishedSnapshotService = publishedSnapshotService;
|
|
_backofficeSecurityAccessor = backofficeSecurityAccessor;
|
|
_localizationService = localizationService;
|
|
_hostingEnvironment = hostingEnvironment;
|
|
_cookieManager = cookieManager;
|
|
_runtimeMinifier = runtimeMinifier;
|
|
_viewEngines = viewEngines;
|
|
_umbracoContextAccessor = umbracoContextAccessor;
|
|
}
|
|
|
|
[Authorize(Policy = AuthorizationPolicies.BackOfficeAccessWithoutApproval)]
|
|
[DisableBrowserCache]
|
|
public ActionResult Index(int? id = null)
|
|
{
|
|
var availableLanguages = _localizationService.GetAllLanguages();
|
|
if (id.HasValue)
|
|
{
|
|
var umbracoContext = _umbracoContextAccessor.GetRequiredUmbracoContext();
|
|
var content = umbracoContext.Content?.GetById(true, id.Value);
|
|
if (content is null)
|
|
return NotFound();
|
|
|
|
availableLanguages = availableLanguages.Where(language => content.Cultures.ContainsKey(language.IsoCode));
|
|
}
|
|
var model = new BackOfficePreviewModel(_features, availableLanguages);
|
|
|
|
if (model.PreviewExtendedHeaderView.IsNullOrWhiteSpace() == false)
|
|
{
|
|
var viewEngineResult = _viewEngines.FindView(ControllerContext, model.PreviewExtendedHeaderView!, false);
|
|
if (viewEngineResult.View == null)
|
|
throw new InvalidOperationException("Could not find the view " + model.PreviewExtendedHeaderView + ", the following locations were searched: " + Environment.NewLine + string.Join(Environment.NewLine, viewEngineResult.SearchedLocations));
|
|
}
|
|
|
|
var viewPath = Path.Combine(
|
|
_globalSettings.UmbracoPath,
|
|
Constants.Web.Mvc.BackOfficeArea,
|
|
ControllerExtensions.GetControllerName<PreviewController>() + ".cshtml")
|
|
.Replace("\\", "/"); // convert to forward slashes since it's a virtual path
|
|
|
|
return View(viewPath, model);
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// Returns the JavaScript file for preview
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
[MinifyJavaScriptResult(Order = 0)]
|
|
// TODO: Replace this with response caching https://docs.microsoft.com/en-us/aspnet/core/performance/caching/response?view=aspnetcore-3.1
|
|
//[OutputCache(Order = 1, VaryByParam = "none", Location = OutputCacheLocation.Server, Duration = 5000)]
|
|
public async Task<JavaScriptResult> Application()
|
|
{
|
|
var files = await _runtimeMinifier.GetJsAssetPathsAsync(BackOfficeWebAssets.UmbracoPreviewJsBundleName);
|
|
var result = BackOfficeJavaScriptInitializer.GetJavascriptInitialization(files, "umbraco.preview", _globalSettings, _hostingEnvironment);
|
|
|
|
return new JavaScriptResult(result);
|
|
}
|
|
|
|
/// <summary>
|
|
/// The endpoint that is loaded within the preview iframe
|
|
/// </summary>
|
|
[Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)]
|
|
public ActionResult Frame(int id, string culture)
|
|
{
|
|
EnterPreview(id);
|
|
|
|
// use a numeric URL because content may not be in cache and so .Url would fail
|
|
var query = culture.IsNullOrWhiteSpace() ? string.Empty : $"?culture={culture}";
|
|
|
|
return RedirectPermanent($"../../{id}{query}");
|
|
}
|
|
|
|
public ActionResult? EnterPreview(int id)
|
|
{
|
|
var user = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser;
|
|
_cookieManager.SetCookieValue(Constants.Web.PreviewCookieName, "preview");
|
|
|
|
return new EmptyResult();
|
|
}
|
|
|
|
public ActionResult End(string? redir = null)
|
|
{
|
|
_cookieManager.ExpireCookie(Constants.Web.PreviewCookieName);
|
|
|
|
// Expire Client-side cookie that determines whether the user has accepted to be in Preview Mode when visiting the website.
|
|
_cookieManager.ExpireCookie(Constants.Web.AcceptPreviewCookieName);
|
|
|
|
if (Uri.IsWellFormedUriString(redir, UriKind.Relative)
|
|
&& redir.StartsWith("//") == false
|
|
&& Uri.TryCreate(redir, UriKind.Relative, out var url))
|
|
return Redirect(url.ToString());
|
|
|
|
return Redirect("/");
|
|
}
|
|
}
|
|
}
|