From b60665d096fa703c18bf11a2396723b266b56a04 Mon Sep 17 00:00:00 2001 From: Christian Yngvesson <117633799+ChristianYngvesson@users.noreply.github.com> Date: Fri, 14 Jun 2024 17:18:18 +0200 Subject: [PATCH 01/90] Feature/swedish translations (#16582) * Added some translations * Update sv.xml - Minor typo --- .../EmbeddedResources/Lang/sv.xml | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml b/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml index 2e81fa2159..0a688083eb 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml @@ -14,13 +14,16 @@ Ändra dokumenttyp Kopiera Skapa + Exportera Skapa grupp Skapa paket Skapa innehållsmall Standardvärde Ta bort Avaktivera + Ändra inställningar Töm papperskorgen + Aktivera Exportera dokumenttyp Importera dokumenttyp Importera paket @@ -40,6 +43,13 @@ Översätt Avpublicera Uppdatera + Ändra rättigheter + Lås upp + Skapa innehållsmall + Skicka inbjudan igen + Dölj otillgängliga alternativ + Ändra datatyp + Redigera innehåll Administration @@ -47,6 +57,10 @@ Övrigt Innehåll + + Innehåll + Info + Lägg till nytt domännamn Domännamn @@ -113,8 +127,21 @@ %0% måste maximalt finnas %3% time(s).]]> + Ogiltig e-postadress + Värde får inte vara 'null' + Värde får inte vara tomt + Värdet är ogiltigt och matchar inte det korrekta formatet %1% mer.]]> %1% för många.]]> + Innehållskraven har ej godkänts på ett eller flera områden. + Ogiltigt namn för medlemsgrupp + Ogiltigt namn för användargrupp + Ogiltig token + Ogiltigt användarnamn + E-postadressen '%0%' är redan tagen + Namnet '%0%' är redan taget + Namnet '%0%' är redan taget + Användarnamnet '%0%' är redan taget %0%]]> @@ -176,6 +203,7 @@ Klicka för att redigera detta objekt Skapad av Ursprunglig författare + Uppdaterad av Skapad Datum/tid som dokumentet skapades Dokumenttyp @@ -559,6 +587,29 @@ Hämta valda + + Blå + + + Lägg till grupp + Lägg till egenskap + Lägg till redigerare + Lägg till mall + Ändra datatyp + Genvägar + visa genvägar + Toggle list view + Toggle allow as root + Kommentera bort/återställ rader + Radera rad + Kopiera upp rader + Kopiera ned rader + Flytta upp rader + Flytta ned rader + Allmänt + Redigerare + Lägg till tabb + Bakgrundsfärg Fetstil @@ -661,6 +712,11 @@ Skapa en ny medlem Alla medlemmar Medlemsgrupper har inga extra egenskaper för redigering. + En medlem med detta inlogg existerar redan + Medlem finns redan i gruppen '%0%' + Medlem har redan ett lösenord + Avstängning är inte aktiverat för denna medlem + Medlem är inte med i gruppen '%0%' Välj sida ovan... @@ -1087,9 +1143,45 @@ Äldst Nyast Senaste login + En användare med detta inlogg existerar redan + Lösenordet måste innehålla minst en siffra ('0'-'9') + Lösenordet måste innehålla minst en liten bokstav ('a'-'z') + Lösenordet måste innehålla minst ett specialtecken + Lösenordet måste innehålla minst %0% unika tecken + Lösenordet måste innehålla minst en stor bokstav ('A'-'Z') + Lösenordet måste vara minst %0% tecken + Användaren har redan ett lösenord + Användaren finns redan i gruppen '%0%' + Avstängning är inte aktiverat för denna användaren + Användaren finns inte i gruppen '%0%' Välj alla Avmarkera alla + + Avsluta + Avsluta förhandsvisning + Förhandsvisa webbplats + Öppna webbplats i förhandsvisningsläge + Förhandsvisa webbplats? + Du har avslutat förhandsvisningsläge, vill du aktivera det igen för att se senast sparade version av webbplatsen? + Förhandsvisa senaste version + Visa publicerad version + Visa publicerad version? + Du visar webbplats i förhandsvisningsläge, vill du avsluta förhandsvisning och visa senaste publicerad version av webbplatsen? + + Visa publicerad version + Fortsätt förhandsvisning + + + Skapa kataloger + Skriva filer till paket + Skriva filer + Skapa media-kataloger + + + Vi kommer endast att skicka ett anonymt Id så att vi informeras om att webbplatsens finns. + Vi kommer att skicka ett anonymt Id, Umbraco-version och installerade paket + From 4e746d367e83dfbc4c01e235b40c82a1c0048ed5 Mon Sep 17 00:00:00 2001 From: Vlael Layug <32614506+vlaellayug@users.noreply.github.com> Date: Sat, 22 Jun 2024 20:01:04 +0800 Subject: [PATCH 02/90] Use parentElement instead of parent when setting focus for modals with tabs (#16257) * added null checker for umb-tab when it's trying to get the elm.parent * use parentElement instead of parent --- .../directives/components/forms/umbfocuslock.directive.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js index 3d412d34e1..9c481eb684 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js @@ -126,7 +126,7 @@ else if(defaultFocusedElement === null ){ // If the first focusable elements are either items from the umb-sub-views-nav menu or the umb-button-ellipsis we most likely want to start the focus on the second item // We don't want to focus the second button if it's in a tab otherwise the second tab is highlighted as well as the first tab - var avoidStartElm = focusableElements.findIndex(elm => elm.classList.contains('umb-button-ellipsis') || elm.classList.contains('umb-sub-views-nav-item__action') || (elm.classList.contains('umb-tab-button') && !elm.parent.classList.contains('umb-tab'))); + var avoidStartElm = focusableElements.findIndex(elm => elm.classList.contains('umb-button-ellipsis') || elm.classList.contains('umb-sub-views-nav-item__action') || (elm.classList.contains('umb-tab-button') && !elm.parentElement.classList.contains('umb-tab'))); if(avoidStartElm === 0) { focusableElements[1].focus(); From ee0fd7dd5f1d2e0d03967bf62f258771eb5f9fb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Knippers?= Date: Tue, 16 Jul 2024 21:48:32 +0200 Subject: [PATCH 03/90] Configure WebP encoder to use Lossy by default (#16769) This greatly reduces file sizes in many cases compared to the default Lossless setting that seems to be used for PNGs. --- .../ConfigureImageSharpMiddlewareOptions.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Umbraco.Cms.Imaging.ImageSharp/ConfigureImageSharpMiddlewareOptions.cs b/src/Umbraco.Cms.Imaging.ImageSharp/ConfigureImageSharpMiddlewareOptions.cs index 9a1ecead89..95ee6a60c7 100644 --- a/src/Umbraco.Cms.Imaging.ImageSharp/ConfigureImageSharpMiddlewareOptions.cs +++ b/src/Umbraco.Cms.Imaging.ImageSharp/ConfigureImageSharpMiddlewareOptions.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Headers; using Microsoft.Extensions.Options; using Microsoft.Net.Http.Headers; +using SixLabors.ImageSharp.Formats.Webp; using SixLabors.ImageSharp.Web.Commands; using SixLabors.ImageSharp.Web.Middleware; using SixLabors.ImageSharp.Web.Processors; @@ -85,5 +86,12 @@ public sealed class ConfigureImageSharpMiddlewareOptions : IConfigureOptions Date: Tue, 6 Aug 2024 09:04:27 +0200 Subject: [PATCH 04/90] Revert "Configure WebP encoder to use Lossy by default (#16769)" This reverts commit ee0fd7dd5f1d2e0d03967bf62f258771eb5f9fb7. --- .../ConfigureImageSharpMiddlewareOptions.cs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/Umbraco.Cms.Imaging.ImageSharp/ConfigureImageSharpMiddlewareOptions.cs b/src/Umbraco.Cms.Imaging.ImageSharp/ConfigureImageSharpMiddlewareOptions.cs index 95ee6a60c7..9a1ecead89 100644 --- a/src/Umbraco.Cms.Imaging.ImageSharp/ConfigureImageSharpMiddlewareOptions.cs +++ b/src/Umbraco.Cms.Imaging.ImageSharp/ConfigureImageSharpMiddlewareOptions.cs @@ -2,7 +2,6 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Headers; using Microsoft.Extensions.Options; using Microsoft.Net.Http.Headers; -using SixLabors.ImageSharp.Formats.Webp; using SixLabors.ImageSharp.Web.Commands; using SixLabors.ImageSharp.Web.Middleware; using SixLabors.ImageSharp.Web.Processors; @@ -86,12 +85,5 @@ public sealed class ConfigureImageSharpMiddlewareOptions : IConfigureOptions Date: Tue, 30 Jul 2024 08:38:06 +0200 Subject: [PATCH 05/90] Combining OpenId and OfflineAccess scope (#16220) * Combining OpenId and OfflineAccess scope When the client scope is set to "openid offline_access", the returned scope only has the "offline_access" scope. The "openid" scope and the "id_token" are missing. By combining the OpenId and OfflineAccess as return scope, the refresh_token and id_token are returned. * Update MemberController.cs Cleaner way, provided by @kjac, to check if the scope has openid and/or offiline_access set. (cherry picked from commit 55f9b09ab754702ceaabdbb57d4f532f5fbabca5) --- .../Controllers/Security/MemberController.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Cms.Api.Delivery/Controllers/Security/MemberController.cs b/src/Umbraco.Cms.Api.Delivery/Controllers/Security/MemberController.cs index a9c670b7ad..102bf16224 100644 --- a/src/Umbraco.Cms.Api.Delivery/Controllers/Security/MemberController.cs +++ b/src/Umbraco.Cms.Api.Delivery/Controllers/Security/MemberController.cs @@ -160,11 +160,12 @@ public class MemberController : DeliveryApiControllerBase claim.SetDestinations(OpenIddictConstants.Destinations.AccessToken); } - if (request.GetScopes().Contains(OpenIddictConstants.Scopes.OfflineAccess)) - { - // "offline_access" scope is required to use refresh tokens - memberPrincipal.SetScopes(OpenIddictConstants.Scopes.OfflineAccess); - } + // "openid" and "offline_access" are the only scopes allowed for members; explicitly ensure we only add those + // NOTE: the "offline_access" scope is required to use refresh tokens + IEnumerable allowedScopes = request + .GetScopes() + .Intersect(new[] { OpenIddictConstants.Scopes.OpenId, OpenIddictConstants.Scopes.OfflineAccess }); + memberPrincipal.SetScopes(allowedScopes); return new SignInResult(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme, memberPrincipal); } From 212b2c999f54f5521c5fea452faf373ad0afdc37 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 7 Aug 2024 10:17:00 +0200 Subject: [PATCH 06/90] Updated to lastest nuget minor or patch versions (#16871) --- Directory.Packages.props | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index ccd1e91a2e..aff37a4b02 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,30 +5,30 @@ - + - + - - - - - - - + + + + + + + - + - - + + @@ -45,13 +45,13 @@ - - - + + + - + - + @@ -62,22 +62,22 @@ - + - + - - + + - + From 2e3369a09a16999e5536cd17f0f83a7bdefbe16e Mon Sep 17 00:00:00 2001 From: Sven Geusens Date: Wed, 7 Aug 2024 15:20:28 +0200 Subject: [PATCH 07/90] Upgrade imagesharp2 dependency (#16883) --- .../Umbraco.Cms.Imaging.ImageSharp2.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Cms.Imaging.ImageSharp2/Umbraco.Cms.Imaging.ImageSharp2.csproj b/src/Umbraco.Cms.Imaging.ImageSharp2/Umbraco.Cms.Imaging.ImageSharp2.csproj index 724c5b5e34..c513082675 100644 --- a/src/Umbraco.Cms.Imaging.ImageSharp2/Umbraco.Cms.Imaging.ImageSharp2.csproj +++ b/src/Umbraco.Cms.Imaging.ImageSharp2/Umbraco.Cms.Imaging.ImageSharp2.csproj @@ -5,7 +5,7 @@ - + From 7afc2b996307af8ede449295fc4a40a5f65c4677 Mon Sep 17 00:00:00 2001 From: Ealse Date: Fri, 21 Jun 2024 15:07:27 +0200 Subject: [PATCH 08/90] fix: uploaded item not selected in media picker --- .../infiniteeditors/mediapicker/mediapicker.controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js index b3d3bc2dc3..08ecf390fe 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js @@ -271,6 +271,8 @@ angular.module("umbraco") $scope.path = []; performGotoFolder(folder); } + + return getChildren(folder.id); } function performGotoFolder(folder) { @@ -280,8 +282,6 @@ angular.module("umbraco") $scope.currentFolder = folder; localStorageService.set("umbLastOpenedMediaNodeId", folder.id); - - getChildren(folder.id); } function toggleListView() { From 81f36df066f06b9f9ae642972fa993c66f39b5de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 13 Aug 2024 10:25:24 +0200 Subject: [PATCH 09/90] V13: fix 15516 (#16864) * fix unit testing * fix server value update case * re initialize Block if it was offloaded --- .../blockeditormodelobject.service.js | 3 ++- .../src/common/services/tinymce.service.js | 20 +++++++++++++++++-- .../rte/blocks/umb-rte-block.component.js | 10 +++++++++- .../propertyeditors/rte/rte.component.js | 20 +++++++++++++++++-- 4 files changed, 47 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js index ab6c176c85..85ca297e69 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js @@ -401,8 +401,9 @@ // If we are in the document type editor, we need to use -20 as the current page id. // If we are in the content editor, we need to use the current page id or parent id if the current page is new. // We can recognize a content editor context by checking if the current editor state has a contentTypeKey. + // If no current is represented, we will use null. const currentEditorState = editorState.getCurrent(); - const currentPageId = currentEditorState.contentTypeKey ? currentEditorState.id || currentEditorState.parentId || -20 : -20; + const currentPageId = currentEditorState ? currentEditorState.contentTypeKey ? currentEditorState.id || currentEditorState.parentId || -20 : -20 : null; // Load all scaffolds for the block types. // The currentPageId is used to determine the access level for the current user. diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js index ebf759c20c..df5b0d51bb 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js @@ -1457,12 +1457,13 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s function syncContent() { - const content = args.editor.getContent() + const content = args.editor.getContent(); if (getPropertyValue() === content) { return; } + //stop watching before we update the value stopWatch(); angularHelper.safeApply($rootScope, function () { @@ -1493,8 +1494,9 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s const blockEls = args.editor.contentDocument.querySelectorAll('umb-rte-block, umb-rte-block-inline'); for (var blockEl of blockEls) { if(!blockEl._isInitializedUmbBlock) { + // First time we initialize this block element const blockContentUdi = blockEl.getAttribute('data-content-udi'); - if(blockContentUdi && !blockEl.$block) { + if(blockContentUdi) { const block = args.blockEditorApi.getBlockByContentUdi(blockContentUdi); if(block) { blockEl.removeAttribute('contenteditable'); @@ -1533,9 +1535,23 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s } else { args.editor.dom.remove(blockEl); } + } else { + // Second time we initialize this block element, cause by a new Block Model Object has been initiated. (Mainly cause we re initiate all blocks when there is a value update) + const blockContentUdi = blockEl.getAttribute('data-content-udi'); + const block = args.blockEditorApi.getBlockByContentUdi(blockContentUdi); + if(block) { + blockEl.$index = block.index; + blockEl.$block = block; + blockEl.update(); + } else { + console.error('Could not find block with content udi: ' + blockContentUdi); + } } } } + args.editor.on('updateBlocks', function () { + initBlocks(); + }); // If we can not find the insert image/media toolbar button // Then we need to add an event listener to the editor diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/umb-rte-block.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/umb-rte-block.component.js index 0c4c8e2e50..7738a73c9f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/umb-rte-block.component.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/umb-rte-block.component.js @@ -18,7 +18,8 @@ } function onInit() { - $element[0]._isInitializedUmbBlock = true; + + // We might call onInit multiple times(via the update method), so parsing the latest values is needed no matter if it has been initialized before. $scope.block = $element[0].$block; $scope.api = $element[0].$api; $scope.index = $element[0].$index; @@ -27,6 +28,13 @@ $scope.parentForm = $element[0].$parentForm; $scope.valFormManager = $element[0].$valFormManager; + if($element[0]._isInitializedUmbBlock === true) { + return; + } + $element[0]._isInitializedUmbBlock = true; + $element[0].update = onInit; + + const stylesheet = $scope.block.config.stylesheet; var shadowRoot = $element[0].attachShadow({ mode: 'open' }); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.component.js index 7f06215148..d499f47a9c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.component.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.component.js @@ -264,7 +264,7 @@ }, culture: vm.umbProperty?.culture ?? null, segment: vm.umbProperty?.segment ?? null, - blockEditorApi: vm.noBlocksMode ? undefined : vm.blockEditorApi, + blockEditorApi: vm.noBlocksMode ? undefined : vm.blockEditorApi, parentForm: vm.propertyForm, valFormManager: vm.valFormManager, currentFormInput: $scope.rteForm.modelValue @@ -341,10 +341,14 @@ // we need to deal with that here so that our model values are all in sync so we basically re-initialize. function onServerValueChanged(newVal, oldVal) { + ensurePropertyValue(newVal); + // updating the modelObject with the new value cause a angular compile issue. + // But I'm not sure it's needed, as this does not trigger the RTE if(modelObject) { modelObject.update(vm.model.value.blocks, $scope); + vm.tinyMceEditor.fire('updateBlocks'); } onLoaded(); } @@ -944,7 +948,19 @@ return undefined; } - return vm.layout[layoutIndex].$block; + var layoutEntry = vm.layout[layoutIndex]; + if(layoutEntry.$block === undefined || layoutEntry.$block.config === undefined) { + // make block model + var blockObject = getBlockObject(layoutEntry); + if (blockObject === null) { + // Initialization of the Block Object didn't go well, therefor we will fail the paste action. + return false; + } + + // set the BlockObject on our layout entry. + layoutEntry.$block = blockObject; + } + return layoutEntry.$block; } vm.blockEditorApi = { From 9d94658372f9af21985e5579f1d0d21c1438e311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 13 Aug 2024 10:43:20 +0200 Subject: [PATCH 10/90] V13: fix 16663 (#16866) * fix unit testing * fix server value update case * PastePropertyResolver for RTE Blocks --------- Co-authored-by: leekelleher --- .../umb-rte-block-clipboard.component.js | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/umb-rte-block-clipboard.component.js diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/umb-rte-block-clipboard.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/umb-rte-block-clipboard.component.js new file mode 100644 index 0000000000..216b7fe1e8 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/umb-rte-block-clipboard.component.js @@ -0,0 +1,95 @@ +/** + * @ngdoc service + * @name umbraco.services.rte-block-clipboard-service + * + * Handles clipboard resolvers for Block of RTE properties. + * + */ +(function () { + 'use strict'; + + + + /** + * When performing a runtime copy of Block Editors entries, we copy the ElementType Data Model and inner IDs are kept identical, to ensure new IDs are changed on paste we need to provide a resolver for the ClipboardService. + */ + angular.module('umbraco').run(['clipboardService', 'udiService', function (clipboardService, udiService) { + + function replaceUdi(obj, key, dataObject, markup) { + var udi = obj[key]; + var newUdi = udiService.create("element"); + obj[key] = newUdi; + dataObject.forEach((data) => { + if (data.udi === udi) { + data.udi = newUdi; + } + }); + // make a attribute name of the key, by kebab casing it: + var attrName = key.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase(); + // replace the udi in the markup as well. + var regex = new RegExp('data-'+attrName+'="'+udi+'"', "g"); + markup = markup.replace(regex, 'data-'+attrName+'="'+newUdi+'"'); + return markup; + } + function replaceUdisOfObject(obj, propValue, markup) { + for (var k in obj) { + if(k === "contentUdi") { + markup = replaceUdi(obj, k, propValue.contentData, markup); + } else if(k === "settingsUdi") { + markup = replaceUdi(obj, k, propValue.settingsData, markup); + } else { + // lets crawl through all properties of layout to make sure get captured all `contentUdi` and `settingsUdi` properties. + var propType = typeof obj[k]; + if(propType != null && (propType === "object" || propType === "array")) { + markup = replaceUdisOfObject(obj[k], propValue, markup); + } + } + } + return markup + } + + + function rawRteBlockResolver(propertyValue, propPasteResolverMethod) { + if (propertyValue != null && typeof propertyValue === "object") { + + // object property of 'blocks' holds the data for the Block Editor. + var value = propertyValue.blocks; + + // we got an object, and it has these three props then we are most likely dealing with a Block Editor. + if ((value.layout !== undefined && value.contentData !== undefined && value.settingsData !== undefined)) { + + // replaceUdisOfObject replaces udis of the value object(by instance reference), but also returns the updated markup (as we cant update the reference of a string). + propertyValue.markup = replaceUdisOfObject(value.layout, value, propertyValue.markup); + + // run resolvers for inner properties of this Blocks content data. + if(value.contentData.length > 0) { + value.contentData.forEach((item) => { + for (var k in item) { + propPasteResolverMethod(item[k], clipboardService.TYPES.RAW); + } + }); + } + // run resolvers for inner properties of this Blocks settings data. + if(value.settingsData.length > 0) { + value.settingsData.forEach((item) => { + for (var k in item) { + propPasteResolverMethod(item[k], clipboardService.TYPES.RAW); + } + }); + } + + } + } + } + + function elementTypeBlockResolver(obj, propPasteResolverMethod) { + // we could filter for specific Property Editor Aliases, but as the Block Editor structure can be used by many Property Editor we do not in this code know a good way to detect that this is a Block Editor and will therefor leave it to the value structure to determin this. + rawRteBlockResolver(obj.value, propPasteResolverMethod); + } + + clipboardService.registerPastePropertyResolver(elementTypeBlockResolver, clipboardService.TYPES.ELEMENT_TYPE); + clipboardService.registerPastePropertyResolver(rawRteBlockResolver, clipboardService.TYPES.RAW); + + }]); + +})(); From 09f16c33d1994e445a31b142ff5a3e5789e96782 Mon Sep 17 00:00:00 2001 From: Andrii Kud <127977482+ideo2@users.noreply.github.com> Date: Sat, 27 Jul 2024 13:11:26 +0300 Subject: [PATCH 11/90] Issue-15712: MemberDefaultLockoutTimeInMinutes fix. --- src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs b/src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs index 9e9a85811b..7bfaabd030 100644 --- a/src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs +++ b/src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs @@ -146,7 +146,7 @@ public class IdentityMapDefinition : IMapDefinition target.PasswordConfig = source.PasswordConfiguration; target.IsApproved = source.IsApproved; target.SecurityStamp = source.SecurityStamp; - DateTime? lockedOutUntil = source.LastLockoutDate?.AddMinutes(_securitySettings.UserDefaultLockoutTimeInMinutes); + DateTime? lockedOutUntil = source.LastLockoutDate?.AddMinutes(_securitySettings.MemberDefaultLockoutTimeInMinutes); target.LockoutEnd = source.IsLockedOut ? (lockedOutUntil ?? DateTime.MaxValue).ToUniversalTime() : null; target.Comments = source.Comments; target.LastLockoutDateUtc = source.LastLockoutDate == DateTime.MinValue From bb1c36f59147d1c383703fc40bf953b55a5f156b Mon Sep 17 00:00:00 2001 From: Peter <45105665+PeterKvayt@users.noreply.github.com> Date: Wed, 14 Aug 2024 22:07:36 +0200 Subject: [PATCH 12/90] Making method ExecuteAsync virtual. (#16496) Co-authored-by: Kvyatkovsky, Petr (cherry picked from commit 3a9ef3810bdc063be16bded4877957065e964dbc) --- .../HostedServices/RecurringHostedServiceBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Infrastructure/HostedServices/RecurringHostedServiceBase.cs b/src/Umbraco.Infrastructure/HostedServices/RecurringHostedServiceBase.cs index a35f7aa956..c6f21738c2 100644 --- a/src/Umbraco.Infrastructure/HostedServices/RecurringHostedServiceBase.cs +++ b/src/Umbraco.Infrastructure/HostedServices/RecurringHostedServiceBase.cs @@ -129,7 +129,7 @@ public abstract class RecurringHostedServiceBase : IHostedService, IDisposable /// Executes the task. /// /// The task state. - public async void ExecuteAsync(object? state) + public virtual async void ExecuteAsync(object? state) { try { From 3b51475150c1ee751a0d1ba086d24a6c084956d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 15 Aug 2024 12:53:57 +0200 Subject: [PATCH 13/90] move and rename (#16916) --- .../services/rte-blockeditor-clipboard.service.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/Umbraco.Web.UI.Client/src/{views/propertyeditors/rte/blocks/umb-rte-block-clipboard.component.js => common/services/rte-blockeditor-clipboard.service.js} (100%) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/umb-rte-block-clipboard.component.js b/src/Umbraco.Web.UI.Client/src/common/services/rte-blockeditor-clipboard.service.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/blocks/umb-rte-block-clipboard.component.js rename to src/Umbraco.Web.UI.Client/src/common/services/rte-blockeditor-clipboard.service.js From a3ede677773d7a06625886c3b816f53d47d4a9fc Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Fri, 16 Aug 2024 09:29:03 +0200 Subject: [PATCH 14/90] bump version --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index f912de9385..e6cb0690c0 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", - "version": "14.1.1", + "version": "14.1.2", "assemblyVersion": { "precision": "build" }, From 20087c8e80c23ed619619923dd39bff5ad898ae6 Mon Sep 17 00:00:00 2001 From: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com> Date: Mon, 19 Aug 2024 13:54:55 +0700 Subject: [PATCH 15/90] V14 Added the Content tests with Radiobox and Tags datatype (#16909) * Added Content tests with Radiobox data type - not done * Removed Content test with Tags property editor * Added Content tests with Radiobox datatype * Added Content tests with Tags data type * Created content with data type via API * Bumped version of test helper * Make all Content tests run in the pipeline * Make all smoke tests run in the pipeline --- .../package-lock.json | 18 ++-- .../Umbraco.Tests.AcceptanceTest/package.json | 4 +- .../ContentWithPropertyEditors.spec.ts | 24 ----- .../Content/ContentWithRadiobox.spec.ts | 87 +++++++++++++++++++ .../Content/ContentWithTags.spec.ts | 85 ++++++++++++++++++ 5 files changed, 183 insertions(+), 35 deletions(-) create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithRadiobox.spec.ts create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTags.spec.ts diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json index 264945f43c..c5e0c9f020 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json @@ -7,8 +7,8 @@ "name": "acceptancetest", "hasInstallScript": true, "dependencies": { - "@umbraco/json-models-builders": "^2.0.14", - "@umbraco/playwright-testhelpers": "^2.0.0-beta.73", + "@umbraco/json-models-builders": "^2.0.15", + "@umbraco/playwright-testhelpers": "^2.0.0-beta.74", "camelize": "^1.0.0", "dotenv": "^16.3.1", "faker": "^4.1.0", @@ -132,19 +132,19 @@ } }, "node_modules/@umbraco/json-models-builders": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/@umbraco/json-models-builders/-/json-models-builders-2.0.14.tgz", - "integrity": "sha512-fP6hVSSph1iFQ1c65UH80AM6QK3r1CzuIiYOvZh+QOoVzpVFtH1VCHL3J2k8AwaHWLVAEopcvtvH5kkl7Luqww==", + "version": "2.0.15", + "resolved": "https://registry.npmjs.org/@umbraco/json-models-builders/-/json-models-builders-2.0.15.tgz", + "integrity": "sha512-+YT/9wr6zu2+agCLDw12ZPiqLpa2BT5/q90Lh5TZAlrhRRpGITDxMFkFMu1+7Z9bsmxHC/9VN+phN+sinF9BGQ==", "dependencies": { "camelize": "^1.0.1" } }, "node_modules/@umbraco/playwright-testhelpers": { - "version": "2.0.0-beta.73", - "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-2.0.0-beta.73.tgz", - "integrity": "sha512-CCURatZa7Ipui9ZTqdZmkpx89Sr5AJLoXogniq6mv84mSVGeCQFYzHvw1op2UE8nkKY5/wyqfrCihjrbW5v8lw==", + "version": "2.0.0-beta.74", + "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-2.0.0-beta.74.tgz", + "integrity": "sha512-TgmASLfTCyEMqGDVi3ky9S2gKR33wjcTjZpNIWcNGBSJAsmBQWaJur+3/iMlIVH1oO4hMuYpDvjLuaXZCbFRCw==", "dependencies": { - "@umbraco/json-models-builders": "2.0.14", + "@umbraco/json-models-builders": "2.0.15", "node-fetch": "^2.6.7" } }, diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json index 9cccd40a36..45244d8ff1 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package.json @@ -21,8 +21,8 @@ "wait-on": "^7.2.0" }, "dependencies": { - "@umbraco/json-models-builders": "^2.0.14", - "@umbraco/playwright-testhelpers": "^2.0.0-beta.73", + "@umbraco/json-models-builders": "^2.0.15", + "@umbraco/playwright-testhelpers": "^2.0.0-beta.74", "camelize": "^1.0.0", "dotenv": "^16.3.1", "faker": "^4.1.0", diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithPropertyEditors.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithPropertyEditors.spec.ts index dcfaba9ff7..2ae61af845 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithPropertyEditors.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithPropertyEditors.spec.ts @@ -96,30 +96,6 @@ test.skip('can create content with the upload file datatype', async ({umbracoApi expect(contentData.values[0].value.src).toContainEqual(uploadFilePath); }); -test('can create content with the tags datatype', async ({umbracoApi, umbracoUi}) => { - // Arrange - const dataTypeName = 'Tags'; - const tagName = 'test'; - const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); - await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); - await umbracoUi.goToBackOffice(); - await umbracoUi.content.goToSection(ConstantHelper.sections.content); - - // Act - await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); - await umbracoUi.content.chooseDocumentType(documentTypeName); - await umbracoUi.content.enterContentName(contentName); - await umbracoUi.content.addTags(tagName); - await umbracoUi.content.clickSaveAndPublishButton(); - - // Assert - await umbracoUi.content.doesSuccessNotificationsHaveCount(2); - expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); - const contentData = await umbracoApi.document.getByName(contentName); - expect(contentData.values[0].value).toEqual([tagName]); -}); - // TODO: Remove skip and update the test when the front-end is ready. Currently the list of content is not displayed. test.skip('can create content with the list view - content datatype', async ({umbracoApi, umbracoUi}) => { // Arrange diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithRadiobox.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithRadiobox.spec.ts new file mode 100644 index 0000000000..04fb322806 --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithRadiobox.spec.ts @@ -0,0 +1,87 @@ +import { ConstantHelper, test, AliasHelper } from '@umbraco/playwright-testhelpers'; +import {expect} from "@playwright/test"; + +const contentName = 'TestContent'; +const documentTypeName = 'TestDocumentTypeForContent'; +const dataTypeName = 'Radiobox'; + +test.beforeEach(async ({umbracoApi}) => { + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); + await umbracoApi.document.ensureNameNotExists(contentName); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); +}); + +test('can create content with the radiobox data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Draft'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.clickActionsMenuAtRoot(); + await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.chooseDocumentType(documentTypeName); + await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +test('can publish content with the radiobox data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Published'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickSaveAndPublishButton(); + + // Assert + await umbracoUi.content.doesSuccessNotificationsHaveCount(2); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +test('can create content with the custom radiobox data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const customDataTypeName = 'CustomRadiobox'; + const optionValues = ['testOption1', 'testOption2']; + const customDataTypeId = await umbracoApi.dataType.createRadioboxDataType(customDataTypeName, optionValues); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, customDataTypeId); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.chooseRadioboxOption(optionValues[0]); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(customDataTypeName)); + expect(contentData.values[0].value).toEqual(optionValues[0]); + + // Clean + await umbracoApi.dataType.ensureNameNotExists(customDataTypeName); +}); + diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTags.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTags.spec.ts new file mode 100644 index 0000000000..33856a5b35 --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTags.spec.ts @@ -0,0 +1,85 @@ +import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; +import {expect} from "@playwright/test"; + +const contentName = 'TestContent'; +const documentTypeName = 'TestDocumentTypeForContent'; +const dataTypeName = 'Tags'; +const tagsName = ['testTag1', 'testTag2']; + +test.beforeEach(async ({umbracoApi, umbracoUi}) => { + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoUi.goToBackOffice(); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); +}); + +test('can create content with one tag', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Draft'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.clickActionsMenuAtRoot(); + await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.chooseDocumentType(documentTypeName); + await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.clickPlusIconButton(); + await umbracoUi.content.enterTag(tagsName[0]); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values[0].value).toEqual([tagsName[0]]); +}); + +test('can publish content with multiple tags', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Published'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickPlusIconButton(); + await umbracoUi.content.enterTag(tagsName[0]); + await umbracoUi.content.enterTag(tagsName[1]); + await umbracoUi.content.clickSaveAndPublishButton(); + + // Assert + await umbracoUi.content.doesSuccessNotificationsHaveCount(2); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values[0].value).toEqual(tagsName); +}); + +test('can remove a tag in the content', async ({umbracoApi, umbracoUi}) => { + // Arrange + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDocumentWithTags(contentName, documentTypeId, [tagsName[0]]); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.removeTagByName(tagsName[0]); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values).toEqual([]); +}); + From b0988e61366acafe53e660b22d6fbca884d7d060 Mon Sep 17 00:00:00 2001 From: Sven Geusens Date: Mon, 19 Aug 2024 15:04:08 +0200 Subject: [PATCH 16/90] Merge commit from fork --- .../BackOfficeAuthPolicyBuilderExtensions.cs | 3 +- .../DenyLocalLogin/DenyLocalLoginHandler.cs | 9 ++--- .../Authorization/User/BackOfficeHandler.cs | 35 +++++++++++++++++++ .../User/BackOfficeRequirement.cs | 20 +++++++++++ 4 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 src/Umbraco.Cms.Api.Management/Security/Authorization/User/BackOfficeHandler.cs create mode 100644 src/Umbraco.Cms.Api.Management/Security/Authorization/User/BackOfficeRequirement.cs diff --git a/src/Umbraco.Cms.Api.Management/DependencyInjection/BackOfficeAuthPolicyBuilderExtensions.cs b/src/Umbraco.Cms.Api.Management/DependencyInjection/BackOfficeAuthPolicyBuilderExtensions.cs index 04a9150ed6..730da19a4c 100644 --- a/src/Umbraco.Cms.Api.Management/DependencyInjection/BackOfficeAuthPolicyBuilderExtensions.cs +++ b/src/Umbraco.Cms.Api.Management/DependencyInjection/BackOfficeAuthPolicyBuilderExtensions.cs @@ -29,6 +29,7 @@ internal static class BackOfficeAuthPolicyBuilderExtensions builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddSingleton(); + builder.Services.AddSingleton(); builder.Services.AddAuthorization(CreatePolicies); return builder; @@ -46,7 +47,7 @@ internal static class BackOfficeAuthPolicyBuilderExtensions options.AddPolicy(AuthorizationPolicies.BackOfficeAccess, policy => { policy.AuthenticationSchemes.Add(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); - policy.RequireAuthenticatedUser(); + policy.Requirements.Add(new BackOfficeRequirement()); }); options.AddPolicy(AuthorizationPolicies.RequireAdminAccess, policy => diff --git a/src/Umbraco.Cms.Api.Management/Security/Authorization/DenyLocalLogin/DenyLocalLoginHandler.cs b/src/Umbraco.Cms.Api.Management/Security/Authorization/DenyLocalLogin/DenyLocalLoginHandler.cs index e57eb6c742..cd9a675bfc 100644 --- a/src/Umbraco.Cms.Api.Management/Security/Authorization/DenyLocalLogin/DenyLocalLoginHandler.cs +++ b/src/Umbraco.Cms.Api.Management/Security/Authorization/DenyLocalLogin/DenyLocalLoginHandler.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization.Infrastructure; +using Umbraco.Cms.Api.Management.Security.Authorization.User; namespace Umbraco.Cms.Api.Management.Security.Authorization.DenyLocalLogin; @@ -24,12 +25,12 @@ public class DenyLocalLoginHandler : MustSatisfyRequirementAuthorizationHandler< if (isDenied is false) { - // AuthorizationPolicies.BackOfficeAccess policy adds this requirement by policy.RequireAuthenticatedUser() + // AuthorizationPolicies.BackOfficeAccess policy adds this requirement by policy.Requirements.Add(new BackOfficeRequirement()); // Since we want to "allow anonymous" for some endpoints (i.e. BackOfficeController.Login()), it is necessary to succeed this requirement - IEnumerable denyAnonymousUserRequirements = context.PendingRequirements.OfType(); - foreach (DenyAnonymousAuthorizationRequirement denyAnonymousUserRequirement in denyAnonymousUserRequirements) + IEnumerable backOfficeRequirements = context.PendingRequirements.OfType(); + foreach (BackOfficeRequirement backOfficeRequirement in backOfficeRequirements) { - context.Succeed(denyAnonymousUserRequirement); + context.Succeed(backOfficeRequirement); } } diff --git a/src/Umbraco.Cms.Api.Management/Security/Authorization/User/BackOfficeHandler.cs b/src/Umbraco.Cms.Api.Management/Security/Authorization/User/BackOfficeHandler.cs new file mode 100644 index 0000000000..ff79e344ae --- /dev/null +++ b/src/Umbraco.Cms.Api.Management/Security/Authorization/User/BackOfficeHandler.cs @@ -0,0 +1,35 @@ +using Microsoft.AspNetCore.Authorization; +using Umbraco.Cms.Core.Security; + +namespace Umbraco.Cms.Api.Management.Security.Authorization.User; + +/// +/// Ensures authorization is successful for a back office user. +/// +public class BackOfficeHandler : MustSatisfyRequirementAuthorizationHandler +{ + private readonly IBackOfficeSecurityAccessor _backOfficeSecurity; + + public BackOfficeHandler(IBackOfficeSecurityAccessor backOfficeSecurity) + { + _backOfficeSecurity = backOfficeSecurity; + } + + protected override Task IsAuthorized(AuthorizationHandlerContext context, BackOfficeRequirement requirement) + { + + if (context.HasFailed is false && context.HasSucceeded is true) + { + return Task.FromResult(true); + } + + if (!_backOfficeSecurity.BackOfficeSecurity?.IsAuthenticated() ?? false) + { + return Task.FromResult(false); + } + + var userApprovalSucceeded = !requirement.RequireApproval || + (_backOfficeSecurity.BackOfficeSecurity?.CurrentUser?.IsApproved ?? false); + return Task.FromResult(userApprovalSucceeded); + } +} diff --git a/src/Umbraco.Cms.Api.Management/Security/Authorization/User/BackOfficeRequirement.cs b/src/Umbraco.Cms.Api.Management/Security/Authorization/User/BackOfficeRequirement.cs new file mode 100644 index 0000000000..8c6f97b24f --- /dev/null +++ b/src/Umbraco.Cms.Api.Management/Security/Authorization/User/BackOfficeRequirement.cs @@ -0,0 +1,20 @@ +using Microsoft.AspNetCore.Authorization; + +namespace Umbraco.Cms.Api.Management.Security.Authorization.User; + +/// +/// Authorization requirement for the . +/// +public class BackOfficeRequirement : IAuthorizationRequirement +{ + /// + /// Initializes a new instance of the class. + /// + /// Flag for whether back-office user approval is required. + public BackOfficeRequirement(bool requireApproval = true) => RequireApproval = requireApproval; + + /// + /// Gets a value indicating whether back-office user approval is required. + /// + public bool RequireApproval { get; } +} From d0c76171dddd44d1373b3a7a782e7edd7e506a76 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Mon, 19 Aug 2024 15:05:02 +0200 Subject: [PATCH 17/90] Merge commit from fork * Use Debug Mode to determine content of the ProblemDetails * Cache the debug value --- .../ApplicationBuilderExtensions.cs | 7 ++++--- .../AspNetCore/AspNetCoreHostingEnvironment.cs | 16 ++++++++++------ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Cms.Api.Management/DependencyInjection/ApplicationBuilderExtensions.cs b/src/Umbraco.Cms.Api.Management/DependencyInjection/ApplicationBuilderExtensions.cs index 9018b97bee..870c4d3e1e 100644 --- a/src/Umbraco.Cms.Api.Management/DependencyInjection/ApplicationBuilderExtensions.cs +++ b/src/Umbraco.Cms.Api.Management/DependencyInjection/ApplicationBuilderExtensions.cs @@ -33,6 +33,7 @@ internal static class ApplicationBuilderExtensions { innerBuilder.UseExceptionHandler(exceptionBuilder => exceptionBuilder.Run(async context => { + var isDebug = context.RequestServices.GetRequiredService().IsDebugMode; Exception? exception = context.Features.Get()?.Error; if (exception is null) { @@ -42,16 +43,16 @@ internal static class ApplicationBuilderExtensions var response = new ProblemDetails { Title = exception.Message, - Detail = exception.StackTrace, + Detail = isDebug ? exception.StackTrace : null, Status = StatusCodes.Status500InternalServerError, - Instance = exception.GetType().Name, + Instance = isDebug ? exception.GetType().Name : null, Type = "Error" }; await context.Response.WriteAsJsonAsync(response); })); }); - internal static IApplicationBuilder UseEndpoints(this IApplicationBuilder applicationBuilder) +internal static IApplicationBuilder UseEndpoints(this IApplicationBuilder applicationBuilder) { IServiceProvider provider = applicationBuilder.ApplicationServices; diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs index 8d471428de..324781b5a3 100644 --- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs +++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs @@ -43,14 +43,14 @@ public class AspNetCoreHostingEnvironment : IHostingEnvironment _webHostEnvironment = webHostEnvironment ?? throw new ArgumentNullException(nameof(webHostEnvironment)); _urlProviderMode = _webRoutingSettings.CurrentValue.UrlProviderMode; - SetSiteName(hostingSettings.CurrentValue.SiteName); + SetSiteNameAndDebugMode(hostingSettings.CurrentValue); // We have to ensure that the OptionsMonitor is an actual options monitor since we have a hack // where we initially use an OptionsMonitorAdapter, which doesn't implement OnChange. // See summery of OptionsMonitorAdapter for more information. if (hostingSettings is OptionsMonitor) { - hostingSettings.OnChange(settings => SetSiteName(settings.SiteName)); + hostingSettings.OnChange(settings => SetSiteNameAndDebugMode(settings)); } ApplicationPhysicalPath = webHostEnvironment.ContentRootPath; @@ -95,7 +95,7 @@ public class AspNetCoreHostingEnvironment : IHostingEnvironment _hostingSettings.CurrentValue.ApplicationVirtualPath?.EnsureStartsWith('/') ?? "/"; /// - public bool IsDebugMode => _hostingSettings.CurrentValue.Debug; + public bool IsDebugMode { get; private set; } public string LocalTempPath { @@ -188,8 +188,12 @@ public class AspNetCoreHostingEnvironment : IHostingEnvironment } } - private void SetSiteName(string? siteName) => - SiteName = string.IsNullOrWhiteSpace(siteName) + private void SetSiteNameAndDebugMode(HostingSettings hostingSettings) + { + SiteName = string.IsNullOrWhiteSpace(hostingSettings.SiteName) ? _webHostEnvironment.ApplicationName - : siteName; + : hostingSettings.SiteName; + + IsDebugMode = hostingSettings.Debug; + } } From 72bef8861d94a39d5cc9530a04c4797b91fcbecf Mon Sep 17 00:00:00 2001 From: Sven Geusens Date: Mon, 19 Aug 2024 15:04:08 +0200 Subject: [PATCH 18/90] Merge commit from fork --- .../BackOfficeAuthPolicyBuilderExtensions.cs | 3 +- .../DenyLocalLogin/DenyLocalLoginHandler.cs | 9 ++--- .../Authorization/User/BackOfficeHandler.cs | 35 +++++++++++++++++++ .../User/BackOfficeRequirement.cs | 20 +++++++++++ 4 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 src/Umbraco.Cms.Api.Management/Security/Authorization/User/BackOfficeHandler.cs create mode 100644 src/Umbraco.Cms.Api.Management/Security/Authorization/User/BackOfficeRequirement.cs diff --git a/src/Umbraco.Cms.Api.Management/DependencyInjection/BackOfficeAuthPolicyBuilderExtensions.cs b/src/Umbraco.Cms.Api.Management/DependencyInjection/BackOfficeAuthPolicyBuilderExtensions.cs index 45eccad5ec..11940d243f 100644 --- a/src/Umbraco.Cms.Api.Management/DependencyInjection/BackOfficeAuthPolicyBuilderExtensions.cs +++ b/src/Umbraco.Cms.Api.Management/DependencyInjection/BackOfficeAuthPolicyBuilderExtensions.cs @@ -29,6 +29,7 @@ internal static class BackOfficeAuthPolicyBuilderExtensions builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddSingleton(); + builder.Services.AddSingleton(); builder.Services.AddAuthorization(CreatePolicies); return builder; @@ -46,7 +47,7 @@ internal static class BackOfficeAuthPolicyBuilderExtensions options.AddPolicy(AuthorizationPolicies.BackOfficeAccess, policy => { policy.AuthenticationSchemes.Add(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); - policy.RequireAuthenticatedUser(); + policy.Requirements.Add(new BackOfficeRequirement()); }); options.AddPolicy(AuthorizationPolicies.RequireAdminAccess, policy => diff --git a/src/Umbraco.Cms.Api.Management/Security/Authorization/DenyLocalLogin/DenyLocalLoginHandler.cs b/src/Umbraco.Cms.Api.Management/Security/Authorization/DenyLocalLogin/DenyLocalLoginHandler.cs index e57eb6c742..cd9a675bfc 100644 --- a/src/Umbraco.Cms.Api.Management/Security/Authorization/DenyLocalLogin/DenyLocalLoginHandler.cs +++ b/src/Umbraco.Cms.Api.Management/Security/Authorization/DenyLocalLogin/DenyLocalLoginHandler.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization.Infrastructure; +using Umbraco.Cms.Api.Management.Security.Authorization.User; namespace Umbraco.Cms.Api.Management.Security.Authorization.DenyLocalLogin; @@ -24,12 +25,12 @@ public class DenyLocalLoginHandler : MustSatisfyRequirementAuthorizationHandler< if (isDenied is false) { - // AuthorizationPolicies.BackOfficeAccess policy adds this requirement by policy.RequireAuthenticatedUser() + // AuthorizationPolicies.BackOfficeAccess policy adds this requirement by policy.Requirements.Add(new BackOfficeRequirement()); // Since we want to "allow anonymous" for some endpoints (i.e. BackOfficeController.Login()), it is necessary to succeed this requirement - IEnumerable denyAnonymousUserRequirements = context.PendingRequirements.OfType(); - foreach (DenyAnonymousAuthorizationRequirement denyAnonymousUserRequirement in denyAnonymousUserRequirements) + IEnumerable backOfficeRequirements = context.PendingRequirements.OfType(); + foreach (BackOfficeRequirement backOfficeRequirement in backOfficeRequirements) { - context.Succeed(denyAnonymousUserRequirement); + context.Succeed(backOfficeRequirement); } } diff --git a/src/Umbraco.Cms.Api.Management/Security/Authorization/User/BackOfficeHandler.cs b/src/Umbraco.Cms.Api.Management/Security/Authorization/User/BackOfficeHandler.cs new file mode 100644 index 0000000000..ff79e344ae --- /dev/null +++ b/src/Umbraco.Cms.Api.Management/Security/Authorization/User/BackOfficeHandler.cs @@ -0,0 +1,35 @@ +using Microsoft.AspNetCore.Authorization; +using Umbraco.Cms.Core.Security; + +namespace Umbraco.Cms.Api.Management.Security.Authorization.User; + +/// +/// Ensures authorization is successful for a back office user. +/// +public class BackOfficeHandler : MustSatisfyRequirementAuthorizationHandler +{ + private readonly IBackOfficeSecurityAccessor _backOfficeSecurity; + + public BackOfficeHandler(IBackOfficeSecurityAccessor backOfficeSecurity) + { + _backOfficeSecurity = backOfficeSecurity; + } + + protected override Task IsAuthorized(AuthorizationHandlerContext context, BackOfficeRequirement requirement) + { + + if (context.HasFailed is false && context.HasSucceeded is true) + { + return Task.FromResult(true); + } + + if (!_backOfficeSecurity.BackOfficeSecurity?.IsAuthenticated() ?? false) + { + return Task.FromResult(false); + } + + var userApprovalSucceeded = !requirement.RequireApproval || + (_backOfficeSecurity.BackOfficeSecurity?.CurrentUser?.IsApproved ?? false); + return Task.FromResult(userApprovalSucceeded); + } +} diff --git a/src/Umbraco.Cms.Api.Management/Security/Authorization/User/BackOfficeRequirement.cs b/src/Umbraco.Cms.Api.Management/Security/Authorization/User/BackOfficeRequirement.cs new file mode 100644 index 0000000000..8c6f97b24f --- /dev/null +++ b/src/Umbraco.Cms.Api.Management/Security/Authorization/User/BackOfficeRequirement.cs @@ -0,0 +1,20 @@ +using Microsoft.AspNetCore.Authorization; + +namespace Umbraco.Cms.Api.Management.Security.Authorization.User; + +/// +/// Authorization requirement for the . +/// +public class BackOfficeRequirement : IAuthorizationRequirement +{ + /// + /// Initializes a new instance of the class. + /// + /// Flag for whether back-office user approval is required. + public BackOfficeRequirement(bool requireApproval = true) => RequireApproval = requireApproval; + + /// + /// Gets a value indicating whether back-office user approval is required. + /// + public bool RequireApproval { get; } +} From b76070c794925932cb159ef50b851db6e966a004 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Mon, 19 Aug 2024 15:05:02 +0200 Subject: [PATCH 19/90] Merge commit from fork * Use Debug Mode to determine content of the ProblemDetails * Cache the debug value --- .../ApplicationBuilderExtensions.cs | 7 ++++--- .../AspNetCore/AspNetCoreHostingEnvironment.cs | 16 ++++++++++------ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Cms.Api.Management/DependencyInjection/ApplicationBuilderExtensions.cs b/src/Umbraco.Cms.Api.Management/DependencyInjection/ApplicationBuilderExtensions.cs index 9018b97bee..870c4d3e1e 100644 --- a/src/Umbraco.Cms.Api.Management/DependencyInjection/ApplicationBuilderExtensions.cs +++ b/src/Umbraco.Cms.Api.Management/DependencyInjection/ApplicationBuilderExtensions.cs @@ -33,6 +33,7 @@ internal static class ApplicationBuilderExtensions { innerBuilder.UseExceptionHandler(exceptionBuilder => exceptionBuilder.Run(async context => { + var isDebug = context.RequestServices.GetRequiredService().IsDebugMode; Exception? exception = context.Features.Get()?.Error; if (exception is null) { @@ -42,16 +43,16 @@ internal static class ApplicationBuilderExtensions var response = new ProblemDetails { Title = exception.Message, - Detail = exception.StackTrace, + Detail = isDebug ? exception.StackTrace : null, Status = StatusCodes.Status500InternalServerError, - Instance = exception.GetType().Name, + Instance = isDebug ? exception.GetType().Name : null, Type = "Error" }; await context.Response.WriteAsJsonAsync(response); })); }); - internal static IApplicationBuilder UseEndpoints(this IApplicationBuilder applicationBuilder) +internal static IApplicationBuilder UseEndpoints(this IApplicationBuilder applicationBuilder) { IServiceProvider provider = applicationBuilder.ApplicationServices; diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs index 8d471428de..324781b5a3 100644 --- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs +++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs @@ -43,14 +43,14 @@ public class AspNetCoreHostingEnvironment : IHostingEnvironment _webHostEnvironment = webHostEnvironment ?? throw new ArgumentNullException(nameof(webHostEnvironment)); _urlProviderMode = _webRoutingSettings.CurrentValue.UrlProviderMode; - SetSiteName(hostingSettings.CurrentValue.SiteName); + SetSiteNameAndDebugMode(hostingSettings.CurrentValue); // We have to ensure that the OptionsMonitor is an actual options monitor since we have a hack // where we initially use an OptionsMonitorAdapter, which doesn't implement OnChange. // See summery of OptionsMonitorAdapter for more information. if (hostingSettings is OptionsMonitor) { - hostingSettings.OnChange(settings => SetSiteName(settings.SiteName)); + hostingSettings.OnChange(settings => SetSiteNameAndDebugMode(settings)); } ApplicationPhysicalPath = webHostEnvironment.ContentRootPath; @@ -95,7 +95,7 @@ public class AspNetCoreHostingEnvironment : IHostingEnvironment _hostingSettings.CurrentValue.ApplicationVirtualPath?.EnsureStartsWith('/') ?? "/"; /// - public bool IsDebugMode => _hostingSettings.CurrentValue.Debug; + public bool IsDebugMode { get; private set; } public string LocalTempPath { @@ -188,8 +188,12 @@ public class AspNetCoreHostingEnvironment : IHostingEnvironment } } - private void SetSiteName(string? siteName) => - SiteName = string.IsNullOrWhiteSpace(siteName) + private void SetSiteNameAndDebugMode(HostingSettings hostingSettings) + { + SiteName = string.IsNullOrWhiteSpace(hostingSettings.SiteName) ? _webHostEnvironment.ApplicationName - : siteName; + : hostingSettings.SiteName; + + IsDebugMode = hostingSettings.Debug; + } } From 1ff3858a9efcd847631df3380584f19d13a89582 Mon Sep 17 00:00:00 2001 From: leekelleher Date: Tue, 20 Aug 2024 09:56:00 +0100 Subject: [PATCH 20/90] update backoffice submodule --- src/Umbraco.Web.UI.Client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client index bb6abdc884..d52d9c70bf 160000 --- a/src/Umbraco.Web.UI.Client +++ b/src/Umbraco.Web.UI.Client @@ -1 +1 @@ -Subproject commit bb6abdc88452bbd3a47bf867dcb1332f536ad264 +Subproject commit d52d9c70bff68fab77412c539b99a0e91a9dbe7c From bf805a181ae27574c668d53683d48d0f3d8af0ea Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Tue, 20 Aug 2024 12:54:19 +0200 Subject: [PATCH 21/90] Bump version --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 2d3aca5f9d..1cec93bcea 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", - "version": "14.2.0-rc3", + "version": "14.2.0", "assemblyVersion": { "precision": "build" }, From f99f821a6dd9a4e7c3dcefd55bfffb1e9a2f86ae Mon Sep 17 00:00:00 2001 From: Sven Geusens Date: Wed, 21 Aug 2024 09:07:09 +0200 Subject: [PATCH 22/90] Fix Mismatching constraint names in old migration (#16891) * Find the constraint name based on table,column,type name instead of hardcoding it * removed unnecesary using * Check constraint rename seperatly from column rename --- .../Upgrade/V_13_3_0/AlignUpgradedDatabase.cs | 35 ++++++++++++++++--- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_13_3_0/AlignUpgradedDatabase.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_13_3_0/AlignUpgradedDatabase.cs index 84171e8717..6ee48ce0e7 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_13_3_0/AlignUpgradedDatabase.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_13_3_0/AlignUpgradedDatabase.cs @@ -120,23 +120,48 @@ public class AlignUpgradedDatabase : MigrationBase // We need to do this to ensure we don't try to rename the constraint if it doesn't exist. const string tableName = "umbracoContentVersion"; const string columnName = "VersionDate"; + const string newColumnName = "versionDate"; + const string expectedConstraintName = "DF_umbracoContentVersion_versionDate"; + ColumnInfo? versionDateColumn = columns .FirstOrDefault(x => x is { TableName: tableName, ColumnName: columnName }); - if (versionDateColumn is null) + // we only want to rename the column if necessary + if (versionDateColumn is not null) { // The column was not found I.E. the column is correctly named - return; + RenameColumn(tableName, columnName, newColumnName, columns); } - RenameColumn(tableName, columnName, "versionDate", columns); - // Renames the default constraint for the column, // apparently the content version table used to be prefixed with cms and not umbraco // We don't have a fluid way to rename the default constraint so we have to use raw SQL // This should be okay though since we are only running this migration on SQL Server + Sql constraintNameQuery = Database.SqlContext.Sql(@$" +SELECT obj_Constraint.NAME AS 'constraintName' + FROM sys.objects obj_table + JOIN sys.objects obj_Constraint + ON obj_table.object_id = obj_Constraint.parent_object_id + JOIN sys.sysconstraints constraints + ON constraints.constid = obj_Constraint.object_id + JOIN sys.columns columns + ON columns.object_id = obj_table.object_id + AND columns.column_id = constraints.colid + WHERE obj_table.NAME = '{tableName}' + AND columns.NAME = '{newColumnName}' + AND obj_Constraint.type = 'D' +"); + var currentConstraintName = Database.ExecuteScalar(constraintNameQuery); + + + // only rename the constraint if necessary + if (currentConstraintName == expectedConstraintName) + { + return; + } + Sql renameConstraintQuery = Database.SqlContext.Sql( - "EXEC sp_rename N'DF_cmsContentVersion_VersionDate', N'DF_umbracoContentVersion_versionDate', N'OBJECT'"); + $"EXEC sp_rename N'{currentConstraintName}', N'{expectedConstraintName}', N'OBJECT'"); Database.Execute(renameConstraintQuery); } From 79080ffa93a2cbf96ec2e33e3c6beefbe52bc007 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 21 Aug 2024 10:25:39 +0200 Subject: [PATCH 23/90] Updated nuget packages and take a explicit dependency on Microsoft.IdentityModel.JsonWebTokens (#16935) --- Directory.Packages.props | 24 ++++++++++--------- .../Umbraco.Cms.Api.Common.csproj | 3 +++ ...co.Cms.Persistence.EFCore.SqlServer.csproj | 3 +++ .../Umbraco.Cms.Persistence.SqlServer.csproj | 3 +++ .../Controllers/AuthenticationController.cs | 2 ++ .../Umbraco.Web.Common.csproj | 2 ++ tests/Directory.Packages.props | 4 ++-- 7 files changed, 28 insertions(+), 13 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index aff37a4b02..43435394c1 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -12,23 +12,23 @@ - - + + - - - - + + + + - + - - + + @@ -47,7 +47,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -89,5 +89,7 @@ + + \ No newline at end of file diff --git a/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj b/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj index 82439efec6..f479e70901 100644 --- a/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj +++ b/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj @@ -12,6 +12,9 @@ + + + diff --git a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj index 7e6fc6153d..d663ef0197 100644 --- a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj +++ b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj @@ -8,6 +8,9 @@ + + + diff --git a/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj b/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj index 75e2a6fe60..9aef183cf6 100644 --- a/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj +++ b/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj @@ -8,6 +8,9 @@ + + + diff --git a/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs b/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs index 45a1746b7e..aedb545a44 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs @@ -708,6 +708,8 @@ public class AuthenticationController : UmbracoApiControllerBase return Ok(); } + + await _signInManager.SignOutAsync(); _logger.LogInformation("User {UserName} from IP address {RemoteIpAddress} has logged out", diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj index b0b5f2af6a..26fa5cf636 100644 --- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj +++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj @@ -24,6 +24,8 @@ + + diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props index 586469c2c8..9e14b435ea 100644 --- a/tests/Directory.Packages.props +++ b/tests/Directory.Packages.props @@ -4,8 +4,8 @@ - - + + From bbda1c8330345d795d86f3c5d3b6cab32652611e Mon Sep 17 00:00:00 2001 From: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com> Date: Thu, 22 Aug 2024 16:00:35 +0700 Subject: [PATCH 24/90] V14 Added Content tests with Multi URL picker (#16885) * Added Content tests with Multi URL Picker * Bumped version of test helper * Make all Content tests run in the pipeline - remove it before merging * Added goToSection step * Fix comments * Fix comments * Fixed comments * Make the smoke tests run in the pipeline --- .../Content/ContentWithMultiURLPicker.spec.ts | 255 ++++++++++++++++++ 1 file changed, 255 insertions(+) create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultiURLPicker.spec.ts diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultiURLPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultiURLPicker.spec.ts new file mode 100644 index 0000000000..3a6333ddb4 --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultiURLPicker.spec.ts @@ -0,0 +1,255 @@ +import { ConstantHelper, test, AliasHelper } from '@umbraco/playwright-testhelpers'; +import {expect} from "@playwright/test"; + +const dataTypeName = 'Multi URL Picker'; +const contentName = 'TestContent'; +const documentTypeName = 'TestDocumentTypeForContent'; +const link = 'https://docs.umbraco.com'; +const linkTitle = 'Umbraco Documentation'; + +test.beforeEach(async ({umbracoApi}) => { + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); + await umbracoApi.document.ensureNameNotExists(contentName); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); +}); + +test('can create content with the document link', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + // Create a document to link + const documentTypeForLinkedDocumentName = 'TestDocumentType'; + const documentTypeForLinkedDocumentId = await umbracoApi.documentType.createDefaultDocumentTypeWithAllowAsRoot(documentTypeForLinkedDocumentName); + const linkedDocumentName = 'LinkedDocument'; + const linkedDocumentId = await umbracoApi.document.createDefaultDocument(linkedDocumentName, documentTypeForLinkedDocumentId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.clickActionsMenuAtRoot(); + await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.chooseDocumentType(documentTypeName); + await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.clickAddMultiURLPickerButton(); + await umbracoUi.content.selectLinkByName(linkedDocumentName); + await umbracoUi.content.clickSubmitButton(); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value.length).toBe(1); + expect(contentData.values[0].value[0].type).toEqual('document'); + expect(contentData.values[0].value[0].icon).toEqual('icon-document'); + expect(contentData.values[0].value[0].target).toBeNull(); + expect(contentData.values[0].value[0].unique).toEqual(linkedDocumentId); + // Uncomment this when the front-end is ready. Currently the link title is not auto filled after choosing document to link + //expect(contentData.values[0].value[0].name).toEqual(linkedDocumentId); + + // Clean + await umbracoApi.documentType.ensureNameNotExists(documentTypeForLinkedDocumentName); + await umbracoApi.document.ensureNameNotExists(linkedDocumentName); +}); + +test('can publish content with the document link', async ({umbracoApi, umbracoUi}) => { + // Arrange + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + // Create a document to link + const documentTypeForLinkedDocumentName = 'TestDocumentType'; + const documentTypeForLinkedDocumentId = await umbracoApi.documentType.createDefaultDocumentTypeWithAllowAsRoot(documentTypeForLinkedDocumentName); + const linkedDocumentName = 'ContentToPick'; + const linkedDocumentId = await umbracoApi.document.createDefaultDocument(linkedDocumentName, documentTypeForLinkedDocumentId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickAddMultiURLPickerButton(); + await umbracoUi.content.selectLinkByName(linkedDocumentName); + await umbracoUi.content.clickSubmitButton(); + await umbracoUi.content.clickSaveAndPublishButton(); + + // Assert + await umbracoUi.content.doesSuccessNotificationsHaveCount(2); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe('Published'); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value.length).toBe(1); + expect(contentData.values[0].value[0].type).toEqual('document'); + expect(contentData.values[0].value[0].icon).toEqual('icon-document'); + expect(contentData.values[0].value[0].target).toBeNull(); + expect(contentData.values[0].value[0].unique).toEqual(linkedDocumentId); + // Uncomment this when the front-end is ready. Currently the link title is not auto filled after choosing document to link + //expect(contentData.values[0].value[0].name).toEqual(linkedDocumentId); + + // Clean + await umbracoApi.documentType.ensureNameNotExists(documentTypeForLinkedDocumentName); + await umbracoApi.document.ensureNameNotExists(linkedDocumentName); +}); + +test('can create content with the external link', async ({umbracoApi, umbracoUi}) => { + // Arrange + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickAddMultiURLPickerButton(); + await umbracoUi.content.enterLink(link); + await umbracoUi.content.enterLinkTitle(linkTitle); + await umbracoUi.content.clickSubmitButton(); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value.length).toBe(1); + expect(contentData.values[0].value[0].type).toEqual('external'); + expect(contentData.values[0].value[0].icon).toEqual('icon-link'); + expect(contentData.values[0].value[0].name).toEqual(linkTitle); + expect(contentData.values[0].value[0].url).toEqual(link); +}); + +test('can create content with the media link', async ({umbracoApi, umbracoUi}) => { + // Arrange + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + // Create a media to pick + const mediaFileName = 'TestMediaFileForContent'; + await umbracoApi.media.ensureNameNotExists(mediaFileName); + const mediaFileId = await umbracoApi.media.createDefaultMediaWithImage(mediaFileName); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickAddMultiURLPickerButton(); + await umbracoUi.content.selectLinkByName(mediaFileName); + await umbracoUi.content.clickSubmitButton(); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value.length).toBe(1); + expect(contentData.values[0].value[0].type).toEqual('media'); + expect(contentData.values[0].value[0].icon).toEqual('icon-picture'); + expect(contentData.values[0].value[0].unique).toEqual(mediaFileId); + // Uncomment this when the front-end is ready. Currently the link title is not auto filled after choosing media to link + //expect(contentData.values[0].value[0].name).toEqual(mediaFileName); + + // Clean + await umbracoApi.media.ensureNameNotExists(mediaFileName); +}); + +test('can add multiple links in the content', async ({umbracoApi, umbracoUi}) => { + // Arrange + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + // Create a media to pick + const mediaFileName = 'TestMediaFileForContent'; + await umbracoApi.media.ensureNameNotExists(mediaFileName); + const mediaFileId = await umbracoApi.media.createDefaultMediaWithImage(mediaFileName); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + // Add media link + await umbracoUi.content.clickAddMultiURLPickerButton(); + await umbracoUi.content.selectLinkByName(mediaFileName); + await umbracoUi.content.clickSubmitButton(); + // Add external link + await umbracoUi.content.clickAddMultiURLPickerButton(); + await umbracoUi.content.enterLink(link); + await umbracoUi.content.enterLinkTitle(linkTitle); + await umbracoUi.content.clickSubmitButton(); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value.length).toBe(2); + // Verify the information of the first URL picker + expect(contentData.values[0].value[0].type).toEqual('media'); + expect(contentData.values[0].value[0].icon).toEqual('icon-picture'); + expect(contentData.values[0].value[0].unique).toEqual(mediaFileId); + // Uncomment this when the front-end is ready. Currently the link title is not auto filled after choosing media to link + //expect(contentData.values[0].value[0].name).toEqual(mediaFileName); + // Verify the information of the second URL picker + expect(contentData.values[0].value[1].type).toEqual('external'); + expect(contentData.values[0].value[1].icon).toEqual('icon-link'); + expect(contentData.values[0].value[1].name).toEqual(linkTitle); + expect(contentData.values[0].value[1].url).toEqual(link); + + // Clean + await umbracoApi.media.ensureNameNotExists(mediaFileName); +}); + +test('can remove the URL picker in the content', async ({umbracoApi, umbracoUi}) => { + // Arrange + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDocumentWithExternalLinkURLPicker(contentName, documentTypeId, link, linkTitle); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.removeUrlPickerByName(linkTitle); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values).toEqual([]); +}); + +test('can edit the URL picker in the content', async ({umbracoApi, umbracoUi}) => { + // Arrange + const updatedLinkTitle = 'Updated Umbraco Documentation'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDocumentWithExternalLinkURLPicker(contentName, documentTypeId, link, linkTitle); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickEditUrlPickerButtonByName(linkTitle); + await umbracoUi.content.enterLinkTitle(updatedLinkTitle); + await umbracoUi.content.clickSubmitButton(); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value.length).toBe(1); + expect(contentData.values[0].value[0].type).toEqual('external'); + expect(contentData.values[0].value[0].icon).toEqual('icon-link'); + expect(contentData.values[0].value[0].name).toEqual(updatedLinkTitle); + expect(contentData.values[0].value[0].url).toEqual(link); +}); From 1b21caa20ac98c6e7f54d7f325a64858646313f7 Mon Sep 17 00:00:00 2001 From: Sven Geusens Date: Thu, 22 Aug 2024 12:14:43 +0200 Subject: [PATCH 25/90] Update backoffice submodule with hotfix for breaking change that broke forms. --- src/Umbraco.Web.UI.Client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client index d52d9c70bf..a9d3a43969 160000 --- a/src/Umbraco.Web.UI.Client +++ b/src/Umbraco.Web.UI.Client @@ -1 +1 @@ -Subproject commit d52d9c70bff68fab77412c539b99a0e91a9dbe7c +Subproject commit a9d3a4396968e4cc47c1d1cd290ca8b1cf764e12 From 405fd9724facb87509fdadae17281976eedbaf63 Mon Sep 17 00:00:00 2001 From: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com> Date: Fri, 23 Aug 2024 13:54:14 +0700 Subject: [PATCH 26/90] V14 Added the Content tests with Textarea, Textstring, TrueFalse datatype (#16946) * Added Contents test with Textarea * Added Content tests with textstring * Removed the tests for Textarea property editor * Added Content tests for TrueFalse data type * Bumped version of test helper * Make all Content tests run in the pipeline * Cleaned code * Make the smoke tests run in the pipeline --- .../package-lock.json | 18 +-- .../Umbraco.Tests.AcceptanceTest/package.json | 4 +- .../Content/ContentInfoTab.spec.ts | 2 +- .../Content/ContentWithCheckboxList.spec.ts | 2 +- .../Content/ContentWithDropdown.spec.ts | 2 +- .../Content/ContentWithMediaPicker.spec.ts | 2 +- .../ContentWithMultipleMediaPicker.spec.ts | 2 +- .../ContentWithPropertyEditors.spec.ts | 24 --- .../Content/ContentWithRadiobox.spec.ts | 2 +- .../Content/ContentWithTextarea.spec.ts | 104 +++++++++++++ .../Content/ContentWithTextstring.spec.ts | 104 +++++++++++++ .../Content/ContentWithTrueFalse.spec.ts | 142 ++++++++++++++++++ 12 files changed, 367 insertions(+), 41 deletions(-) create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextarea.spec.ts create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextstring.spec.ts create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json index c5e0c9f020..0ba065d409 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json @@ -7,8 +7,8 @@ "name": "acceptancetest", "hasInstallScript": true, "dependencies": { - "@umbraco/json-models-builders": "^2.0.15", - "@umbraco/playwright-testhelpers": "^2.0.0-beta.74", + "@umbraco/json-models-builders": "^2.0.17", + "@umbraco/playwright-testhelpers": "^2.0.0-beta.76", "camelize": "^1.0.0", "dotenv": "^16.3.1", "faker": "^4.1.0", @@ -132,19 +132,19 @@ } }, "node_modules/@umbraco/json-models-builders": { - "version": "2.0.15", - "resolved": "https://registry.npmjs.org/@umbraco/json-models-builders/-/json-models-builders-2.0.15.tgz", - "integrity": "sha512-+YT/9wr6zu2+agCLDw12ZPiqLpa2BT5/q90Lh5TZAlrhRRpGITDxMFkFMu1+7Z9bsmxHC/9VN+phN+sinF9BGQ==", + "version": "2.0.17", + "resolved": "https://registry.npmjs.org/@umbraco/json-models-builders/-/json-models-builders-2.0.17.tgz", + "integrity": "sha512-i7uuojDjWuXkch9XkEClGtlKJ0Lw3BTGpp4qKaUM+btb7g1sn1Gi50+f+478cJvLG6+q6rmQDZCIXqrTU6Ryhg==", "dependencies": { "camelize": "^1.0.1" } }, "node_modules/@umbraco/playwright-testhelpers": { - "version": "2.0.0-beta.74", - "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-2.0.0-beta.74.tgz", - "integrity": "sha512-TgmASLfTCyEMqGDVi3ky9S2gKR33wjcTjZpNIWcNGBSJAsmBQWaJur+3/iMlIVH1oO4hMuYpDvjLuaXZCbFRCw==", + "version": "2.0.0-beta.76", + "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-2.0.0-beta.76.tgz", + "integrity": "sha512-wXAG70dqFvzCL0XWd+/8dhDoNtWvGzBmOfg5HAkwxHkQ0YvloeZSVPBd2Ji2WWRtFiK07CAvCKibnbCOeBkYVg==", "dependencies": { - "@umbraco/json-models-builders": "2.0.15", + "@umbraco/json-models-builders": "2.0.17", "node-fetch": "^2.6.7" } }, diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json index 45244d8ff1..fbe8c18ec4 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package.json @@ -21,8 +21,8 @@ "wait-on": "^7.2.0" }, "dependencies": { - "@umbraco/json-models-builders": "^2.0.15", - "@umbraco/playwright-testhelpers": "^2.0.0-beta.74", + "@umbraco/json-models-builders": "^2.0.17", + "@umbraco/playwright-testhelpers": "^2.0.0-beta.76", "camelize": "^1.0.0", "dotenv": "^16.3.1", "faker": "^4.1.0", diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentInfoTab.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentInfoTab.spec.ts index b2cbeb9c6e..ce295aa912 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentInfoTab.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentInfoTab.spec.ts @@ -1,4 +1,4 @@ -import { expect } from '@playwright/test'; +import {expect} from '@playwright/test'; import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; let documentTypeId = ''; diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCheckboxList.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCheckboxList.spec.ts index 6435272481..981d586148 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCheckboxList.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCheckboxList.spec.ts @@ -1,4 +1,4 @@ -import { ConstantHelper, test, AliasHelper } from '@umbraco/playwright-testhelpers'; +import {ConstantHelper, test, AliasHelper} from '@umbraco/playwright-testhelpers'; import {expect} from "@playwright/test"; const contentName = 'TestContent'; diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDropdown.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDropdown.spec.ts index 07343cfaa1..8994e9f026 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDropdown.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDropdown.spec.ts @@ -1,4 +1,4 @@ -import { ConstantHelper, test, AliasHelper } from '@umbraco/playwright-testhelpers'; +import {ConstantHelper, test, AliasHelper} from '@umbraco/playwright-testhelpers'; import {expect} from "@playwright/test"; const contentName = 'TestContent'; diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMediaPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMediaPicker.spec.ts index b8cb9f4c66..5d66cc6d91 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMediaPicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMediaPicker.spec.ts @@ -1,4 +1,4 @@ -import { ConstantHelper, test, AliasHelper } from '@umbraco/playwright-testhelpers'; +import {ConstantHelper, test, AliasHelper} from '@umbraco/playwright-testhelpers'; import {expect} from "@playwright/test"; const dataTypeName = 'Media Picker'; diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleMediaPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleMediaPicker.spec.ts index 0093866fdd..0ccae1f89b 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleMediaPicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleMediaPicker.spec.ts @@ -1,4 +1,4 @@ -import { ConstantHelper, test, AliasHelper } from '@umbraco/playwright-testhelpers'; +import {ConstantHelper, test, AliasHelper} from '@umbraco/playwright-testhelpers'; import {expect} from "@playwright/test"; const dataTypeName = 'Multiple Media Picker'; diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithPropertyEditors.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithPropertyEditors.spec.ts index 2ae61af845..074a4840f0 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithPropertyEditors.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithPropertyEditors.spec.ts @@ -47,30 +47,6 @@ test('can create content with the Rich Text Editor datatype', {tag: '@smoke'}, a expect(contentData.values[0].value).toEqual(expectedContentValue); }); -test('can create content with the text area datatype', async ({umbracoApi, umbracoUi}) => { - // Arrange - const dataTypeName = 'Textarea'; - const contentText = 'This is Textarea content!'; - const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); - await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); - await umbracoUi.goToBackOffice(); - await umbracoUi.content.goToSection(ConstantHelper.sections.content); - - // Act - await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); - await umbracoUi.content.chooseDocumentType(documentTypeName); - await umbracoUi.content.enterContentName(contentName); - await umbracoUi.content.enterTextArea(contentText); - await umbracoUi.content.clickSaveAndPublishButton(); - - // Assert - await umbracoUi.content.doesSuccessNotificationsHaveCount(2); - expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); - const contentData = await umbracoApi.document.getByName(contentName); - expect(contentData.values[0].value).toEqual(contentText); -}); - // TODO: Remove skip when the front-end is ready. Currently it returns error when publishing a content test.skip('can create content with the upload file datatype', async ({umbracoApi, umbracoUi}) => { // Arrange diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithRadiobox.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithRadiobox.spec.ts index 04fb322806..195483125b 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithRadiobox.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithRadiobox.spec.ts @@ -1,4 +1,4 @@ -import { ConstantHelper, test, AliasHelper } from '@umbraco/playwright-testhelpers'; +import {ConstantHelper, test, AliasHelper} from '@umbraco/playwright-testhelpers'; import {expect} from "@playwright/test"; const contentName = 'TestContent'; diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextarea.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextarea.spec.ts new file mode 100644 index 0000000000..243713d8df --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextarea.spec.ts @@ -0,0 +1,104 @@ +import {ConstantHelper, test, AliasHelper} from '@umbraco/playwright-testhelpers'; +import {expect} from "@playwright/test"; + +const contentName = 'TestContent'; +const documentTypeName = 'TestDocumentTypeForContent'; +const dataTypeName = 'Textarea'; +const text = 'This is the content with textarea'; +const customDataTypeName = 'Custom Textarea'; + +test.beforeEach(async ({umbracoApi, umbracoUi}) => { + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoUi.goToBackOffice(); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); +}); + +test('can create content with the textarea data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Draft'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.clickActionsMenuAtRoot(); + await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.chooseDocumentType(documentTypeName); + await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +test('can publish content with the textarea data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Published'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickSaveAndPublishButton(); + + // Assert + await umbracoUi.content.doesSuccessNotificationsHaveCount(2); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +test('can input text into the textarea', async ({umbracoApi, umbracoUi}) => { + // Arrange + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.enterTextArea(text); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value).toEqual(text); +}); + +test('cannot input the text that exceeds the allowed amount of characters', async ({umbracoApi, umbracoUi}) => { + // Arrange + const maxChars = 100; + const textExceedMaxChars = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam mattis porttitor orci id cursus. Nulla'; + const warningMessage = 'This field exceeds the allowed amount of characters'; + const dataTypeId = await umbracoApi.dataType.createTextareaDataType(customDataTypeName, maxChars); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, dataTypeId); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.enterTextArea(textExceedMaxChars); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isTextWithExactNameVisible(warningMessage); + await umbracoUi.content.isSuccessNotificationVisible(); + + // Clean + await umbracoApi.dataType.ensureNameNotExists(customDataTypeName); +}); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextstring.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextstring.spec.ts new file mode 100644 index 0000000000..f834ae35de --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextstring.spec.ts @@ -0,0 +1,104 @@ +import {ConstantHelper, test, AliasHelper} from '@umbraco/playwright-testhelpers'; +import {expect} from "@playwright/test"; + +const contentName = 'TestContent'; +const documentTypeName = 'TestDocumentTypeForContent'; +const dataTypeName = 'Textstring'; +const text = 'This is the content with textstring'; +const customDataTypeName = 'Custom Textstring'; + +test.beforeEach(async ({umbracoApi, umbracoUi}) => { + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoUi.goToBackOffice(); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); +}); + +test('can create content with the textstring data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Draft'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.clickActionsMenuAtRoot(); + await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.chooseDocumentType(documentTypeName); + await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +test('can publish content with the textstring data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Published'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickSaveAndPublishButton(); + + // Assert + await umbracoUi.content.doesSuccessNotificationsHaveCount(2); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +test('can input text into the textstring', async ({umbracoApi, umbracoUi}) => { + // Arrange + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.enterTextstring(text); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value).toEqual(text); +}); + +test('cannot input the text that exceeds the allowed amount of characters', async ({umbracoApi, umbracoUi}) => { + // Arrange + const maxChars = 20; + const textExceedMaxChars = 'Lorem ipsum dolor sit'; + const warningMessage = 'This field exceeds the allowed amount of characters'; + const dataTypeId = await umbracoApi.dataType.createTextstringDataType(customDataTypeName, maxChars); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, dataTypeId); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.enterTextstring(textExceedMaxChars); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isTextWithExactNameVisible(warningMessage); + await umbracoUi.content.isSuccessNotificationVisible(); + + // Clean + await umbracoApi.dataType.ensureNameNotExists(customDataTypeName); +}); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts new file mode 100644 index 0000000000..479176b401 --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts @@ -0,0 +1,142 @@ +import {ConstantHelper, test, AliasHelper} from '@umbraco/playwright-testhelpers'; +import {expect} from "@playwright/test"; + +const contentName = 'TestContent'; +const documentTypeName = 'TestDocumentTypeForContent'; +const dataTypeName = 'True/false'; +const customDataTypeName = 'Custom Truefalse'; + +test.beforeEach(async ({umbracoApi}) => { + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); + await umbracoApi.document.ensureNameNotExists(contentName); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); +}); + +test('can create content with the true/false data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Draft'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.clickActionsMenuAtRoot(); + await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.chooseDocumentType(documentTypeName); + await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +test('can publish content with the true/false data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Published'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickSaveAndPublishButton(); + + // Assert + await umbracoUi.content.doesSuccessNotificationsHaveCount(2); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +test('can toggle the true/false value in the content ', async ({umbracoApi, umbracoUi}) => { + // Arrange + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickToggleButton(); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values[0].alias).toEqual('truefalse'); + expect(contentData.values[0].value).toEqual(true); +}); + +test('can toggle the true/false value with the initial state enabled', async ({umbracoApi, umbracoUi}) => { + // Arrange + const dataTypeId = await umbracoApi.dataType.createTrueFalseDataTypeWithInitialState(customDataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, dataTypeId); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickToggleButton(); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(customDataTypeName)); + expect(contentData.values[0].value).toEqual(false); +}); + +test('can show the label on for the true/false in the content ', async ({umbracoApi, umbracoUi}) => { + // Arrange + const labelOn = 'Test Label On'; + const dataTypeId = await umbracoApi.dataType.createTrueFalseDataTypeWithLabelOn(customDataTypeName, labelOn); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, dataTypeId); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickToggleButton(); + + // Assert + await umbracoUi.content.doesToggleHaveLabel(labelOn); + + // Clean + await umbracoApi.dataType.ensureNameNotExists(customDataTypeName); +}); + +test('can show the label off for the true/false in the content ', async ({umbracoApi, umbracoUi}) => { + // Arrange + const labelOff = 'Test Label Off'; + const dataTypeId = await umbracoApi.dataType.createTrueFalseDataTypeWithLabelOff(customDataTypeName, labelOff); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, dataTypeId); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + + // Assert + await umbracoUi.content.doesToggleHaveLabel(labelOff); + + // Clean + await umbracoApi.dataType.ensureNameNotExists(customDataTypeName); +}); \ No newline at end of file From 8eeac2774b30c3b722d990d01bec937f751e8baa Mon Sep 17 00:00:00 2001 From: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com> Date: Fri, 23 Aug 2024 15:17:30 +0700 Subject: [PATCH 27/90] V14 Added the Content tests with Upload Article, Upload Audio and Upload File data type (#16945) * Added the test files for article * Added Content tests with Upload Article datatype * Added the audio test files * Fix format * Updated the Content tests with Upload Article * Added Content tests with Upload Audio * Added Content tests with Upload File * Bumped version * Make all Content tests run in the pipeline * Cleaned code * Make the smoke tests run in the pipeline --- .../fixtures/mediaLibrary/ArticleDOC.doc | Bin 0 -> 29184 bytes .../fixtures/mediaLibrary/ArticleDOCX.docx | Bin 0 -> 13184 bytes .../fixtures/mediaLibrary/AudioOGA.oga | Bin 0 -> 115805 bytes .../fixtures/mediaLibrary/AudioOPUS.opus | Bin 0 -> 35574 bytes .../fixtures/mediaLibrary/AudioWEBA.weba | Bin 0 -> 29074 bytes .../Content/ContentInfoTab.spec.ts | 10 +- .../Content/ContentWithUploadArticle.spec.ts | 112 +++++++++++++++++ .../Content/ContentWithUploadAudio.spec.ts | 113 ++++++++++++++++++ .../Content/ContentWithUploadFile.spec.ts | 111 +++++++++++++++++ 9 files changed, 341 insertions(+), 5 deletions(-) create mode 100644 tests/Umbraco.Tests.AcceptanceTest/fixtures/mediaLibrary/ArticleDOC.doc create mode 100644 tests/Umbraco.Tests.AcceptanceTest/fixtures/mediaLibrary/ArticleDOCX.docx create mode 100644 tests/Umbraco.Tests.AcceptanceTest/fixtures/mediaLibrary/AudioOGA.oga create mode 100644 tests/Umbraco.Tests.AcceptanceTest/fixtures/mediaLibrary/AudioOPUS.opus create mode 100644 tests/Umbraco.Tests.AcceptanceTest/fixtures/mediaLibrary/AudioWEBA.weba create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadArticle.spec.ts create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadAudio.spec.ts create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadFile.spec.ts diff --git a/tests/Umbraco.Tests.AcceptanceTest/fixtures/mediaLibrary/ArticleDOC.doc b/tests/Umbraco.Tests.AcceptanceTest/fixtures/mediaLibrary/ArticleDOC.doc new file mode 100644 index 0000000000000000000000000000000000000000..9232c5f1fdcf2bf352de98307ac8a8ef6432e6f4 GIT binary patch literal 29184 zcmeHQ30#fa+FyI`W=)bbsa=w2E)8goR5VD)6kGG022va$5)S1Y^AwekA>%R2JftI$ zDTj*O2o;%!{XNgSdmDCb+;h+O-E+UYSHI_7^Z$9)^R9WVcUO9?Yvty>s#S!~*bx@_ z%9SKyZNeGg?oa#W39$q>hJEF7xfpB?1Wuv(57NN%ywfCzNQw~Bpl}LbA|dc*!AKAy z4J1pZgii?%4GRsULfbtgMU;q`EW@Ehfr%aetm-Ccth z_bpqI&JH%d1oZZ8&exfZ5?eq#+H`!CCLyse1`Qd)P5jh7KRttQR^T z9UlwfSa0`&Z2~sdKQwf@8Bh$rz>ra{wjYPjMl*0f5X+6_6Eg$WtZ92aon@-1X z)AfAB_S1T%{eo;7mwu1@_V?oX)Bja|`h5wKTTnPH?>}n`!o$9K zEOek1>Vyo0S}#fz;E5xO(ER;1FgzwMD2g2x8=n{@^Y@olDB)kO0hr@4fVwo#_ddUA z{L5Jg0soyE5K{`hpd0~n-0q>fBD9GT^&}9AJ{CRC|MKq?QONt>p#hwsG7N}mW++3m zu+*4cSZS+Om@TRe)GISvR0pVcAt5~qOPR_*(wU{WoDmwK280?AYCxy~p$3E+5NbfE z0igzj8W3tgr~#n{gc=ZPK&XNLC=FcrVynGADfQkWcYBQA|O1;!c%VUj6;Cr9vLDw9YOSGa@5A%P@}M3WH0 zCZ>Sc4bq9~FvN5i-Eu=2in-pzL6;CM;?xfq=z;JeAUpx#MTkGx90-dIl^e<-fX$?N zsK^WCVMg&_w(!UX>5&J6=E3fS2b<30je-YacuoVPi<4w$Nkdnss2Kn_seirFLEG6cEnovCxCFUS{vu1qYb_OE* z0CG2h$QBf`Xa{5w(iNpf*fyAca7UDuR#6}(-WBZzDQRi-Kw1LQigqsT*s)^?NGaYT zZFhmlRur;$2V^mRX(>!!nAxDTzMugmftc2SDF-Qe(()t~?_AP8efnT4k)%+em8kR( zh&q5mm28J9!7n9+H<&oGUvW2+!9=?GR)##>xf=|vBpBLBBDA^$XeHj@jspszp0Okp z!d#$bMnfzbA81dnx%=^LH=~${Nkhpw&_W^si_O=L)kzN=a{J$c7b?YyE)5{PTw4)NJ%9o5XZ6|PNz~)Es7`A2udn(foN9k(D)9A9Eb_ZRXi6iznup}tVl6R0+X{e&`6 z2yB2YWTC*3eS0U1VWdAvd;*Y`8PqirTi`ejm+~xYNCl zyc&g82z}Q`=qILtl&zAA5>+Av<6BRVPp z=a*`ezpX4Cb32gzz`dH`K+R!L+ia$6OK;U#KZ^2b5dXANCcaNttr1Zz=*JkYEePHW zdE!R(v_bHUr+U*NFeAcVm;-+739)YQMq;WY)Z8SN9HcZ63rJd2Nh%pK9gx~;Mjz@E zZw3^~@Vp>_C?X6g;@#?;m^PW^57a?-6h~fN>&nEs#%|`Q@C}XvbxEOl6LHXl78B|Q z%m-1IgxR$Nnh!Nn1wns~+6kcEuoAJ5m@`mfj>AGxta}sijFkstET_4B+ML-+Oj93*-_ zoqKWV#Vs?7F0Ii~x_oC}{-{syhL`y|ZDT7%8r(I1w{g&;xD%S<2hXlvpYOism6N_s zo!Zcec@M3;?(Q0$F-KL|hLb0^y6Nc2<9b%X%g6lEe}BmFqIHtRG!=zFosQRM^wc_GQh7)jHLg2aeiXdhT?0mYBD{X!*_O z+djBlR&p}Ba-`22qg?%r%_U>c_#B?@N?r86d73t_7mJ~=gL zW5)A}TVo@S|FLx6(wUb2S3OU26(_&3ukCi@>g@5eK_gr)%-GxMEALkRKZ-z4mQYP` ze4Z2+6d7-9gwM2P*TT=5NT=7&KQZt6tPy2rm3vP!&dYQ*&Y4B3^k#=@t5vAgRd`(# zlR74mmRtXByY1KAi$7HT`VY3!+8ttNtDWtOL#w9Qo|--P^8DQV-V)=JVi)A3R2-ai z-1~ZtO^K;mp6el#6$)|-?|L2g+3gf~{jz+S`;dzMQ*>tMXHA`STXXeBl}gLuH{K}u z+_sv$d)cxM@rhLW81$jN3dtIMJMtpg61{(pNpC&a&kls%CATo_W_Q;F#W! zDf^0dAA3uj*Q+{S%r4thal7WxJgeUyDweMsCNtJxy|~Pxpc12nzctJ>$XDBT&sF`r zL1fj%?oXa3DPKPDbGL_Xm*Pjv>Q$aOf7ii3*tZVqmuuA<{NaB@C){@N&@r_)-u0~> zQm3yg#kB5R_%o@e3#woz0`K_au2LJZc||Zqv7e7EiB_|cKiQ*pkipvre#@ionrVx# z?0wPWbGoZr)+4_y)579cby>bIXMEQBF+KgpeN7&B1fA?dg zg>>%R1L8~ab2Vf$r0aLh{&;z!-$+w8*VI?rC(KJ$)?cy9(BP7h(Y)hl&6ii7u`00z?i{;rlqZZT!)EF*UwS9T==HkKQ3v`#J zoqoHtSXC=M?w5>85kK2=vywj_aNfAxWHP(^gKg=(U-vND`EX+D!7TZa@qva%3}0I< zSCed7svqptwWrd$mE%^F=f!P)NLH^se{l4h*_*GC?27ZhJed%=p{6E0?4a41aoL~q zhfa^mJ6>CD_+_#A`r?D(Ir|>hT4hh*mPwyHFe<`gRnOy$n)fv-pIx?>Z8IF0#JbX0 zuJYL@A|S6Uu0c%Ee67Z{Ed}}o1?63jrZx?zczY(IJUlFKz+5kHWtkxfPYplXjCwuA za856yL-N^kq!m3_7FS(0k1C&6TT^Wo>a)gFd4Z!?-&Kbv?D(}61Cp(R`GgX7;Vpx$95ON_qRa@4N?UOqSek z#|eY%x~>kNS@daMuk_eKN~|Has+t!vSodqzTO4i}SGD;;u~~dbrpwoo^F^J_syhx#21EyxZk0h@%>*b%UZnTqD)UjL9({*)J zLr?F$%K}sMj#}>S-934r_7d@38d+t1_8T`GUwK258EmzuV)|W^saa0f12+BMv+}-+ z<%h;#X}2e54~3~#+__d`xT zJBU@)STpO)hWAl&V>K5Vmq#u<=eAdEZgNhJ>B9A;546%w_id7p)R_H}Q(Czu;I-sa zans-xQPo{`idSCPandv6oWGlu)&3cA>F#|3D|D*k-#?elSGXo$CUVZEB&9a7;>j-O zIdVDaXYA@UDvE3u*|IMzzODC3A<^%&?U*`8X-~$D+hv-2oU7i~n_W}3TQyYn=V3Oh z^qhAa%**&=<%jI3fko?ObQw1os?Xn-87{JZxoKf-b@(|k|05?qm3rP!{Uhr}lTQB= z*{qNC12vx;|2{jZM)LH!r_(+!+Tfdb-Y&$y-`$PRqMuZ4O zth+N4E3V(4*1w8-GH1;@n}=^rUmyLs!cOEy>;1|14ehsYa5;Ho|rms z3VeAr-%BN;K&#iFvL&;0PL?zsiXBnBW=5aB!Kq`H*e9+zE2BO^r|6Q%+ydimiz-Y5 zt=0Oak8{%*x}%p$;DqW+mkd%8BW%=kjvZgMY+y;`_Fu=0mJHwLKkmZjktdf1^jncr zpr13O;C9B^hD9>fDy}b61iYnF`6_)65ORHIxd*eYrEre5*tF z{4ouQgNjx)B_BSXD_ON^4<*)Lv4yri<6@{Aedrzh-eycvy=r6Kyn{NL*~coT*7vs#WHm~doLf2O%Dq(EevQSB1AYr$ zR-Ip{o#jy-v%}=)<)^+FUODG|Qr2KG$9Kf@z>Q};Z2Q)(E;u80tGxDVsCThWj#HBI zQ)Yx(`Sz_to?aPnb=T1zUBZgTy2bmLZ`iq|V5|M&0fUwl7yW9uXUt>6(E;58JooF* z+;}v9WOUT}x~(76wzy}X?(%8ko~H3Pb=M8J+5geq{yXE}hL-Q@`H1E3@WO1!nJXX5 z_ulJ!th>dTV?B-h3tr{iPqxa!$s?m#KZjCS=4NxmpCiCaUEmkd7Tqe37Y3ZvNooZS+Do7_5l17zt-F)pwBkbK>m#U z6RFmWDlo(BFf(bRetsnWSxqa_tDC1M8;}d3u#GXPKTJ&Y5LP4{pk=3I>dqwv7|#Rwb`MOVbKv#BDA#G!7-7p zya3vzZET0y!%cnI;e*e+n?I$7^%;H;E{XxoZd5va(%mo|!-!Y|9^f(I*Z|%>EOJ{3 z{k=$+2E<%&8Xn|4^>iQ_jd-fS`%s%pQd3jOJNy7$jxZaRLxen$Xux$L1qQ%!gwLUE)Cxw5lTomQjsS`w)8UDs$cQ$)R6HFrX-&ckns(zm8mf^A zP)w#6OH@RZ$r9ljk;?H&qzH?MhGGOZZa_uBVm+SV)^HH;W5ecg40X^G4e=I$0|zFe z3?@Tdj48^~0ZQ9yQqeh*%z!*oAZH}_%#A4SUBpC~XasV1gzbVb*gR>?gIGM1&ZJHc zX)oD?ssZB&8!idJ2RB=sDLzy%_4s}sHf*WmMold60#q*3jl65-k>?Dmm?kghKPf8psyS7Civlk8|e4nY7P@nnwCp3{@$30K?{W z#rGsZKI0xh=SIT88zUqe;FmBYb-?`?`VIIXe6}E>HrOBy9#(cVTG;FG8F|2lwP2$Yt~RiKkJ+X}GhiQBWh16fa~+lhqNUZTOxhQ1;c+Rl%q z;)51?|2`V{3PXhyuWxH76jqAL`I}yS@CubL$dVxXefHnQ_LB+`UBSlqOdxCktAXHv zkmLekjVuJhDtHwLho3t@I95Cc!lA1P2!|ed0Ksaf4mQr%Y{13=&=qVvT=WGS$H~cH z<1fcxXDSbNEZDd=oCG%V$3}#sIPylr@5W!(a7~Pf4qIMTfF|@%L=_)3wcy za(d$Q4n`wP_dN`3pqNe>$RjKuE+#%EIDzdI92^!9#2yn97YN}FK*Z&2FSH!+5orB8 z{!&O=H|i0JMd_2av9V&f&-U{NcpK&b5U%%+10nWhpw8Cy-(DNbw`}Ion_K+01~5mtk*Moy$OISd zD70@_LS#_OvKs<~MyLUy280?AYCxy~p$3E+5NbfE0igzj8W3tgsDb}K8o;$ME`xDx zjpyIEj>qLNp4a35^}%y`Je$Y0G_K8YosMVnxbDYzT<7B%KCb8Sj2!<{39jjJ-H&JC zDnP10YC!5hJ%Mn^4Ijb~HjoyOHV|UzfZZEN7YOf4=>hcx>Ia1J24EWk837ps;eG`E zQUIR4WBeB&{B|APG=WoSzM%oU-iO~{vdIv*>XQH$+VC3Oj~gW-%Anz~4v9%(Z6c(I zdcx=EZ4CXNQSgiX)aLNP)WtbYn^gat6Yj3G@JBg*Bsbpepf4?&!bK+fd-xy8%b!LT z_%k37+su#h$2~CmzjurQ?Z?3{UknC20Ipc!^-KEueSTh@`Bi~GY8>0`kMgH*PzW%h z)OWp6)D=&B_xMd~FeMZIx(9wej90(}8@)fF|6T~!!k@q7_}%i4%VQ1vvERb7qY*4= zYm7cRoB1=~7Xt8tYb^1C>zv`OiGI+f0KF%VGw=C>+2Ec3b>`3Tr@3R@#lBK#{yR0m zfVaa2ZnWNI!%J-J0ak|ad4oB7a7;jA6nwHk%?&(8VjKifjSAgHbi9!@ RX&SI^DqY)z_TNnd{{y-WfUE!j literal 0 HcmV?d00001 diff --git a/tests/Umbraco.Tests.AcceptanceTest/fixtures/mediaLibrary/ArticleDOCX.docx b/tests/Umbraco.Tests.AcceptanceTest/fixtures/mediaLibrary/ArticleDOCX.docx new file mode 100644 index 0000000000000000000000000000000000000000..afbc888bc8e5616629935ca6593dade7a59f81fc GIT binary patch literal 13184 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�k|8np2qM~r9!G7twLT1cH`Ya!rKJ1i^ohZs+DKbtayvoq#7D2z$vA~blEGy)z32xRu}aIAPdy6fm5@h*kKf0YO1^w4EP9;pas-C+n)af9mg)9& zajM~Q5z?}E^FAl)!kU{;*y0`ofhDyY0IRA1v`YUg_wHaW@GC?kx8GE)R=m@eh(jrQ zFnOC=)rP@wJh%5)oS+xp=1RTSx~QppmM@Df>7#|I_MbvRl~gN{r+UQ(R8!FyTklU_ zxn6TTD!q=_w&;O0T(LRGVAHh^OrUW4;@<*3*D8NxIu3ShLaplA(h_nfyc!BGD9W$7 zgpT*~v;IMA6dpg=AYA+-9>P#NY;exUfRC#>=a`~DLp!J=!71Cuyztzw%PJvfJl=k= z1ppqkel~1x(9LBI4feKvtjD6c?JpXLBp5uw{G!PMIzAVqy5U!=_?C=S zpXUam<{0ufj3()+lh&0{I&miB5O?(kCQMu((Bw?a#g!LmZc8S&x4=TsRXPoc86#Z2 zAo4kF_Me~wQ0CAqaD^#`C`}_)4GDPwzJVDaH@H|41oazdb+FlvraKV-1V#SVo>HgK zq=QAQPUfc|f*4GVFda9psK1^*rl?VGo#f7T$7BfB>)>Ins=XDnX}Dl01)AmC*4i7` zx|RZ+cl{I_2IEE@ey5&mS=65BjkynlUJ#uI2*sNpynBxnwgR?qJ(o`9?;1|Ae~@^1+Zpn9rh*YzT5CvHd`{*I>juj{&kUsSrZ*?`!Z^K`)=Y*$ zmMXYLe=RqTzLR3RKIFFq*wPB>HWWOT0)7^|OL0%Aq~W5T)Y8BDeUUD;@2E;Wr}f*# z1Hpz=Pif&GNVO{x!Hc+9AJVQaaD@p~){Gc2@wWxG;BEA+4CNhfh(Y06HJ>(+?pGKA zH?Gvw-bBA*OC5B!&i@{{_V<9_*qz09zOtvfTSITTngt-yx-fT#GlKC(w849bUegMZ z*uD0+6?|bI>@3DiKzN&K_=l&pI$uLuwD{j_x|9d;gsV`-%Pp;VPvZj zf&iIIV9=qb(+IV z{aDp0-&^IDj}z(px8Gpy;PjvW+b$G@GP&>DV9r6W1&sWPgQ>a^4vpy73+0(Fv%Z{{ zf*0cN(M-4a)L8kZ4^4p7y{helZ*wYOZo>AJV(dH!{p3RY*=ssu6Gh0$H$1C?0X-Oh zYZRB4U+Rp{w7{y7So9B6ZjO6`zF^`u*z;7J7y5R&)|h{dWg7^YrBk`a`DDG~#fIK7 z+_XTBSl;edz{+Dx7zkRonUI=89{W+t9_CCNqC6YYO}A7(^=g?SlVyWQ0{yB2tpfjf z_JLrAQ^V6YpMEMc-<+;2{t(kA1INT8o%nJDzd!3{&qN)lxqj^f4M4vR(CB}UHQu~4 z`>{7U!B9X^L?(taryhU<&ER3pl zE5i+FVvsz(u&|T_IjuOyw$i}x#9#sIZbd$44PJVapMlA)yw`1cZ+w^6CwBr<>yoV` zo!4xK+KvD0z1Dj&OoABMjBweT z72sm@iuTpBGVz2=tT_8E?sVP|=FNwZ1Q`s8MR5tkLyZI2Alg;rjV%^Qa*AWsDuvJb z|E_DuH8>)TtYk{2iBTx|zxmxhMFek9$nEbfJ(#HonhjIr80Rr!QWb;fG=AW;^k}x} zT(kd8@C%_~*^+kZK9H)1~xDL<>L z*s-bgpSAal0GrSxpjw;0N|S{`Mf*lUTa2Mn*^LQSV?5heL9Zwev$P$0Nil3twU0Y_ z6pLZ>@>ZFhxV!7bF4Df({%T3O147gp{wes+J7!g{?jt$Bo*V56wTp+EUA#`2Oc$g+ zvCfZ|K|*BX0rpDS;}sD~Nx{l$CBMNg60}%8HBFd_5U3^-XX~4`P1oz$(a4VirGYAu zv0^(H-)qF=0MD@6@M@1M7H7_dU8RjD`wVtMei_@`{CRuS;?&c&`*~Tz;V0kYG@v_l zK}IUgsH@kxiyS$Er44+AbZ#?*%cvma;)xV}6npa;a%mI9H-KWd1QAfo`d>%3GBdd| zNS?En%i)9U>_#jTrb+$6&@`iy50ibd+6C4DB2yviqA z4&c6XMeoWLv!_@|Twe4|m+`=J2BH&lWgjsb*l5a#u;>3M75lp{N^PwMSZm=9*16ih z$u>q5G^SY%1S_0@K!haUc(oJ|f382TaW#lvCJn4g#}902gSJ663*$YmkF+(A#*AXhIxSDzl}X?8O51}O$KdSP8*tfG?Fn5RBL4P zfS*D`*XtL67tA33mzPDHZm!)*T(ohS;PKDqYC}LW%{hz8J*E94oK#39n0g@HQARPV zXJ8~HsMo$a$O-2@eQ&WrY{h5Z_H`NCNpIr-zgO>Fl$mO{GMu4+!w)4;6D3x)==&SeUoOfUj2}2G22qI-eHK*GjQbOKaLT+i*&jk2? z>9Q>UH|h4jbXl+;t(OP`qY-C$P31_(KzmJVYg6}l8Q^SYvTOLfXJ~e15pewm0NPm{ z?{BK^YN=|gN&z$uP5}l1Et{Lu9UVUd3?*oX0F(uol3B?mMSa*xnBJY8UZmMI!s$5I zVNx+`Y481_%-0TK{)kRKIeUo@5oh`e6`$C&Ss<&SNj=f+&OU6!fVTIk@XKHvRZ`&5)k zp~$*{M)|*K{|Kqd-mDKVF%P4<_yY7}rEelD%wB^a1~)0Vp)i zC71hUFP12mC`$klsCl8@0IW5~7X=WAw?lBHZ5l87-E}~Rn_S*{OF?Yq%KSc&pm5wBHEOtF? zZt%G#RVGY0&L_n&!@}k%POWP%esn4ZP#@j}+4~kE>}R~POXY0ImL@y>Lv>cpGGI&E zmP`O>=D#NWDJqRY_jw-J!=)_MfFTx8;TqXh*PjJx+ko{m^k>Ml5O@4y)LQufkRr_* zNheLeRbRpwl zwQijh+AImnTSFkt@t}D^m6(}!frKO11AR%rzF%{+CrH^RWDB;EzXQ$ukcdAB))@1B zqJ9D4sq8@-@S_5<1b0!kR7TS0 zfy%oGS}lziyH7j1!c3MqYA3ST{xDI|@VIlQV9eG@HRtCYE*N``cm;sO)S zakt2h>bIhtpqYG3z*b>m;&v>g?JhOC{?C(iKC^@vc^zm;DK?d-9ZO$)xD!x-H>usFxtGvW|EbdACTas*n z5C`slCh|sjCVUiS{jaaKX;e1VPN{x1WzT}m4b8CLL5*Bv5>a3g!q|}?r;$W)iNQJ< zDl1fFs8{x>*odq8LsLh(!L(;eq*+ak#lMu}8rlS5{B1oF5kmgzEMWc%qo!~QEn%I=@Xr?-K z+U3riRHl|ksUCR35<_8e$|fA^zDcm%Y=8=g8}OeDL9Q~DPIIL9)&vXG0qn>Uq{ysf zAmBhMDf?sDqv-4F1zPFBUJXG&JCPigP0d&x&j#&J_Q;h;Y^W}xP~nv&@g5d7zLKc}y_R!( zAN{)1GLOBbY+L7f);tED*o1v)Gj_xY_sQe_fYdYq&PHFrKTy!^HB{Vy(zGNkVH{ypL8pakd6MRy-j1*Ka%(M9ov9zq-rA2 zf}Yu=N+ut;_VzZSYdo5rb=R3P;fi}cT`{Xoul-Dr)bZpg1!9G6raW4fF*(J%j`|3_ zTL5MPWs7&YTApkULLas_Mr%%pSch`?Z@rt_RQ>e&+XF;6kK?Ff@t!+5=b-RZ`7Cw=jwQK2+=3}Yfod81-vw-Yg z=gPTAa#}F~Ux54I6Ys`vYOdZFoP3_JziKY?Tf)CwpzV32?ECkN`zhF11*v_h^ZOKv zi|>SMX%Yyn#Ipm2wz%vm(Y>0a;IEr3&!4epAP7vsq4I_)A+k~W92i?Wurg}OwlKR5 z5JIxt+6@?h0&D4i=U9Hcnm4f6;azM37+DFMo>?p$SCcDt2ha3sSNA=Ejk0Mxk!?=I zBW7T^{8(;{lX(tyq;96`>;WwK1(+x@8!){a`V^fhY@-!fNl)7cdtj7;A5`MGH;Is& zf$7CVQ0N`Wmm%UU?!m^faysxCbxv6t4gmrh%#sxCpkp#px!GJ=l8-q>ChV)|p%c*C zTs8~6$mL-^jQs%@-NHZ{Fk|NGE^4r1YAy$(~d1rCeO>3+&5lfR;18 zoYB)#-N`aDVSJ|&jppzGBMWXS4%E+M0Uxw}=3;&CZ4(|Bm>#Un&NmXRP;pdn3niI7 zXyTdvC!JRU{dUwp#{^Chs3wHJK~m>DH|qP}^*Rnh? zggzdfiVn(?;UBR!CtH#d^SPah^&qUL>~qq9nQ!=@B#Ek%qdJ(*6;(>G)tC?2zHr;m z9$)1#*EB$!@qd*@ELvoXSGe7V0-Vd`WG%0DtE32WR!MV3Bh~2&h>-AnzVK6`>^nDl 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 literal 0 HcmV?d00001 diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentInfoTab.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentInfoTab.spec.ts index ce295aa912..a680f656be 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentInfoTab.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentInfoTab.spec.ts @@ -67,7 +67,7 @@ test('can open document type', async ({umbracoApi, umbracoUi}) => { test('can open template', async ({umbracoApi, umbracoUi}) => { // Arrange - const templateName = "TestTemplateForContent"; + const templateName = 'TestTemplateForContent'; await umbracoApi.template.ensureNameNotExists(templateName); const templateId = await umbracoApi.template.createDefaultTemplate(templateName); documentTypeId = await umbracoApi.documentType.createDocumentTypeWithAllowedTemplate(documentTypeName, templateId, true); @@ -88,8 +88,8 @@ test('can open template', async ({umbracoApi, umbracoUi}) => { test('can change template', async ({umbracoApi, umbracoUi}) => { // Arrange - const firstTemplateName = "TestTemplateOneForContent"; - const secondTemplateName = "TestTemplateTwoForContent"; + const firstTemplateName = 'TestTemplateOneForContent'; + const secondTemplateName = 'TestTemplateTwoForContent'; await umbracoApi.template.ensureNameNotExists(firstTemplateName); await umbracoApi.template.ensureNameNotExists(secondTemplateName); const firstTemplateId = await umbracoApi.template.createDefaultTemplate(firstTemplateName); @@ -115,8 +115,8 @@ test('can change template', async ({umbracoApi, umbracoUi}) => { test('cannot change to a template that is not allowed in the document type', async ({umbracoApi, umbracoUi}) => { // Arrange - const firstTemplateName = "TestTemplateOneForContent"; - const secondTemplateName = "TestTemplateTwoForContent"; + const firstTemplateName = 'TestTemplateOneForContent'; + const secondTemplateName = 'TestTemplateTwoForContent'; await umbracoApi.template.ensureNameNotExists(firstTemplateName); await umbracoApi.template.ensureNameNotExists(secondTemplateName); const firstTemplateId = await umbracoApi.template.createDefaultTemplate(firstTemplateName); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadArticle.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadArticle.spec.ts new file mode 100644 index 0000000000..33c25bcd53 --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadArticle.spec.ts @@ -0,0 +1,112 @@ +import {ConstantHelper, test, AliasHelper} from '@umbraco/playwright-testhelpers'; +import {expect} from "@playwright/test"; + +const contentName = 'TestContent'; +const documentTypeName = 'TestDocumentTypeForContent'; +const dataTypeName = 'Upload Article'; +const uploadFilePath = './fixtures/mediaLibrary/'; + +test.beforeEach(async ({umbracoApi}) => { + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); + await umbracoApi.document.ensureNameNotExists(contentName); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); +}); + +test('can create content with the upload article data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Draft'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.clickActionsMenuAtRoot(); + await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.chooseDocumentType(documentTypeName); + await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +test('can publish content with the upload article data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Published'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickSaveAndPublishButton(); + + // Assert + await umbracoUi.content.doesSuccessNotificationsHaveCount(2); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +const uploadFiles = [ + {fileExtension: 'pdf', fileName: 'Article.pdf'}, + {fileExtension: 'docx', fileName: 'ArticleDOCX.docx'}, + {fileExtension: 'doc', fileName: 'ArticleDOC.doc'} +]; +for (const uploadFile of uploadFiles) { + test(`can upload an article with the ${uploadFile.fileExtension} extension in the content`, async ({umbracoApi, umbracoUi}) => { + // Arrange + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.uploadFile(uploadFilePath + uploadFile.fileName); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value.src).toContain(AliasHelper.toAlias(uploadFile.fileName)); + }); +} + +// TODO: Remove skip when the front-end is ready. Currently the uploaded file still displays after removing. +test.skip('can remove an article file in the content', async ({umbracoApi, umbracoUi}) => { + // Arrange + const uploadFileName = 'Article.pdf'; + const mimeType = 'application/pdf'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDocumentWithUploadFile(contentName, documentTypeId, dataTypeName, uploadFileName, mimeType); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickRemoveFilesButton(); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values).toEqual([]); +}); \ No newline at end of file diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadAudio.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadAudio.spec.ts new file mode 100644 index 0000000000..21114c52b5 --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadAudio.spec.ts @@ -0,0 +1,113 @@ +import {ConstantHelper, test, AliasHelper} from '@umbraco/playwright-testhelpers'; +import {expect} from "@playwright/test"; + +const contentName = 'TestContent'; +const documentTypeName = 'TestDocumentTypeForContent'; +const dataTypeName = 'Upload Audio'; +const uploadFilePath = './fixtures/mediaLibrary/'; + +test.beforeEach(async ({umbracoApi}) => { + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); + await umbracoApi.document.ensureNameNotExists(contentName); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); +}); + +test('can create content with the upload audio data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Draft'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.clickActionsMenuAtRoot(); + await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.chooseDocumentType(documentTypeName); + await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +test('can publish content with the upload audio data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Published'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickSaveAndPublishButton(); + + // Assert + await umbracoUi.content.doesSuccessNotificationsHaveCount(2); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +const uploadFiles = [ + {fileExtension: 'mp3', fileName: 'Audio.mp3'}, + {fileExtension: 'weba', fileName: 'AudioWEBA.weba'}, + {fileExtension: 'oga', fileName: 'AudioOGA.oga'}, + {fileExtension: 'opus', fileName: 'AudioOPUS.opus'} +]; +for (const uploadFile of uploadFiles) { + test(`can upload an audio with the ${uploadFile.fileExtension} extension in the content`, async ({umbracoApi, umbracoUi}) => { + // Arrange + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.uploadFile(uploadFilePath + uploadFile.fileName); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value.src).toContain(AliasHelper.toAlias(uploadFile.fileName)); + }); +} + +// TODO: Remove skip when the front-end is ready. Currently the uploaded file still displays after removing. +test.skip('can remove an audio file in the content', async ({umbracoApi, umbracoUi}) => { + // Arrange + const uploadFileName = 'Audio.mp3'; + const mineType = 'audio/mpeg'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDocumentWithUploadFile(contentName, documentTypeId, dataTypeName, uploadFileName, mineType); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickRemoveFilesButton(); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values).toEqual([]); +}); \ No newline at end of file diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadFile.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadFile.spec.ts new file mode 100644 index 0000000000..eec9b3febe --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadFile.spec.ts @@ -0,0 +1,111 @@ +import {ConstantHelper, test, AliasHelper} from '@umbraco/playwright-testhelpers'; +import {expect} from "@playwright/test"; + +const contentName = 'TestContent'; +const documentTypeName = 'TestDocumentTypeForContent'; +const dataTypeName = 'Upload File'; +const uploadFilePath = './fixtures/mediaLibrary/'; + +test.beforeEach(async ({umbracoApi}) => { + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); + await umbracoApi.document.ensureNameNotExists(contentName); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); +}); + +test('can create content with the upload file data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Draft'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.clickActionsMenuAtRoot(); + await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.chooseDocumentType(documentTypeName); + await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +test('can publish content with the upload file data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Published'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickSaveAndPublishButton(); + + // Assert + await umbracoUi.content.doesSuccessNotificationsHaveCount(2); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +const uploadFiles = [ + {fileExtension: 'txt', fileName: 'File.txt'}, + {fileExtension: 'png', fileName: 'Umbraco.png'} +]; +for (const uploadFile of uploadFiles) { + test(`can upload a file with the ${uploadFile.fileExtension} extension in the content`, async ({umbracoApi, umbracoUi}) => { + // Arrange + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.uploadFile(uploadFilePath + uploadFile.fileName); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value.src).toContain(AliasHelper.toAlias(uploadFile.fileName)); + }); +} + +// TODO: Remove skip when the front-end is ready. Currently the uploaded file still displays after removing. +test.skip('can remove a text file in the content', async ({umbracoApi, umbracoUi}) => { + // Arrange + const uploadFileName = 'File.txt'; + const mineType = 'text/plain'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDocumentWithUploadFile(contentName, documentTypeId, dataTypeName, uploadFileName, mineType); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickRemoveFilesButton(); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values).toEqual([]); +}); \ No newline at end of file From 17d441760d0d52417ea269d34b060e73f1db5cdb Mon Sep 17 00:00:00 2001 From: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com> Date: Fri, 23 Aug 2024 16:18:28 +0700 Subject: [PATCH 28/90] V14 QA Fixed the failing smoke tests (#16953) * Updated api tests for Data type due to test helper changes * Fixed Data Type tests due to test helper changes * Updated the test for edit password due to ui helper changes * Bumped version --- .../package-lock.json | 8 ++++---- .../Umbraco.Tests.AcceptanceTest/package.json | 2 +- .../ApiTesting/DataType/DataType.spec.ts | 11 ++++++----- .../DefaultConfig/DataType/DataType.spec.ts | 19 +++++++++---------- .../DefaultConfig/Members/Members.spec.ts | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json index 0ba065d409..4401900faf 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json @@ -8,7 +8,7 @@ "hasInstallScript": true, "dependencies": { "@umbraco/json-models-builders": "^2.0.17", - "@umbraco/playwright-testhelpers": "^2.0.0-beta.76", + "@umbraco/playwright-testhelpers": "^2.0.0-beta.77", "camelize": "^1.0.0", "dotenv": "^16.3.1", "faker": "^4.1.0", @@ -140,9 +140,9 @@ } }, "node_modules/@umbraco/playwright-testhelpers": { - "version": "2.0.0-beta.76", - "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-2.0.0-beta.76.tgz", - "integrity": "sha512-wXAG70dqFvzCL0XWd+/8dhDoNtWvGzBmOfg5HAkwxHkQ0YvloeZSVPBd2Ji2WWRtFiK07CAvCKibnbCOeBkYVg==", + "version": "2.0.0-beta.77", + "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-2.0.0-beta.77.tgz", + "integrity": "sha512-e0yNJ8CV9f7vlVC77ThC2gUSee323G6koTk/Jp8CUpkwKnN/oL73sGfeKLQdPoL4QPt+Cu8j7hrU0D89Zsu3fg==", "dependencies": { "@umbraco/json-models-builders": "2.0.17", "node-fetch": "^2.6.7" diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json index fbe8c18ec4..fd9c2ede9b 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@umbraco/json-models-builders": "^2.0.17", - "@umbraco/playwright-testhelpers": "^2.0.0-beta.76", + "@umbraco/playwright-testhelpers": "^2.0.0-beta.77", "camelize": "^1.0.0", "dotenv": "^16.3.1", "faker": "^4.1.0", diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/ApiTesting/DataType/DataType.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/ApiTesting/DataType/DataType.spec.ts index e5bbf36b89..2024224119 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/ApiTesting/DataType/DataType.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/ApiTesting/DataType/DataType.spec.ts @@ -9,6 +9,7 @@ test.describe('DataType tests', () => { const dataTypeName = 'TestDataType'; const folderName = 'TestDataTypeFolder'; const editorAlias = 'Umbraco.DateTime'; + const editorUiAlias = 'Umb.PropertyEditorUi.DatePicker'; const dataTypeData = [ { "alias": "tester", @@ -29,7 +30,7 @@ test.describe('DataType tests', () => { test('can create dataType', async ({umbracoApi}) => { // Act - dataTypeId = await umbracoApi.dataType.create(dataTypeName, editorAlias, dataTypeData); + dataTypeId = await umbracoApi.dataType.create(dataTypeName, editorAlias, editorUiAlias, dataTypeData); // Assert expect(umbracoApi.dataType.doesExist(dataTypeId)).toBeTruthy(); @@ -37,7 +38,7 @@ test.describe('DataType tests', () => { test('can update dataType', async ({umbracoApi}) => { // Arrange - dataTypeId = await umbracoApi.dataType.create(dataTypeName, editorAlias, []); + dataTypeId = await umbracoApi.dataType.create(dataTypeName, editorAlias, editorUiAlias, []); const dataType = await umbracoApi.dataType.get(dataTypeId); dataType.values = dataTypeData; @@ -52,7 +53,7 @@ test.describe('DataType tests', () => { test('can delete dataType', async ({umbracoApi}) => { // Arrange - dataTypeId = await umbracoApi.dataType.create(dataTypeName, editorAlias, dataTypeData); + dataTypeId = await umbracoApi.dataType.create(dataTypeName, editorAlias, editorUiAlias, dataTypeData); expect(await umbracoApi.dataType.doesExist(dataTypeId)).toBeTruthy(); // Act @@ -65,7 +66,7 @@ test.describe('DataType tests', () => { test('can move a dataType to a folder', async ({umbracoApi}) => { // Arrange await umbracoApi.dataType.ensureNameNotExists(folderName); - dataTypeId = await umbracoApi.dataType.create(dataTypeName, editorAlias, dataTypeData); + dataTypeId = await umbracoApi.dataType.create(dataTypeName, editorAlias, editorUiAlias, dataTypeData); expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy(); dataTypeFolderId = await umbracoApi.dataType.createFolder(folderName); expect(await umbracoApi.dataType.doesFolderExist(dataTypeFolderId)).toBeTruthy(); @@ -82,7 +83,7 @@ test.describe('DataType tests', () => { test('can copy a dataType to a folder', async ({umbracoApi}) => { // Arrange await umbracoApi.dataType.ensureNameNotExists(folderName); - dataTypeId = await umbracoApi.dataType.create(dataTypeName, editorAlias, dataTypeData); + dataTypeId = await umbracoApi.dataType.create(dataTypeName, editorAlias, editorUiAlias, dataTypeData); dataTypeFolderId = await umbracoApi.dataType.createFolder(folderName); const dataType = await umbracoApi.dataType.get(dataTypeId); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataType.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataType.spec.ts index 5fa452f211..cf3b771973 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataType.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataType.spec.ts @@ -2,8 +2,6 @@ import {expect} from "@playwright/test"; const dataTypeName = 'TestDataType'; -const editorAlias = 'Umbraco.ColorPicker'; -const propertyEditorName = 'Color Picker'; test.beforeEach(async ({umbracoApi, umbracoUi}) => { await umbracoApi.dataType.ensureNameNotExists(dataTypeName); @@ -22,7 +20,7 @@ test('can create a data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) await umbracoUi.dataType.clickNewDataTypeThreeDotsButton(); await umbracoUi.dataType.enterDataTypeName(dataTypeName); await umbracoUi.dataType.clickSelectAPropertyEditorButton(); - await umbracoUi.dataType.selectAPropertyEditor(propertyEditorName); + await umbracoUi.dataType.selectAPropertyEditor('Text Box'); await umbracoUi.dataType.clickSaveButton(); // Assert @@ -34,7 +32,7 @@ test('can rename a data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) // Arrange const wrongDataTypeName = 'Wrong Data Type'; await umbracoApi.dataType.ensureNameNotExists(wrongDataTypeName); - await umbracoApi.dataType.create(wrongDataTypeName, editorAlias, []); + await umbracoApi.dataType.createTextstringDataType(wrongDataTypeName); expect(await umbracoApi.dataType.doesNameExist(wrongDataTypeName)).toBeTruthy(); // Act @@ -49,7 +47,7 @@ test('can rename a data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) test('can delete a data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Arrange - await umbracoApi.dataType.create(dataTypeName, editorAlias, []); + await umbracoApi.dataType.createTextstringDataType(dataTypeName); expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy(); // Act @@ -67,7 +65,7 @@ test('can change property editor in a data type', {tag: '@smoke'}, async ({umbra const updatedEditorAlias = 'Umbraco.TextArea'; const updatedEditorUiAlias = 'Umb.PropertyEditorUi.TextArea'; - await umbracoApi.dataType.create(dataTypeName, editorAlias, []); + await umbracoApi.dataType.createTextstringDataType(dataTypeName); expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy(); // Act @@ -98,16 +96,17 @@ test('cannot create a data type without selecting the property editor', {tag: '@ test('can change settings', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Arrange + const maxCharsValue = 126; const expectedDataTypeValues = { - alias: "useLabel", - value: true + "alias": "maxChars", + "value": maxCharsValue }; - await umbracoApi.dataType.create(dataTypeName, editorAlias, []); + await umbracoApi.dataType.createTextstringDataType(dataTypeName); expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy(); // Act await umbracoUi.dataType.goToDataType(dataTypeName); - await umbracoUi.dataType.clickIncludeLabelsSlider(); + await umbracoUi.dataType.enterMaximumAllowedCharactersValue(maxCharsValue.toString()); await umbracoUi.dataType.clickSaveButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/Members.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/Members.spec.ts index 4fde4683a6..f44a164a20 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/Members.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/Members.spec.ts @@ -106,7 +106,7 @@ test('can edit password', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.member.clickMemberLinkByName(memberName); await umbracoUi.member.clickChangePasswordButton(); - await umbracoUi.member.enterPassword(updatedPassword); + await umbracoUi.member.enterNewPassword(updatedPassword); await umbracoUi.member.enterConfirmNewPassword(updatedPassword); await umbracoUi.member.clickSaveButton(); From a31e4265bdd823d7b7f8624249cb9f87bffb1817 Mon Sep 17 00:00:00 2001 From: Mole Date: Mon, 26 Aug 2024 11:21:02 +0200 Subject: [PATCH 29/90] Improve dotnet templates (#16815) * Add delivery api toggle * Add Dockerfile * add docker compose template * Ensure no duplicate database containers * Remove wwwroot/umbraco permission check We don't need write access to this folder * Provide environment variables from dokcer-compose * Build as debug from compose The compose file is intended to be used for local dev * Don't store password in docker files Still not great to store it in .env but it's fine for dev * Add additional template files * Add docker ignore file * Enable delivery API in settings too * Enable models builder mode toggle * Add WIP for umbraco release option * Add starterkit option * Add option to chose LTS or latest * Add development mode option * Add descriptions * Add display names * Add backoffice development at explicit default * Rearrange DevelopmentMode before ModelsBuilderMode * Allow specifying a port for the compose file * Add some notes * Move starterkits into its own template * Don't update version * Remove test configuration from Dockerfile * Add default modelsbuilder option * Update descriptions * overwrite default values in IDE development * Remove obsolete runtime minification * Try and fix healthcheck * Don't use post action for starterkit otherwise it won't work with Rider, also make the version 13.0.0 if LTS is chosen * Move UmbracoVersion above FinalVersion Otherwise, rider will use UmbracoVersion for some weird reason * Fix healthcheck * Use else instead of second if for modelsbuilder * Obsolete UmbracoVersion * Remove custom release option * Use forward slashes for volumes * Add MSSQL_SA_PASSWORD env variable * Temporarily limit acceptance tests so it works * Try again * Disable SQLServer integration tests * Set UseHttps to false in appsettings.Development.json You still want to be able to use non-https when developing locally * Fix LTS version LTS still needs installer endpoints added * Update permissions of wwwroot/umbraco for v13 sites * Fix conditional in Program.cs * Undo pipeline shenanigans --- .../Install/FilePermissionHelper.cs | 1 - src/Umbraco.Web.UI/Program.cs | 5 + templates/Umbraco.Templates.csproj | 3 +- templates/UmbracoDockerCompose/.env | 1 + .../.template.config/dotnetcli.host.json | 24 +++ .../.template.config/ide.host.json | 23 +++ .../.template.config/template.json | 49 ++++++ .../UmbracoDockerCompose/Database/Dockerfile | 21 +++ .../Database/healthcheck.sh | 15 ++ .../UmbracoDockerCompose/Database/setup.sql | 10 ++ .../UmbracoDockerCompose/Database/startup.sh | 23 +++ .../UmbracoDockerCompose/docker-compose.yml | 102 +++++++++++++ templates/UmbracoProject/.dockerignore | 25 ++++ .../.template.config/dotnetcli.host.json | 27 +++- .../.template.config/ide.host.json | 30 +++- .../starterkits.template.json | 47 ++++++ .../.template.config/template.json | 141 +++++++++++++++++- templates/UmbracoProject/Dockerfile | 33 ++++ .../UmbracoProject/UmbracoProject.csproj | 11 +- .../appsettings.Development.json | 23 ++- templates/UmbracoProject/appsettings.json | 20 ++- 21 files changed, 620 insertions(+), 14 deletions(-) create mode 100644 templates/UmbracoDockerCompose/.env create mode 100644 templates/UmbracoDockerCompose/.template.config/dotnetcli.host.json create mode 100644 templates/UmbracoDockerCompose/.template.config/ide.host.json create mode 100644 templates/UmbracoDockerCompose/.template.config/template.json create mode 100644 templates/UmbracoDockerCompose/Database/Dockerfile create mode 100644 templates/UmbracoDockerCompose/Database/healthcheck.sh create mode 100644 templates/UmbracoDockerCompose/Database/setup.sql create mode 100644 templates/UmbracoDockerCompose/Database/startup.sh create mode 100644 templates/UmbracoDockerCompose/docker-compose.yml create mode 100644 templates/UmbracoProject/.dockerignore create mode 100644 templates/UmbracoProject/.template.config/starterkits.template.json create mode 100644 templates/UmbracoProject/Dockerfile diff --git a/src/Umbraco.Infrastructure/Install/FilePermissionHelper.cs b/src/Umbraco.Infrastructure/Install/FilePermissionHelper.cs index ccb3e4a0da..d3777d4113 100644 --- a/src/Umbraco.Infrastructure/Install/FilePermissionHelper.cs +++ b/src/Umbraco.Infrastructure/Install/FilePermissionHelper.cs @@ -51,7 +51,6 @@ public class FilePermissionHelper : IFilePermissionHelper { hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.Bin), hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.Umbraco), - hostingEnvironment.MapPathWebRoot(_globalSettings.UmbracoPath), hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.Packages), }; } diff --git a/src/Umbraco.Web.UI/Program.cs b/src/Umbraco.Web.UI/Program.cs index e91f6ba60d..8fca919b0a 100644 --- a/src/Umbraco.Web.UI/Program.cs +++ b/src/Umbraco.Web.UI/Program.cs @@ -3,7 +3,9 @@ WebApplicationBuilder builder = WebApplication.CreateBuilder(args); builder.CreateUmbracoBuilder() .AddBackOffice() .AddWebsite() +#if UseDeliveryApi .AddDeliveryApi() +#endif .AddComposers() .Build(); @@ -23,6 +25,9 @@ app.UseUmbraco() }) .WithEndpoints(u => { + /*#if (UmbracoRelease = 'LTS') + u.UseInstallerEndpoints(); + #endif */ u.UseBackOfficeEndpoints(); u.UseWebsiteEndpoints(); }); diff --git a/templates/Umbraco.Templates.csproj b/templates/Umbraco.Templates.csproj index 57830bff09..b75df9f9a5 100644 --- a/templates/Umbraco.Templates.csproj +++ b/templates/Umbraco.Templates.csproj @@ -19,6 +19,7 @@ + UmbracoProject\Views\Partials\blocklist\%(RecursiveDir)%(Filename)%(Extension) UmbracoProject\Views\Partials\blocklist @@ -47,7 +48,7 @@ - + <_PackageFiles Include="%(_TemplateJsonFiles.DestinationFile)"> %(_TemplateJsonFiles.RelativeDir) diff --git a/templates/UmbracoDockerCompose/.env b/templates/UmbracoDockerCompose/.env new file mode 100644 index 0000000000..38985be5c5 --- /dev/null +++ b/templates/UmbracoDockerCompose/.env @@ -0,0 +1 @@ +DB_PASSWORD=Password1234 diff --git a/templates/UmbracoDockerCompose/.template.config/dotnetcli.host.json b/templates/UmbracoDockerCompose/.template.config/dotnetcli.host.json new file mode 100644 index 0000000000..aaab590168 --- /dev/null +++ b/templates/UmbracoDockerCompose/.template.config/dotnetcli.host.json @@ -0,0 +1,24 @@ +{ + "$schema": "https://json.schemastore.org/dotnetcli.host.json", + "symbolInfo": { + "ProjectName": { + "longName": "ProjectName", + "shortName": "P" + }, + "DatabasePassword": { + "longName": "DatabasePassword", + "shortName": "dbpw" + }, + "Port": + { + "longName": "Port", + "shortName": "p" + } + }, + "usageExamples": [ + "dotnet new umbraco-compose -P MyProject", + "dotnet new umbraco-compose --ProjectName MyProject", + "dotnet new umbraco-compose -P -MyProject -dbpw MyStr0ngP@ssword", + "dotnet new umbraco-compose -P -MyProject --DatabasePassword MyStr0ngP@ssword" + ] +} diff --git a/templates/UmbracoDockerCompose/.template.config/ide.host.json b/templates/UmbracoDockerCompose/.template.config/ide.host.json new file mode 100644 index 0000000000..ae8c5fb05c --- /dev/null +++ b/templates/UmbracoDockerCompose/.template.config/ide.host.json @@ -0,0 +1,23 @@ +{ + "$schema": "https://json.schemastore.org/ide.host.json", + "order": 0, + "icon": "../../icon.png", + "description": { + "id": "UmbracoDockerCompose", + "text": "Umbraco Docker Compose - Docker compose for Umbraco CMS and associated database" + }, + "symbolInfo": [ + { + "id": "ProjectName", + "isVisible": true + }, + { + "id": "DatabasePassword", + "isVisible": true + }, + { + "id": "Port", + "isVisible": true + } + ] +} diff --git a/templates/UmbracoDockerCompose/.template.config/template.json b/templates/UmbracoDockerCompose/.template.config/template.json new file mode 100644 index 0000000000..6f6877b7e0 --- /dev/null +++ b/templates/UmbracoDockerCompose/.template.config/template.json @@ -0,0 +1,49 @@ +{ + "$schema": "https://json.schemastore.org/template.json", + "author": "Umbraco HQ", + "classifications": [ + "Web", + "CMS", + "Umbraco" + ], + "name": "Umbraco Docker Compose", + "description": "Creates the prerequisites for developing Umbraco in Docker containers", + "groupIdentity": "Umbraco.Templates.UmbracoDockerCompose", + "identity": "Umbraco.Templates.UmbracoDockerCompose", + "shortName": "umbraco-compose", + "tags": { + "type": "item" + }, + "symbols": { + "ProjectName": { + "type": "parameter", + "description": "The name of the project the Docker Compose file will be created for", + "datatype": "string", + "replaces": "UmbracoProject", + "isRequired": true + }, + "DatabasePassword": { + "type": "parameter", + "description": "The password to the database, will be stored in .env file", + "datatype": "string", + "replaces": "Password1234", + "defaultValue": "Password1234" + }, + "Port": { + "type": "parameter", + "description": "The port forward on the docker container, this is the port you use to access the site", + "datatype": "string", + "replaces": "TEMPLATE_PORT", + "defaultValue": "44372" + }, + "ImageName": { + "type": "generated", + "generator": "casing", + "parameters": { + "source": "ProjectName", + "toLower": true + }, + "replaces": "umbraco_image" + } + } +} diff --git a/templates/UmbracoDockerCompose/Database/Dockerfile b/templates/UmbracoDockerCompose/Database/Dockerfile new file mode 100644 index 0000000000..4e74b6435e --- /dev/null +++ b/templates/UmbracoDockerCompose/Database/Dockerfile @@ -0,0 +1,21 @@ +FROM mcr.microsoft.com/azure-sql-edge:latest + +ENV ACCEPT_EULA=Y + +USER root + +RUN mkdir /var/opt/sqlserver + +RUN chown mssql /var/opt/sqlserver + +ENV MSSQL_BACKUP_DIR="/var/opt/mssql" +ENV MSSQL_DATA_DIR="/var/opt/mssql/data" +ENV MSSQL_LOG_DIR="/var/opt/mssql/log" + +EXPOSE 1433/tcp +COPY setup.sql / +COPY startup.sh / +COPY healthcheck.sh / + +ENTRYPOINT [ "/bin/bash", "startup.sh" ] +CMD [ "/opt/mssql/bin/sqlservr" ] diff --git a/templates/UmbracoDockerCompose/Database/healthcheck.sh b/templates/UmbracoDockerCompose/Database/healthcheck.sh new file mode 100644 index 0000000000..2964e17dc4 --- /dev/null +++ b/templates/UmbracoDockerCompose/Database/healthcheck.sh @@ -0,0 +1,15 @@ +value="$(/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P "$SA_PASSWORD" -d master -Q "SELECT state_desc FROM sys.databases WHERE name = 'umbracoDb'" | awk 'NR==3')" + +# This checks for any non-zero length string, and $value will be empty when the database does not exist. +if [ -n "$value" ] +then + echo "ONLINE" + return 0 # With docker 0 = success +else + echo "OFFLINE" + return 1 # And 1 = unhealthy +fi + +# This is useful for debugging +# echo "Value is:" +# echo "$value" diff --git a/templates/UmbracoDockerCompose/Database/setup.sql b/templates/UmbracoDockerCompose/Database/setup.sql new file mode 100644 index 0000000000..466030dd50 --- /dev/null +++ b/templates/UmbracoDockerCompose/Database/setup.sql @@ -0,0 +1,10 @@ +USE [master] +GO + +IF NOT EXISTS (SELECT * FROM sys.databases WHERE name = 'UmbracoDb') + BEGIN + CREATE DATABASE [umbracoDb] + END; +GO + +USE UmbracoDb; \ No newline at end of file diff --git a/templates/UmbracoDockerCompose/Database/startup.sh b/templates/UmbracoDockerCompose/Database/startup.sh new file mode 100644 index 0000000000..c4fad8f0ae --- /dev/null +++ b/templates/UmbracoDockerCompose/Database/startup.sh @@ -0,0 +1,23 @@ +#!/bin/bash +set -e + +# Taken from: https://github.com/CarlSargunar/Umbraco-Docker-Workshop +if [ "$1" = '/opt/mssql/bin/sqlservr' ]; then + # If this is the container's first run, initialize the application database + if [ ! -f /tmp/app-initialized ]; then + # Initialize the application database asynchronously in a background process. This allows a) the SQL Server process to be the main process in the container, which allows graceful shutdown and other goodies, and b) us to only start the SQL Server process once, as opposed to starting, stopping, then starting it again. + function initialize_app_database() { + # Wait a bit for SQL Server to start. SQL Server's process doesn't provide a clever way to check if it's up or not, and it needs to be up before we can import the application database + sleep 15s + + #run the setup script to create the DB and the schema in the DB + /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P "$SA_PASSWORD" -d master -i setup.sql + + # Note that the container has been initialized so future starts won't wipe changes to the data + touch /tmp/app-initialized + } + initialize_app_database & + fi +fi + +exec "$@" diff --git a/templates/UmbracoDockerCompose/docker-compose.yml b/templates/UmbracoDockerCompose/docker-compose.yml new file mode 100644 index 0000000000..7acae5d8d6 --- /dev/null +++ b/templates/UmbracoDockerCompose/docker-compose.yml @@ -0,0 +1,102 @@ +services: + umb_database: + container_name: umbraco_image_database + build: + context: ./Database + environment: + SA_PASSWORD: ${DB_PASSWORD} + MSSQL_SA_PASSWORD: ${DB_PASSWORD} + ports: + - "1433:1433" + - "1434:1434" + volumes: + - umb_database:/var/opt/mssql + networks: + - umbnet + healthcheck: + # This healthcheck is to make sure that the database is up and running before the umbraco container starts. + # It works by querying the database for the state of the umbracoDb database, ensuring it exists. + test: ./healthcheck.sh + interval: 5m + timeout: 5s + retries: 3 + start_period: 15s # Bootstrap duration, for this duration failures does not count towards max retries. + start_interval: 5s # How long after the health check has started to run the healthcheck again. + + umbraco_image: + image: umbraco_image + environment: + - ASPNETCORE_ENVIRONMENT=Development + - ConnectionStrings__umbracoDbDSN=Server=umb_database;Database=umbracoDb;User Id=sa;Password=${DB_PASSWORD};TrustServerCertificate=true; + - ConnectionStrings__umbracoDbDSN_ProviderName=Microsoft.Data.SqlClient + volumes: + - umb_media:/app/wwwroot/media + - umb_scripts:/app/wwwroot/scripts + - umb_styles:/app/wwwroot/css + - umb_logs:/app/umbraco/Logs + - umb_views:/app/Views + - umb_data:/app/umbraco + - umb_models:/app/umbraco/models + build: + context: . + dockerfile: UmbracoProject/Dockerfile + args: + - BUILD_CONFIGURATION=Debug + + depends_on: + umb_database: + condition: service_healthy + restart: always + ports: + - "TEMPLATE_PORT:8080" + networks: + - umbnet + develop: + # This allows you to run docker compose watch, after doing so the container will rebuild when the models are changed. + # Once a restart only feature is implemented (https://github.com/docker/compose/issues/11446) + # It would be really nice to add a restart only watch to \Views, since the file watchers for recompilation of Razor views does not work with docker. + watch: + - path: ./UmbracoProject/umbraco/models + action: rebuild + +# These volumes are all made as bind mounts, meaning that they are bound to the host machine's file system. +# This is to better facilitate local development in the IDE, so the views, models, etc... are available in the IDE. +# This can be changed by removing the driver and driver_opts from the volumes. +volumes: + umb_media: + driver: local + driver_opts: + type: none + device: ./UmbracoProject/wwwroot/media + o: bind + umb_scripts: + driver: local + driver_opts: + type: none + device: ./UmbracoProject/wwwroot/scripts + o: bind + umb_styles: + driver: local + driver_opts: + type: none + device: ./UmbracoProject/wwwroot/css + o: bind + umb_logs: + umb_views: + driver: local + driver_opts: + type: none + device: ./UmbracoProject/Views + o: bind + umb_data: + umb_models: + driver: local + driver_opts: + type: none + device: ./UmbracoProject/umbraco/models + o: bind + umb_database: + +networks: + umbnet: + driver: bridge diff --git a/templates/UmbracoProject/.dockerignore b/templates/UmbracoProject/.dockerignore new file mode 100644 index 0000000000..2f32bfe4fe --- /dev/null +++ b/templates/UmbracoProject/.dockerignore @@ -0,0 +1,25 @@ +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/.idea +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/azds.yaml +**/bin +**/charts +**/docker-compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj +**/secrets.dev.yaml +**/values.dev.yaml +LICENSE +README.md diff --git a/templates/UmbracoProject/.template.config/dotnetcli.host.json b/templates/UmbracoProject/.template.config/dotnetcli.host.json index dfd6f80184..b18020b6de 100644 --- a/templates/UmbracoProject/.template.config/dotnetcli.host.json +++ b/templates/UmbracoProject/.template.config/dotnetcli.host.json @@ -8,12 +8,25 @@ }, "UmbracoVersion": { "longName": "version", - "shortName": "v" + "shortName": "v", + "isHidden": true + }, + "UmbracoRelease": { + "longName": "release", + "shortName": "r" }, "UseHttpsRedirect": { "longName": "use-https-redirect", "shortName": "" }, + "UseDeliveryApi": { + "longName": "use-delivery-api", + "shortName": "da" + }, + "Docker": { + "longName": "add-docker", + "shortName": "" + }, "SkipRestore": { "longName": "no-restore", "shortName": "" @@ -58,6 +71,18 @@ "longName": "PackageTestSiteName", "shortName": "p", "isHidden": true + }, + "ModelsBuilderMode": { + "longName": "models-mode", + "shortName": "mm" + }, + "StarterKit": { + "longName": "starter-kit", + "shortName": "sk" + }, + "DevelopmentMode": { + "longName": "development-mode", + "shortName": "dm" } }, "usageExamples": [ diff --git a/templates/UmbracoProject/.template.config/ide.host.json b/templates/UmbracoProject/.template.config/ide.host.json index 1a302779cc..90de3b977a 100644 --- a/templates/UmbracoProject/.template.config/ide.host.json +++ b/templates/UmbracoProject/.template.config/ide.host.json @@ -9,11 +9,22 @@ "symbolInfo": [ { "id": "UmbracoVersion", - "isVisible": true + "isVisible": false }, { "id": "UseHttpsRedirect", "isVisible": true, + "persistenceScope": "templateGroup", + "defaultValue": "true" + }, + { + "id": "UseDeliveryApi", + "isVisible": true, + "persistenceScope": "templateGroup" + }, + { + "id": "ModelsBuilderMode", + "isVisible": true, "persistenceScope": "templateGroup" }, { @@ -54,6 +65,23 @@ { "id": "NoNodesViewPath", "isVisible": true + }, + { + "id": "Docker", + "isVisible": true + }, + { + "id": "StarterKit", + "isVisible": true + }, + { + "id": "UmbracoRelease", + "isVisible": true + }, + { + "id": "DevelopmentMode", + "isVisible": true, + "defaultValue": "IDEDevelopment" } ] } diff --git a/templates/UmbracoProject/.template.config/starterkits.template.json b/templates/UmbracoProject/.template.config/starterkits.template.json new file mode 100644 index 0000000000..5d2a5dabf9 --- /dev/null +++ b/templates/UmbracoProject/.template.config/starterkits.template.json @@ -0,0 +1,47 @@ +{ + "$schema": "https://json.schemastore.org/template.json", + "symbols": { + "StarterKit": { + "displayName": "Starter kit", + "type": "parameter", + "datatype": "choice", + "description": "Choose a starter kit to install.", + "defaultValue": "None", + "replaces": "STARTER_KIT_NAME", + // The choice here should be the name of the starter kit package, since it will be used directly for package reference. + "choices": [ + { + "choice": "None", + "description": "No starter kit." + }, + { + "choice": "Umbraco.TheStarterKit", + "description": "The Umbraco starter kit.", + "displayName": "The Starter Kit" + } + ] + }, + // Used to determine the version of the starter kit to install. + // there should be cases for Latest, LTS and Custom for every starterkit added above. + // This has the benefit that all maintenance of starter kits in template can be done from this file. + "StarterKitVersion": { + "type": "generated", + "generator": "switch", + "replaces": "STARTER_KIT_VERSION", + "parameters": { + "evaluator": "C++", + "datatype": "string", + "cases": [ + { + "condition": "(StarterKit == 'Umbraco.TheStarterKit' && (UmbracoRelease == 'Latest' || UmbracoRelease == 'Custom'))", + "value": "14.0.0" + }, + { + "condition": "(StarterKit == 'Umbraco.TheStarterKit' && UmbracoRelease == 'LTS')", + "value": "13.0.0" + } + ] + } + } + } +} diff --git a/templates/UmbracoProject/.template.config/template.json b/templates/UmbracoProject/.template.config/template.json index b17352476e..e342cdaeb8 100644 --- a/templates/UmbracoProject/.template.config/template.json +++ b/templates/UmbracoProject/.template.config/template.json @@ -18,6 +18,7 @@ "sourceName": "UmbracoProject", "defaultName": "UmbracoProject1", "preferNameDirectory": true, + "additionalConfigFiles": [ "starterkits.template.json"], "sources": [ { "modifiers": [ @@ -26,6 +27,13 @@ "exclude": [ ".gitignore" ] + }, + { + "condition": "(!Docker)", + "exclude": [ + "Dockerfile", + ".dockerignore" + ] } ] } @@ -46,13 +54,72 @@ "defaultValue": "net8.0", "replaces": "net8.0" }, + "UmbracoRelease": { + "displayName": "Umbraco Version", + "description": "The Umbraco release to use, either latest or latest long term supported", + "type": "parameter", + "datatype": "choice", + "defaultValue": "Latest", + "choices": [ + { + "choice": "Latest", + "description": "The latest umbraco release" + }, + { + "choice": "LTS", + "description": "The most recent long term supported version", + "displayName": "Long Term Supported" + } + ], + "isRequired": false + }, "UmbracoVersion": { - "displayName": "Umbraco version", - "description": "The version of Umbraco.Cms to add as PackageReference.", + "displayName": "Custom Version", + "description": "The selected custom version of Umbraco, this is obsoleted, and will be removed in a future version of the template.", "type": "parameter", "datatype": "string", - "defaultValue": "*", - "replaces": "UMBRACO_VERSION_FROM_TEMPLATE" + "defaultValue": "null", + "replaces": "CUSTOM_VERSION", + "isRequired": false + }, + "FinalVersion" : { + "type": "generated", + "generator": "switch", + "datatype": "text", + "description": "The calculated version of Umbraco to use", + "replaces": "UMBRACO_VERSION_FROM_TEMPLATE", + "parameters": { + "evaluator": "C++", + "datatype": "text", + "cases": [ + { + "condition": "(UmbracoRelease == 'Latest')", + "value": "*" + }, + { + "condition": "(UmbracoRelease == 'LTS')", + "value": "13.4.1" + } + ] + } + }, + "DotnetVersion": + { + "type": "generated", + "generator": "switch", + "datatype": "text", + "description": "Not relevant at the moment, but if we need to change the dotnet version based on the Umbraco version, we can do it here", + "replaces": "DOTNET_VERSION_FROM_TEMPLATE", + "parameters": { + "evaluator": "C++", + "datatype": "text", + "cases": [ + { + "condition": "(true)", + "value": "net8.0" + } + ] + } }, "UseHttpsRedirect": { "displayName": "Use HTTPS redirect", @@ -61,6 +128,20 @@ "datatype": "bool", "defaultValue": "false" }, + "UseDeliveryApi": { + "displayName": "Use Delivery API", + "description": "Enables the Delivery API", + "type": "parameter", + "datatype": "bool", + "defaultValue": "false" + }, + "Docker": { + "displayName": "Add Docker file", + "description": "Adds a docker file to the project.", + "type": "parameter", + "datatype": "bool", + "defaultValue": "false" + }, "SkipRestore": { "displayName": "Skip restore", "description": "If specified, skips the automatic restore of the project on create.", @@ -244,6 +325,58 @@ "defaultValue": "", "replaces": "PACKAGE_PROJECT_NAME_FROM_TEMPLATE" }, + "DevelopmentMode": { + "type": "parameter", + "displayName": "Development mode", + "datatype": "choice", + "description": "Choose the development mode to use for the project.", + "defaultValue": "BackofficeDevelopment", + "choices": [ + { + "choice": "BackofficeDevelopment", + "description": "Enables backoffice development, allowing you to develop from within the backoffice, this is the default behaviour.", + "displayName": "Backoffice Development" + }, + { + "choice": "IDEDevelopment", + "description": "Configures appsettings.Development.json to Development runtime mode and SourceCodeAuto models builder mode, and configures appsettings.json to Production runtime mode, Nothing models builder mode, and enables UseHttps", + "displayName": "IDE Development" + } + ] + }, + "ModelsBuilderMode": { + "type": "parameter", + "displayName": "Models builder mode", + "datatype": "choice", + "description": "Choose the models builder mode to use for the project. When development mode is set to IDEDevelopment this only changes the models builder mode appsetttings.development.json", + "defaultValue": "Default", + "replaces": "MODELS_MODE", + "choices": [ + { + "choice": "Default", + "description": "Let DevelopmentMode determine the models builder mode." + }, + { + "choice": "InMemoryAuto", + "description": "Generate models in memory, automatically updating when a content type change, this means no need for app rebuild, however models are only available in views.", + "displayName": "In Memory Auto" + }, + { + "choice": "SourceCodeManual", + "description": "Generate models as source code, only updating when requested manually, this means a interaction and rebuild is required when content type(s) change, however models are available in code.", + "displayName": "Source Code Manual" + }, + { + "choice": "SourceCodeAuto", + "description": "Generate models as source code, automatically updating when a content type change, this means a rebuild is required when content type(s) change, however models are available in code.", + "displayName": "Source Code Auto" + }, + { + "choice": "Nothing", + "description": "No models are generated, this is recommended for production assuming generated models are used for development." + } + ] + }, "Namespace": { "type": "derived", "valueSource": "name", diff --git a/templates/UmbracoProject/Dockerfile b/templates/UmbracoProject/Dockerfile new file mode 100644 index 0000000000..e3eda648dd --- /dev/null +++ b/templates/UmbracoProject/Dockerfile @@ -0,0 +1,33 @@ +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +USER $APP_UID +WORKDIR /app +EXPOSE 8080 +EXPOSE 8081 + +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +ARG BUILD_CONFIGURATION=Release +WORKDIR /src +COPY ["UmbracoProject/UmbracoProject.csproj", "UmbracoProject/"] +RUN dotnet restore "UmbracoProject/UmbracoProject.csproj" +COPY . . +WORKDIR "/src/UmbracoProject" +RUN dotnet build "UmbracoProject.csproj" -c $BUILD_CONFIGURATION -o /app/build + +FROM build AS publish +ARG BUILD_CONFIGURATION=Release +RUN dotnet publish "UmbracoProject.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +# We need to make sure that the user running the app has write access to the umbraco folder, in order to write logs and other files. +# Since these are volumes they are created as root by the docker daemon. +USER root +RUN mkdir umbraco +RUN mkdir umbraco/Logs +RUN chown $APP_UID umbraco --recursive +#if (UmbracoRelease = 'LTS') +RUN chown $APP_UID wwwroot/umbraco --recursive +#endif +USER $APP_UID +ENTRYPOINT ["dotnet", "UmbracoProject.dll"] diff --git a/templates/UmbracoProject/UmbracoProject.csproj b/templates/UmbracoProject/UmbracoProject.csproj index ee8dd5e56e..019d5d2990 100644 --- a/templates/UmbracoProject/UmbracoProject.csproj +++ b/templates/UmbracoProject/UmbracoProject.csproj @@ -1,13 +1,20 @@ - net8.0 + DOTNET_VERSION_FROM_TEMPLATE enable enable Umbraco.Cms.Web.UI + + + + @@ -21,11 +28,13 @@ true + false false + diff --git a/templates/UmbracoProject/appsettings.Development.json b/templates/UmbracoProject/appsettings.Development.json index 17b9f86361..0521b835ed 100644 --- a/templates/UmbracoProject/appsettings.Development.json +++ b/templates/UmbracoProject/appsettings.Development.json @@ -25,6 +25,11 @@ //#endif "Umbraco": { "CMS": { + //#if (UseHttpsRedirect || DevelopmentMode == "IDEDevelopment") + "Global": { + "UseHttps": false + }, + //#endif //#if (UsingUnattenedInstall) "Unattended": { "InstallUnattended": true, @@ -36,12 +41,22 @@ "Content": { "MacroErrors": "Throw" }, + //#if (DevelopmentMode == "IDEDevelopment") + "Runtime": { + "Mode": "Development" + }, + //#if (ModelsBuilderMode == "Default") + "ModelsBuilder": { + "ModelsMode": "SourceCodeAuto" + }, + ////#else + //"ModelsBuilder": { + // "ModelsMode": "MODELS_MODE" + //}, + //#endif + //#endif "Hosting": { "Debug": true - }, - "RuntimeMinification": { - "UseInMemoryCache": true, - "CacheBuster": "Timestamp" } } } diff --git a/templates/UmbracoProject/appsettings.json b/templates/UmbracoProject/appsettings.json index 6678478951..23520bbe6b 100644 --- a/templates/UmbracoProject/appsettings.json +++ b/templates/UmbracoProject/appsettings.json @@ -20,7 +20,7 @@ "CMS": { "Global": { "Id": "TELEMETRYID_FROM_TEMPLATE", - //#if (UseHttpsRedirect) + //#if (UseHttpsRedirect || DevelopmentMode == "IDEDevelopment") "UseHttps": true, //#endif //#if (HasNoNodesViewPath) @@ -37,6 +37,24 @@ "Unattended": { "UpgradeUnattended": true }, + //#if (UseDeliveryApi) + "DeliveryApi": { + "Enabled": true + }, + //#endif + //#if (ModelsBuilderMode != "Default" && DevelopmentMode == "BackOfficeDevelopment") + "ModelsBuilder": { + "ModelsMode": "MODELS_MODE" + }, + //#endif + //#if (DevelopmentMode == "IDEDevelopment") + "Runtime": { + "Mode": "Production" + }, + "ModelsBuilder": { + "ModelsMode": "Nothing" + }, + //#endif "Security": { "AllowConcurrentLogins": false } From bafdb21b45fbe56c01cb94a7cdf182063a608832 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Mon, 26 Aug 2024 15:03:11 +0200 Subject: [PATCH 30/90] Fix mandatory RTE validation (#16962) * Added a custom RichTextRequiredValidator, to check that the empty richtext object (still with json) can be required or not. We are now testing the markdown needs to have a value * Fixed namespaced and moved back wrong class * Cleanup --- .../Validators/RequiredValidator.cs | 4 +- .../UmbracoBuilder.CoreServices.cs | 3 ++ .../PropertyEditors/RichTextPropertyEditor.cs | 49 +++++++++++++++++++ .../Validators/IRichTextRequiredValidator.cs | 7 +++ .../Validators/RichTextRequiredValidator.cs | 30 ++++++++++++ 5 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 src/Umbraco.Infrastructure/PropertyEditors/Validators/IRichTextRequiredValidator.cs create mode 100644 src/Umbraco.Infrastructure/PropertyEditors/Validators/RichTextRequiredValidator.cs diff --git a/src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs b/src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs index 296e8eed36..1bf19b361b 100644 --- a/src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs +++ b/src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs @@ -7,7 +7,7 @@ namespace Umbraco.Cms.Core.PropertyEditors.Validators; ///

/// A validator that validates that the value is not null or empty (if it is a string) /// -public sealed class RequiredValidator : IValueRequiredValidator, IManifestValueValidator +public class RequiredValidator : IValueRequiredValidator, IManifestValueValidator { private const string ValueCannotBeNull = "Value cannot be null"; private const string ValueCannotBeEmpty = "Value cannot be empty"; @@ -23,7 +23,7 @@ public sealed class RequiredValidator : IValueRequiredValidator, IManifestValueV ValidateRequired(value, valueType); /// - public IEnumerable ValidateRequired(object? value, string? valueType) + public virtual IEnumerable ValidateRequired(object? value, string? valueType) { if (value == null) { diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs index 77194cef2e..a9ffc67f64 100644 --- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs +++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs @@ -28,6 +28,7 @@ using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Notifications; using Umbraco.Cms.Core.Packaging; using Umbraco.Cms.Core.PropertyEditors; +using Umbraco.Cms.Core.PropertyEditors.Validators; using Umbraco.Cms.Core.PropertyEditors.ValueConverters; using Umbraco.Cms.Core.PublishedCache; using Umbraco.Cms.Core.Routing; @@ -238,6 +239,8 @@ public static partial class UmbracoBuilderExtensions builder.Services.AddSingleton(); + builder.Services.AddSingleton(); + return builder; } diff --git a/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs index ee37d8c63b..772e722833 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs @@ -12,6 +12,7 @@ using Umbraco.Cms.Core.Media; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Blocks; using Umbraco.Cms.Core.Models.Editors; +using Umbraco.Cms.Core.PropertyEditors.Validators; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; @@ -166,6 +167,7 @@ public class RichTextPropertyEditor : DataEditor internal class RichTextPropertyValueEditor : BlockValuePropertyValueEditorBase { private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor; + private readonly ILocalizedTextService _localizedTextService; private readonly IHtmlSanitizer _htmlSanitizer; private readonly HtmlImageSourceParser _imageSourceParser; private readonly HtmlLocalLinkParser _localLinkParser; @@ -173,8 +175,10 @@ public class RichTextPropertyEditor : DataEditor private readonly RichTextEditorPastedImages _pastedImages; private readonly IJsonSerializer _jsonSerializer; private readonly IBlockEditorElementTypeCache _elementTypeCache; + private readonly IRichTextRequiredValidator _richTextRequiredValidator; private readonly ILogger _logger; + [Obsolete("Use non-obsolete constructor. This is schedules for removal in v16.")] public RichTextPropertyValueEditor( DataEditorAttribute attribute, PropertyEditorCollection propertyEditors, @@ -193,21 +197,66 @@ public class RichTextPropertyEditor : DataEditor IBlockEditorElementTypeCache elementTypeCache, IPropertyValidationService propertyValidationService, DataValueReferenceFactoryCollection dataValueReferenceFactoryCollection) + : this( + attribute, + propertyEditors, + dataTypeReadCache, + logger, + backOfficeSecurityAccessor, + localizedTextService, + shortStringHelper, + imageSourceParser, + localLinkParser, + pastedImages, + jsonSerializer, + ioHelper, + htmlSanitizer, + macroParameterParser, + elementTypeCache, + propertyValidationService, + dataValueReferenceFactoryCollection, + StaticServiceProvider.Instance.GetRequiredService()) + { + + } + public RichTextPropertyValueEditor( + DataEditorAttribute attribute, + PropertyEditorCollection propertyEditors, + IDataTypeConfigurationCache dataTypeReadCache, + ILogger logger, + IBackOfficeSecurityAccessor backOfficeSecurityAccessor, + ILocalizedTextService localizedTextService, + IShortStringHelper shortStringHelper, + HtmlImageSourceParser imageSourceParser, + HtmlLocalLinkParser localLinkParser, + RichTextEditorPastedImages pastedImages, + IJsonSerializer jsonSerializer, + IIOHelper ioHelper, + IHtmlSanitizer htmlSanitizer, + IHtmlMacroParameterParser macroParameterParser, + IBlockEditorElementTypeCache elementTypeCache, + IPropertyValidationService propertyValidationService, + DataValueReferenceFactoryCollection dataValueReferenceFactoryCollection, + IRichTextRequiredValidator richTextRequiredValidator) : base(attribute, propertyEditors, dataTypeReadCache, localizedTextService, logger, shortStringHelper, jsonSerializer, ioHelper, dataValueReferenceFactoryCollection) { _backOfficeSecurityAccessor = backOfficeSecurityAccessor; + _localizedTextService = localizedTextService; _imageSourceParser = imageSourceParser; _localLinkParser = localLinkParser; _pastedImages = pastedImages; _htmlSanitizer = htmlSanitizer; _macroParameterParser = macroParameterParser; _elementTypeCache = elementTypeCache; + _richTextRequiredValidator = richTextRequiredValidator; _jsonSerializer = jsonSerializer; _logger = logger; Validators.Add(new RichTextEditorBlockValidator(propertyValidationService, CreateBlockEditorValues(), elementTypeCache, jsonSerializer, logger)); } + public override IValueRequiredValidator RequiredValidator => _richTextRequiredValidator; + /// public override object? Configuration { diff --git a/src/Umbraco.Infrastructure/PropertyEditors/Validators/IRichTextRequiredValidator.cs b/src/Umbraco.Infrastructure/PropertyEditors/Validators/IRichTextRequiredValidator.cs new file mode 100644 index 0000000000..7358e92f38 --- /dev/null +++ b/src/Umbraco.Infrastructure/PropertyEditors/Validators/IRichTextRequiredValidator.cs @@ -0,0 +1,7 @@ +using Umbraco.Cms.Core.PropertyEditors; + +namespace Umbraco.Cms.Core.PropertyEditors.Validators; + +internal interface IRichTextRequiredValidator : IValueRequiredValidator +{ +} diff --git a/src/Umbraco.Infrastructure/PropertyEditors/Validators/RichTextRequiredValidator.cs b/src/Umbraco.Infrastructure/PropertyEditors/Validators/RichTextRequiredValidator.cs new file mode 100644 index 0000000000..b239f0bda5 --- /dev/null +++ b/src/Umbraco.Infrastructure/PropertyEditors/Validators/RichTextRequiredValidator.cs @@ -0,0 +1,30 @@ +using System.ComponentModel.DataAnnotations; +using Microsoft.Extensions.Logging; +using Umbraco.Cms.Core.Serialization; +using Umbraco.Cms.Core.Services; + +namespace Umbraco.Cms.Core.PropertyEditors.Validators; + +internal class RichTextRequiredValidator : RequiredValidator, IRichTextRequiredValidator +{ + private readonly IJsonSerializer _jsonSerializer; + private readonly ILogger _logger; + + public RichTextRequiredValidator(ILocalizedTextService textService, IJsonSerializer jsonSerializer, ILogger logger) : base(textService) + { + _jsonSerializer = jsonSerializer; + _logger = logger; + } + + public override IEnumerable ValidateRequired(object? value, string? valueType) => base.ValidateRequired(GetValue(value), valueType); + + private object? GetValue(object? value) + { + if(RichTextPropertyEditorHelper.TryParseRichTextEditorValue(value, _jsonSerializer, _logger, out RichTextEditorValue? richTextEditorValue)) + { + return richTextEditorValue?.Markup; + } + + return value; + } +} From c5e5fa2dd1d6d69f6cca7bc0ee22216e5c7918d5 Mon Sep 17 00:00:00 2001 From: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com> Date: Tue, 27 Aug 2024 13:53:35 +0700 Subject: [PATCH 31/90] V14 QA Added Content tests with various of data types (#16824) * Added Content tests with content picker * Removed the test for content picker * Added Content tests with the default content picker * Added more Content tests with Content Picker data type * Added the Content tests with Dropdown * Added Content tests with Image Cropper * Updated upload file method due to test helper changes * Added Content tests with Image Cropper * Added Content tests with Image Cropper data type * Added Content tests with Media Picker data type * Updated Media tests due to ui helper changes * Bumped version of test helper and json builder * Make all Content tests run in pipeline - should remove it before merging * Fixed the name of tests * Updated the tests for Media Picker in Content section * Added the Content tests with Multiple Media Picker * Updated the Content test with Content Picker due to the test helper changes * Bumped version of test helper * Fixed the failing tests for Content * Removed Image Cropper test in this branch * Added more waits * Added smoke tags * Make smoke tests run in the pipeline * Added Content tests for Image Cropper * Added smoke tags to make all Image Cropper tests running in the pipeline * Added Content tests with Member Picker * Added Content tests with Multiple Image Media Picker * Added Content tests with Numeric * Bumped version of test helper * Make all Content tests running in the pipeline * Assert that the content is published * Assert that the content is published * Fixed code conflict * Fixed comment and code conflict * Make all Content tests run in the pipeline * Refactor the Content tests with different data type * Cleaned code * Make the smoke tests run in the pipeline --- .../Content/ContentWithCheckboxList.spec.ts | 20 +-- .../Content/ContentWithContentPicker.spec.ts | 52 ++++---- .../Content/ContentWithDropdown.spec.ts | 20 +-- .../Content/ContentWithImageCropper.spec.ts | 103 +++++++++++++++ .../Content/ContentWithMediaPicker.spec.ts | 19 ++- .../Content/ContentWithMemberPicker.spec.ts | 97 ++++++++++++++ .../Content/ContentWithMultiURLPicker.spec.ts | 5 +- ...ontentWithMultipleImageMediaPicker.spec.ts | 120 ++++++++++++++++++ .../ContentWithMultipleMediaPicker.spec.ts | 60 +++++---- .../Content/ContentWithNumeric.spec.ts | 65 ++++++++++ 10 files changed, 484 insertions(+), 77 deletions(-) create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMemberPicker.spec.ts create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleImageMediaPicker.spec.ts create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithNumeric.spec.ts diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCheckboxList.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCheckboxList.spec.ts index 981d586148..1cfe2a419f 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCheckboxList.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCheckboxList.spec.ts @@ -18,6 +18,7 @@ test.afterEach(async ({umbracoApi}) => { test('can create content with the checkbox list data type', async ({umbracoApi, umbracoUi}) => { // Arrange + const expectedState = 'Draft'; const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); await umbracoUi.content.goToSection(ConstantHelper.sections.content); @@ -33,26 +34,27 @@ test('can create content with the checkbox list data type', async ({umbracoApi, await umbracoUi.content.isSuccessNotificationVisible(); expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); expect(contentData.values).toEqual([]); }); test('can publish content with the checkbox list data type', async ({umbracoApi, umbracoUi}) => { // Arrange + const expectedState = 'Published'; const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); - await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); await umbracoUi.content.goToSection(ConstantHelper.sections.content); // Act - await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); - await umbracoUi.content.chooseDocumentType(documentTypeName); - await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.goToContentWithName(contentName); await umbracoUi.content.clickSaveAndPublishButton(); // Assert await umbracoUi.content.doesSuccessNotificationsHaveCount(2); expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); expect(contentData.values).toEqual([]); }); @@ -61,14 +63,12 @@ test('can create content with the custom checkbox list data type', async ({umbra const customDataTypeName = 'CustomCheckboxList'; const optionValues = ['testOption1', 'testOption2']; const customDataTypeId = await umbracoApi.dataType.createCheckboxListDataType(customDataTypeName, optionValues); - await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, customDataTypeId); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, customDataTypeId); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); await umbracoUi.content.goToSection(ConstantHelper.sections.content); // Act - await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); - await umbracoUi.content.chooseDocumentType(documentTypeName); - await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.goToContentWithName(contentName); await umbracoUi.content.chooseCheckboxListOption(optionValues[0]); await umbracoUi.content.clickSaveAndPublishButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithContentPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithContentPicker.spec.ts index ce18c79e9a..5764b4b7fc 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithContentPicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithContentPicker.spec.ts @@ -8,11 +8,10 @@ const contentPickerDocumentTypeName = 'DocumentTypeForContentPicker'; const contentPickerName = 'TestContentPicker'; let contentPickerDocumentTypeId = ''; -test.beforeEach(async ({umbracoApi, umbracoUi}) => { +test.beforeEach(async ({umbracoApi}) => { await umbracoApi.documentType.ensureNameNotExists(documentTypeName); await umbracoApi.document.ensureNameNotExists(contentName); contentPickerDocumentTypeId = await umbracoApi.documentType.createDefaultDocumentTypeWithAllowAsRoot(contentPickerDocumentTypeName); - await umbracoUi.goToBackOffice(); }); test.afterEach(async ({umbracoApi}) => { @@ -24,9 +23,11 @@ test.afterEach(async ({umbracoApi}) => { test('can create content with the content picker datatype', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Arrange + const expectedState = 'Draft'; const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); const contentPickerId = await umbracoApi.document.createDefaultDocument(contentPickerName, contentPickerDocumentTypeId); + await umbracoUi.goToBackOffice(); await umbracoUi.content.goToSection(ConstantHelper.sections.content); // Act @@ -38,24 +39,25 @@ test('can create content with the content picker datatype', {tag: '@smoke'}, asy await umbracoUi.content.clickSaveButton(); // Assert - await umbracoUi.content.doesSuccessNotificationsHaveCount(1); + await umbracoUi.content.isSuccessNotificationVisible(); expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); expect(contentData.values[0].value).toEqual(contentPickerId); }); test('can publish content with the content picker data type', async ({umbracoApi, umbracoUi}) => { // Arrange + const expectedState = 'Published'; const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); - await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); const contentPickerId = await umbracoApi.document.createDefaultDocument(contentPickerName, contentPickerDocumentTypeId); + await umbracoUi.goToBackOffice(); await umbracoUi.content.goToSection(ConstantHelper.sections.content); // Act - await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); - await umbracoUi.content.chooseDocumentType(documentTypeName); - await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.goToContentWithName(contentName); await umbracoUi.content.addContentPicker(contentPickerName); await umbracoUi.content.clickSaveAndPublishButton(); @@ -63,6 +65,7 @@ test('can publish content with the content picker data type', async ({umbracoApi await umbracoUi.content.doesSuccessNotificationsHaveCount(2); expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); expect(contentData.values[0].value).toEqual(contentPickerId); }); @@ -70,15 +73,15 @@ test('can open content picker in the content', async ({umbracoApi, umbracoUi}) = // Arrange const customDataTypeName = 'CustomContentPicker'; const customDataTypeId = await umbracoApi.dataType.createContentPickerDataTypeWithShowOpenButton(customDataTypeName); - await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, customDataTypeId); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, customDataTypeId); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + // Create content to pick await umbracoApi.document.createDefaultDocument(contentPickerName, contentPickerDocumentTypeId); + await umbracoUi.goToBackOffice(); await umbracoUi.content.goToSection(ConstantHelper.sections.content); // Act - await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); - await umbracoUi.content.chooseDocumentType(documentTypeName); - await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.goToContentWithName(contentName); await umbracoUi.content.addContentPicker(contentPickerName); // Assert @@ -97,19 +100,18 @@ test('can choose start node for the content picker in the content', async ({umbr const childContentPickerName = 'TestChildContentPicker'; await umbracoApi.documentType.ensureNameNotExists(childContentPickerDocumentTypeName); const childContentPickerDocumentTypeId = await umbracoApi.documentType.createDefaultDocumentType(childContentPickerDocumentTypeName); - const contentPickerDocumentTypeId = await umbracoApi.documentType.createDocumentTypeWithAllowedChildNode(contentPickerName, childContentPickerDocumentTypeId); + contentPickerDocumentTypeId = await umbracoApi.documentType.createDocumentTypeWithAllowedChildNode(contentPickerName, childContentPickerDocumentTypeId); const contentPickerId = await umbracoApi.document.createDefaultDocument(contentPickerName, contentPickerDocumentTypeId); await umbracoApi.document.createDefaultDocumentWithParent(childContentPickerName, childContentPickerDocumentTypeId, contentPickerId); // Create a custom content picker with start node const customDataTypeId = await umbracoApi.dataType.createContentPickerDataTypeWithStartNode(customDataTypeName, contentPickerId); - await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, customDataTypeId); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, customDataTypeId); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); await umbracoUi.content.goToSection(ConstantHelper.sections.content); // Act - await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); - await umbracoUi.content.chooseDocumentType(documentTypeName); - await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.goToContentWithName(contentName); await umbracoUi.content.clickChooseButton(); // Assert @@ -128,19 +130,18 @@ test.skip('can ignore user start node for the content picker in the content', as const childContentPickerName = 'TestChildContentPicker'; await umbracoApi.documentType.ensureNameNotExists(childContentPickerDocumentTypeName); const childContentPickerDocumentTypeId = await umbracoApi.documentType.createDefaultDocumentType(childContentPickerDocumentTypeName); - const contentPickerDocumentTypeId = await umbracoApi.documentType.createDocumentTypeWithAllowedChildNode(contentPickerName, childContentPickerDocumentTypeId); + contentPickerDocumentTypeId = await umbracoApi.documentType.createDocumentTypeWithAllowedChildNode(contentPickerName, childContentPickerDocumentTypeId); const contentPickerId = await umbracoApi.document.createDefaultDocument(contentPickerName, contentPickerDocumentTypeId); await umbracoApi.document.createDefaultDocumentWithParent(childContentPickerName, childContentPickerDocumentTypeId, contentPickerId); // Create a custom content picker with the setting "ignore user start node" is enable const customDataTypeId = await umbracoApi.dataType.createContentPickerDataTypeWithIgnoreUserStartNodes(customDataTypeName, contentPickerId); - await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, customDataTypeId); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, customDataTypeId); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); await umbracoUi.content.goToSection(ConstantHelper.sections.content); // Act - await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); - await umbracoUi.content.chooseDocumentType(documentTypeName); - await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.goToContentWithName(contentName); await umbracoUi.content.clickChooseButton(); // Assert @@ -158,6 +159,7 @@ test('can remove content picker in the content', async ({umbracoApi, umbracoUi}) const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); const contentPickerId = await umbracoApi.document.createDefaultDocument(contentPickerName, contentPickerDocumentTypeId); await umbracoApi.document.createDocumentWithContentPicker(contentName, documentTypeId, contentPickerId); + await umbracoUi.goToBackOffice(); await umbracoUi.content.goToSection(ConstantHelper.sections.content); // Act diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDropdown.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDropdown.spec.ts index 8994e9f026..7a4c246b01 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDropdown.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDropdown.spec.ts @@ -20,6 +20,7 @@ for (const dataTypeName of dataTypeNames) { test(`can create content with the ${dataTypeName} data type`, async ({umbracoApi, umbracoUi}) => { // Arrange + const expectedState = 'Draft'; const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); await umbracoUi.content.goToSection(ConstantHelper.sections.content); @@ -35,26 +36,27 @@ for (const dataTypeName of dataTypeNames) { await umbracoUi.content.isSuccessNotificationVisible(); expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); expect(contentData.values).toEqual([]); }); test(`can publish content with the ${dataTypeName} data type`, async ({umbracoApi, umbracoUi}) => { // Arrange + const expectedState = 'Published'; const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); - await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); await umbracoUi.content.goToSection(ConstantHelper.sections.content); // Act - await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); - await umbracoUi.content.chooseDocumentType(documentTypeName); - await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.goToContentWithName(contentName); await umbracoUi.content.clickSaveAndPublishButton(); // Assert await umbracoUi.content.doesSuccessNotificationsHaveCount(2); expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); expect(contentData.values).toEqual([]); }); @@ -65,14 +67,12 @@ for (const dataTypeName of dataTypeNames) { const selectedOptions = dataTypeName === 'Dropdown' ? [optionValues[0]] : optionValues; const isMultiple = dataTypeName === 'Dropdown' ? false : true; const customDataTypeId = await umbracoApi.dataType.createDropdownDataType(customDataTypeName, isMultiple, optionValues); - await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, customDataTypeId); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, customDataTypeId); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); await umbracoUi.content.goToSection(ConstantHelper.sections.content); // Act - await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); - await umbracoUi.content.chooseDocumentType(documentTypeName); - await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.goToContentWithName(contentName); await umbracoUi.content.chooseDropdownOption(selectedOptions); await umbracoUi.content.clickSaveAndPublishButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts new file mode 100644 index 0000000000..2b15dbbe14 --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts @@ -0,0 +1,103 @@ +import {ConstantHelper, test, AliasHelper} from '@umbraco/playwright-testhelpers'; +import {expect} from "@playwright/test"; + +const contentName = 'TestContent'; +const documentTypeName = 'TestDocumentTypeForContent'; +const dataTypeName = 'Image Cropper'; +const imageFileName = 'Umbraco.png'; +const imageFilePath = './fixtures/mediaLibrary/' + imageFileName; +const defaultFocalPoint = { + left: 0.5, + top: 0.5, +}; + +test.beforeEach(async ({umbracoApi, umbracoUi}) => { + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoUi.goToBackOffice(); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); +}); + +test('can create content with the image cropper data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Draft'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.clickActionsMenuAtRoot(); + await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.chooseDocumentType(documentTypeName); + await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.uploadFile(imageFilePath); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value.src).toContain(AliasHelper.toAlias(imageFileName)); + expect(contentData.values[0].value.crops).toEqual([]); + expect(contentData.values[0].value.focalPoint).toEqual(defaultFocalPoint); +}); + +test('can publish content with the image cropper data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Published'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.uploadFile(imageFilePath); + await umbracoUi.content.clickSaveAndPublishButton(); + + // Assert + await umbracoUi.content.doesSuccessNotificationsHaveCount(2); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value.src).toContain(AliasHelper.toAlias(imageFileName)); + expect(contentData.values[0].value.crops).toEqual([]); + expect(contentData.values[0].value.focalPoint).toEqual(defaultFocalPoint); +}); + +test('can create content with the custom image cropper data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const customDataTypeName = 'CustomImageCropper'; + const cropValue = ['TestCropLabel', 100, 50]; + const customDataTypeId = await umbracoApi.dataType.createImageCropperDataTypeWithOneCrop(customDataTypeName, cropValue[0], cropValue[1], cropValue[2]); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, customDataTypeId); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.uploadFile(imageFilePath); + await umbracoUi.content.clickSaveAndPublishButton(); + + // Assert + await umbracoUi.content.doesSuccessNotificationsHaveCount(2); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(customDataTypeName)); + expect(contentData.values[0].value.src).toContain(AliasHelper.toAlias(imageFileName)); + expect(contentData.values[0].value.focalPoint).toEqual(defaultFocalPoint); + expect(contentData.values[0].value.crops[0].alias).toEqual(AliasHelper.toAlias(cropValue[0])); + expect(contentData.values[0].value.crops[0].width).toEqual(cropValue[1]); + expect(contentData.values[0].value.crops[0].height).toEqual(cropValue[2]); + + // Clean + await umbracoApi.dataType.ensureNameNotExists(customDataTypeName); +}); + diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMediaPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMediaPicker.spec.ts index 5d66cc6d91..f855841738 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMediaPicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMediaPicker.spec.ts @@ -13,7 +13,6 @@ test.beforeEach(async ({umbracoApi, umbracoUi}) => { await umbracoApi.document.ensureNameNotExists(contentName); await umbracoApi.media.ensureNameNotExists(mediaFileName); mediaFileId = await umbracoApi.media.createDefaultMediaFile(mediaFileName); - await umbracoUi.goToBackOffice(); }); test.afterEach(async ({umbracoApi}) => { @@ -24,8 +23,10 @@ test.afterEach(async ({umbracoApi}) => { test('can create content with the media picker data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Arrange + const expectedState = 'Draft'; const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoUi.goToBackOffice(); await umbracoUi.content.goToSection(ConstantHelper.sections.content); // Act @@ -41,6 +42,7 @@ test('can create content with the media picker data type', {tag: '@smoke'}, asyn await umbracoUi.content.isSuccessNotificationVisible(); expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); expect(contentData.values[0].value[0].mediaKey).toEqual(mediaFileId); expect(contentData.values[0].value[0].mediaTypeAlias).toEqual(mediaTypeName); @@ -50,8 +52,10 @@ test('can create content with the media picker data type', {tag: '@smoke'}, asyn test('can publish content with the media picker data type', async ({umbracoApi, umbracoUi}) => { // Arrange + const expectedState = 'Published'; const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoUi.goToBackOffice(); await umbracoUi.content.goToSection(ConstantHelper.sections.content); // Act @@ -67,6 +71,7 @@ test('can publish content with the media picker data type', async ({umbracoApi, await umbracoUi.content.doesSuccessNotificationsHaveCount(2); expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); expect(contentData.values[0].value[0].mediaKey).toEqual(mediaFileId); expect(contentData.values[0].value[0].mediaTypeAlias).toEqual(mediaTypeName); @@ -79,6 +84,7 @@ test('can remove a media picker in the content', async ({umbracoApi, umbracoUi}) const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); await umbracoApi.document.createDocumentWithOneMediaPicker(contentName, documentTypeId, mediaFileId); + await umbracoUi.goToBackOffice(); await umbracoUi.content.goToSection(ConstantHelper.sections.content); // Act @@ -87,7 +93,7 @@ test('can remove a media picker in the content', async ({umbracoApi, umbracoUi}) await umbracoUi.content.clickSaveButton(); // Assert - await umbracoUi.content.doesSuccessNotificationsHaveCount(1); + await umbracoUi.content.isSuccessNotificationVisible(); expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); const contentData = await umbracoApi.document.getByName(contentName); expect(contentData.values).toEqual([]); @@ -103,14 +109,13 @@ test('can limit the media picker in the content by setting the start node', asyn await umbracoApi.media.ensureNameNotExists(childMediaName); await umbracoApi.media.createDefaultMediaFileAndParentId(childMediaName, mediaFolderId); const customDataTypeId = await umbracoApi.dataType.createMediaPickerDataTypeWithStartNodeId(customDataTypeName, mediaFolderId); - await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, customDataTypeId); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, customDataTypeId); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); await umbracoUi.content.goToSection(ConstantHelper.sections.content); // Act - await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); - await umbracoUi.content.chooseDocumentType(documentTypeName); - await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.goToContentWithName(contentName); await umbracoUi.content.clickChooseMediaPickerButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMemberPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMemberPicker.spec.ts new file mode 100644 index 0000000000..b049976a1c --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMemberPicker.spec.ts @@ -0,0 +1,97 @@ +import { ConstantHelper, test, AliasHelper } from '@umbraco/playwright-testhelpers'; +import {expect} from "@playwright/test"; + +const dataTypeName = 'Member Picker'; +const contentName = 'TestContent'; +const memberName = 'TestMemberForContent'; +const documentTypeName = 'TestDocumentTypeForContent'; +const memberTypeName = 'Test Member Type'; +const memberInfo = ['testmember@acceptance.test', 'testmember', '0123456789']; +let memberId = ''; + +test.beforeEach(async ({umbracoApi, umbracoUi}) => { + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.memberType.ensureNameNotExists(memberTypeName); + await umbracoApi.member.ensureNameNotExists(memberName); + const memberTypeId = await umbracoApi.memberType.createDefaultMemberType(memberTypeName); + memberId = await umbracoApi.member.createDefaultMember(memberName, memberTypeId, memberInfo[0], memberInfo[1], memberInfo[2]); + await umbracoUi.goToBackOffice(); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.memberType.ensureNameNotExists(memberTypeName); + await umbracoApi.member.ensureNameNotExists(memberName); + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); +}); + +test('can create content with the member picker data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Draft'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.clickActionsMenuAtRoot(); + await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.chooseDocumentType(documentTypeName); + await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.clickChooseMemberPickerButton(); + await umbracoUi.content.selectMemberByName(memberName); + await umbracoUi.content.clickSubmitButton(); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value).toEqual(memberId); +}); + +test('can publish content with the member picker data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Published'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickChooseMemberPickerButton(); + await umbracoUi.content.selectMemberByName(memberName); + await umbracoUi.content.clickSubmitButton(); + await umbracoUi.content.clickSaveAndPublishButton(); + + // Assert + await umbracoUi.content.doesSuccessNotificationsHaveCount(2); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value).toEqual(memberId); +}); + +test('can remove a member picker in the content', async ({umbracoApi, umbracoUi}) => { + // Arrange + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDocumentWithMemberPicker(contentName, documentTypeId, memberId); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.removeMemberPickerByName(memberName); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values).toEqual([]); +}); + diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultiURLPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultiURLPicker.spec.ts index 3a6333ddb4..6c6135b3e3 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultiURLPicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultiURLPicker.spec.ts @@ -19,6 +19,7 @@ test.afterEach(async ({umbracoApi}) => { test('can create content with the document link', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Arrange + const expectedState = 'Draft'; const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); // Create a document to link @@ -43,6 +44,7 @@ test('can create content with the document link', {tag: '@smoke'}, async ({umbra await umbracoUi.content.isSuccessNotificationVisible(); expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); expect(contentData.values[0].value.length).toBe(1); expect(contentData.values[0].value[0].type).toEqual('document'); @@ -59,6 +61,7 @@ test('can create content with the document link', {tag: '@smoke'}, async ({umbra test('can publish content with the document link', async ({umbracoApi, umbracoUi}) => { // Arrange + const expectedState = 'Published'; const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); @@ -81,7 +84,7 @@ test('can publish content with the document link', async ({umbracoApi, umbracoUi await umbracoUi.content.doesSuccessNotificationsHaveCount(2); expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); const contentData = await umbracoApi.document.getByName(contentName); - expect(contentData.variants[0].state).toBe('Published'); + expect(contentData.variants[0].state).toBe(expectedState); expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); expect(contentData.values[0].value.length).toBe(1); expect(contentData.values[0].value[0].type).toEqual('document'); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleImageMediaPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleImageMediaPicker.spec.ts new file mode 100644 index 0000000000..907889247c --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleImageMediaPicker.spec.ts @@ -0,0 +1,120 @@ +import {ConstantHelper, test, AliasHelper} from '@umbraco/playwright-testhelpers'; +import {expect} from "@playwright/test"; + +const dataTypeName = 'Multiple Image Media Picker'; +const contentName = 'TestContent'; +const documentTypeName = 'TestDocumentTypeForContent'; +const firstMediaFileName = 'TestFirstMedia'; +const secondMediaFileName = 'TestSecondMedia'; +const mediaTypeName = 'Image'; +let firstMediaFileId = ''; +let secondMediaFileId = ''; + +test.beforeEach(async ({umbracoApi, umbracoUi}) => { + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.media.ensureNameNotExists(firstMediaFileName); + firstMediaFileId = await umbracoApi.media.createDefaultMediaWithImage(firstMediaFileName); + await umbracoApi.media.ensureNameNotExists(secondMediaFileName); + secondMediaFileId = await umbracoApi.media.createDefaultMediaWithImage(secondMediaFileName); + await umbracoUi.goToBackOffice(); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.media.ensureNameNotExists(firstMediaFileName); + await umbracoApi.media.ensureNameNotExists(secondMediaFileName); + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); +}); + +test('can create content with multiple image media picker data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Draft'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.clickActionsMenuAtRoot(); + await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.chooseDocumentType(documentTypeName); + await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +test('can publish content with multiple image media picker data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Published'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickSaveAndPublishButton(); + + // Assert + await umbracoUi.content.doesSuccessNotificationsHaveCount(2); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +test('can add multiple images to the multiple image media picker', async ({umbracoApi, umbracoUi}) => { + // Arrange + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickChooseMediaPickerButton(); + await umbracoUi.content.clickMediaByNameInMediaPicker(firstMediaFileName); + await umbracoUi.content.clickMediaByNameInMediaPicker(secondMediaFileName); + await umbracoUi.content.clickSubmitButton(); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value.length).toBe(2); + expect(contentData.values[0].value[0].mediaKey).toEqual(firstMediaFileId); + expect(contentData.values[0].value[0].mediaTypeAlias).toEqual(mediaTypeName); + expect(contentData.values[0].value[1].mediaKey).toEqual(secondMediaFileId); + expect(contentData.values[0].value[1].mediaTypeAlias).toEqual(mediaTypeName); +}); + +test('can remove a media picker in the content', async ({umbracoApi, umbracoUi}) => { + // Arrange + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDocumentWithTwoMediaPicker(contentName, documentTypeId, firstMediaFileId, secondMediaFileId, AliasHelper.toAlias(dataTypeName)); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.removeMediaPickerByName(firstMediaFileName); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value.length).toBe(1); + expect(contentData.values[0].value[0].mediaKey).toEqual(secondMediaFileId); + expect(contentData.values[0].value[0].mediaTypeAlias).toEqual(mediaTypeName); +}); + diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleMediaPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleMediaPicker.spec.ts index 0ccae1f89b..2cf94e8a89 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleMediaPicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleMediaPicker.spec.ts @@ -5,8 +5,8 @@ const dataTypeName = 'Multiple Media Picker'; const contentName = 'TestContent'; const documentTypeName = 'TestDocumentTypeForContent'; const firstMediaFileName = 'TestFirstMedia'; -const firstMediaTypeName = 'File'; const secondMediaFileName = 'TestSecondMedia'; +const firstMediaTypeName = 'File'; const secondMediaTypeName = 'Image'; let firstMediaFileId = ''; let secondMediaFileId = ''; @@ -24,12 +24,13 @@ test.beforeEach(async ({umbracoApi, umbracoUi}) => { test.afterEach(async ({umbracoApi}) => { await umbracoApi.media.ensureNameNotExists(firstMediaFileName); await umbracoApi.media.ensureNameNotExists(secondMediaFileName); - await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.document.ensureNameNotExists(contentName); await umbracoApi.documentType.ensureNameNotExists(documentTypeName); }); test('can create content with multiple media picker data type', async ({umbracoApi, umbracoUi}) => { // Arrange + const expectedState = 'Draft'; const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); await umbracoUi.content.goToSection(ConstantHelper.sections.content); @@ -39,45 +40,55 @@ test('can create content with multiple media picker data type', async ({umbracoA await umbracoUi.content.clickCreateButton(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); - await umbracoUi.content.selectMediaByName(firstMediaFileName); - await umbracoUi.content.clickSubmitButton(); - await umbracoUi.content.selectMediaByName(secondMediaFileName); - await umbracoUi.content.clickSubmitButton(); await umbracoUi.content.clickSaveButton(); // Assert - await umbracoUi.content.doesSuccessNotificationsHaveCount(1); + await umbracoUi.content.isSuccessNotificationVisible(); expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); const contentData = await umbracoApi.document.getByName(contentName); - expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); - expect(contentData.values[0].value.length).toBe(2); - expect(contentData.values[0].value[0].mediaKey).toEqual(firstMediaFileId); - expect(contentData.values[0].value[0].mediaTypeAlias).toEqual(firstMediaTypeName); - expect(contentData.values[0].value[1].mediaKey).toEqual(secondMediaFileId); - expect(contentData.values[0].value[1].mediaTypeAlias).toEqual(secondMediaTypeName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); }); test('can publish content with multiple media picker data type', async ({umbracoApi, umbracoUi}) => { // Arrange + const expectedState = 'Published'; const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); - await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); await umbracoUi.content.goToSection(ConstantHelper.sections.content); // Act - await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); - await umbracoUi.content.chooseDocumentType(documentTypeName); - await umbracoUi.content.enterContentName(contentName); - await umbracoUi.content.selectMediaByName(firstMediaFileName); - await umbracoUi.content.clickSubmitButton(); - await umbracoUi.content.selectMediaByName(secondMediaFileName); - await umbracoUi.content.clickSubmitButton(); + await umbracoUi.content.goToContentWithName(contentName); await umbracoUi.content.clickSaveAndPublishButton(); // Assert await umbracoUi.content.doesSuccessNotificationsHaveCount(2); expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +test('can add multiple media files to the multiple media picker', async ({umbracoApi, umbracoUi}) => { + // Arrange + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickChooseMediaPickerButton(); + await umbracoUi.content.clickMediaByNameInMediaPicker(firstMediaFileName); + await umbracoUi.content.clickMediaByNameInMediaPicker(secondMediaFileName); + await umbracoUi.content.clickSubmitButton(); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); expect(contentData.values[0].value.length).toBe(2); expect(contentData.values[0].value[0].mediaKey).toEqual(firstMediaFileId); @@ -90,7 +101,7 @@ test('can remove a media picker in the content', async ({umbracoApi, umbracoUi}) // Arrange const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); - await umbracoApi.document.createDocumentWithTwoMediaPicker(contentName, documentTypeId, firstMediaFileId, secondMediaFileId); + await umbracoApi.document.createDocumentWithTwoMediaPicker(contentName, documentTypeId, firstMediaFileId, secondMediaFileId, AliasHelper.toAlias(dataTypeName)); await umbracoUi.content.goToSection(ConstantHelper.sections.content); // Act @@ -99,7 +110,7 @@ test('can remove a media picker in the content', async ({umbracoApi, umbracoUi}) await umbracoUi.content.clickSaveButton(); // Assert - await umbracoUi.content.doesSuccessNotificationsHaveCount(1); + await umbracoUi.content.isSuccessNotificationVisible(); expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); const contentData = await umbracoApi.document.getByName(contentName); expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); @@ -108,3 +119,4 @@ test('can remove a media picker in the content', async ({umbracoApi, umbracoUi}) expect(contentData.values[0].value[0].mediaTypeAlias).toEqual(secondMediaTypeName); }); + diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithNumeric.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithNumeric.spec.ts new file mode 100644 index 0000000000..946c16b312 --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithNumeric.spec.ts @@ -0,0 +1,65 @@ +import { ConstantHelper, test, AliasHelper } from '@umbraco/playwright-testhelpers'; +import {expect} from "@playwright/test"; + +const contentName = 'TestContent'; +const documentTypeName = 'TestDocumentTypeForContent'; +const dataTypeName = 'Numeric'; +const number = 10; + +test.beforeEach(async ({umbracoApi, umbracoUi}) => { + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoUi.goToBackOffice(); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); +}); + +test('can create content with the numeric data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Draft'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.clickActionsMenuAtRoot(); + await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.chooseDocumentType(documentTypeName); + await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.enterNumeric(number); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value).toEqual(number); +}); + +test('can publish content with the numeric data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Published'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.enterNumeric(number); + await umbracoUi.content.clickSaveAndPublishButton(); + + // Assert + await umbracoUi.content.doesSuccessNotificationsHaveCount(2); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value).toEqual(number); +}); + From 3f8bae1a29c05c8adb0e339440ead69ab0a09c0a Mon Sep 17 00:00:00 2001 From: Andreas Zerbst <73799582+andr317c@users.noreply.github.com> Date: Tue, 27 Aug 2024 10:36:44 +0200 Subject: [PATCH 32/90] V14 QA added Block grid acceptance tests (#16908) * Added blockgrid tests * Additional tests * Added more tets * Split tests * Block updates * Bumped version * Added block tests * Fixes, not done * Fixed * Updated helper * Bumped version * Bumped helpers * Fixed conflicts * Removed page * Removed page * Bumped * Reverted to run smoke tests --- .../package-lock.json | 22 +- .../Umbraco.Tests.AcceptanceTest/package.json | 2 +- .../Block/BlockGridBlockAdvanced.spec.ts | 277 ++++++++++++ .../Block/BlockGridBlockAreas.spec.ts | 356 ++++++++++++++++ .../Block/BlockGridBlockSettings.spec.ts | 253 +++++++++++ .../BlockGrid/BlockGridEditor.spec.ts | 399 ++++++++++++++++++ 6 files changed, 1290 insertions(+), 19 deletions(-) create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/Block/BlockGridBlockAdvanced.spec.ts create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/Block/BlockGridBlockAreas.spec.ts create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/Block/BlockGridBlockSettings.spec.ts create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/BlockGridEditor.spec.ts diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json index 4401900faf..f7103ba5a4 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json @@ -8,7 +8,7 @@ "hasInstallScript": true, "dependencies": { "@umbraco/json-models-builders": "^2.0.17", - "@umbraco/playwright-testhelpers": "^2.0.0-beta.77", + "@umbraco/playwright-testhelpers": "^2.0.0-beta.78", "camelize": "^1.0.0", "dotenv": "^16.3.1", "faker": "^4.1.0", @@ -140,9 +140,9 @@ } }, "node_modules/@umbraco/playwright-testhelpers": { - "version": "2.0.0-beta.77", - "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-2.0.0-beta.77.tgz", - "integrity": "sha512-e0yNJ8CV9f7vlVC77ThC2gUSee323G6koTk/Jp8CUpkwKnN/oL73sGfeKLQdPoL4QPt+Cu8j7hrU0D89Zsu3fg==", + "version": "2.0.0-beta.78", + "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-2.0.0-beta.78.tgz", + "integrity": "sha512-s9jLCKQRfXH2zAkT4iUzu/XsrrPQRFVWdj7Ps3uvBV8YzdM1EYMAaCKwgZ5OnCSCN87gysYTW++NZyKT2Fg6qQ==", "dependencies": { "@umbraco/json-models-builders": "2.0.17", "node-fetch": "^2.6.7" @@ -415,20 +415,6 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, - "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json index fd9c2ede9b..d6877d5581 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@umbraco/json-models-builders": "^2.0.17", - "@umbraco/playwright-testhelpers": "^2.0.0-beta.77", + "@umbraco/playwright-testhelpers": "^2.0.0-beta.78", "camelize": "^1.0.0", "dotenv": "^16.3.1", "faker": "^4.1.0", diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/Block/BlockGridBlockAdvanced.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/Block/BlockGridBlockAdvanced.spec.ts new file mode 100644 index 0000000000..3f6c56c50c --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/Block/BlockGridBlockAdvanced.spec.ts @@ -0,0 +1,277 @@ +import {test} from '@umbraco/playwright-testhelpers'; +import {expect} from "@playwright/test"; + +const blockGridEditorName = 'TestBlockGridEditor'; +const elementTypeName = 'BlockGridElement'; +const dataTypeName = 'Textstring'; +const groupName = 'testGroup'; + +test.beforeEach(async ({umbracoUi, umbracoApi}) => { + await umbracoApi.dataType.ensureNameNotExists(blockGridEditorName); + await umbracoUi.goToBackOffice(); + await umbracoUi.dataType.goToSettingsTreeItem('Data Types'); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.dataType.ensureNameNotExists(blockGridEditorName); +}); + +//TODO: It is not possible to add a view to a block +test.skip('can add a custom view to a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAdvancedTab(); +}); + +//TODO: It is not possible to add a view to a block +test.skip('can remove a custom view from a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAdvancedTab(); +}); + +// TODO: Stylesheets are currently saved as arrays +test.skip('can remove a custom stylesheet from a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const stylesheetName = 'TestStylesheet.css' + const stylesheetPath = '/wwwroot/css/' + stylesheetName; + await umbracoApi.stylesheet.ensureNameNotExists(stylesheetName); + await umbracoApi.stylesheet.createDefaultStylesheet(stylesheetName); + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithAdvancedSettingsInBlock(blockGridEditorName, contentElementTypeId, undefined, stylesheetPath, undefined, undefined, undefined); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainStylesheet(blockGridEditorName, contentElementTypeId, stylesheetPath)).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAdvancedTab(); +}); + +test('can update overlay size in a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const overlaySize = 'medium'; + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAdvancedTab(); + await umbracoUi.dataType.updateBlockOverlaySize(overlaySize); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainOverlaySize(blockGridEditorName, contentElementTypeId, overlaySize)).toBeTruthy(); +}); + +test('can enable inline editing mode in a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAdvancedTab(); + await umbracoUi.dataType.clickInlineEditingMode(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainInlineEditing(blockGridEditorName, contentElementTypeId, true)).toBeTruthy(); +}); + +test('can disable inline editing mode in a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithAdvancedSettingsInBlock(blockGridEditorName, contentElementTypeId, undefined, undefined, 'small', true); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainInlineEditing(blockGridEditorName, contentElementTypeId, true)).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAdvancedTab(); + await umbracoUi.dataType.clickInlineEditingMode(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainInlineEditing(blockGridEditorName, contentElementTypeId, false)).toBeTruthy(); +}); + +test('can enable hide content editor in a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAdvancedTab(); + await umbracoUi.dataType.clickBlockGridHideContentEditorButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainHideContentEditor(blockGridEditorName, contentElementTypeId, true)).toBeTruthy(); +}); + +test('can disable hide content editor in a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithAdvancedSettingsInBlock(blockGridEditorName, contentElementTypeId, undefined, undefined, 'small', false, true); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainHideContentEditor(blockGridEditorName, contentElementTypeId, true)).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAdvancedTab(); + await umbracoUi.dataType.clickBlockGridHideContentEditorButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainHideContentEditor(blockGridEditorName, contentElementTypeId, false)).toBeTruthy(); +}); + +test('can add a background color to a block', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const backGroundColor = '#000000'; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAdvancedTab(); + await umbracoUi.dataType.selectBlockBackgroundColor(backGroundColor); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainBackgroundColor(blockGridEditorName, contentElementTypeId, backGroundColor)).toBeTruthy(); +}); + +test('can remove a background color to a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const backGroundColor = '#000000'; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithCatalogueAppearanceInBlock(blockGridEditorName, contentElementTypeId, backGroundColor); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainBackgroundColor(blockGridEditorName, contentElementTypeId, backGroundColor)).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAdvancedTab(); + await umbracoUi.dataType.selectBlockBackgroundColor(''); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainBackgroundColor(blockGridEditorName, contentElementTypeId, '')).toBeTruthy(); +}); + +test('can add a icon color to a block', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const iconColor = '#000000'; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAdvancedTab(); + await umbracoUi.dataType.selectBlockIconColor(iconColor); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainIconColor(blockGridEditorName, contentElementTypeId, iconColor)).toBeTruthy(); +}); + +test('can remove a icon color from a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const iconColor = '#000000'; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithCatalogueAppearanceInBlock(blockGridEditorName, contentElementTypeId, '', iconColor); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainIconColor(blockGridEditorName, contentElementTypeId, iconColor)).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAdvancedTab(); + await umbracoUi.dataType.selectBlockIconColor(''); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainIconColor(blockGridEditorName, contentElementTypeId, '')).toBeTruthy(); +}); + +// TODO: Thumbnails are not showing correctly +test.skip('can add a thumbnail to a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const mediaName = 'TestMedia'; + await umbracoApi.media.ensureNameNotExists(mediaName); + await umbracoApi.media.createDefaultMediaWithImage(mediaName); + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, contentElementTypeId); + const mediaUrl = await umbracoApi.media.getMediaPathByName(mediaName); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAdvancedTab(); + await umbracoUi.dataType.chooseBlockThumbnailWithPath(mediaUrl.fileName, mediaUrl.mediaPath); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); +}); + +// TODO: Thumbnails are not showing correctly +test.skip('can remove a thumbnail from a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAdvancedTab(); +}); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/Block/BlockGridBlockAreas.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/Block/BlockGridBlockAreas.spec.ts new file mode 100644 index 0000000000..d33141220a --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/Block/BlockGridBlockAreas.spec.ts @@ -0,0 +1,356 @@ +import {test} from '@umbraco/playwright-testhelpers'; +import {expect} from "@playwright/test"; + +const blockGridEditorName = 'TestBlockGridEditor'; +const elementTypeName = 'BlockGridElement'; +const dataTypeName = 'Textstring'; +const groupName = 'testGroup'; + +test.beforeEach(async ({umbracoUi, umbracoApi}) => { + await umbracoApi.dataType.ensureNameNotExists(blockGridEditorName); + await umbracoApi.documentType.ensureNameNotExists(elementTypeName); + await umbracoUi.goToBackOffice(); + await umbracoUi.dataType.goToSettingsTreeItem('Data Types'); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.dataType.ensureNameNotExists(blockGridEditorName); + await umbracoApi.documentType.ensureNameNotExists(elementTypeName); +}); + +test('can update grid columns for areas for a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const gridColumns = 6; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAreasTab(); + await umbracoUi.dataType.enterGridColumnsForArea(gridColumns); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainAreaGridColumns(blockGridEditorName, contentElementTypeId, gridColumns)).toBeTruthy(); +}); + +test('can add an area for a block', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAreasTab(); + await umbracoUi.dataType.addAreaButton(); + await umbracoUi.dataType.clickAreaSubmitButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainAreaWithAlias(blockGridEditorName, contentElementTypeId)).toBeTruthy(); +}); + +// TODO: There are currently issues when trying to select the locator. +test.skip('can resize an area for a block', async ({umbracoApi, umbracoUi}) => { +// Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const areaAlias = 'TestArea'; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithAnAreaInABlock(blockGridEditorName, contentElementTypeId, areaAlias); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAreasTab(); +}); + +test('can update alias an area for a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const areaAlias = 'TestArea'; + const newAlias = 'NewAlias'; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithAnAreaInABlock(blockGridEditorName, contentElementTypeId, areaAlias); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAreasTab(); + await umbracoUi.dataType.goToAreaByAlias(areaAlias); + await umbracoUi.dataType.enterAreaAlias(newAlias); + await umbracoUi.dataType.clickAreaSubmitButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainAreaWithAlias(blockGridEditorName, contentElementTypeId, newAlias)).toBeTruthy(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainAreaCount(blockGridEditorName, contentElementTypeId, 1)).toBeTruthy(); +}); + +test('can remove an area for a block', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const areaAlias = 'TestArea'; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithAnAreaInABlock(blockGridEditorName, contentElementTypeId, areaAlias); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainAreaWithAlias(blockGridEditorName, contentElementTypeId, areaAlias)).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAreasTab(); + await umbracoUi.dataType.clickRemoveAreaByAlias(areaAlias); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainAreaWithAlias(blockGridEditorName, contentElementTypeId, areaAlias)).toBeFalsy(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainAreaCount(blockGridEditorName, contentElementTypeId, 0)).toBeTruthy(); +}); + +test('can add multiple areas for a block', async ({umbracoApi, umbracoUi}) => { +// Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const areaAlias = 'TestArea'; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithAnAreaInABlock(blockGridEditorName, contentElementTypeId, areaAlias); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainAreaCount(blockGridEditorName, contentElementTypeId, 1)).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAreasTab(); + await umbracoUi.dataType.addAreaButton(); + await umbracoUi.dataType.clickAreaSubmitButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainAreaWithAlias(blockGridEditorName, contentElementTypeId)).toBeTruthy(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainAreaWithAlias(blockGridEditorName, contentElementTypeId, areaAlias)).toBeTruthy(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainAreaCount(blockGridEditorName, contentElementTypeId, 2)).toBeTruthy(); +}); + +test('can add create button label for an area in a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const areaAlias = 'TestArea'; + const createButtonLabel = 'CreateButtonLabel'; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithAnAreaInABlock(blockGridEditorName, contentElementTypeId, areaAlias); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAreasTab(); + await umbracoUi.dataType.goToAreaByAlias(areaAlias); + await umbracoUi.dataType.enterCreateButtonLabelInArea(createButtonLabel); + await umbracoUi.dataType.clickAreaSubmitButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainAreaWithCreateButtonLabel(blockGridEditorName, contentElementTypeId, areaAlias, createButtonLabel)).toBeTruthy(); +}); + +test('can remove create button label for an area in a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const areaAlias = 'TestArea'; + const createButtonLabel = 'CreateButtonLabel'; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithAnAreaInABlock(blockGridEditorName, contentElementTypeId, areaAlias, createButtonLabel); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAreasTab(); + await umbracoUi.dataType.goToAreaByAlias(areaAlias); + await umbracoUi.dataType.enterCreateButtonLabelInArea(''); + await umbracoUi.dataType.clickAreaSubmitButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainAreaWithCreateButtonLabel(blockGridEditorName, contentElementTypeId, areaAlias, '')).toBeTruthy(); +}); + +//TODO: Frontend issue. when value is inserted to the min or max, it is set as a string instead of number +test.skip('can add min allowed for an area in a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const areaAlias = 'TestArea'; + const minAllowed = 3; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithAnAreaInABlock(blockGridEditorName, contentElementTypeId, areaAlias); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAreasTab(); + await umbracoUi.dataType.goToAreaByAlias(areaAlias); + await umbracoUi.dataType.enterMinAllowedInArea(minAllowed); + await umbracoUi.dataType.clickAreaSubmitButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainAreaWithMinAllowed(blockGridEditorName, contentElementTypeId, areaAlias, minAllowed)).toBeTruthy(); +}); + +test('can remove min allowed for an area in a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const areaAlias = 'TestArea'; + const minAllowed = 6; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithAnAreaInABlock(blockGridEditorName, contentElementTypeId, areaAlias, null, undefined, undefined, minAllowed); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainAreaWithMinAllowed(blockGridEditorName, contentElementTypeId, areaAlias, minAllowed)).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAreasTab(); + await umbracoUi.dataType.goToAreaByAlias(areaAlias); + await umbracoUi.dataType.enterMinAllowedInArea(undefined); + await umbracoUi.dataType.clickAreaSubmitButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainAreaWithMinAllowed(blockGridEditorName, contentElementTypeId, areaAlias, minAllowed)).toBeFalsy(); +}); + +//TODO: Frontend issue. when value is inserted to the min or max, it is set as a string instead of number +test.skip('can add add max allowed for an area in a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const areaAlias = 'TestArea'; + const maxAllowed = 7; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithAnAreaInABlock(blockGridEditorName, contentElementTypeId, areaAlias); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAreasTab(); + await umbracoUi.dataType.goToAreaByAlias(areaAlias); + await umbracoUi.dataType.enterMaxAllowedInArea(maxAllowed); + await umbracoUi.dataType.clickAreaSubmitButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainAreaWithMaxAllowed(blockGridEditorName, contentElementTypeId, areaAlias, maxAllowed)).toBeTruthy(); +}); + +test('can remove max allowed for an area in a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const areaAlias = 'TestArea'; + const maxAllowed = 7; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithAnAreaInABlock(blockGridEditorName, contentElementTypeId, areaAlias, null, undefined, undefined, undefined, maxAllowed); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainAreaWithMaxAllowed(blockGridEditorName, contentElementTypeId, areaAlias, maxAllowed)).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAreasTab(); + await umbracoUi.dataType.goToAreaByAlias(areaAlias); + await umbracoUi.dataType.enterMaxAllowedInArea(undefined); + await umbracoUi.dataType.clickAreaSubmitButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainAreaWithMaxAllowed(blockGridEditorName, contentElementTypeId, areaAlias, maxAllowed)).toBeFalsy(); +}); + +// TODO: There is no frontend validation for min and max values +test.skip('min can not be more than max an area in a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const areaAlias = 'TestArea'; + const minAllowed = 6; + const maxAllowed = 7; + const newMinAllowed = 8; + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithAnAreaInABlock(blockGridEditorName, contentElementTypeId, areaAlias, null, undefined, undefined, minAllowed, maxAllowed); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAreasTab(); + await umbracoUi.dataType.goToAreaByAlias(areaAlias); + await umbracoUi.dataType.enterMinAllowedInArea(newMinAllowed); + await umbracoUi.dataType.clickAreaSubmitButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); +}); + +// TODO: It is currently not possible to add a specified allowance +test.skip('can add specified allowance for an area in a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const areaAlias = 'TestArea'; + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithAnAreaInABlock(blockGridEditorName, contentElementTypeId, areaAlias); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.goToBlockAreasTab(); + await umbracoUi.dataType.goToAreaByAlias(areaAlias); + await umbracoUi.dataType.clickAddSpecifiedAllowanceButton(); + await umbracoUi.dataType.clickAreaSubmitButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); +}); + +// TODO: It is currently not possible to add a specified allowance +test.skip('can update specified allowance for an area in a block', async ({umbracoApi, umbracoUi}) => { + +}); + +// TODO: It is currently not possible to add a specified allowance +test.skip('can remove specified allowance for an area in a block', async ({umbracoApi, umbracoUi}) => { + +}); + +// TODO: It is currently not possible to add a specified allowance +test.skip('can add multiple specified allowances for an area in a block', async ({umbracoApi, umbracoUi}) => { + +}); + +// TODO: It is currently not possible to add a specified allowance +test.skip('can add specified allowance with min and max for an area in a block', async ({umbracoApi, umbracoUi}) => { +}); + +// TODO: It is currently not possible to add a specified allowance +test.skip('can remove min and max from specified allowance for an area in a block', async ({umbracoApi, umbracoUi}) => { + +}); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/Block/BlockGridBlockSettings.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/Block/BlockGridBlockSettings.spec.ts new file mode 100644 index 0000000000..bf0ca4905e --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/Block/BlockGridBlockSettings.spec.ts @@ -0,0 +1,253 @@ +import {test} from '@umbraco/playwright-testhelpers'; +import {expect} from "@playwright/test"; + +const blockGridEditorName = 'TestBlockGridEditor'; +const elementTypeName = 'BlockGridElement'; +const dataTypeName = 'Textstring'; +const groupName = 'testGroup'; + +test.beforeEach(async ({umbracoUi, umbracoApi}) => { + await umbracoApi.dataType.ensureNameNotExists(blockGridEditorName); + await umbracoUi.goToBackOffice(); + await umbracoUi.dataType.goToSettingsTreeItem('Data Types'); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.dataType.ensureNameNotExists(blockGridEditorName); +}); + +test('can add a label to a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const labelText = 'TestLabel'; + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, elementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.enterBlockLabelText(labelText); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainLabel(blockGridEditorName, elementTypeId, labelText)).toBeTruthy(); +}); + +test('can remove a label from a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const labelText = 'TestLabel'; + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListWithBlockWithEditorAppearance(blockGridEditorName, elementTypeId, labelText); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainLabel(blockGridEditorName, elementTypeId, labelText)).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.enterBlockLabelText(''); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainLabel(blockGridEditorName, elementTypeId, labelText)).toBeFalsy(); +}); + +test('can open content model in a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, elementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.openBlockContentModel(); + + // Assert + await umbracoUi.dataType.isElementWorkspaceOpenInBlock(elementTypeName); +}); + +test('can add a settings model to a block', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + const secondElementName = 'SecondElementTest'; + const settingsElementTypeId = await umbracoApi.documentType.createDefaultElementType(secondElementName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.addBlockSettingsModel(secondElementName); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorContainBlocksWithSettingsTypeIds(blockGridEditorName, [settingsElementTypeId])).toBeTruthy(); +}); + +test('can remove a settings model from a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + const secondElementName = 'SecondElementTest'; + const settingsElementTypeId = await umbracoApi.documentType.createDefaultElementType(secondElementName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithContentAndSettingsElementType(blockGridEditorName, contentElementTypeId, settingsElementTypeId); + expect(await umbracoApi.dataType.doesBlockEditorContainBlocksWithSettingsTypeIds(blockGridEditorName, [settingsElementTypeId])).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.removeBlockSettingsModel(); + await umbracoUi.dataType.clickConfirmRemoveButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorContainBlocksWithSettingsTypeIds(blockGridEditorName, [settingsElementTypeId])).toBeFalsy(); +}); + +test('can enable allow in root from a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.clickAllowInRootForBlock(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockHaveAllowInRootEnabled(blockGridEditorName, contentElementTypeId)).toBeTruthy(); +}); + +test('can enable allow in areas from a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.clickAllowInAreasForBlock(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockHaveAllowInAreasEnabled(blockGridEditorName, contentElementTypeId)).toBeTruthy(); +}); + +test('can add a column span to a block', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const columnSpan = [1]; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.clickShowResizeOptions(); + await umbracoUi.dataType.clickAvailableColumnSpans(columnSpan); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainColumnSpanOptions(blockGridEditorName, contentElementTypeId, columnSpan)).toBeTruthy(); +}); + +test('can add multiple column spans to a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const columnSpan = [1, 3, 6, 8]; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.clickShowResizeOptions(); + await umbracoUi.dataType.clickAvailableColumnSpans(columnSpan); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainColumnSpanOptions(blockGridEditorName, contentElementTypeId, columnSpan)).toBeTruthy(); +}); + +test('can remove a column span from a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const columnSpan = [4]; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithSizeOptions(blockGridEditorName, contentElementTypeId, columnSpan[0]); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainColumnSpanOptions(blockGridEditorName, contentElementTypeId, columnSpan)).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.clickAvailableColumnSpans(columnSpan); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainColumnSpanOptions(blockGridEditorName, contentElementTypeId, [])).toBeTruthy(); +}); + +test('can add min and max row span to a block', async ({umbracoApi, umbracoUi}) => { +// Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const rowSpanMin = 2; + const rowSpanMax = 6; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.clickShowResizeOptions(); + await umbracoUi.dataType.enterMinRowSpan(rowSpanMin); + await umbracoUi.dataType.enterMaxRowSpan(rowSpanMax); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainRowSpanOptions(blockGridEditorName, contentElementTypeId, rowSpanMin, rowSpanMax)).toBeTruthy(); +}); + +test('can remove min and max row spans from a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const rowSpanMin = undefined; + const rowSpanMax = undefined; + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithSizeOptions(blockGridEditorName, contentElementTypeId, undefined, 2, 6); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainRowSpanOptions(blockGridEditorName, contentElementTypeId, 2, 6)).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.enterMinRowSpan(rowSpanMin); + await umbracoUi.dataType.enterMaxRowSpan(rowSpanMax); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainRowSpanOptions(blockGridEditorName, contentElementTypeId, rowSpanMin, rowSpanMax)).toBeTruthy(); +}); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/BlockGridEditor.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/BlockGridEditor.spec.ts new file mode 100644 index 0000000000..fa717aa183 --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/BlockGridEditor.spec.ts @@ -0,0 +1,399 @@ +import {test} from "@umbraco/playwright-testhelpers"; +import {expect} from "@playwright/test"; + +const blockGridEditorName = 'TestBlockGridEditor'; +const elementTypeName = 'BlockGridElement'; +const dataTypeName = 'Textstring'; +const groupName = 'testGroup'; + +test.beforeEach(async ({umbracoUi, umbracoApi}) => { + await umbracoApi.dataType.ensureNameNotExists(blockGridEditorName); + await umbracoUi.goToBackOffice(); + await umbracoUi.dataType.goToSettingsTreeItem('Data Types'); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.dataType.ensureNameNotExists(blockGridEditorName); +}); + +test('can create a block grid editor', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const blockGridLocatorName = 'Block Grid'; + const blockGridEditorAlias = 'Umbraco.BlockGrid'; + const blockGridEditorUiAlias = 'Umb.PropertyEditorUi.BlockGrid'; + + // Act + await umbracoUi.dataType.clickActionsMenuAtRoot(); + await umbracoUi.dataType.clickCreateButton(); + await umbracoUi.dataType.clickNewDataTypeThreeDotsButton(); + await umbracoUi.dataType.enterDataTypeName(blockGridEditorName); + await umbracoUi.dataType.clickSelectAPropertyEditorButton(); + await umbracoUi.dataType.selectAPropertyEditor(blockGridLocatorName); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesNameExist(blockGridEditorName)).toBeTruthy(); + const dataTypeData = await umbracoApi.dataType.getByName(blockGridEditorName); + expect(dataTypeData.editorAlias).toBe(blockGridEditorAlias); + expect(dataTypeData.editorUiAlias).toBe(blockGridEditorUiAlias); +}); + +test('can rename a block grid editor', async ({umbracoApi, umbracoUi}) => { + // Arrange + const wrongName = 'BlockListEditorTest'; + await umbracoApi.dataType.createEmptyBlockGrid(wrongName); + + // Act + await umbracoUi.dataType.goToDataType(wrongName); + await umbracoUi.dataType.enterDataTypeName(blockGridEditorName); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesNameExist(blockGridEditorName)).toBeTruthy(); + expect(await umbracoApi.dataType.doesNameExist(wrongName)).toBeFalsy(); +}); + +test('can delete a block grid editor', async ({umbracoApi, umbracoUi}) => { + // Arrange + const blockGridId = await umbracoApi.dataType.createEmptyBlockGrid(blockGridEditorName); + + // Act + await umbracoUi.dataType.clickRootFolderCaretButton(); + await umbracoUi.dataType.clickActionsMenuForDataType(blockGridEditorName); + await umbracoUi.dataType.clickDeleteExactButton(); + await umbracoUi.dataType.clickConfirmToDeleteButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesExist(blockGridId)).toBeFalsy(); + await umbracoUi.dataType.isTreeItemVisible(blockGridEditorName, false); +}); + +test('can add a block to a block grid editor', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createEmptyBlockGrid(blockGridEditorName); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.clickAddBlockButton(); + await umbracoUi.dataType.clickLabelWithName(elementTypeName); + await umbracoUi.dataType.clickChooseModalButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorContainBlocksWithContentTypeIds(blockGridEditorName, [elementTypeId])).toBeTruthy(); + + // Clean + await umbracoApi.documentType.ensureNameNotExists(elementTypeName); +}); + +test('can add multiple blocks to a block grid editor', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const secondElementName = 'SecondBlockGridElement'; + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + const secondElementTypeId = await umbracoApi.documentType.createDefaultElementType(secondElementName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, elementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.clickAddBlockButton(); + await umbracoUi.dataType.clickLabelWithName(secondElementName); + await umbracoUi.dataType.clickChooseModalButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorContainBlocksWithContentTypeIds(blockGridEditorName, [elementTypeId, secondElementTypeId])).toBeTruthy(); + + // Clean + await umbracoApi.documentType.ensureNameNotExists(elementTypeName); + await umbracoApi.documentType.ensureNameNotExists(secondElementTypeId); +}); + +test('can remove a block from a block grid editor', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlock(blockGridEditorName, elementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.clickRemoveBlockWithName(elementTypeName); + await umbracoUi.dataType.clickConfirmRemoveButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorContainBlocksWithContentTypeIds(blockGridEditorName, [elementTypeId])).toBeFalsy(); + + // Clean + await umbracoApi.documentType.ensureNameNotExists(elementTypeName); +}); + +test('can add a block to a group in a block grid editor', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createEmptyBlockGrid(blockGridEditorName); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.clickAddGroupButton(); + await umbracoUi.dataType.enterGroupName(groupName); + await umbracoUi.dataType.clickAddBlockButton(1); + await umbracoUi.dataType.clickLabelWithName(elementTypeName); + await umbracoUi.dataType.clickChooseModalButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockGridGroupContainCorrectBlocks(blockGridEditorName, groupName, [elementTypeId])).toBeTruthy(); + + // Clean + await umbracoApi.documentType.ensureNameNotExists(elementTypeName); +}); + +test('can add multiple blocks to a group in a block grid editor', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const secondElementName = 'SecondBlockGridElement'; + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + const secondElementTypeId = await umbracoApi.documentType.createDefaultElementType(secondElementName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlockInAGroup(blockGridEditorName, elementTypeId, groupName); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.clickAddBlockButton(1); + await umbracoUi.dataType.clickLabelWithName(secondElementName); + await umbracoUi.dataType.clickChooseModalButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockGridGroupContainCorrectBlocks(blockGridEditorName, groupName, [elementTypeId, secondElementTypeId])).toBeTruthy(); + + // Clean + await umbracoApi.documentType.ensureNameNotExists(elementTypeName); + await umbracoApi.documentType.ensureNameNotExists(secondElementName); +}); + +test('can delete a block in a group from a block grid editor', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlockInAGroup(blockGridEditorName, elementTypeId, groupName); + expect(await umbracoApi.dataType.doesBlockEditorContainBlocksWithContentTypeIds(blockGridEditorName, [elementTypeId])).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.clickRemoveBlockWithName(elementTypeName); + await umbracoUi.dataType.clickConfirmRemoveButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorContainBlocksWithContentTypeIds(blockGridEditorName, [elementTypeId])).toBeFalsy(); +}); + +test('can move a block from a group to another group in a block grid editor', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const secondGroupName = 'MoveToHereGroup'; + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlockInAGroup(blockGridEditorName, elementTypeId, groupName); + expect(await umbracoApi.dataType.doesBlockEditorContainBlocksWithContentTypeIds(blockGridEditorName, [elementTypeId])).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.clickAddGroupButton(); + await umbracoUi.dataType.enterGroupName(secondGroupName, 1); + // Drag and Drop + const dragFromLocator = await umbracoUi.dataType.getLinkWithName(elementTypeName); + const dragToLocator = await umbracoUi.dataType.getAddButtonInGroupWithName(secondGroupName); + await umbracoUi.dataType.dragAndDrop(dragFromLocator, dragToLocator, -10, 0, 10); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockGridGroupContainCorrectBlocks(blockGridEditorName, secondGroupName, [elementTypeId])).toBeTruthy(); + expect(await umbracoApi.dataType.doesBlockGridGroupContainCorrectBlocks(blockGridEditorName, groupName, [elementTypeId])).toBeFalsy(); +}); + +// TODO: When deleting a group should there not be a confirmation button? and should the block be moved another group when the group it was in is deleted? +test.skip('can delete a group in a block grid editor', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockGridWithABlockInAGroup(blockGridEditorName, elementTypeId, groupName); + expect(await umbracoApi.dataType.doesBlockEditorContainBlocksWithContentTypeIds(blockGridEditorName, [elementTypeId])).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); +}); + +test('can add a min and max amount to a block grid editor', async ({umbracoApi, umbracoUi}) => { + // Arrange + const minAmount = 1; + const maxAmount = 2; + await umbracoApi.dataType.createEmptyBlockGrid(blockGridEditorName); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.enterMinAmount(minAmount.toString()); + await umbracoUi.dataType.enterMaxAmount(maxAmount.toString()); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + const dataTypeData = await umbracoApi.dataType.getByName(blockGridEditorName); + expect(dataTypeData.values[0].value.min).toBe(minAmount); + expect(dataTypeData.values[0].value.max).toBe(maxAmount); +}); + +test('max can not be less than min in a block grid editor', async ({umbracoApi, umbracoUi}) => { + // Arrange + const minAmount = 2; + const oldMaxAmount = 2; + const newMaxAmount = 1; + await umbracoApi.dataType.createBlockGridWithMinAndMaxAmount(blockGridEditorName, minAmount, oldMaxAmount); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.enterMaxAmount(newMaxAmount.toString()); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(false); + await umbracoUi.dataType.doesAmountContainErrorMessageWithText('The low value must not be exceed the high value'); + const dataTypeData = await umbracoApi.dataType.getByName(blockGridEditorName); + expect(dataTypeData.values[0].value.min).toBe(minAmount); + // The max value should not be updated + expect(dataTypeData.values[0].value.max).toBe(oldMaxAmount); +}); + +test('can enable live editing mode in a block grid editor', async ({umbracoApi, umbracoUi}) => { + // Arrange + await umbracoApi.dataType.createEmptyBlockGrid(blockGridEditorName); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + // This wait is currently necessary, sometimes there are issues when clicking the liveEdtingMode button + await umbracoUi.waitForTimeout(2000); + await umbracoUi.dataType.clickLiveEditingMode(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.isLiveEditingModeEnabledForBlockEditor(blockGridEditorName, true)).toBeTruthy(); +}); + +test('can disable live editing mode in a block grid editor', async ({umbracoApi, umbracoUi}) => { + // Arrange + await umbracoApi.dataType.createBlockGridWithLiveEditingMode(blockGridEditorName, true); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + // This wait is currently necessary, sometimes there are issues when clicking the liveEditingMode button + await umbracoUi.waitForTimeout(2000); + await umbracoUi.dataType.clickLiveEditingMode(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.isLiveEditingModeEnabledForBlockEditor(blockGridEditorName, false)).toBeTruthy(); +}); + +test('can add editor width in a block grid editor', async ({umbracoApi, umbracoUi}) => { + // Arrange + const propertyEditorWidth = '100%'; + await umbracoApi.dataType.createEmptyBlockGrid(blockGridEditorName); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.enterEditorWidth(propertyEditorWidth); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesMaxPropertyContainWidthForBlockEditor(blockGridEditorName, propertyEditorWidth)).toBeTruthy(); +}); + +test('can remove editor width in a block grid editor', async ({umbracoApi, umbracoUi}) => { + // Arrange + const propertyEditorWidth = '100%'; + await umbracoApi.dataType.createBlockGridWithPropertyEditorWidth(blockGridEditorName, propertyEditorWidth); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.enterEditorWidth(''); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesMaxPropertyContainWidthForBlockEditor(blockGridEditorName, propertyEditorWidth)).toBeFalsy(); + expect(await umbracoApi.dataType.doesMaxPropertyContainWidthForBlockEditor(blockGridEditorName, '')).toBeTruthy(); +}); + +test('can add a create button label in a block grid editor', async ({umbracoApi, umbracoUi}) => { + // Arrange + const createButtonLabel = 'Create Block'; + await umbracoApi.dataType.createEmptyBlockGrid(blockGridEditorName); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.enterCreateButtonLabel(createButtonLabel); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockGridContainCreateButtonLabel(blockGridEditorName, createButtonLabel)).toBeTruthy(); +}); + +test('can remove a create button label in a block grid editor', async ({umbracoApi, umbracoUi}) => { + // Arrange + const createButtonLabel = 'Create Block'; + await umbracoApi.dataType.createBlockGridWithCreateButtonLabel(blockGridEditorName, createButtonLabel); + expect(await umbracoApi.dataType.doesBlockGridContainCreateButtonLabel(blockGridEditorName, createButtonLabel)).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.enterCreateButtonLabel(''); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockGridContainCreateButtonLabel(blockGridEditorName, createButtonLabel)).toBeFalsy(); + expect(await umbracoApi.dataType.doesBlockGridContainCreateButtonLabel(blockGridEditorName, '')).toBeTruthy(); +}); + +test('can update grid columns in a block grid editor', async ({umbracoApi, umbracoUi}) => { + // Arrange + const gridColumns = 3; + await umbracoApi.dataType.createEmptyBlockGrid(blockGridEditorName); + + // Act + await umbracoUi.dataType.goToDataType(blockGridEditorName); + await umbracoUi.dataType.enterGridColumns(gridColumns); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockGridContainGridColumns(blockGridEditorName, gridColumns)).toBeTruthy(); +}); + +// TODO: wait until fixed by frontend, currently you are able to insert multiple stylesheets +test.skip('can add a stylesheet a block grid editor', async ({umbracoApi, umbracoUi}) => { +}); + +test.skip('can remove a stylesheet in a block grid editor', async ({umbracoApi, umbracoUi}) => { +}); From 27108036b4264d95f870b2e3cb33220cfd43891e Mon Sep 17 00:00:00 2001 From: Sven Geusens Date: Tue, 27 Aug 2024 15:18:25 +0200 Subject: [PATCH 33/90] Support parentId in document/media item search endpoints (#16933) * Updated search services to start searching from a guid based key. * Solved api breaking changes with new minor version * Ordering and formatting * Changed interface default implementation to the new method... * Consolidated version * PR review cleanup and renaming --- .../Document/Item/SearchDocumentItemController.cs | 11 ++++++++--- .../Media/Item/SearchMediaItemController.cs | 11 ++++++++--- .../Services/IIndexedEntitySearchService.cs | 4 ++++ .../BackOfficeExamineSearcher.cs | 12 ++++++++++-- .../Services/Implement/IndexedEntitySearchService.cs | 12 +++++++++++- 5 files changed, 41 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/SearchDocumentItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/SearchDocumentItemController.cs index 415fd156d4..f3b7cb1caf 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/SearchDocumentItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/SearchDocumentItemController.cs @@ -21,16 +21,21 @@ public class SearchDocumentItemController : DocumentItemControllerBase _documentPresentationFactory = documentPresentationFactory; } + [NonAction] + [Obsolete("Scheduled to be removed in v16, use the non obsoleted method instead")] + public async Task Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100) + => await SearchFromParent(cancellationToken, query, skip, take); + [HttpGet("search")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedModel), StatusCodes.Status200OK)] - public async Task Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100) + public async Task SearchFromParent(CancellationToken cancellationToken, string query, int skip = 0, int take = 100, Guid? parentId = null) { - PagedModel searchResult = _indexedEntitySearchService.Search(UmbracoObjectTypes.Document, query, skip, take); + PagedModel searchResult = _indexedEntitySearchService.Search(UmbracoObjectTypes.Document, query, parentId, skip, take); var result = new PagedModel { Items = searchResult.Items.OfType().Select(_documentPresentationFactory.CreateItemResponseModel), - Total = searchResult.Total + Total = searchResult.Total, }; return await Task.FromResult(Ok(result)); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/SearchMediaItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/SearchMediaItemController.cs index 37543444fb..81d4f17748 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/SearchMediaItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/SearchMediaItemController.cs @@ -21,16 +21,21 @@ public class SearchMediaItemController : MediaItemControllerBase _mediaPresentationFactory = mediaPresentationFactory; } + [NonAction] + [Obsolete("Scheduled to be removed in v16, use the non obsoleted method instead")] + public async Task Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100) + => await SearchFromParent(cancellationToken, query, skip, take, null); + [HttpGet("search")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedModel), StatusCodes.Status200OK)] - public async Task Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100) + public async Task SearchFromParent(CancellationToken cancellationToken, string query, int skip = 0, int take = 100, Guid? parentId = null) { - PagedModel searchResult = _indexedEntitySearchService.Search(UmbracoObjectTypes.Media, query, skip, take); + PagedModel searchResult = _indexedEntitySearchService.Search(UmbracoObjectTypes.Media, query, parentId, skip, take); var result = new PagedModel { Items = searchResult.Items.OfType().Select(_mediaPresentationFactory.CreateItemResponseModel), - Total = searchResult.Total + Total = searchResult.Total, }; return await Task.FromResult(Ok(result)); diff --git a/src/Umbraco.Core/Services/IIndexedEntitySearchService.cs b/src/Umbraco.Core/Services/IIndexedEntitySearchService.cs index 047f5e7e2f..4463733146 100644 --- a/src/Umbraco.Core/Services/IIndexedEntitySearchService.cs +++ b/src/Umbraco.Core/Services/IIndexedEntitySearchService.cs @@ -13,4 +13,8 @@ namespace Umbraco.Cms.Core.Services; public interface IIndexedEntitySearchService { PagedModel Search(UmbracoObjectTypes objectType, string query, int skip = 0, int take = 100, bool ignoreUserStartNodes = false); + + // default implementation to avoid breaking changes falls back to old behaviour + PagedModel Search(UmbracoObjectTypes objectType, string query, Guid? parentId, int skip = 0, int take = 100, bool ignoreUserStartNodes = false) + => Search(objectType,query, skip, take, ignoreUserStartNodes); } diff --git a/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs b/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs index e843d7954b..82d33ee480 100644 --- a/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs +++ b/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs @@ -356,8 +356,16 @@ public class BackOfficeExamineSearcher : IBackOfficeExamineSearcher throw new ArgumentNullException(nameof(entityService)); } - UdiParser.TryParse(searchFrom, true, out Udi? udi); - searchFrom = udi == null ? searchFrom : entityService.GetId(udi).Result.ToString(); + if (Guid.TryParse(searchFrom, out Guid guid)) + { + searchFrom = entityService.GetId(guid, objectType).Result.ToString(); + } + else + { + // fallback to Udi for legacy reasons as the calling methods take string? + UdiParser.TryParse(searchFrom, true, out Udi? udi); + searchFrom = udi == null ? searchFrom : entityService.GetId(udi).Result.ToString(); + } TreeEntityPath? entityPath = int.TryParse(searchFrom, NumberStyles.Integer, CultureInfo.InvariantCulture, out var searchFromId) && diff --git a/src/Umbraco.Infrastructure/Services/Implement/IndexedEntitySearchService.cs b/src/Umbraco.Infrastructure/Services/Implement/IndexedEntitySearchService.cs index 0055df6244..0f097df262 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/IndexedEntitySearchService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/IndexedEntitySearchService.cs @@ -20,6 +20,15 @@ internal sealed class IndexedEntitySearchService : IIndexedEntitySearchService } public PagedModel Search(UmbracoObjectTypes objectType, string query, int skip = 0, int take = 100, bool ignoreUserStartNodes = false) + => Search(objectType, query, null, skip, take, ignoreUserStartNodes); + + public PagedModel Search( + UmbracoObjectTypes objectType, + string query, + Guid? parentId, + int skip = 0, + int take = 100, + bool ignoreUserStartNodes = false) { UmbracoEntityTypes entityType = objectType switch { @@ -37,7 +46,8 @@ internal sealed class IndexedEntitySearchService : IIndexedEntitySearchService pageSize, pageNumber, out var totalFound, - ignoreUserStartNodes: ignoreUserStartNodes); + ignoreUserStartNodes: ignoreUserStartNodes, + searchFrom: parentId?.ToString()); Guid[] keys = searchResults.Select( result => From 62b7c9468e8d7a813556f94e03d781508dd664ef Mon Sep 17 00:00:00 2001 From: Sven Geusens Date: Tue, 27 Aug 2024 15:28:04 +0200 Subject: [PATCH 34/90] Fix undefined property read (#16941) --- .../blockgrid/umbBlockGridPropertyEditor.component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbBlockGridPropertyEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbBlockGridPropertyEditor.component.js index f260bd4d31..b5353c74e4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbBlockGridPropertyEditor.component.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbBlockGridPropertyEditor.component.js @@ -369,7 +369,7 @@ let i = layoutEntry.areas.length; while(i--) { const layoutEntryArea = layoutEntry.areas[i]; - const areaConfigIndex = block.config.areas.findIndex(x => x.key === layoutEntryArea.key); + const areaConfigIndex = block.config.unsupported ? -1 : block.config.areas.findIndex(x => x.key === layoutEntryArea.key); if(areaConfigIndex === -1) { layoutEntry.areas.splice(i, 1); } From ef58416814c2fe7868ad1c51a9ec4262bc35734c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 27 Aug 2024 16:01:59 +0200 Subject: [PATCH 35/90] V13: Read only mode while saving (#16961) * make a clear console error when case happens * turn Content into readonly mode when submitting form aka saving --- .../content/umbtabbedcontent.directive.js | 18 +++++++++++++++- .../blockeditormodelobject.service.js | 21 ++++++++++++------- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js index 90f81bd827..f003e1afa6 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js @@ -15,7 +15,8 @@ $scope.activeTabAlias = null; $scope.tabs = []; - $scope.allowUpdate = $scope.content.allowedActions.includes('A'); + //$scope.allowUpdate = $scope.content.allowedActions.includes('A'); + setAllowUpdate() $scope.allowEditInvariantFromNonDefault = Umbraco.Sys.ServerVariables.umbracoSettings.allowEditInvariantFromNonDefault; $scope.$watchCollection('content.tabs', (newValue) => { @@ -44,6 +45,10 @@ } }); + function setAllowUpdate() { + $scope.allowUpdate = $scope.content.allowedActions.includes('A'); + } + function onScroll(event) { var viewFocusY = scrollableNode.scrollTop + scrollableNode.clientHeight * .5; @@ -151,6 +156,17 @@ } }); + $scope.$on("formSubmitting", function() { + $scope.allowUpdate = false; + }); + + $scope.$on("formSubmitted", function() { + setAllowUpdate(); + }); + $scope.$on("formSubmittedValidationFailed", function() { + setAllowUpdate(); + }); + //ensure to unregister from all dom-events $scope.$on('$destroy', function () { cancelScrollTween(); diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js index 85ca297e69..4a8dff7146 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js @@ -637,21 +637,26 @@ } blockObject.retrieveValuesFrom = function (content, settings) { - if (this.content !== null) { + if (this.content) { mapElementValues(content, this.content); + if (this.config.settingsElementTypeKey !== null) { + mapElementValues(settings, this.settings); + } + } else { + console.error("This data cannot be edited at the given movement. Maybe due to publishing while editing."); } - if (this.config.settingsElementTypeKey !== null) { - mapElementValues(settings, this.settings); - } + }; blockObject.sync = function () { - if (this.content !== null) { + if (this.content) { mapToPropertyModel(this.content, this.data); - } - if (this.config.settingsElementTypeKey !== null) { - mapToPropertyModel(this.settings, this.settingsData); + if (this.config.settingsElementTypeKey !== null) { + mapToPropertyModel(this.settings, this.settingsData); + } + } else { + console.error("This data cannot be edited at the given movement. Maybe due to publishing while editing."); } }; // first time instant update of label. From 04d96c6a94802f455168ff3f4d977333190d627f Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Tue, 27 Aug 2024 17:07:50 +0200 Subject: [PATCH 36/90] fix: `appEntryPoint` types are not executed unless we have the UmbappEntryPointExtensionInitializer running (#16967) --- .../src/controllers/slim-backoffice-initializer.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Login/src/controllers/slim-backoffice-initializer.ts b/src/Umbraco.Web.UI.Login/src/controllers/slim-backoffice-initializer.ts index 45422bf272..681ab098a7 100644 --- a/src/Umbraco.Web.UI.Login/src/controllers/slim-backoffice-initializer.ts +++ b/src/Umbraco.Web.UI.Login/src/controllers/slim-backoffice-initializer.ts @@ -2,7 +2,10 @@ import { UmbBundleExtensionInitializer, UmbServerExtensionRegistrator } from "@umbraco-cms/backoffice/extension-api"; -import { umbExtensionsRegistry } from "@umbraco-cms/backoffice/extension-registry"; +import { + UmbAppEntryPointExtensionInitializer, + umbExtensionsRegistry +} from "@umbraco-cms/backoffice/extension-registry"; import type { UmbElement } from "@umbraco-cms/backoffice/element-api"; import { UmbControllerBase } from "@umbraco-cms/backoffice/class-api"; import { UUIIconRegistryEssential } from "@umbraco-cms/backoffice/external/uui"; @@ -21,6 +24,7 @@ export class UmbSlimBackofficeController extends UmbControllerBase { constructor(host: UmbElement) { super(host); new UmbBundleExtensionInitializer(host, umbExtensionsRegistry); + new UmbAppEntryPointExtensionInitializer(host, umbExtensionsRegistry); new UmbServerExtensionRegistrator(host, umbExtensionsRegistry).registerPublicExtensions(); this.#uuiIconRegistry.attach(host); From 95f08e748e7258afba1fd5e120088e1543b35ad3 Mon Sep 17 00:00:00 2001 From: Sven Geusens Date: Tue, 27 Aug 2024 18:55:42 +0200 Subject: [PATCH 37/90] Update sdk version to fully support Umbraco.code 2.2.0 dependency on Microsoft.CodeAnalysis.CSharp.Workspaces 4.10.0 (#16963) --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 391ba3c2a3..e972eb192a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "8.0.300", "rollForward": "latestFeature" } } From 6851113cf11f633c70ad4a01f1d1fe1cdbe56f2c Mon Sep 17 00:00:00 2001 From: Andreas Zerbst <73799582+andr317c@users.noreply.github.com> Date: Thu, 29 Aug 2024 08:47:24 +0200 Subject: [PATCH 38/90] V14 QA added block list editor tests (#16862) * Added tests for blocklistEditor * Added more tets * Removed faker * Added blockTest * Updates * Added tests * Removed dependencies * Fixes * Clean up * Fixed naming * Cleaned up * Bumped version * Added missing semicolons * Added tags * Only runs the new tests * Updates * Bumped version * Fixed tests * Cleaned up * Updated version * Fixes, not done * Fixed tests * Bumped helpers * Bumped helpers * Fixed conflict * Fixed comment * Reverted to run smokeTests * Updated helpers --- .../package-lock.json | 759 +----------------- .../Umbraco.Tests.AcceptanceTest/package.json | 10 +- .../BlockListEditor/BlockListBlocks.spec.ts | 419 ++++++++++ .../BlockListEditor/BlockListEditor.spec.ts | 311 +++++++ 4 files changed, 758 insertions(+), 741 deletions(-) create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListBlocks.spec.ts create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListEditor.spec.ts diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json index f7103ba5a4..d3d88edf60 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json @@ -11,20 +11,14 @@ "@umbraco/playwright-testhelpers": "^2.0.0-beta.78", "camelize": "^1.0.0", "dotenv": "^16.3.1", - "faker": "^4.1.0", - "form-data": "^4.0.0", - "node-fetch": "^2.6.7", - "xhr2": "^0.2.1" + "node-fetch": "^2.6.7" }, "devDependencies": { "@playwright/test": "^1.43", "@types/node": "^20.9.0", - "del": "^6.0.0", - "ncp": "^2.0.0", "prompt": "^1.2.0", "tslib": "^2.4.0", - "typescript": "^4.8.3", - "wait-on": "^7.2.0" + "typescript": "^4.8.3" } }, "node_modules/@colors/colors": { @@ -36,96 +30,25 @@ "node": ">=0.1.90" } }, - "node_modules/@hapi/hoek": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", - "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==", - "dev": true - }, - "node_modules/@hapi/topo": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", - "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", - "dev": true, - "dependencies": { - "@hapi/hoek": "^9.0.0" - } - }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/@playwright/test": { - "version": "1.43.1", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.43.1.tgz", - "integrity": "sha512-HgtQzFgNEEo4TE22K/X7sYTYNqEMMTZmFS8kTq6m8hXj+m1D8TgwgIbumHddJa9h4yl4GkKb8/bgAl2+g7eDgA==", + "version": "1.46.0", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.46.0.tgz", + "integrity": "sha512-/QYft5VArOrGRP5pgkrfKksqsKA6CEFyGQ/gjNe6q0y4tZ1aaPfq4gIjudr1s3D+pXyrPRdsy4opKDrjBabE5w==", "dev": true, "dependencies": { - "playwright": "1.43.1" + "playwright": "1.46.0" }, "bin": { "playwright": "cli.js" }, "engines": { - "node": ">=16" + "node": ">=18" } }, - "node_modules/@sideway/address": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz", - "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==", - "dev": true, - "dependencies": { - "@hapi/hoek": "^9.0.0" - } - }, - "node_modules/@sideway/formula": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz", - "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==", - "dev": true - }, - "node_modules/@sideway/pinpoint": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz", - "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==", - "dev": true - }, "node_modules/@types/node": { - "version": "20.10.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.7.tgz", - "integrity": "sha512-fRbIKb8C/Y2lXxB5eVMj4IU7xpdox0Lh8bUPEdtLysaylsml1hOOx1+STloRs/B9nf7C6kPRmmg/V7aQW7usNg==", + "version": "20.14.15", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.15.tgz", + "integrity": "sha512-Fz1xDMCF/B00/tYSVMlmK7hVeLh7jE5f3B7X1/hmV0MJBwE27KlS7EvD/Yp+z1lm8mVhwV5w+n8jOZG8AfTlKw==", "dev": true, "dependencies": { "undici-types": "~5.26.4" @@ -148,78 +71,12 @@ "node-fetch": "^2.6.7" } }, - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/async": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==", "dev": true }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" - }, - "node_modules/axios": { - "version": "1.6.5", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz", - "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==", - "dev": true, - "dependencies": { - "follow-redirects": "^1.15.4", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, - "dependencies": { - "fill-range": "^7.1.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/camelize": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz", @@ -228,15 +85,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/colors": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", @@ -246,23 +94,6 @@ "node": ">=0.1.90" } }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true - }, "node_modules/cycle": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz", @@ -272,57 +103,15 @@ "node": ">=0.4.0" } }, - "node_modules/del": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz", - "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==", - "dev": true, - "dependencies": { - "globby": "^11.0.1", - "graceful-fs": "^4.2.4", - "is-glob": "^4.0.1", - "is-path-cwd": "^2.2.0", - "is-path-inside": "^3.0.2", - "p-map": "^4.0.0", - "rimraf": "^3.0.2", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/dotenv": { - "version": "16.3.1", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz", - "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==", + "version": "16.4.5", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", + "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", "engines": { "node": ">=12" }, "funding": { - "url": "https://github.com/motdotla/dotenv?sponsor=1" + "url": "https://dotenvx.com" } }, "node_modules/eyes": { @@ -334,329 +123,24 @@ "node": "> 0.1.90" } }, - "node_modules/faker": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/faker/-/faker-4.1.0.tgz", - "integrity": "sha512-ILKg69P6y/D8/wSmDXw35Ly0re8QzQ8pMfBCflsGiZG2ZjMUNLYNexA6lz5pkmJlepVdsiDFUxYAzPQ9/+iGLA==" - }, - "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/fastq": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz", - "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==", - "dev": true, - "dependencies": { - "reusify": "^1.0.4" - } - }, - "node_modules/fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/follow-redirects": { - "version": "1.15.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", - "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], - "engines": { - "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } - } - }, - "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, - "node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true - }, - "node_modules/ignore": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz", - "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/is-path-cwd": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", - "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==", "dev": true }, - "node_modules/joi": { - "version": "17.11.0", - "resolved": "https://registry.npmjs.org/joi/-/joi-17.11.0.tgz", - "integrity": "sha512-NgB+lZLNoqISVy1rZocE9PZI36bL/77ie924Ri43yEvi9GUUMPeyVIr8KdFTMUlby1p0PBYMk9spIxEUQYqrJQ==", - "dev": true, - "dependencies": { - "@hapi/hoek": "^9.0.0", - "@hapi/topo": "^5.0.0", - "@sideway/address": "^4.1.3", - "@sideway/formula": "^3.0.1", - "@sideway/pinpoint": "^2.0.0" - } - }, "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, - "dependencies": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/mute-stream": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, - "node_modules/ncp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", - "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==", - "dev": true, - "bin": { - "ncp": "bin/ncp" - } - }, "node_modules/node-fetch": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", @@ -676,88 +160,34 @@ } } }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "dependencies": { - "aggregate-error": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, "node_modules/playwright": { - "version": "1.43.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.43.1.tgz", - "integrity": "sha512-V7SoH0ai2kNt1Md9E3Gwas5B9m8KR2GVvwZnAI6Pg0m3sh7UvgiYhRrhsziCmqMJNouPckiOhk8T+9bSAK0VIA==", + "version": "1.46.0", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.46.0.tgz", + "integrity": "sha512-XYJ5WvfefWONh1uPAUAi0H2xXV5S3vrtcnXe6uAOgdGi3aSpqOSXX08IAjXW34xitfuOJsvXU5anXZxPSEQiJw==", "dev": true, "dependencies": { - "playwright-core": "1.43.1" + "playwright-core": "1.46.0" }, "bin": { "playwright": "cli.js" }, "engines": { - "node": ">=16" + "node": ">=18" }, "optionalDependencies": { "fsevents": "2.3.2" } }, "node_modules/playwright-core": { - "version": "1.43.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.43.1.tgz", - "integrity": "sha512-EI36Mto2Vrx6VF7rm708qSnesVQKbxEWvPrfA1IPY6HgczBplDx7ENtx+K2n4kJ41sLLkuGfmb0ZLSSXlDhqPg==", + "version": "1.46.0", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.46.0.tgz", + "integrity": "sha512-9Y/d5UIwuJk8t3+lhmMSAJyNP1BUC/DqP3cQJDQQL/oWqAiuPTLgy7Q5dzglmTLwcBRdetzgNM/gni7ckfTr6A==", "dev": true, "bin": { "playwright-core": "cli.js" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/prompt": { @@ -776,32 +206,6 @@ "node": ">= 6.0.0" } }, - "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "dev": true - }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, "node_modules/read": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz", @@ -814,16 +218,6 @@ "node": ">=0.8" } }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, "node_modules/revalidator": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz", @@ -833,62 +227,6 @@ "node": ">= 0.4.0" } }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, - "node_modules/rxjs": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", - "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", - "dev": true, - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/stack-trace": { "version": "0.0.10", "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", @@ -898,27 +236,15 @@ "node": "*" } }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, "node_modules/tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", + "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==", "dev": true }, "node_modules/typescript": { @@ -940,25 +266,6 @@ "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", "dev": true }, - "node_modules/wait-on": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-7.2.0.tgz", - "integrity": "sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ==", - "dev": true, - "dependencies": { - "axios": "^1.6.1", - "joi": "^17.11.0", - "lodash": "^4.17.21", - "minimist": "^1.2.8", - "rxjs": "^7.8.1" - }, - "bin": { - "wait-on": "bin/wait-on" - }, - "engines": { - "node": ">=12.0.0" - } - }, "node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", @@ -998,20 +305,6 @@ "dependencies": { "lodash": "^4.17.14" } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true - }, - "node_modules/xhr2": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.2.1.tgz", - "integrity": "sha512-sID0rrVCqkVNUn8t6xuv9+6FViXjUVXq8H5rWOH2rz9fDNQEd4g0EA2XlcEdJXRz5BMEn4O1pJFdT+z4YHhoWw==", - "engines": { - "node": ">= 6" - } } } } diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json index d6877d5581..170bdac491 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package.json @@ -13,21 +13,15 @@ "devDependencies": { "@playwright/test": "^1.43", "@types/node": "^20.9.0", - "del": "^6.0.0", - "ncp": "^2.0.0", "prompt": "^1.2.0", "tslib": "^2.4.0", - "typescript": "^4.8.3", - "wait-on": "^7.2.0" + "typescript": "^4.8.3" }, "dependencies": { "@umbraco/json-models-builders": "^2.0.17", "@umbraco/playwright-testhelpers": "^2.0.0-beta.78", "camelize": "^1.0.0", "dotenv": "^16.3.1", - "faker": "^4.1.0", - "form-data": "^4.0.0", - "node-fetch": "^2.6.7", - "xhr2": "^0.2.1" + "node-fetch": "^2.6.7" } } diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListBlocks.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListBlocks.spec.ts new file mode 100644 index 0000000000..737cc34e9f --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListBlocks.spec.ts @@ -0,0 +1,419 @@ +import {test} from '@umbraco/playwright-testhelpers'; +import {expect} from "@playwright/test"; + +const blockListEditorName = 'TestBlockListEditor'; +const elementTypeName = 'BlockListElement'; +const dataTypeName = 'Textstring'; +const groupName = 'testGroup'; + +test.beforeEach(async ({umbracoUi, umbracoApi}) => { + await umbracoApi.dataType.ensureNameNotExists(blockListEditorName); + await umbracoUi.goToBackOffice(); + await umbracoUi.dataType.goToSettingsTreeItem('Data Types'); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.dataType.ensureNameNotExists(blockListEditorName); +}); + +test('can add a label to a block', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const labelText = 'ThisIsALabel'; + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListDataTypeWithABlock(blockListEditorName, elementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.enterBlockLabelText(labelText); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainLabel(blockListEditorName, elementTypeId, labelText)).toBeTruthy(); +}); + +test('can update a label for a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const labelText = 'ThisIsALabel'; + const newLabelText = 'ThisIsANewLabel'; + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListWithBlockWithEditorAppearance(blockListEditorName, elementTypeId, labelText); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainLabel(blockListEditorName, elementTypeId, labelText)).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.enterBlockLabelText(newLabelText); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainLabel(blockListEditorName, elementTypeId, newLabelText)).toBeTruthy(); +}); + +test('can remove a label from a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const labelText = 'ThisIsALabel'; + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListWithBlockWithEditorAppearance(blockListEditorName, elementTypeId, labelText); + expect(await umbracoApi.dataType.doesBlockEditorBlockContainLabel(blockListEditorName, elementTypeId, labelText)).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.enterBlockLabelText(""); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + expect(await umbracoApi.dataType.doesBlockEditorBlockContainLabel(blockListEditorName, elementTypeId, "")).toBeTruthy(); +}); + +test('can update overlay size for a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const overlaySize = 'medium'; + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListWithBlockWithEditorAppearance(blockListEditorName, elementTypeId, ""); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.updateBlockOverlaySize(overlaySize); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + const blockData = await umbracoApi.dataType.getByName(blockListEditorName); + expect(blockData.values[0].value[0].editorSize).toEqual(overlaySize); +}); + +test('can open content model in a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListDataTypeWithABlock(blockListEditorName, elementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.openBlockContentModel(); + + // Assert + await umbracoUi.dataType.isElementWorkspaceOpenInBlock(elementTypeName); +}); + +// TODO: Is this an issue? should you be able to remove the contentModel so you have none? +// There is currently frontend issues +test.skip('can remove a content model from a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListDataTypeWithABlock(blockListEditorName, elementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.removeBlockContentModel(); + await umbracoUi.dataType.clickConfirmRemoveButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + const blockData = await umbracoApi.dataType.getByName(blockListEditorName); +}); + +test('can add a settings model to a block', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + const secondElementName = 'SecondElementTest'; + const settingsElementTypeId = await umbracoApi.documentType.createDefaultElementType(secondElementName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListDataTypeWithABlock(blockListEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.addBlockSettingsModel(secondElementName); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorContainBlocksWithSettingsTypeIds(blockListEditorName, [settingsElementTypeId])).toBeTruthy(); +}); + +test('can remove a settings model from a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + const secondElementName = 'SecondElementTest'; + const settingsElementTypeId = await umbracoApi.documentType.createDefaultElementType(secondElementName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListDataTypeWithContentAndSettingsElementType(blockListEditorName, contentElementTypeId, settingsElementTypeId); + expect(await umbracoApi.dataType.doesBlockEditorContainBlocksWithSettingsTypeIds(blockListEditorName, [settingsElementTypeId])).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.removeBlockSettingsModel(); + await umbracoUi.dataType.clickConfirmRemoveButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorContainBlocksWithSettingsTypeIds(blockListEditorName, [settingsElementTypeId])).toBeFalsy(); +}); + +test('can add a background color to a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const backgroundColor = '#ff0000'; + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListDataTypeWithABlock(blockListEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.selectBlockBackgroundColor(backgroundColor); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + const blockData = await umbracoApi.dataType.getByName(blockListEditorName); + expect(blockData.values[0].value[0].backgroundColor).toEqual(backgroundColor); +}); + +test('can update a background color for a block', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const backgroundColor = '#ff0000'; + const newBackgroundColor = '#ff4444'; + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListWithBlockWithCatalogueAppearance(blockListEditorName, contentElementTypeId, backgroundColor); + let blockData = await umbracoApi.dataType.getByName(blockListEditorName); + expect(blockData.values[0].value[0].backgroundColor).toEqual(backgroundColor); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.selectBlockBackgroundColor(newBackgroundColor); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + blockData = await umbracoApi.dataType.getByName(blockListEditorName); + expect(blockData.values[0].value[0].backgroundColor).toEqual(newBackgroundColor); +}); + +test('can delete a background color from a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const backgroundColor = '#ff0000'; + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListWithBlockWithCatalogueAppearance(blockListEditorName, contentElementTypeId, backgroundColor); + let blockData = await umbracoApi.dataType.getByName(blockListEditorName); + expect(blockData.values[0].value[0].backgroundColor).toEqual(backgroundColor); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.selectBlockBackgroundColor(''); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + blockData = await umbracoApi.dataType.getByName(blockListEditorName); + expect(blockData.values[0].value[0].backgroundColor).toEqual(''); +}); + +test('can add a icon color to a block', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const iconColor = '#ff0000'; + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListDataTypeWithABlock(blockListEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.selectBlockIconColor(iconColor); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + const blockData = await umbracoApi.dataType.getByName(blockListEditorName); + expect(blockData.values[0].value[0].iconColor).toEqual(iconColor); +}); + +test('can update a icon color for a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const iconColor = '#ff0000'; + const newIconColor = '#ff4444'; + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListWithBlockWithCatalogueAppearance(blockListEditorName, contentElementTypeId, "", iconColor); + let blockData = await umbracoApi.dataType.getByName(blockListEditorName); + expect(blockData.values[0].value[0].iconColor).toEqual(iconColor); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.selectBlockIconColor(newIconColor); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + blockData = await umbracoApi.dataType.getByName(blockListEditorName); + expect(blockData.values[0].value[0].iconColor).toEqual(newIconColor); +}); + +test('can delete a icon color from a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const iconColor = '#ff0000'; + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListWithBlockWithCatalogueAppearance(blockListEditorName, contentElementTypeId, '', iconColor); + let blockData = await umbracoApi.dataType.getByName(blockListEditorName); + expect(blockData.values[0].value[0].iconColor).toEqual(iconColor); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.selectBlockIconColor(''); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + blockData = await umbracoApi.dataType.getByName(blockListEditorName); + expect(blockData.values[0].value[0].iconColor).toEqual(''); +}); + +// TODO: Currently it is not possible to update a stylesheet to a block +test.skip('can update a custom stylesheet for a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const stylesheetName = 'TestStylesheet.css'; + const stylesheetPath = '/wwwroot/css/' + stylesheetName; + const encodedStylesheetPath = await umbracoApi.stylesheet.encodeStylesheetPath(stylesheetPath); + const secondStylesheetName = 'SecondStylesheet.css'; + const secondStylesheetPath = '/wwwroot/css/' + secondStylesheetName; + const encodedSecondStylesheetPath = await umbracoApi.stylesheet.encodeStylesheetPath(secondStylesheetPath); + await umbracoApi.stylesheet.ensureNameNotExists(stylesheetName); + await umbracoApi.stylesheet.ensureNameNotExists(secondStylesheetName); + await umbracoApi.stylesheet.createDefaultStylesheet(stylesheetName); + await umbracoApi.stylesheet.createDefaultStylesheet(secondStylesheetName); + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListWithBlockWithCatalogueAppearance(blockListEditorName, contentElementTypeId, '', '', encodedStylesheetPath); + let blockData = await umbracoApi.dataType.getByName(blockListEditorName); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + // Removes first stylesheet + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + blockData = await umbracoApi.dataType.getByName(blockListEditorName); + expect(blockData.values[0].value[0].stylesheet[0]).toEqual(encodedSecondStylesheetPath); + + // Clean + await umbracoApi.stylesheet.ensureNameNotExists(stylesheetName); + await umbracoApi.stylesheet.ensureNameNotExists(secondStylesheetName); +}); + +// TODO: Currently it is not possible to delete a stylesheet to a block +test.skip('can delete a custom stylesheet from a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const stylesheetName = 'TestStylesheet.css'; + const stylesheetPath = '/wwwroot/css/' + stylesheetName; + const encodedStylesheetPath = await umbracoApi.stylesheet.encodeStylesheetPath(stylesheetPath); + await umbracoApi.stylesheet.ensureNameNotExists(stylesheetName); + await umbracoApi.stylesheet.createDefaultStylesheet(stylesheetName); + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListWithBlockWithCatalogueAppearance(blockListEditorName, contentElementTypeId, '', '', encodedStylesheetPath); + let blockData = await umbracoApi.dataType.getByName(blockListEditorName); + expect(blockData.values[0].value[0].stylesheet[0]).toEqual(encodedStylesheetPath); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.clickRemoveCustomStylesheetWithName(stylesheetName); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + blockData = await umbracoApi.dataType.getByName(blockListEditorName); + expect(blockData.values[0].value[0].stylesheet[0]).toBeUndefined(); + + // Clean + await umbracoApi.stylesheet.ensureNameNotExists(stylesheetName); +}); + +test('can enable hide content editor in a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListDataTypeWithABlock(blockListEditorName, contentElementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.clickBlockListHideContentEditorButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + const blockData = await umbracoApi.dataType.getByName(blockListEditorName); + expect(blockData.values[0].value[0].forceHideContentEditorInOverlay).toEqual(true); +}); + +test('can disable hide content editor in a block', async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const contentElementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListWithBlockWithHideContentEditor(blockListEditorName, contentElementTypeId, true); + let blockData = await umbracoApi.dataType.getByName(blockListEditorName); + expect(blockData.values[0].value[0].forceHideContentEditorInOverlay).toEqual(true); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.goToBlockWithName(elementTypeName); + await umbracoUi.dataType.clickBlockListHideContentEditorButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + blockData = await umbracoApi.dataType.getByName(blockListEditorName); + expect(blockData.values[0].value[0].forceHideContentEditorInOverlay).toEqual(false); +}); + +// TODO: Thumbnails are not showing in the UI +test.skip('can add a thumbnail to a block ', {tag: '@smoke'}, async ({page, umbracoApi, umbracoUi}) => { + +}); + +// TODO: Thumbnails are not showing in the UI +test.skip('can remove a thumbnail to a block ', {tag: '@smoke'}, async ({page, umbracoApi, umbracoUi}) => { + +}); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListEditor.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListEditor.spec.ts new file mode 100644 index 0000000000..24142bca82 --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListEditor.spec.ts @@ -0,0 +1,311 @@ +import {test} from '@umbraco/playwright-testhelpers'; +import {expect} from "@playwright/test"; + +const blockListEditorName = 'TestBlockListEditor'; +const elementTypeName = 'BlockListElement'; +const dataTypeName = 'Textstring'; +const groupName = 'testGroup'; + +test.beforeEach(async ({umbracoUi, umbracoApi}) => { + await umbracoApi.dataType.ensureNameNotExists(blockListEditorName); + await umbracoUi.goToBackOffice(); + await umbracoUi.dataType.goToSettingsTreeItem('Data Types'); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.dataType.ensureNameNotExists(blockListEditorName); +}); + +test('can create a block list editor', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const blockListLocatorName = 'Block List'; + const blockListEditorAlias = 'Umbraco.BlockList'; + const blockListEditorUiAlias = 'Umb.PropertyEditorUi.BlockList'; + + // Act + await umbracoUi.dataType.clickActionsMenuAtRoot(); + await umbracoUi.dataType.clickCreateButton(); + await umbracoUi.dataType.clickNewDataTypeThreeDotsButton(); + await umbracoUi.dataType.enterDataTypeName(blockListEditorName); + await umbracoUi.dataType.clickSelectAPropertyEditorButton(); + await umbracoUi.dataType.selectAPropertyEditor(blockListLocatorName); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesNameExist(blockListEditorName)).toBeTruthy(); + const dataTypeData = await umbracoApi.dataType.getByName(blockListEditorName); + expect(dataTypeData.editorAlias).toBe(blockListEditorAlias); + expect(dataTypeData.editorUiAlias).toBe(blockListEditorUiAlias); +}); + +test('can rename a block list editor', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const wrongName = 'BlockGridEditorTest'; + await umbracoApi.dataType.createEmptyBlockListDataType(wrongName); + + // Act + await umbracoUi.dataType.goToDataType(wrongName); + await umbracoUi.dataType.enterDataTypeName(blockListEditorName); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesNameExist(blockListEditorName)).toBeTruthy(); + expect(await umbracoApi.dataType.doesNameExist(wrongName)).toBeFalsy(); +}); + +test('can delete a block list editor', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const blockListId = await umbracoApi.dataType.createEmptyBlockListDataType(blockListEditorName); + + // Act + await umbracoUi.dataType.clickRootFolderCaretButton(); + await umbracoUi.dataType.clickActionsMenuForDataType(blockListEditorName); + await umbracoUi.dataType.clickDeleteExactButton(); + await umbracoUi.dataType.clickConfirmToDeleteButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesExist(blockListId)).toBeFalsy(); + await umbracoUi.dataType.isTreeItemVisible(blockListEditorName, false); +}); + +test('can add a block to a block list editor', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, 'testGroup', dataTypeName, textStringData.id); + await umbracoApi.dataType.createEmptyBlockListDataType(blockListEditorName); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.clickAddBlockButton(); + await umbracoUi.dataType.clickLabelWithName(elementTypeName); + await umbracoUi.dataType.clickChooseButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorContainBlocksWithContentTypeIds(blockListEditorName, [elementTypeId])).toBeTruthy(); + + // Clean + await umbracoApi.documentType.ensureNameNotExists(elementTypeName); +}); + +test('can add multiple blocks to a block list editor', async ({umbracoApi, umbracoUi}) => { + // Arrange + const secondElementTypeName = 'SecondBlockListElement'; + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + const secondElementTypeId = await umbracoApi.documentType.createDefaultElementType(secondElementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListDataTypeWithABlock(blockListEditorName, elementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.clickAddBlockButton(); + await umbracoUi.dataType.clickLabelWithName(secondElementTypeName); + await umbracoUi.dataType.clickChooseButton(); + await umbracoUi.dataType.clickSubmitButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorContainBlocksWithContentTypeIds(blockListEditorName, [elementTypeId, secondElementTypeId])).toBeTruthy(); + + // Clean + await umbracoApi.documentType.ensureNameNotExists(elementTypeName); + await umbracoApi.documentType.ensureNameNotExists(secondElementTypeName); +}); + +test('can remove a block from a block list editor', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const textStringData = await umbracoApi.dataType.getByName(dataTypeName); + const elementTypeId = await umbracoApi.documentType.createDefaultElementType(elementTypeName, groupName, dataTypeName, textStringData.id); + await umbracoApi.dataType.createBlockListDataTypeWithABlock(blockListEditorName, elementTypeId); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.clickRemoveBlockWithName(elementTypeName); + await umbracoUi.dataType.clickConfirmRemoveButton(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesBlockEditorContainBlocksWithContentTypeIds(blockListEditorName, [elementTypeId])).toBeFalsy(); + + // Clean + await umbracoApi.documentType.ensureNameNotExists(elementTypeName); +}); + +test('can add a min and max amount to a block list editor', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const minAmount = 1; + const maxAmount = 2; + await umbracoApi.dataType.createEmptyBlockListDataType(blockListEditorName); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.enterMinAmount(minAmount.toString()); + await umbracoUi.dataType.enterMaxAmount(maxAmount.toString()); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + const dataTypeData = await umbracoApi.dataType.getByName(blockListEditorName); + expect(dataTypeData.values[0].value.min).toBe(minAmount); + expect(dataTypeData.values[0].value.max).toBe(maxAmount); +}); + +test('max can not be less than min', async ({umbracoApi, umbracoUi}) => { + // Arrange + const minAmount = 2; + const oldMaxAmount = 2; + const newMaxAmount = 1; + await umbracoApi.dataType.createBlockListDataTypeWithMinAndMaxAmount(blockListEditorName, minAmount, oldMaxAmount); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.enterMaxAmount(newMaxAmount.toString()); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(false); + const dataTypeData = await umbracoApi.dataType.getByName(blockListEditorName); + await umbracoUi.dataType.doesAmountContainErrorMessageWithText('The low value must not be exceed the high value'); + expect(dataTypeData.values[0].value.min).toBe(minAmount); + // The max value should not be updated + expect(dataTypeData.values[0].value.max).toBe(oldMaxAmount); +}); + +test('can enable single block mode', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + await umbracoApi.dataType.createBlockListDataTypeWithSingleBlockMode(blockListEditorName, false); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.clickSingleBlockMode(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.isSingleBlockModeEnabledForBlockList(blockListEditorName, true)).toBeTruthy(); +}); + +test('can disable single block mode', async ({umbracoApi, umbracoUi}) => { + // Arrange + await umbracoApi.dataType.createBlockListDataTypeWithSingleBlockMode(blockListEditorName, true); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.clickSingleBlockMode(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.isSingleBlockModeEnabledForBlockList(blockListEditorName, false)).toBeTruthy(); +}); + +test('can enable live editing mode', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + await umbracoApi.dataType.createBlockListDataTypeWithLiveEditingMode(blockListEditorName, false); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.clickLiveEditingMode(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.isLiveEditingModeEnabledForBlockEditor(blockListEditorName, true)).toBeTruthy(); +}); + +test('can disable live editing mode', async ({umbracoApi, umbracoUi}) => { +// Arrange + await umbracoApi.dataType.createBlockListDataTypeWithLiveEditingMode(blockListEditorName, true); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.clickLiveEditingMode(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.isLiveEditingModeEnabledForBlockEditor(blockListEditorName, false)).toBeTruthy(); +}); + +test('can enable inline editing mode', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + await umbracoApi.dataType.createBlockListDataTypeWithInlineEditingMode(blockListEditorName, false); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.clickInlineEditingMode(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.isInlineEditingModeEnabledForBlockList(blockListEditorName, true)).toBeTruthy(); +}); + +test('can disable inline editing mode', async ({umbracoApi, umbracoUi}) => { + // Arrange + await umbracoApi.dataType.createBlockListDataTypeWithInlineEditingMode(blockListEditorName, true); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.clickInlineEditingMode(); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.isInlineEditingModeEnabledForBlockList(blockListEditorName, false)).toBeTruthy(); +}); + +test('can add a property editor width', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { + // Arrange + const propertyWidth = '50%'; + await umbracoApi.dataType.createEmptyBlockListDataType(blockListEditorName); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.enterPropertyEditorWidth(propertyWidth); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesMaxPropertyContainWidthForBlockEditor(blockListEditorName, propertyWidth)).toBeTruthy(); +}); + +test('can update a property editor width', async ({umbracoApi, umbracoUi}) => { + // Arrange + const oldPropertyWidth = '50%'; + const newPropertyWidth = '100%'; + await umbracoApi.dataType.createBlockListDataTypeWithPropertyEditorWidth(blockListEditorName, oldPropertyWidth); + expect(await umbracoApi.dataType.doesMaxPropertyContainWidthForBlockEditor(blockListEditorName, oldPropertyWidth)).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.enterPropertyEditorWidth(newPropertyWidth); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesMaxPropertyContainWidthForBlockEditor(blockListEditorName, newPropertyWidth)).toBeTruthy(); +}); + +test('can remove a property editor width', async ({umbracoApi, umbracoUi}) => { + // Arrange + const propertyWidth = '50%'; + await umbracoApi.dataType.createBlockListDataTypeWithPropertyEditorWidth(blockListEditorName, propertyWidth); + expect(await umbracoApi.dataType.doesMaxPropertyContainWidthForBlockEditor(blockListEditorName, propertyWidth)).toBeTruthy(); + + // Act + await umbracoUi.dataType.goToDataType(blockListEditorName); + await umbracoUi.dataType.enterPropertyEditorWidth(''); + await umbracoUi.dataType.clickSaveButton(); + + // Assert + await umbracoUi.dataType.isSuccessNotificationVisible(); + expect(await umbracoApi.dataType.doesMaxPropertyContainWidthForBlockEditor(blockListEditorName, '')).toBeTruthy(); +}); From c277005b62dd9ea143670720da72a9df7c905bd6 Mon Sep 17 00:00:00 2001 From: Sven Geusens Date: Thu, 29 Aug 2024 10:12:43 +0200 Subject: [PATCH 39/90] improve missingProperties data returned for missing propertie values (#16910) Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> --- .../Content/ContentControllerBase.cs | 19 ++++++++++++++++--- .../PropertyValidationResponseModel.cs | 12 ++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 src/Umbraco.Cms.Api.Management/ViewModels/Content/PropertyValidationResponseModel.cs diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Content/ContentControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Content/ContentControllerBase.cs index a2277820bf..c008dad102 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Content/ContentControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Content/ContentControllerBase.cs @@ -1,5 +1,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Umbraco.Cms.Api.Management.ViewModels.Content; +using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.ContentEditing.Validation; using Umbraco.Cms.Core.Services.OperationStatus; @@ -9,6 +11,7 @@ namespace Umbraco.Cms.Api.Management.Controllers.Content; public abstract class ContentControllerBase : ManagementApiControllerBase { + protected IActionResult ContentEditingOperationStatusResult(ContentEditingOperationStatus status) => OperationStatusResult(status, problemDetailsBuilder => status switch { @@ -96,7 +99,8 @@ public abstract class ContentControllerBase : ManagementApiControllerBase } var errors = new SortedDictionary(); - var missingPropertyAliases = new List(); + + var missingPropertyModels = new List(); foreach (PropertyValidationError validationError in validationResult.ValidationErrors) { TValueModel? requestValue = requestModel.Values.FirstOrDefault(value => @@ -105,7 +109,7 @@ public abstract class ContentControllerBase : ManagementApiControllerBase && value.Segment == validationError.Segment); if (requestValue is null) { - missingPropertyAliases.Add(validationError.Alias); + missingPropertyModels.Add(MapMissingProperty(validationError)); continue; } @@ -119,7 +123,16 @@ public abstract class ContentControllerBase : ManagementApiControllerBase .WithTitle("Validation failed") .WithDetail("One or more properties did not pass validation") .WithRequestModelErrors(errors) - .WithExtension("missingProperties", missingPropertyAliases.ToArray()) + .WithExtension("missingValues", missingPropertyModels.ToArray()) .Build())); } + + private PropertyValidationResponseModel MapMissingProperty(PropertyValidationError source) => + new() + { + Alias = source.Alias, + Segment = source.Segment, + Culture = source.Culture, + Messages = source.ErrorMessages, + }; } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Content/PropertyValidationResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Content/PropertyValidationResponseModel.cs new file mode 100644 index 0000000000..6f8d918c3e --- /dev/null +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Content/PropertyValidationResponseModel.cs @@ -0,0 +1,12 @@ +namespace Umbraco.Cms.Api.Management.ViewModels.Content; + +public class PropertyValidationResponseModel +{ + public string[] Messages { get; set; } = Array.Empty(); + + public string Alias { get; set; } = string.Empty; + + public string? Culture { get; set; } + + public string? Segment { get; set; } +} From 590b28110b4135d141112dd0f56bb5fcb4080bf5 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Thu, 29 Aug 2024 11:38:24 +0200 Subject: [PATCH 40/90] update backoffice submodule --- src/Umbraco.Web.UI.Client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client index a9d3a43969..a2fc54b77e 160000 --- a/src/Umbraco.Web.UI.Client +++ b/src/Umbraco.Web.UI.Client @@ -1 +1 @@ -Subproject commit a9d3a4396968e4cc47c1d1cd290ca8b1cf764e12 +Subproject commit a2fc54b77e99de28a0669ab628ecfd7983df7ad8 From 087a01de835124af0b173494bc0d3dec68952b6a Mon Sep 17 00:00:00 2001 From: Sven Geusens Date: Tue, 3 Sep 2024 11:05:22 +0200 Subject: [PATCH 41/90] V14/fix/cookie breaking installer (#16993) * Do not run authentication if Umbraco is not ready for it. Fail instead. * Fix breaking change * Spelling + code style :) --------- Co-authored-by: kjac --- .../Security/BackOfficeDefaultController.cs | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Security/BackOfficeDefaultController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Security/BackOfficeDefaultController.cs index 62b69f0a23..da6ab4b18a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Security/BackOfficeDefaultController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Security/BackOfficeDefaultController.cs @@ -1,19 +1,37 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.DependencyInjection; using Umbraco.Cms.Core; +using Umbraco.Cms.Core.DependencyInjection; +using Umbraco.Cms.Core.Services; using Umbraco.Extensions; namespace Umbraco.Cms.Api.Management.Controllers.Security; public class BackOfficeDefaultController : Controller { + private readonly IRuntime _umbracoRuntime; + + [ActivatorUtilitiesConstructor] + public BackOfficeDefaultController(IRuntime umbracoRuntime) + => _umbracoRuntime = umbracoRuntime; + + [Obsolete("Use the non obsoleted constructor instead. Scheduled to be removed in v17")] + public BackOfficeDefaultController() + : this(StaticServiceProvider.Instance.GetRequiredService()) + { + } + [HttpGet] [AllowAnonymous] public async Task Index(CancellationToken cancellationToken) { // force authentication to occur since this is not an authorized endpoint - AuthenticateResult result = await this.AuthenticateBackOfficeAsync(); + // a user can not be authenticated if no users have been created yet, or the user repository is unavailable + AuthenticateResult result = _umbracoRuntime.State.Level < RuntimeLevel.Upgrade + ? AuthenticateResult.Fail("RuntimeLevel " + _umbracoRuntime.State.Level + " does not support authentication") + : await this.AuthenticateBackOfficeAsync(); // if we are not authenticated then we need to redirect to the login page if (!result.Succeeded) From ef3bf496e911b18e3a1fb5edca555f3ef50ef74f Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Wed, 4 Sep 2024 13:44:19 +0200 Subject: [PATCH 42/90] Avoid concurrent build of `Umbraco.JsonSchema` tool and add execution timeouts to `Exec` build tasks (#17006) * Disable building Umbraco.JsonSchema and Umbraco.Tests.AcceptanceTest.UmbracoProject * Add 10 minute timeout to Exec MSBuild tasks --- .../Umbraco.Cms.StaticAssets.csproj | 8 ++++---- src/Umbraco.Cms.Targets/Umbraco.Cms.Targets.csproj | 2 +- umbraco.sln | 8 +------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj b/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj index f973b22fc6..6bd6fceb51 100644 --- a/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj +++ b/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj @@ -30,13 +30,13 @@ - - + + - - + + diff --git a/src/Umbraco.Cms.Targets/Umbraco.Cms.Targets.csproj b/src/Umbraco.Cms.Targets/Umbraco.Cms.Targets.csproj index a02370bb1e..37a2dfd4a0 100644 --- a/src/Umbraco.Cms.Targets/Umbraco.Cms.Targets.csproj +++ b/src/Umbraco.Cms.Targets/Umbraco.Cms.Targets.csproj @@ -40,7 +40,7 @@ - + diff --git a/umbraco.sln b/umbraco.sln index 3742753fe9..4e49921dab 100644 --- a/umbraco.sln +++ b/umbraco.sln @@ -185,7 +185,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Persistence.EFC EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Persistence.EFCore.SqlServer", "src\Umbraco.Cms.Persistence.EFCore.SqlServer\Umbraco.Cms.Persistence.EFCore.SqlServer.csproj", "{9276C3F0-0DC9-46C9-BF32-9EE79D92AE02}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests.AcceptanceTest.UmbracoProject", "tests\Umbraco.Tests.AcceptanceTest.UmbracoProject\Umbraco.Tests.AcceptanceTest.UmbracoProject.csproj", "{A13FF0A0-69FA-468A-9F79-565401D5C341}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.AcceptanceTest.UmbracoProject", "tests\Umbraco.Tests.AcceptanceTest.UmbracoProject\Umbraco.Tests.AcceptanceTest.UmbracoProject.csproj", "{A13FF0A0-69FA-468A-9F79-565401D5C341}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -277,11 +277,8 @@ Global {79E4293D-C92C-4649-AEC8-F1EFD95BDEB1}.SkipTests|Any CPU.ActiveCfg = Debug|Any CPU {79E4293D-C92C-4649-AEC8-F1EFD95BDEB1}.SkipTests|Any CPU.Build.0 = Debug|Any CPU {2A5027D9-F71D-4957-929E-F7A56AA1B95A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A5027D9-F71D-4957-929E-F7A56AA1B95A}.Debug|Any CPU.Build.0 = Debug|Any CPU {2A5027D9-F71D-4957-929E-F7A56AA1B95A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A5027D9-F71D-4957-929E-F7A56AA1B95A}.Release|Any CPU.Build.0 = Release|Any CPU {2A5027D9-F71D-4957-929E-F7A56AA1B95A}.SkipTests|Any CPU.ActiveCfg = Debug|Any CPU - {2A5027D9-F71D-4957-929E-F7A56AA1B95A}.SkipTests|Any CPU.Build.0 = Debug|Any CPU {32F6A309-EC1E-4CDB-BA80-C804CF680BEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {32F6A309-EC1E-4CDB-BA80-C804CF680BEE}.Debug|Any CPU.Build.0 = Debug|Any CPU {32F6A309-EC1E-4CDB-BA80-C804CF680BEE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -361,11 +358,8 @@ Global {9276C3F0-0DC9-46C9-BF32-9EE79D92AE02}.SkipTests|Any CPU.ActiveCfg = Debug|Any CPU {9276C3F0-0DC9-46C9-BF32-9EE79D92AE02}.SkipTests|Any CPU.Build.0 = Debug|Any CPU {A13FF0A0-69FA-468A-9F79-565401D5C341}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A13FF0A0-69FA-468A-9F79-565401D5C341}.Debug|Any CPU.Build.0 = Debug|Any CPU {A13FF0A0-69FA-468A-9F79-565401D5C341}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A13FF0A0-69FA-468A-9F79-565401D5C341}.Release|Any CPU.Build.0 = Release|Any CPU {A13FF0A0-69FA-468A-9F79-565401D5C341}.SkipTests|Any CPU.ActiveCfg = Debug|Any CPU - {A13FF0A0-69FA-468A-9F79-565401D5C341}.SkipTests|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From b16dfa9ca1e15be8c661cc215f0d99a1e100363f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Mon, 9 Sep 2024 12:49:07 +0200 Subject: [PATCH 43/90] dispatch change event when embedded media has been added (#17008) --- .../src/common/services/tinymce.service.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js index df5b0d51bb..18707c1f60 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js @@ -611,6 +611,11 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s } else { editor.selection.setNode(wrapper); } + + + angularHelper.safeApply($rootScope, function () { + editor.dispatch("Change"); + }); }, From 5fe18bb78ce8ffe689a7859e414182f245cc1991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yari=20Mari=C3=ABn?= <75362020+Yinzy00@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:05:12 +0200 Subject: [PATCH 44/90] Content.EditorDirectiveController: added formSubmittedValidationFailed broadcast to prevent fields to stay disabled (#17018) --- .../common/directives/components/content/edit.controller.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js index 1e455aea5f..8a8ae0a36b 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js @@ -757,8 +757,8 @@ formHelper.showNotifications(err.data); clearNotifications($scope.content); - handleHttpException(err); - deferred.reject(err); + handleHttpException(err); + deferred.reject(err); }); }, close: function () { @@ -787,6 +787,7 @@ }, function (err) { $scope.page.buttonGroupState = "error"; handleHttpException(err); + $scope.$broadcast("formSubmittedValidationFailed") deferred.reject(err); }); } From 0f37cd3a45eb9bd32fcd8a589fa15688b0f737d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Mon, 9 Sep 2024 13:07:47 +0200 Subject: [PATCH 45/90] PR 17018 --- .../common/directives/components/content/edit.controller.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js index 1e455aea5f..8a8ae0a36b 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js @@ -757,8 +757,8 @@ formHelper.showNotifications(err.data); clearNotifications($scope.content); - handleHttpException(err); - deferred.reject(err); + handleHttpException(err); + deferred.reject(err); }); }, close: function () { @@ -787,6 +787,7 @@ }, function (err) { $scope.page.buttonGroupState = "error"; handleHttpException(err); + $scope.$broadcast("formSubmittedValidationFailed") deferred.reject(err); }); } From 02a47695e76b1178caef6472c2428580f61018d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Mon, 9 Sep 2024 12:49:07 +0200 Subject: [PATCH 46/90] dispatch change event when embedded media has been added (#17008) --- .../src/common/services/tinymce.service.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js index df5b0d51bb..18707c1f60 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js @@ -611,6 +611,11 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s } else { editor.selection.setNode(wrapper); } + + + angularHelper.safeApply($rootScope, function () { + editor.dispatch("Change"); + }); }, From a30827145c462d9482db28d548f719852d5c6024 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:01:25 +0200 Subject: [PATCH 47/90] update backoffice submodule --- src/Umbraco.Web.UI.Client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client index 56091cad98..0e8de9ad0c 160000 --- a/src/Umbraco.Web.UI.Client +++ b/src/Umbraco.Web.UI.Client @@ -1 +1 @@ -Subproject commit 56091cad981b6f51f73c4906ed674bd43c660d5d +Subproject commit 0e8de9ad0c4ba3a8d73c72befaae175898df58d6 From a74d963cfa923f170dbb4fd7d281f1139d1bb574 Mon Sep 17 00:00:00 2001 From: Sven Geusens Date: Mon, 9 Sep 2024 18:13:14 +0200 Subject: [PATCH 48/90] Fix null reference exception in CacheValues.For when building the CompositeStringStringKey (#17024) * Fix null ref exeption based on IPropertyValue.Culture documentation * Clarify comment --- src/Umbraco.PublishedCache.NuCache/Property.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Umbraco.PublishedCache.NuCache/Property.cs b/src/Umbraco.PublishedCache.NuCache/Property.cs index ed9f7277ef..09716ef43a 100644 --- a/src/Umbraco.PublishedCache.NuCache/Property.cs +++ b/src/Umbraco.PublishedCache.NuCache/Property.cs @@ -371,6 +371,12 @@ internal class Property : PublishedPropertyBase public CacheValue For(string? culture, string? segment) { + // As noted on IPropertyValue, null value means invariant + // But as we need an actual string value to build a CompositeStringStringKey + // We need to convert null to empty + culture ??= string.Empty; + segment ??= string.Empty; + if (culture == string.Empty && segment == string.Empty) { return this; From 407734ff4ae773b9dafe6c25019c66adb132786b Mon Sep 17 00:00:00 2001 From: Sven Geusens Date: Mon, 9 Sep 2024 18:13:14 +0200 Subject: [PATCH 49/90] Fix null reference exception in CacheValues.For when building the CompositeStringStringKey (#17024) * Fix null ref exeption based on IPropertyValue.Culture documentation * Clarify comment --- src/Umbraco.PublishedCache.NuCache/Property.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Umbraco.PublishedCache.NuCache/Property.cs b/src/Umbraco.PublishedCache.NuCache/Property.cs index ed9f7277ef..09716ef43a 100644 --- a/src/Umbraco.PublishedCache.NuCache/Property.cs +++ b/src/Umbraco.PublishedCache.NuCache/Property.cs @@ -371,6 +371,12 @@ internal class Property : PublishedPropertyBase public CacheValue For(string? culture, string? segment) { + // As noted on IPropertyValue, null value means invariant + // But as we need an actual string value to build a CompositeStringStringKey + // We need to convert null to empty + culture ??= string.Empty; + segment ??= string.Empty; + if (culture == string.Empty && segment == string.Empty) { return this; From 9a088d36b925e911a25565b486ba38fbd5ef0605 Mon Sep 17 00:00:00 2001 From: Sven Geusens Date: Tue, 10 Sep 2024 18:07:20 +0200 Subject: [PATCH 50/90] Expand RedirectUrl.Url storage type to avoid truncation (#17038) * Add migration to expand RedirectUrl.Url to varcharMax * Simplify Migration * readded notnull attribute --- .../Migrations/Upgrade/UmbracoPlan.cs | 1 + .../ChangeRedirectUrlToNvarcharMax.cs | 41 +++++++++++++++++++ .../Persistence/Dtos/RedirectUrlDto.cs | 1 + 3 files changed, 43 insertions(+) create mode 100644 src/Umbraco.Infrastructure/Migrations/Upgrade/V_13_5_0/ChangeRedirectUrlToNvarcharMax.cs diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs index 3ba30b12df..2d6d47e645 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs @@ -106,5 +106,6 @@ public class UmbracoPlan : MigrationPlan To("{21C42760-5109-4C03-AB4F-7EA53577D1F5}"); To("{6158F3A3-4902-4201-835E-1ED7F810B2D8}"); To("{985AF2BA-69D3-4DBA-95E0-AD3FA7459FA7}"); + To("{CC47C751-A81B-489A-A2BC-0240245DB687}"); } } diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_13_5_0/ChangeRedirectUrlToNvarcharMax.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_13_5_0/ChangeRedirectUrlToNvarcharMax.cs new file mode 100644 index 0000000000..4f28b0fe88 --- /dev/null +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_13_5_0/ChangeRedirectUrlToNvarcharMax.cs @@ -0,0 +1,41 @@ +using System.Linq.Expressions; +using System.Text; +using NPoco; +using Umbraco.Cms.Core; +using Umbraco.Cms.Infrastructure.Migrations.Expressions.Create.Column; +using Umbraco.Cms.Infrastructure.Persistence; +using Umbraco.Cms.Infrastructure.Persistence.Dtos; + +namespace Umbraco.Cms.Infrastructure.Migrations.Upgrade.V_13_5_0; + +public class ChangeRedirectUrlToNvarcharMax : MigrationBase +{ + public ChangeRedirectUrlToNvarcharMax(IMigrationContext context) : base(context) + { + } + + protected override void Migrate() + { + // We don't need to run this migration for SQLite, since ntext is not a thing there, text is just text. + if (DatabaseType == DatabaseType.SQLite) + { + return; + } + + string tableName = RedirectUrlDto.TableName; + string colName = "url"; + + // Determine the current datatype of the column within the database + string colDataType = Database.ExecuteScalar($"SELECT TOP(1) CHARACTER_MAXIMUM_LENGTH FROM INFORMATION_SCHEMA.COLUMNS" + + $" WHERE TABLE_NAME = '{tableName}' AND COLUMN_NAME = '{colName}'"); + + // 255 is the old length, -1 indicate MAX length + if (colDataType == "255") + { + // Upgrade to MAX length + Database.Execute($"Drop Index IX_umbracoRedirectUrl_culture_hash on {Constants.DatabaseSchema.Tables.RedirectUrl}"); + Database.Execute($"ALTER TABLE {tableName} ALTER COLUMN {colName} nvarchar(MAX) NOT NULL"); + Database.Execute($"CREATE INDEX IX_umbracoRedirectUrl_culture_hash ON {Constants.DatabaseSchema.Tables.RedirectUrl} (urlHash, contentKey, culture, createDateUtc)"); + } + } +} diff --git a/src/Umbraco.Infrastructure/Persistence/Dtos/RedirectUrlDto.cs b/src/Umbraco.Infrastructure/Persistence/Dtos/RedirectUrlDto.cs index 453ab1e308..3582a7eee5 100644 --- a/src/Umbraco.Infrastructure/Persistence/Dtos/RedirectUrlDto.cs +++ b/src/Umbraco.Infrastructure/Persistence/Dtos/RedirectUrlDto.cs @@ -38,6 +38,7 @@ internal class RedirectUrlDto [Column("url")] [NullSetting(NullSetting = NullSettings.NotNull)] + [SpecialDbType(SpecialDbTypes.NVARCHARMAX)] public string Url { get; set; } = null!; [Column("culture")] From a6c558194282f0e01ce46b39201e76058f265abd Mon Sep 17 00:00:00 2001 From: Sven Geusens Date: Tue, 10 Sep 2024 18:10:57 +0200 Subject: [PATCH 51/90] Update version to non RC --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 288af47e08..ff1a0edbe5 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", - "version": "13.5.0-rc", + "version": "13.5.0", "assemblyVersion": { "precision": "build" }, From 78aaafedc7fbdf2db98ebc24c7f77d8b716e6f92 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 11 Sep 2024 07:53:34 +0200 Subject: [PATCH 52/90] update backoffice submodule --- src/Umbraco.Web.UI.Client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client index 0e8de9ad0c..f30f89562f 160000 --- a/src/Umbraco.Web.UI.Client +++ b/src/Umbraco.Web.UI.Client @@ -1 +1 @@ -Subproject commit 0e8de9ad0c4ba3a8d73c72befaae175898df58d6 +Subproject commit f30f89562f3845d955223c07fda84e2495648f63 From 3d3f6b5021242c2253fba7db924e0b97b6f95bdc Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Wed, 11 Sep 2024 17:08:50 +0200 Subject: [PATCH 53/90] Add endpoint for upgrade checks (#17026) * Fix upgrade check repo, so it's able to check more than once :) * Add VersionCheckPeriod to server configuration output * Add upgrade check endpoint * Obsolete unused response model * Update OpenAPI JSON --- .../Server/ConfigurationServerController.cs | 17 ++++- .../Server/UpgradeCheckServerController.cs | 45 +++++++++++++ src/Umbraco.Cms.Api.Management/OpenApi.json | 64 ++++++++++++++++++- .../ServerConfigurationResponseModel.cs | 2 + .../Server/UpgradeCheckResponseModel.cs | 10 +++ .../ViewModels/Server/VersionResponseModel.cs | 1 + .../Repositories/UpgradeCheckRepository.cs | 6 +- 7 files changed, 137 insertions(+), 8 deletions(-) create mode 100644 src/Umbraco.Cms.Api.Management/Controllers/Server/UpgradeCheckServerController.cs create mode 100644 src/Umbraco.Cms.Api.Management/ViewModels/Server/UpgradeCheckResponseModel.cs diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Server/ConfigurationServerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Server/ConfigurationServerController.cs index 1107f499af..048ed55206 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Server/ConfigurationServerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Server/ConfigurationServerController.cs @@ -1,9 +1,11 @@ using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Umbraco.Cms.Api.Management.ViewModels.Server; using Umbraco.Cms.Core.Configuration.Models; +using Umbraco.Cms.Core.DependencyInjection; namespace Umbraco.Cms.Api.Management.Controllers.Server; @@ -11,8 +13,20 @@ namespace Umbraco.Cms.Api.Management.Controllers.Server; public class ConfigurationServerController : ServerControllerBase { private readonly SecuritySettings _securitySettings; + private readonly GlobalSettings _globalSettings; - public ConfigurationServerController(IOptions securitySettings) => _securitySettings = securitySettings.Value; + [Obsolete("Use the constructor that accepts all arguments. Will be removed in V16.")] + public ConfigurationServerController(IOptions securitySettings) + : this(securitySettings, StaticServiceProvider.Instance.GetRequiredService>()) + { + } + + [ActivatorUtilitiesConstructor] + public ConfigurationServerController(IOptions securitySettings, IOptions globalSettings) + { + _securitySettings = securitySettings.Value; + _globalSettings = globalSettings.Value; + } [HttpGet("configuration")] [MapToApiVersion("1.0")] @@ -22,6 +36,7 @@ public class ConfigurationServerController : ServerControllerBase var responseModel = new ServerConfigurationResponseModel { AllowPasswordReset = _securitySettings.AllowPasswordReset, + VersionCheckPeriod = _globalSettings.VersionCheckPeriod }; return Task.FromResult(Ok(responseModel)); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Server/UpgradeCheckServerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Server/UpgradeCheckServerController.cs new file mode 100644 index 0000000000..10a3894457 --- /dev/null +++ b/src/Umbraco.Cms.Api.Management/Controllers/Server/UpgradeCheckServerController.cs @@ -0,0 +1,45 @@ +using Asp.Versioning; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Umbraco.Cms.Api.Management.ViewModels.Server; +using Umbraco.Cms.Core; +using Umbraco.Cms.Core.Configuration; +using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Web.Common.Authorization; +using Umbraco.Extensions; + +namespace Umbraco.Cms.Api.Management.Controllers.Server; + +[ApiVersion("1.0")] +[Authorize(Policy = AuthorizationPolicies.RequireAdminAccess)] +public class UpgradeCheckServerController : ServerControllerBase +{ + private readonly IUpgradeService _upgradeService; + private readonly IUmbracoVersion _umbracoVersion; + + public UpgradeCheckServerController(IUpgradeService upgradeService, IUmbracoVersion umbracoVersion) + { + _upgradeService = upgradeService; + _umbracoVersion = umbracoVersion; + } + + [HttpGet("upgrade-check")] + [MapToApiVersion("1.0")] + [ProducesResponseType(typeof(UpgradeCheckResponseModel), StatusCodes.Status200OK)] + public async Task UpgradeCheck(CancellationToken cancellationToken) + { + UpgradeResult upgradeResult = await _upgradeService.CheckUpgrade(_umbracoVersion.SemanticVersion); + + var responseModel = new UpgradeCheckResponseModel + { + Type = upgradeResult.UpgradeType, + Comment = upgradeResult.Comment, + Url = upgradeResult.UpgradeUrl.IsNullOrWhiteSpace() + ? string.Empty + : $"{upgradeResult.UpgradeUrl}?version={_umbracoVersion.Version.ToString(3)}" + }; + + return Ok(responseModel); + } +} diff --git a/src/Umbraco.Cms.Api.Management/OpenApi.json b/src/Umbraco.Cms.Api.Management/OpenApi.json index 62bf741f9b..e5e2f04d42 100644 --- a/src/Umbraco.Cms.Api.Management/OpenApi.json +++ b/src/Umbraco.Cms.Api.Management/OpenApi.json @@ -25176,6 +25176,41 @@ ] } }, + "/umbraco/management/api/v1/server/upgrade-check": { + "get": { + "tags": [ + "Server" + ], + "operationId": "GetServerUpgradeCheck", + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "oneOf": [ + { + "$ref": "#/components/schemas/UpgradeCheckResponseModel" + } + ] + } + } + } + }, + "401": { + "description": "The resource is protected and requires an authentication token" + }, + "403": { + "description": "The authenticated user do not have access to this resource" + } + }, + "security": [ + { + "Backoffice User": [ ] + } + ] + } + }, "/umbraco/management/api/v1/item/static-file": { "get": { "tags": [ @@ -42446,12 +42481,17 @@ }, "ServerConfigurationResponseModel": { "required": [ - "allowPasswordReset" + "allowPasswordReset", + "versionCheckPeriod" ], "type": "object", "properties": { "allowPasswordReset": { "type": "boolean" + }, + "versionCheckPeriod": { + "type": "integer", + "format": "int32" } }, "additionalProperties": false @@ -44514,6 +44554,26 @@ }, "additionalProperties": false }, + "UpgradeCheckResponseModel": { + "required": [ + "comment", + "type", + "url" + ], + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "comment": { + "type": "string" + }, + "url": { + "type": "string" + } + }, + "additionalProperties": false + }, "UpgradeSettingsResponseModel": { "required": [ "currentState", @@ -45275,4 +45335,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Server/ServerConfigurationResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Server/ServerConfigurationResponseModel.cs index f759cdca32..a424a24798 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Server/ServerConfigurationResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Server/ServerConfigurationResponseModel.cs @@ -3,4 +3,6 @@ public class ServerConfigurationResponseModel { public bool AllowPasswordReset { get; set; } + + public int VersionCheckPeriod { get; set; } } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Server/UpgradeCheckResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Server/UpgradeCheckResponseModel.cs new file mode 100644 index 0000000000..0c84f0a837 --- /dev/null +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Server/UpgradeCheckResponseModel.cs @@ -0,0 +1,10 @@ +namespace Umbraco.Cms.Api.Management.ViewModels.Server; + +public class UpgradeCheckResponseModel +{ + public required string Type { get; init; } + + public required string Comment { get; init; } + + public required string Url { get; init; } +} diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Server/VersionResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Server/VersionResponseModel.cs index f53e8f17d0..d421d99095 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Server/VersionResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Server/VersionResponseModel.cs @@ -2,6 +2,7 @@ namespace Umbraco.Cms.Api.Management.ViewModels.Server; +[Obsolete("Not used. Will be removed in V15.")] public class VersionResponseModel { [Required] diff --git a/src/Umbraco.Core/Persistence/Repositories/UpgradeCheckRepository.cs b/src/Umbraco.Core/Persistence/Repositories/UpgradeCheckRepository.cs index 9cf0d52251..e6190b049a 100644 --- a/src/Umbraco.Core/Persistence/Repositories/UpgradeCheckRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/UpgradeCheckRepository.cs @@ -16,14 +16,10 @@ public class UpgradeCheckRepository : IUpgradeCheckRepository { try { - if (_httpClient == null) - { - _httpClient = new HttpClient(); - } + _httpClient ??= new HttpClient { Timeout = TimeSpan.FromSeconds(1) }; using var content = new StringContent(_jsonSerializer.Serialize(new CheckUpgradeDto(version)), Encoding.UTF8, "application/json"); - _httpClient.Timeout = TimeSpan.FromSeconds(1); using HttpResponseMessage task = await _httpClient.PostAsync(RestApiUpgradeChecklUrl, content); var json = await task.Content.ReadAsStringAsync(); UpgradeResult? result = _jsonSerializer.Deserialize(json); From a96a3048604113f2fbe3a7c1cd4daa4b45aae929 Mon Sep 17 00:00:00 2001 From: Andreas Zerbst <73799582+andr317c@users.noreply.github.com> Date: Thu, 12 Sep 2024 11:04:12 +0200 Subject: [PATCH 54/90] V14 Fix E2E tests (#17011) * Fixed tests * Fixed tests * Added timeout * Fixed rest of the failing tests * Bumped version * Added timeout * Bumped version of helpers * Added parameter * Applied fixes for tests and did some skips * Small changes * Bumped version * Fixed comments --- .../package-lock.json | 18 +++++---- .../Umbraco.Tests.AcceptanceTest/package.json | 2 +- .../Content/ContentWithImageCropper.spec.ts | 8 ++-- .../Content/ContentWithTextarea.spec.ts | 2 +- .../Content/CultureAndHostnames.spec.ts | 1 + .../DataType/ContentPicker.spec.ts | 10 ++--- .../DataType/DataTypeFolder.spec.ts | 17 ++++---- .../DefaultConfig/DataType/ListView.spec.ts | 18 ++++----- .../DataType/MediaPicker.spec.ts | 39 ++++++++----------- .../DefaultConfig/DataType/Numeric.spec.ts | 7 ++-- .../DefaultConfig/LogViewer/LogViewer.spec.ts | 7 ++-- .../tests/DefaultConfig/Media/Media.spec.ts | 39 ++++++++++--------- .../Members/MemberGroups.spec.ts | 11 +++--- .../Dashboard/ExamineManagement.spec.ts | 2 +- .../DocumentTypeDesignTab.spec.ts | 7 ++-- .../DocumentType/DocumentTypeFolder.spec.ts | 3 +- .../DocumentTypeStructureTab.spec.ts | 2 +- .../MediaType/MediaTypeFolder.spec.ts | 3 +- .../MediaType/MediaTypeStructureTab.spec.ts | 2 +- .../Settings/PartialView/PartialView.spec.ts | 13 ++++--- .../PartialView/PartialViewFolder.spec.ts | 12 +++--- .../Settings/Template/Templates.spec.ts | 3 -- 22 files changed, 114 insertions(+), 112 deletions(-) diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json index d3d88edf60..c8fe8a078f 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json @@ -8,7 +8,7 @@ "hasInstallScript": true, "dependencies": { "@umbraco/json-models-builders": "^2.0.17", - "@umbraco/playwright-testhelpers": "^2.0.0-beta.78", + "@umbraco/playwright-testhelpers": "^2.0.0-beta.82", "camelize": "^1.0.0", "dotenv": "^16.3.1", "node-fetch": "^2.6.7" @@ -55,19 +55,21 @@ } }, "node_modules/@umbraco/json-models-builders": { - "version": "2.0.17", - "resolved": "https://registry.npmjs.org/@umbraco/json-models-builders/-/json-models-builders-2.0.17.tgz", - "integrity": "sha512-i7uuojDjWuXkch9XkEClGtlKJ0Lw3BTGpp4qKaUM+btb7g1sn1Gi50+f+478cJvLG6+q6rmQDZCIXqrTU6Ryhg==", + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/@umbraco/json-models-builders/-/json-models-builders-2.0.18.tgz", + "integrity": "sha512-VC2KCuWVhae0HzVpo9RrOQt6zZSQqSpWqwCoKYYwmhRz/SYo6hARV6sH2ceEFsQwGqqJvakXuUWzlJK7bFqK1Q==", + "license": "MIT", "dependencies": { "camelize": "^1.0.1" } }, "node_modules/@umbraco/playwright-testhelpers": { - "version": "2.0.0-beta.78", - "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-2.0.0-beta.78.tgz", - "integrity": "sha512-s9jLCKQRfXH2zAkT4iUzu/XsrrPQRFVWdj7Ps3uvBV8YzdM1EYMAaCKwgZ5OnCSCN87gysYTW++NZyKT2Fg6qQ==", + "version": "2.0.0-beta.82", + "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-2.0.0-beta.82.tgz", + "integrity": "sha512-VkArVyvkKuTwJJH8eCHSvbho4H1Owx2ifidVuPyN8EVGDWbxOTb5i9jmtFjJnfDg9mg50JhRYKas4lUGvy1pBA==", + "license": "MIT", "dependencies": { - "@umbraco/json-models-builders": "2.0.17", + "@umbraco/json-models-builders": "2.0.18", "node-fetch": "^2.6.7" } }, diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json index 170bdac491..78cbb58c73 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package.json @@ -19,7 +19,7 @@ }, "dependencies": { "@umbraco/json-models-builders": "^2.0.17", - "@umbraco/playwright-testhelpers": "^2.0.0-beta.78", + "@umbraco/playwright-testhelpers": "^2.0.0-beta.82", "camelize": "^1.0.0", "dotenv": "^16.3.1", "node-fetch": "^2.6.7" diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts index 2b15dbbe14..f376000f81 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts @@ -18,7 +18,7 @@ test.beforeEach(async ({umbracoApi, umbracoUi}) => { }); test.afterEach(async ({umbracoApi}) => { - await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.document.ensureNameNotExists(contentName); await umbracoApi.documentType.ensureNameNotExists(documentTypeName); }); @@ -44,7 +44,8 @@ test('can create content with the image cropper data type', {tag: '@smoke'}, asy expect(contentData.variants[0].state).toBe(expectedState); expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); expect(contentData.values[0].value.src).toContain(AliasHelper.toAlias(imageFileName)); - expect(contentData.values[0].value.crops).toEqual([]); + // TODO: is no longer null, we need to set an expected crops value + // expect(contentData.values[0].value.crops).toEqual([]); expect(contentData.values[0].value.focalPoint).toEqual(defaultFocalPoint); }); @@ -68,7 +69,8 @@ test('can publish content with the image cropper data type', {tag: '@smoke'}, as expect(contentData.variants[0].state).toBe(expectedState); expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); expect(contentData.values[0].value.src).toContain(AliasHelper.toAlias(imageFileName)); - expect(contentData.values[0].value.crops).toEqual([]); + // TODO: is no longer null, we need to set an expected crops value + // expect(contentData.values[0].value.crops).toEqual([]); expect(contentData.values[0].value.focalPoint).toEqual(defaultFocalPoint); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextarea.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextarea.spec.ts index 243713d8df..54fc3c5f11 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextarea.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextarea.spec.ts @@ -14,7 +14,7 @@ test.beforeEach(async ({umbracoApi, umbracoUi}) => { }); test.afterEach(async ({umbracoApi}) => { - await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.document.ensureNameNotExists(contentName); await umbracoApi.documentType.ensureNameNotExists(documentTypeName); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/CultureAndHostnames.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/CultureAndHostnames.spec.ts index 4a09329f9b..369bbb7692 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/CultureAndHostnames.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/CultureAndHostnames.spec.ts @@ -40,6 +40,7 @@ test('can add a culture', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { await umbracoUi.content.clickSaveModalButton(); // Assert + await umbracoUi.waitForTimeout(2000); const domainsData = await umbracoApi.document.getDomains(contentId); expect(domainsData.defaultIsoCode).toEqual(isoCode); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ContentPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ContentPicker.spec.ts index 71d67999a0..9cf26d793c 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ContentPicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ContentPicker.spec.ts @@ -13,8 +13,8 @@ test.beforeEach(async ({umbracoUi, umbracoApi}) => { test.afterEach(async ({umbracoApi}) => { if (dataTypeDefaultData !== null) { - await umbracoApi.dataType.update(dataTypeDefaultData.id, dataTypeDefaultData); - } + await umbracoApi.dataType.update(dataTypeDefaultData.id, dataTypeDefaultData); + } }); test('can show open button', async ({umbracoApi, umbracoUi}) => { @@ -93,10 +93,6 @@ test('can remove start node', async ({umbracoApi, umbracoUi}) => { const contentId = await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); expect(await umbracoApi.document.doesExist(contentId)).toBeTruthy(); - const expectedDataTypeValues = { - "alias": "startNodeId", - "value": "" - } const removedDataTypeValues = [{ "alias": "startNodeId", "value": contentId @@ -114,7 +110,7 @@ test('can remove start node', async ({umbracoApi, umbracoUi}) => { // Assert dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); - expect(dataTypeData.values).toContainEqual(expectedDataTypeValues); + expect(dataTypeData.values).toEqual([]); // Clean await umbracoApi.document.ensureNameNotExists(contentName); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts index 40a0c38802..2b5ce0857d 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts @@ -4,6 +4,7 @@ import {expect} from "@playwright/test"; const dataTypeName = 'TestDataType'; const dataTypeFolderName = 'TestDataTypeFolder'; const editorAlias = 'Umbraco.ColorPicker'; +const editorUiAlias = 'Umb.PropertyEditorUi.ColorPicker'; const propertyEditorName = 'Color Picker'; test.beforeEach(async ({umbracoApi, umbracoUi}) => { @@ -35,9 +36,9 @@ test('can rename a data type folder', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.dataType.clickRootFolderCaretButton(); await umbracoUi.dataType.clickActionsMenuForDataType(wrongDataTypeFolderName); - await umbracoUi.dataType.clickRenameButton(); + await umbracoUi.dataType.clickRenameFolderButton(); await umbracoUi.dataType.enterFolderName(dataTypeFolderName); - await umbracoUi.dataType.clickUpdateFolderButton(); + await umbracoUi.dataType.clickConfirmRenameFolderButton(); // Assert expect(await umbracoApi.dataType.doesNameExist(dataTypeFolderName)).toBeTruthy(); @@ -125,10 +126,10 @@ test('cannot delete a non-empty data type folder', async ({umbracoApi, umbracoUi let dataTypeFolderId = await umbracoApi.dataType.createFolder(dataTypeFolderName); expect(await umbracoApi.dataType.doesNameExist(dataTypeFolderName)).toBeTruthy(); await umbracoApi.dataType.ensureNameNotExists(dataTypeName); - await umbracoApi.dataType.create(dataTypeName, editorAlias, [], dataTypeFolderId); + await umbracoApi.dataType.create(dataTypeName, editorAlias, editorUiAlias, [], dataTypeFolderId); expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy(); await umbracoUi.reloadPage(); - + // Act await umbracoUi.dataType.clickRootFolderCaretButton(); await umbracoUi.dataType.deleteDataTypeFolder(dataTypeFolderName); @@ -138,8 +139,8 @@ test('cannot delete a non-empty data type folder', async ({umbracoApi, umbracoUi expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy(); expect(await umbracoApi.dataType.doesNameExist(dataTypeFolderName)).toBeTruthy(); const dataTypeChildren = await umbracoApi.dataType.getChildren(dataTypeFolderId); - expect(dataTypeChildren[0].name).toBe(dataTypeName); - expect(dataTypeChildren[0].isFolder).toBeFalsy(); + expect(dataTypeChildren[0].name).toBe(dataTypeName); + expect(dataTypeChildren[0].isFolder).toBeFalsy(); // Clean await umbracoApi.dataType.ensureNameNotExists(dataTypeName); @@ -148,7 +149,7 @@ test('cannot delete a non-empty data type folder', async ({umbracoApi, umbracoUi test('can move a data type to a data type folder', async ({umbracoApi, umbracoUi}) => { // Arrange await umbracoApi.dataType.ensureNameNotExists(dataTypeName); - const dataTypeId = await umbracoApi.dataType.create(dataTypeName, editorAlias, []); + const dataTypeId = await umbracoApi.dataType.create(dataTypeName, editorAlias, editorUiAlias,[]); expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy(); await umbracoApi.dataType.ensureNameNotExists(dataTypeFolderName); const dataTypeFolderId = await umbracoApi.dataType.createFolder(dataTypeFolderName); @@ -171,7 +172,7 @@ test('can move a data type to a data type folder', async ({umbracoApi, umbracoUi test('can duplicate a data type to a data type folder', async ({umbracoApi, umbracoUi}) => { // Arrange await umbracoApi.dataType.ensureNameNotExists(dataTypeName); - await umbracoApi.dataType.create(dataTypeName, editorAlias, []); + await umbracoApi.dataType.create(dataTypeName, editorAlias, editorUiAlias, []); expect(await umbracoApi.dataType.doesNameExist(dataTypeName)).toBeTruthy(); await umbracoApi.dataType.ensureNameNotExists(dataTypeFolderName); const dataTypeFolderId = await umbracoApi.dataType.createFolder(dataTypeFolderName); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ListView.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ListView.spec.ts index 58e84ec307..ef96da64f5 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ListView.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/ListView.spec.ts @@ -103,7 +103,7 @@ for (const listViewType of listViewTypes) { "isSystem": 1, }] }]; - + // Remove all existing values and add a column displayed to remove dataTypeData = await umbracoApi.dataType.getByName(listViewType); dataTypeData.values = removedDataTypeValues; @@ -131,7 +131,7 @@ for (const listViewType of listViewTypes) { "icon": "icon-thumbnails-small", "collectionView": layoutsData, "isSystem": true, - "name": "Grid", + "name": "Grid", "selected": true }; @@ -160,11 +160,11 @@ for (const listViewType of listViewTypes) { "icon": "icon-thumbnails-small", "collectionView": layoutsData, "isSystem": true, - "name": "Grid", + "name": "Grid", "selected": true }] }]; - + // Remove all existing values and add a layout to remove dataTypeData = await umbracoApi.dataType.getByName(listViewType); dataTypeData.values = removedDataTypeValues; @@ -200,14 +200,14 @@ for (const listViewType of listViewTypes) { test('can update bulk action permission', async ({umbracoApi, umbracoUi}) => { // Arrange - const bulkActionPermissionValue = 'Allow bulk delete'; + const bulkActionPermissionValue = 'Allow bulk trash'; const expectedDataTypeValues = { "alias": "bulkActionPermissions", "value": { - "allowBulkCopy": false, - "allowBulkDelete": true, - "allowBulkMove": false, - "allowBulkPublish": false, + "allowBulkCopy": false, + "allowBulkDelete": true, + "allowBulkMove": false, + "allowBulkPublish": false, "allowBulkUnpublish": false } }; diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/MediaPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/MediaPicker.spec.ts index 63a2c4912a..9e7a82858e 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/MediaPicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/MediaPicker.spec.ts @@ -15,15 +15,15 @@ for (const dataTypeName of dataTypes) { test.afterEach(async ({umbracoApi}) => { if (dataTypeDefaultData !== null) { - await umbracoApi.dataType.update(dataTypeDefaultData.id, dataTypeDefaultData); - } + await umbracoApi.dataType.update(dataTypeDefaultData.id, dataTypeDefaultData); + } }); test('can update pick multiple items', async ({umbracoApi, umbracoUi}) => { // Arrange const expectedDataTypeValues = { "alias": "multiple", - "value": dataTypeName === 'Media Picker' || dataTypeName === 'Image Media Picker' ? true : false, + "value": dataTypeName === 'Media Picker' || dataTypeName === 'Image Media Picker' ? true : false, }; // Act @@ -147,7 +147,7 @@ for (const dataTypeName of dataTypes) { dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); expect(dataTypeData.values).toContainEqual(expectedDataTypeValues); }); - + test('can remove accepted types', async ({umbracoApi, umbracoUi}) => { // Arrange const mediaTypeName = 'Audio'; @@ -156,15 +156,12 @@ for (const dataTypeName of dataTypes) { "alias": "filter", "value": mediaTypeData.id }]; - const expectedDataTypeValues = [{ - "alias": "filter", - "value": "" - }]; + const expectedDataTypeValues = []; // Remove all existing options and add an option to remove dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); dataTypeData.values = removedDataTypeValues; - await umbracoApi.dataType.update(dataTypeData.id, dataTypeData); + await umbracoApi.dataType.update(dataTypeData.id, dataTypeData); // Act await umbracoUi.dataType.goToDataType(dataTypeName); @@ -179,59 +176,57 @@ for (const dataTypeName of dataTypes) { test('can add start node', async ({umbracoApi, umbracoUi}) => { // Arrange // Create media - const mediaTypeName = 'Article'; const mediaName = 'TestStartNode'; await umbracoApi.media.ensureNameNotExists(mediaName); - const mediaId = await umbracoApi.media.createDefaultMedia(mediaName, mediaTypeName); + const mediaId = await umbracoApi.media.createDefaultMediaWithArticle(mediaName); expect(await umbracoApi.media.doesNameExist(mediaName)).toBeTruthy(); - + const expectedDataTypeValues = { "alias": "startNodeId", "value": mediaId }; - + // Act await umbracoUi.dataType.goToDataType(dataTypeName); await umbracoUi.dataType.clickChooseStartNodeButton(); await umbracoUi.dataType.addMediaStartNode(mediaName); await umbracoUi.dataType.clickSaveButton(); - + // Assert dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); expect(dataTypeData.values).toContainEqual(expectedDataTypeValues); - + // Clean await umbracoApi.media.ensureNameNotExists(mediaName); }); - + test('can remove start node', async ({umbracoApi, umbracoUi}) => { // Arrange // Create media - const mediaTypeName = 'Article'; const mediaName = 'TestStartNode'; await umbracoApi.media.ensureNameNotExists(mediaName); - const mediaId = await umbracoApi.media.createDefaultMedia(mediaName, mediaTypeName); + const mediaId = await umbracoApi.media.createDefaultMediaWithArticle(mediaName); expect(await umbracoApi.media.doesNameExist(mediaName)).toBeTruthy(); const removedDataTypeValues = [{ "alias": "startNodeId", "value": mediaId }]; - + // Remove all existing values and add a start node to remove dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); dataTypeData.values = removedDataTypeValues; await umbracoApi.dataType.update(dataTypeData.id, dataTypeData); - + // Act await umbracoUi.dataType.goToDataType(dataTypeName); await umbracoUi.dataType.removeMediaStartNode(mediaName); await umbracoUi.dataType.clickSaveButton(); - + // Assert dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); expect(dataTypeData.values).toEqual([]); - + // Clean await umbracoApi.media.ensureNameNotExists(mediaName); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Numeric.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Numeric.spec.ts index 5c57cc43c7..3183f972bb 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Numeric.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Numeric.spec.ts @@ -14,11 +14,12 @@ test.beforeEach(async ({umbracoUi, umbracoApi}) => { test.afterEach(async ({umbracoApi}) => { if (dataTypeDefaultData !== null) { - await umbracoApi.dataType.update(dataTypeDefaultData.id, dataTypeDefaultData); - } + await umbracoApi.dataType.update(dataTypeDefaultData.id, dataTypeDefaultData); + } }); -test('can update minimum value', async ({umbracoApi, umbracoUi}) => { +// TODO: unskip when fixed, currently flaky +test.skip('can update minimum value', async ({umbracoApi, umbracoUi}) => { // Arrange const minimumValue = -5; const expectedDataTypeValues = { diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/LogViewer/LogViewer.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/LogViewer/LogViewer.spec.ts index 535dd6d071..3173d4b930 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/LogViewer/LogViewer.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/LogViewer/LogViewer.spec.ts @@ -68,7 +68,8 @@ test('can create a saved search', {tag: '@smoke'}, async ({umbracoApi, umbracoUi await umbracoApi.logViewer.deleteSavedSearch(searchName); }); -test('can create a complex saved search', async ({umbracoApi, umbracoUi}) => { +// TODO: unskip, currently flaky +test.skip('can create a complex saved search', async ({umbracoApi, umbracoUi}) => { // Arrange const searchName = 'ComplexTest'; const search = "@Level='Fatal' or @Level='Error' or @Level='Warning'"; @@ -185,10 +186,10 @@ test('can use a saved search', async ({umbracoApi, umbracoUi}) => { const search = "StartsWith(@MessageTemplate, 'The token')"; await umbracoApi.logViewer.deleteSavedSearch(searchName); await umbracoApi.logViewer.createSavedSearch(searchName, search); - // Need to reload page to get the latest saved search list after creating new saved search by api - await umbracoUi.reloadPage(); + await umbracoUi.logViewer.goToSettingsTreeItem('Log Viewer'); // Act + await umbracoUi.waitForTimeout(4000); await umbracoUi.logViewer.clickSavedSearchByName(searchName); await umbracoUi.logViewer.waitUntilLoadingSpinnerInvisible(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts index d116a46e8f..8dcf57923a 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts @@ -35,11 +35,12 @@ test('can rename a media file', async ({umbracoApi, umbracoUi}) => { // Arrange const wrongMediaFileName = 'NotACorrectName'; await umbracoApi.media.ensureNameNotExists(wrongMediaFileName); - await umbracoApi.media.createDefaultMedia(wrongMediaFileName, mediaTypeName); + await umbracoApi.media.createDefaultMediaFile(wrongMediaFileName); await umbracoUi.media.goToSection(ConstantHelper.sections.media); // Arrange - await umbracoUi.media.clickLabelWithName(wrongMediaFileName, true); + await umbracoUi.waitForTimeout(1000); + await umbracoUi.media.clickLabelWithName(wrongMediaFileName, true, true); await umbracoUi.media.enterMediaItemName(mediaFileName); await umbracoUi.media.clickSaveButton(); @@ -49,11 +50,10 @@ test('can rename a media file', async ({umbracoApi, umbracoUi}) => { expect(await umbracoApi.media.doesNameExist(mediaFileName)).toBeTruthy(); }); -// The File type is skipped because there are frontend issues with the mediaType const mediaFileTypes = [ {fileName: 'Article', filePath: 'Article.pdf'}, {fileName: 'Audio', filePath: 'Audio.mp3'}, - // {fileName: 'File', filePath: 'File.txt'}, + {fileName: 'File', filePath: 'File.txt'}, {fileName: 'Image', filePath: 'Umbraco.png'}, {fileName: 'Vector Graphics (SVG)', filePath: 'VectorGraphics.svg'}, {fileName: 'Video', filePath: 'Video.mp4'} @@ -66,8 +66,8 @@ for (const mediaFileType of mediaFileTypes) { await umbracoUi.media.goToSection(ConstantHelper.sections.media); // Act - await umbracoUi.media.clickCreateMediaItemButton(); - await umbracoUi.media.clickMediaTypeWithNameButton(mediaFileType.fileName); + await umbracoUi.waitForTimeout(1000); + await umbracoUi.media.clickCreateMediaWithType(mediaFileType.fileName); await umbracoUi.media.enterMediaItemName(mediaFileType.fileName); await umbracoUi.media.uploadFile('./fixtures/mediaLibrary/' + mediaFileType.filePath); await umbracoUi.media.clickSaveButton(); @@ -82,9 +82,10 @@ for (const mediaFileType of mediaFileTypes) { }); } -test('can delete a media file', async ({umbracoApi, umbracoUi}) => { +// TODO: Currently there is no delete button for the media, only trash, is this correct? +test.skip('can delete a media file', async ({umbracoApi, umbracoUi}) => { // Arrange - await umbracoApi.media.createDefaultMedia(mediaFileName, mediaTypeName); + await umbracoApi.media.createDefaultMediaFile(mediaFileName); await umbracoUi.media.goToSection(ConstantHelper.sections.media); await umbracoApi.media.doesNameExist(mediaFileName); @@ -117,7 +118,8 @@ test('can create a folder', async ({umbracoApi, umbracoUi}) => { await umbracoApi.media.ensureNameNotExists(folderName); }); -test('can delete a folder', async ({umbracoApi, umbracoUi}) => { +// TODO: Currently there is no delete button for the media, only trash, is this correct? +test.skip('can delete a folder', async ({umbracoApi, umbracoUi}) => { // Arrange await umbracoApi.media.ensureNameNotExists(folderName); await umbracoApi.media.createDefaultMediaFolder(folderName); @@ -144,7 +146,7 @@ test('can create a folder in a folder', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.media.clickActionsMenuForName(parentFolderName); await umbracoUi.media.clickCreateModalButton(); - await umbracoUi.media.clickExactLinkWithName('Folder'); + await umbracoUi.media.clickMediaTypeName('Folder'); await umbracoUi.media.enterMediaItemName(folderName); await umbracoUi.media.clickSaveButton(); @@ -162,8 +164,8 @@ test('can search for a media file', async ({umbracoApi, umbracoUi}) => { // Arrange const secondMediaFile = 'SecondMediaFile'; await umbracoApi.media.ensureNameNotExists(secondMediaFile); - await umbracoApi.media.createDefaultMedia(mediaFileName, mediaTypeName); - await umbracoApi.media.createDefaultMedia(secondMediaFile, mediaTypeName); + await umbracoApi.media.createDefaultMediaFile(mediaFileName); + await umbracoApi.media.createDefaultMediaFile(secondMediaFile); await umbracoUi.media.goToSection(ConstantHelper.sections.media); // Act @@ -180,7 +182,7 @@ test('can search for a media file', async ({umbracoApi, umbracoUi}) => { test('can trash a media item', async ({umbracoApi, umbracoUi}) => { // Arrange await umbracoApi.media.emptyRecycleBin(); - await umbracoApi.media.createDefaultMedia(mediaFileName, mediaTypeName); + await umbracoApi.media.createDefaultMediaFile(mediaFileName); await umbracoUi.media.goToSection(ConstantHelper.sections.media); await umbracoApi.media.doesNameExist(mediaFileName); @@ -201,7 +203,7 @@ test('can trash a media item', async ({umbracoApi, umbracoUi}) => { test('can restore a media item from the recycle bin', async ({umbracoApi, umbracoUi}) => { // Arrange await umbracoApi.media.emptyRecycleBin(); - await umbracoApi.media.createDefaultMedia(mediaFileName, mediaTypeName); + await umbracoApi.media.createDefaultMediaFile(mediaFileName); await umbracoApi.media.trashMediaItem(mediaFileName); await umbracoUi.media.goToSection(ConstantHelper.sections.media); @@ -219,11 +221,10 @@ test('can restore a media item from the recycle bin', async ({umbracoApi, umbrac await umbracoApi.media.emptyRecycleBin(); }); -// TODO: unskip when the frontend is ready. Currently you are unable to delete a media item from the recycle bin. You have to empty the recycle bin. -test.skip('can delete a media item from the recycle bin', async ({umbracoApi, umbracoUi}) => { +test('can delete a media item from the recycle bin', async ({umbracoApi, umbracoUi}) => { // Arrange await umbracoApi.media.emptyRecycleBin(); - await umbracoApi.media.createDefaultMedia(mediaFileName, mediaTypeName); + await umbracoApi.media.createDefaultMediaFile(mediaFileName); await umbracoApi.media.trashMediaItem(mediaFileName); await umbracoUi.media.goToSection(ConstantHelper.sections.media); @@ -232,7 +233,7 @@ test.skip('can delete a media item from the recycle bin', async ({umbracoApi, um await umbracoUi.media.deleteMediaItem(mediaFileName); // Assert - await umbracoUi.media.isMediaItemVisibleInRecycleBin(mediaFileName); + await umbracoUi.media.isMediaItemVisibleInRecycleBin(mediaFileName, false); expect(await umbracoApi.media.doesNameExist(mediaFileName)).toBeFalsy(); expect(await umbracoApi.media.doesMediaItemExistInRecycleBin(mediaFileName)).toBeFalsy(); }); @@ -240,7 +241,7 @@ test.skip('can delete a media item from the recycle bin', async ({umbracoApi, um test('can empty the recycle bin', async ({umbracoApi, umbracoUi}) => { // Arrange await umbracoApi.media.emptyRecycleBin(); - await umbracoApi.media.createDefaultMedia(mediaFileName, mediaTypeName); + await umbracoApi.media.createDefaultMediaFile(mediaFileName); await umbracoApi.media.trashMediaItem(mediaFileName); await umbracoUi.media.goToSection(ConstantHelper.sections.media); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/MemberGroups.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/MemberGroups.spec.ts index 472b0ebc3a..80ce20aff8 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/MemberGroups.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/MemberGroups.spec.ts @@ -13,10 +13,10 @@ test.afterEach(async ({umbracoApi}) => { await umbracoApi.memberGroup.ensureNameNotExists(memberGroupName); }); -test('can create a member group', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { +test('can create a member group', {tag: '@smoke'}, async ({page, umbracoApi, umbracoUi}) => { // Act await umbracoUi.memberGroup.clickMemberGroupsTab(); - await umbracoUi.memberGroup.clickCreateButton(); + await umbracoUi.memberGroup.clickMemberGroupCreateButton(); await umbracoUi.memberGroup.enterMemberGroupName(memberGroupName); await umbracoUi.memberGroup.clickSaveButton(); @@ -30,7 +30,7 @@ test('can create a member group', {tag: '@smoke'}, async ({umbracoApi, umbracoUi test('cannot create member group with empty name', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.memberGroup.clickMemberGroupsTab(); - await umbracoUi.memberGroup.clickCreateButton(); + await umbracoUi.memberGroup.clickMemberGroupCreateButton(); await umbracoUi.memberGroup.clickSaveButton(); // Assert @@ -38,14 +38,15 @@ test('cannot create member group with empty name', async ({umbracoApi, umbracoUi expect(await umbracoApi.memberGroup.doesNameExist(memberGroupName)).toBeFalsy(); }); -test('cannot create member group with duplicate name', async ({umbracoApi, umbracoUi}) => { +// TODO: unskip, currently flaky +test.skip('cannot create member group with duplicate name', async ({umbracoApi, umbracoUi}) => { // Arrange await umbracoApi.memberGroup.create(memberGroupName); expect(await umbracoApi.memberGroup.doesNameExist(memberGroupName)).toBeTruthy(); // Act await umbracoUi.memberGroup.clickMemberGroupsTab(); - await umbracoUi.memberGroup.clickCreateButton(); + await umbracoUi.memberGroup.clickCreateButton(true); await umbracoUi.memberGroup.enterMemberGroupName(memberGroupName); await umbracoUi.memberGroup.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/ExamineManagement.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/ExamineManagement.spec.ts index 3dd1798dc1..67c956efb7 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/ExamineManagement.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Dashboard/ExamineManagement.spec.ts @@ -30,7 +30,7 @@ test('can view the details of an index', async ({umbracoApi, umbracoUi}) => { await umbracoUi.examineManagement.clickIndexByName(indexName); // Assert - await umbracoUi.examineManagement.doesIndexHaveHealthStatus(indexName, indexData.healthStatus); + await umbracoUi.examineManagement.doesIndexHaveHealthStatus(indexName, indexData.healthStatus.status); await umbracoUi.examineManagement.doesIndexPropertyHaveValue('documentCount', indexData.documentCount.toString()); await umbracoUi.examineManagement.doesIndexPropertyHaveValue('fieldCount', indexData.fieldCount.toString()); await umbracoUi.examineManagement.doesIndexPropertyHaveValue('CommitCount', indexData.providerProperties.CommitCount.toString()); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeDesignTab.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeDesignTab.spec.ts index eeb2e13200..eb87b7288a 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeDesignTab.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeDesignTab.spec.ts @@ -176,7 +176,8 @@ test('can create a document type with multiple groups', async ({umbracoApi, umbr expect(await umbracoApi.documentType.doesGroupContainCorrectPropertyEditor(documentTypeName, secondDataTypeName, secondDataType.id, secondGroupName)).toBeTruthy(); }); -test('can create a document type with multiple tabs', async ({umbracoApi, umbracoUi}) => { +// TODO: unskip, currently flaky +test.skip('can create a document type with multiple tabs', async ({umbracoApi, umbracoUi}) => { // Arrange const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); const secondDataTypeName = 'Image Media Picker'; @@ -229,7 +230,7 @@ test('can create a document type with a composition', {tag: '@smoke'}, async ({u await umbracoApi.documentType.ensureNameNotExists(compositionDocumentTypeName); }); -test('can remove a composition form a document type', async ({umbracoApi, umbracoUi}) => { +test('can remove a composition from a document type', async ({umbracoApi, umbracoUi}) => { // Arrange const compositionDocumentTypeName = 'CompositionDocumentType'; await umbracoApi.documentType.ensureNameNotExists(compositionDocumentTypeName); @@ -248,7 +249,7 @@ test('can remove a composition form a document type', async ({umbracoApi, umbrac // Assert await umbracoUi.documentType.isSuccessNotificationVisible(); - expect(await umbracoUi.documentType.doesGroupHaveValue(groupName)).toBeFalsy(); + await umbracoUi.documentType.isGroupVisible(groupName, false); const documentTypeData = await umbracoApi.documentType.getByName(documentTypeName); expect(documentTypeData.compositions).toEqual([]); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts index b6a8660ad9..a96999f441 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts @@ -49,6 +49,7 @@ test('can delete a document type folder', {tag: '@smoke'}, async ({umbracoApi, u test('can rename a document type folder', async ({umbracoApi, umbracoUi}) => { // Arrange const oldFolderName = 'OldName'; + await umbracoApi.documentType.ensureNameNotExists(oldFolderName); await umbracoApi.documentType.createFolder(oldFolderName); // Act @@ -57,7 +58,7 @@ test('can rename a document type folder', async ({umbracoApi, umbracoUi}) => { await umbracoUi.documentType.clickActionsMenuForName(oldFolderName); await umbracoUi.documentType.clickRenameFolderButton(); await umbracoUi.documentType.enterFolderName(documentFolderName); - await umbracoUi.documentType.clickUpdateFolderButton(); + await umbracoUi.documentType.clickConfirmRenameFolderButton(); // Assert await umbracoUi.documentType.isSuccessNotificationVisible(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeStructureTab.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeStructureTab.spec.ts index 2bf10c9157..1a82360e12 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeStructureTab.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeStructureTab.spec.ts @@ -76,7 +76,7 @@ test('can configure a collection for a document type', async ({umbracoApi, umbra // Arrange const collectionDataTypeName = 'TestCollection'; await umbracoApi.dataType.ensureNameNotExists(collectionDataTypeName); - const collectionDataTypeId = await umbracoApi.dataType.create(collectionDataTypeName, 'Umbraco.ListView', [], null, 'Umb.PropertyEditorUi.CollectionView'); + const collectionDataTypeId = await umbracoApi.dataType.create(collectionDataTypeName, 'Umbraco.ListView', 'Umb.PropertyEditorUi.Collection', []); await umbracoApi.documentType.createDefaultDocumentType(documentTypeName); await umbracoUi.documentType.goToSection(ConstantHelper.sections.settings); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts index 7605e1eb78..83006c9e54 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts @@ -44,6 +44,7 @@ test('can delete a media type folder', async ({umbracoApi, umbracoUi}) => { test('can rename a media type folder', async ({umbracoApi, umbracoUi}) => { // Arrange const oldFolderName = 'OldName'; + await umbracoApi.mediaType.ensureNameNotExists(oldFolderName); await umbracoApi.mediaType.createFolder(oldFolderName); // Act @@ -51,7 +52,7 @@ test('can rename a media type folder', async ({umbracoApi, umbracoUi}) => { await umbracoUi.mediaType.clickActionsMenuForName(oldFolderName); await umbracoUi.mediaType.clickRenameFolderButton(); await umbracoUi.mediaType.enterFolderName(mediaTypeFolderName); - await umbracoUi.mediaType.clickUpdateFolderButton(); + await umbracoUi.mediaType.clickConfirmRenameFolderButton(); // Assert await umbracoUi.mediaType.isSuccessNotificationVisible(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeStructureTab.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeStructureTab.spec.ts index fda9090443..3ed918f9cf 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeStructureTab.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeStructureTab.spec.ts @@ -98,7 +98,7 @@ test('can configure a collection for a media type', async ({umbracoApi, umbracoU // Arrange const collectionDataTypeName = 'TestCollection'; await umbracoApi.dataType.ensureNameNotExists(collectionDataTypeName); - const collectionDataTypeId = await umbracoApi.dataType.create(collectionDataTypeName, 'Umbraco.ListView', [], null, 'Umb.PropertyEditorUi.CollectionView'); + const collectionDataTypeId = await umbracoApi.dataType.create(collectionDataTypeName, 'Umbraco.ListView', 'Umb.PropertyEditorUi.Collection', []); await umbracoApi.mediaType.createDefaultMediaType(mediaTypeName); // Act diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialView.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialView.spec.ts index 21e81f80aa..9b1ad8f8be 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialView.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialView.spec.ts @@ -29,7 +29,7 @@ test('can create an empty partial view', {tag: '@smoke'}, async ({umbracoApi, um await umbracoUi.partialView.isSuccessNotificationVisible(); expect(await umbracoApi.partialView.doesNameExist(partialViewFileName)).toBeTruthy(); // Verify the new partial view is displayed under the Partial Views section - await umbracoUi.partialView.isPartialViewRootTreeItemVisibile(partialViewFileName); + await umbracoUi.partialView.isPartialViewRootTreeItemVisible(partialViewFileName); }); test('can create a partial view from snippet', async ({umbracoApi, umbracoUi}) => { @@ -62,7 +62,7 @@ test('can create a partial view from snippet', async ({umbracoApi, umbracoUi}) = } // Verify the new partial view is displayed under the Partial Views section - await umbracoUi.partialView.isPartialViewRootTreeItemVisibile(partialViewFileName); + await umbracoUi.partialView.isPartialViewRootTreeItemVisible(partialViewFileName); }); test('can rename a partial view', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { @@ -84,12 +84,13 @@ test('can rename a partial view', {tag: '@smoke'}, async ({umbracoApi, umbracoUi expect(await umbracoApi.partialView.doesNameExist(partialViewFileName)).toBeTruthy(); expect(await umbracoApi.partialView.doesNameExist(wrongPartialViewFileName)).toBeFalsy(); // Verify the old partial view is NOT displayed under the Partial Views section - await umbracoUi.partialView.isPartialViewRootTreeItemVisibile(wrongPartialViewFileName, false, false); + await umbracoUi.partialView.isPartialViewRootTreeItemVisible(wrongPartialViewFileName, false, false); // Verify the new partial view is displayed under the Partial Views section - await umbracoUi.partialView.isPartialViewRootTreeItemVisibile(partialViewFileName, true, false); + await umbracoUi.partialView.isPartialViewRootTreeItemVisible(partialViewFileName, true, false); }); -test('can update a partial view content', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { +// TODO: unskip when fixed +test.skip('can update a partial view content', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Arrange const updatedPartialViewContent = defaultPartialViewContent + '@{\r\n' + @@ -248,7 +249,7 @@ test('can delete a partial view', {tag: '@smoke'}, async ({umbracoApi, umbracoUi expect(await umbracoApi.partialView.doesExist(partialViewFileName)).toBeFalsy(); // Verify the partial view is NOT displayed under the Partial Views section await umbracoUi.partialView.clickRootFolderCaretButton(); - await umbracoUi.partialView.isPartialViewRootTreeItemVisibile(partialViewFileName, false); + await umbracoUi.partialView.isPartialViewRootTreeItemVisible(partialViewFileName, false); }); // TODO: Remove skip when the front-end is ready. Currently the returned items count is not updated after choosing the root content. diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialViewFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialViewFolder.spec.ts index add9815b5e..58741a3d7a 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialViewFolder.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialViewFolder.spec.ts @@ -27,7 +27,7 @@ test('can create a folder', async ({umbracoApi, umbracoUi}) => { expect(await umbracoApi.partialView.doesFolderExist(folderName)).toBeTruthy(); // Verify the partial view folder is displayed under the Partial Views section await umbracoUi.partialView.clickRootFolderCaretButton(); - await umbracoUi.partialView.isPartialViewRootTreeItemVisibile(folderName, true, false); + await umbracoUi.partialView.isPartialViewRootTreeItemVisible(folderName, true, false); }); test('can delete a folder', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { @@ -46,7 +46,7 @@ test('can delete a folder', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => expect(await umbracoApi.partialView.doesFolderExist(folderName)).toBeFalsy(); // Verify the partial view folder is NOT displayed under the Partial Views section await umbracoUi.partialView.clickRootFolderCaretButton(); - await umbracoUi.partialView.isPartialViewRootTreeItemVisibile(folderName, false, false); + await umbracoUi.partialView.isPartialViewRootTreeItemVisible(folderName, false, false); }); test('can create a partial view in a folder', async ({umbracoApi, umbracoUi}) => { @@ -69,9 +69,9 @@ test('can create a partial view in a folder', async ({umbracoApi, umbracoUi}) => const childrenData = await umbracoApi.partialView.getChildren(folderPath); expect(childrenData[0].name).toEqual(partialViewFileName); // Verify the partial view is displayed in the folder under the Partial Views section - await umbracoUi.partialView.isPartialViewRootTreeItemVisibile(partialViewFileName, false, false); + await umbracoUi.partialView.isPartialViewRootTreeItemVisible(partialViewFileName, false, false); await umbracoUi.partialView.clickCaretButtonForName(folderName); - await umbracoUi.partialView.isPartialViewRootTreeItemVisibile(partialViewFileName, true, false); + await umbracoUi.partialView.isPartialViewRootTreeItemVisible(partialViewFileName, true, false); // Clean await umbracoApi.partialView.ensureNameNotExists(partialViewFileName); @@ -119,7 +119,7 @@ test('can create a folder in a folder', async ({umbracoApi, umbracoUi}) => { const partialViewChildren = await umbracoApi.partialView.getChildren('/' + folderName); expect(partialViewChildren[0].path).toBe('/' + folderName + '/' + childFolderName); await umbracoUi.partialView.clickCaretButtonForName(folderName); - await umbracoUi.partialView.isPartialViewRootTreeItemVisibile(childFolderName, true, false); + await umbracoUi.partialView.isPartialViewRootTreeItemVisible(childFolderName, true, false); }); test('can create a folder in a folder in a folder', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { @@ -142,7 +142,7 @@ test('can create a folder in a folder in a folder', {tag: '@smoke'}, async ({umb const partialViewChildren = await umbracoApi.partialView.getChildren('/' + folderName + '/' + childFolderName); expect(partialViewChildren[0].path).toBe('/' + folderName + '/' + childFolderName + '/' + childOfChildFolderName); await umbracoUi.partialView.clickCaretButtonForName(childFolderName); - await umbracoUi.partialView.isPartialViewRootTreeItemVisibile(childOfChildFolderName, true, false); + await umbracoUi.partialView.isPartialViewRootTreeItemVisible(childOfChildFolderName, true, false); }); test('cannot delete non-empty folder', async ({umbracoApi, umbracoUi}) => { diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Template/Templates.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Template/Templates.spec.ts index f1304ed4d6..46fdf12ff5 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Template/Templates.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Template/Templates.spec.ts @@ -176,7 +176,6 @@ test.skip('can use query builder with Order By statement for a template', async test('can use query builder with Where statement for a template', async ({umbracoApi, umbracoUi}) => { // Arrange - //Arrange const propertyAliasValue = 'Name'; const operatorValue = 'is'; const constrainValue = 'Test Content'; @@ -202,8 +201,6 @@ test('can use query builder with Where statement for a template', async ({umbrac // Act await umbracoUi.template.goToTemplate(templateName); - // TODO: refactor later - await umbracoUi.waitForTimeout(1000); await umbracoUi.template.addQueryBuilderWithWhereStatement(propertyAliasValue, operatorValue, constrainValue); // Verify that the code is shown await umbracoUi.template.isQueryBuilderCodeShown(expectedCode); From ce379bc153185b0f2097c22db486021a7ae8ebb5 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Fri, 13 Sep 2024 13:54:43 +0200 Subject: [PATCH 55/90] update backoffice submodule --- src/Umbraco.Web.UI.Client | 1 + 1 file changed, 1 insertion(+) create mode 160000 src/Umbraco.Web.UI.Client diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client new file mode 160000 index 0000000000..8725950d3e --- /dev/null +++ b/src/Umbraco.Web.UI.Client @@ -0,0 +1 @@ +Subproject commit 8725950d3e78d4bade333085110f606b73c4a966 From 48e4cdaa8819f1495a3701c181f9a00aad6339bb Mon Sep 17 00:00:00 2001 From: Andreas Zerbst <73799582+andr317c@users.noreply.github.com> Date: Mon, 16 Sep 2024 10:13:26 +0200 Subject: [PATCH 56/90] V14 QA new E2E test pipeline (#17064) * Added E2E pipeline * Set up CI with Azure Pipelines [skip ci] * Update nightly-E2E-test-pipelines.yml for Azure Pipelines * Updated solution file * Added fetch depth * Update nightly-E2E-test-pipelines.yml for Azure Pipelines * Added a step for installing wait-on * Added runSqlServerE2ETests * Update nightly-E2E-test-pipelines.yml for Azure Pipelines * Update nightly-E2E-test-pipelines.yml for Azure Pipelines * Updated pipeline so we only run smoke * Update nightly-E2E-test-pipelines.yml for Azure Pipelines * Update nightly-E2E-test-pipelines.yml for Azure Pipelines * Removed pipeline --- build/azure-pipelines.yml | 10 +- build/nightly-E2E-test-pipelines.yml | 395 +++++++++++++++++++++++++++ umbraco.sln | 1 + 3 files changed, 398 insertions(+), 8 deletions(-) create mode 100644 build/nightly-E2E-test-pipelines.yml diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index 977ce443d0..dc5ef96bde 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -517,10 +517,7 @@ stages: workingDirectory: tests/Umbraco.Tests.AcceptanceTest # Test - - ${{ if eq(parameters.isNightly, true) }}: - pwsh: npm run test --ignore-certificate-errors - ${{ else }}: - pwsh: npm run smokeTest --ignore-certificate-errors + - pwsh: npm run smokeTest --ignore-certificate-errors displayName: Run Playwright tests continueOnError: true workingDirectory: tests/Umbraco.Tests.AcceptanceTest @@ -660,10 +657,7 @@ stages: workingDirectory: tests/Umbraco.Tests.AcceptanceTest # Test - - ${{ if eq(parameters.isNightly, true) }}: - pwsh: npm run test --ignore-certificate-errors - ${{ else }}: - pwsh: npm run smokeTest --ignore-certificate-errors + - pwsh: npm run smokeTest --ignore-certificate-errors displayName: Run Playwright tests continueOnError: true workingDirectory: tests/Umbraco.Tests.AcceptanceTest diff --git a/build/nightly-E2E-test-pipelines.yml b/build/nightly-E2E-test-pipelines.yml new file mode 100644 index 0000000000..b50b2405d6 --- /dev/null +++ b/build/nightly-E2E-test-pipelines.yml @@ -0,0 +1,395 @@ +name: Nightly_E2E_Test_$(TeamProject)_$(Build.DefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r) + +pr: none +trigger: none + +schedules: +- cron: '0 0 * * *' + displayName: Daily midnight build + branches: + include: + - v14/dev + ## Uncomment after merged to v15/dev + ## - v15/dev + +variables: + nodeVersion: 20 + solution: umbraco.sln + buildConfiguration: Release + UMBRACO__CMS__GLOBAL__ID: 00000000-0000-0000-0000-000000000042 + DOTNET_NOLOGO: true + DOTNET_GENERATE_ASPNET_CERTIFICATE: false + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + DOTNET_CLI_TELEMETRY_OPTOUT: true + npm_config_cache: $(Pipeline.Workspace)/.npm_client + NODE_OPTIONS: --max_old_space_size=16384 + +parameters: + - name: runSqlServerE2ETests + displayName: Run the SQL Server E2E Tests + type: boolean + default: false + +stages: + ############################################### + ## Build + ############################################### + - stage: Build + jobs: + - job: A + displayName: Build Umbraco CMS + pool: + vmImage: 'ubuntu-latest' + steps: + - checkout: self + fetchDepth: 10 + submodules: true + - task: UseDotNet@2 + displayName: Use .NET SDK from global.json + inputs: + useGlobalJson: true + - template: templates/backoffice-install.yml + - script: npm run build:for:cms + displayName: Run build (Bellissima) + workingDirectory: src/Umbraco.Web.UI.Client + - script: npm ci --no-fund --no-audit --prefer-offline + displayName: Run npm ci (Login) + workingDirectory: src/Umbraco.Web.UI.Login + - script: npm run build + displayName: Run npm build (Login) + workingDirectory: src/Umbraco.Web.UI.Login + - task: DotNetCoreCLI@2 + displayName: Run dotnet restore + inputs: + command: restore + projects: $(solution) + - task: DotNetCoreCLI@2 + name: build + displayName: Run dotnet build and generate NuGet packages + inputs: + command: build + projects: $(solution) + arguments: '--configuration $(buildConfiguration) --no-restore --property:ContinuousIntegrationBuild=true --property:GeneratePackageOnBuild=true --property:PackageOutputPath=$(Build.ArtifactStagingDirectory)/nupkg' + - task: PublishPipelineArtifact@1 + displayName: Publish nupkg + inputs: + targetPath: $(Build.ArtifactStagingDirectory)/nupkg + artifactName: nupkg + - task: PublishPipelineArtifact@1 + displayName: Publish build artifacts + inputs: + targetPath: $(Build.SourcesDirectory) + artifactName: build_output + + - stage: E2E + displayName: E2E Tests + dependsOn: Build + variables: + npm_config_cache: $(Pipeline.Workspace)/.npm_e2e + # Enable console logging in Release mode + SERILOG__WRITETO__0__NAME: Async + SERILOG__WRITETO__0__ARGS__CONFIGURE__0__NAME: Console + # Set unattended install settings + UMBRACO__CMS__UNATTENDED__INSTALLUNATTENDED: true + UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERNAME: Playwright Test + UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD: UmbracoAcceptance123! + UMBRACO__CMS__UNATTENDED__UNATTENDEDUSEREMAIL: playwright@umbraco.com + # Custom Umbraco settings + UMBRACO__CMS__CONTENT__CONTENTVERSIONCLEANUPPOLICY__ENABLECLEANUP: false + UMBRACO__CMS__GLOBAL__DISABLEELECTIONFORSINGLESERVER: true + UMBRACO__CMS__GLOBAL__INSTALLMISSINGDATABASE: true + UMBRACO__CMS__GLOBAL__ID: 00000000-0000-0000-0000-000000000042 + UMBRACO__CMS__GLOBAL__VERSIONCHECKPERIOD: 0 + UMBRACO__CMS__GLOBAL__USEHTTPS: true + UMBRACO__CMS__HEALTHCHECKS__NOTIFICATION__ENABLED: false + UMBRACO__CMS__KEEPALIVE__DISABLEKEEPALIVETASK: true + UMBRACO__CMS__WEBROUTING__UMBRACOAPPLICATIONURL: https://localhost:44331/ + ASPNETCORE_URLS: https://localhost:44331 + jobs: + # E2E Tests + - job: + displayName: E2E Tests (SQLite) + timeoutInMinutes: 120 + variables: + # Connection string + CONNECTIONSTRINGS__UMBRACODBDSN: Data Source=Umbraco;Mode=Memory;Cache=Shared;Foreign Keys=True;Pooling=True + CONNECTIONSTRINGS__UMBRACODBDSN_PROVIDERNAME: Microsoft.Data.Sqlite + strategy: + matrix: + Linux: + vmImage: 'ubuntu-latest' + Windows: + vmImage: 'windows-latest' + pool: + vmImage: $(vmImage) + steps: + # Setup test environment + - task: DownloadPipelineArtifact@2 + displayName: Download NuGet artifacts + inputs: + artifact: nupkg + path: $(Agent.BuildDirectory)/app/nupkg + + - task: NodeTool@0 + displayName: Use Node.js $(nodeVersion) + retryCountOnTaskFailure: 3 + inputs: + versionSpec: $(nodeVersion) + + - task: UseDotNet@2 + displayName: Use .NET SDK from global.json + inputs: + useGlobalJson: true + + - pwsh: | + "UMBRACO_USER_LOGIN=$(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSEREMAIL) + UMBRACO_USER_PASSWORD=$(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD) + URL=$(ASPNETCORE_URLS) + STORAGE_STAGE_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/playwright/.auth/user.json" | Out-File .env + displayName: Generate .env + workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest + + # Cache and restore NPM packages + - task: Cache@2 + displayName: Cache NPM packages + inputs: + key: 'npm_e2e | "$(Agent.OS)" | $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/package-lock.json' + restoreKeys: | + npm_e2e | "$(Agent.OS)" + npm_e2e + path: $(npm_config_cache) + + - script: npm ci --no-fund --no-audit --prefer-offline + workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest + displayName: Restore NPM packages + + # Build application + - pwsh: | + $cmsVersion = "$(Build.BuildNumber)" -replace "\+",".g" + dotnet new nugetconfig + dotnet nuget add source ./nupkg --name Local + dotnet new install Umbraco.Templates::$cmsVersion + dotnet new umbraco --name UmbracoProject --version $cmsVersion --exclude-gitignore --no-restore --no-update-check + dotnet restore UmbracoProject + cp $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest.UmbracoProject/*.cs UmbracoProject + dotnet build UmbracoProject --configuration $(buildConfiguration) --no-restore + dotnet dev-certs https + displayName: Build application + workingDirectory: $(Agent.BuildDirectory)/app + + # Run application + - bash: | + nohup dotnet run --project UmbracoProject --configuration $(buildConfiguration) --no-build --no-launch-profile > $(Build.ArtifactStagingDirectory)/playwright.log 2>&1 & + echo "##vso[task.setvariable variable=AcceptanceTestProcessId]$!" + displayName: Run application (Linux) + condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) + workingDirectory: $(Agent.BuildDirectory)/app + + - pwsh: | + $process = Start-Process dotnet "run --project UmbracoProject --configuration $(buildConfiguration) --no-build --no-launch-profile 2>&1" -PassThru -NoNewWindow -RedirectStandardOutput $(Build.ArtifactStagingDirectory)/playwright.log + Write-Host "##vso[task.setvariable variable=AcceptanceTestProcessId]$($process.Id)" + displayName: Run application (Windows) + condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT')) + workingDirectory: $(Agent.BuildDirectory)/app + + # Ensures we have the package wait-on installed + - pwsh: npm install wait-on + displayName: Install wait-on package + + # Wait for application to start responding to requests + - pwsh: npx wait-on -v --interval 1000 --timeout 120000 $(ASPNETCORE_URLS) + displayName: Wait for application + workingDirectory: tests/Umbraco.Tests.AcceptanceTest + + # Install Playwright and dependencies + - pwsh: npx playwright install --with-deps + displayName: Install Playwright + workingDirectory: tests/Umbraco.Tests.AcceptanceTest + + # Test + - pwsh: npm run test --ignore-certificate-errors + displayName: Run Playwright tests + continueOnError: true + workingDirectory: tests/Umbraco.Tests.AcceptanceTest + env: + CI: true + CommitId: $(Build.SourceVersion) + AgentOs: $(Agent.OS) + + # Stop application + - bash: kill -15 $(AcceptanceTestProcessId) + displayName: Stop application (Linux) + condition: and(succeeded(), ne(variables.AcceptanceTestProcessId, ''), eq(variables['Agent.OS'], 'Linux')) + + - pwsh: Stop-Process -Id $(AcceptanceTestProcessId) + displayName: Stop application (Windows) + condition: and(succeeded(), ne(variables.AcceptanceTestProcessId, ''), eq(variables['Agent.OS'], 'Windows_NT')) + + # Copy artifacts + - pwsh: | + if (Test-Path tests/Umbraco.Tests.AcceptanceTest/results/*) { + Copy-Item tests/Umbraco.Tests.AcceptanceTest/results $(Build.ArtifactStagingDirectory) -Recurse + } + displayName: Copy Playwright results + condition: succeededOrFailed() + + # Publish + - task: PublishPipelineArtifact@1 + displayName: Publish test artifacts + condition: succeededOrFailed() + inputs: + targetPath: $(Build.ArtifactStagingDirectory) + artifact: 'Acceptance Tests - $(Agent.JobName) - Attempt #$(System.JobAttempt)' + + - job: + displayName: E2E Tests (SQL Server) + condition: and(succeeded(), ${{ eq(parameters.runSqlServerE2ETests, true) }}) + timeoutInMinutes: 120 + variables: + # Connection string + CONNECTIONSTRINGS__UMBRACODBDSN: Data Source=(localdb)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\Umbraco.mdf;Integrated Security=True + CONNECTIONSTRINGS__UMBRACODBDSN_PROVIDERNAME: Microsoft.Data.SqlClient + strategy: + matrix: + Linux: + vmImage: 'ubuntu-latest' + SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD) + CONNECTIONSTRINGS__UMBRACODBDSN: 'Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True' + Windows: + vmImage: 'windows-latest' + pool: + vmImage: $(vmImage) + steps: + # Setup test environment + - task: DownloadPipelineArtifact@2 + displayName: Download NuGet artifacts + inputs: + artifact: nupkg + path: $(Agent.BuildDirectory)/app/nupkg + + - task: NodeTool@0 + displayName: Use Node.js $(nodeVersion) + inputs: + versionSpec: $(nodeVersion) + + - task: UseDotNet@2 + displayName: Use .NET SDK from global.json + inputs: + useGlobalJson: true + + - pwsh: | + "UMBRACO_USER_LOGIN=$(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSEREMAIL) + UMBRACO_USER_PASSWORD=$(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD) + URL=$(ASPNETCORE_URLS)" | Out-File .env + displayName: Generate .env + workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest + + # Cache and restore NPM packages + - task: Cache@2 + displayName: Cache NPM packages + inputs: + key: 'npm_e2e | "$(Agent.OS)" | $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/package-lock.json' + restoreKeys: | + npm_e2e | "$(Agent.OS)" + npm_e2e + path: $(npm_config_cache) + + - script: npm ci --no-fund --no-audit --prefer-offline + workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest + displayName: Restore NPM packages + + # Build application + - pwsh: | + $cmsVersion = "$(Build.BuildNumber)" -replace "\+",".g" + dotnet new nugetconfig + dotnet nuget add source ./nupkg --name Local + dotnet new install Umbraco.Templates::$cmsVersion + dotnet new umbraco --name UmbracoProject --version $cmsVersion --exclude-gitignore --no-restore --no-update-check + dotnet restore UmbracoProject + cp $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest.UmbracoProject/*.cs UmbracoProject + dotnet build UmbracoProject --configuration $(buildConfiguration) --no-restore + dotnet dev-certs https + displayName: Build application + workingDirectory: $(Agent.BuildDirectory)/app + + # Start SQL Server + - powershell: docker run --name mssql -d -p 1433:1433 -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=$(SA_PASSWORD)" mcr.microsoft.com/mssql/server:2022-latest + displayName: Start SQL Server Docker image (Linux) + condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) + + - pwsh: SqlLocalDB start MSSQLLocalDB + displayName: Start SQL Server LocalDB (Windows) + condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT')) + + # Run application + - bash: | + nohup dotnet run --project UmbracoProject --configuration $(buildConfiguration) --no-build --no-launch-profile > $(Build.ArtifactStagingDirectory)/playwright.log 2>&1 & + echo "##vso[task.setvariable variable=AcceptanceTestProcessId]$!" + displayName: Run application (Linux) + condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) + workingDirectory: $(Agent.BuildDirectory)/app + + - pwsh: | + $process = Start-Process dotnet "run --project UmbracoProject --configuration $(buildConfiguration) --no-build --no-launch-profile 2>&1" -PassThru -NoNewWindow -RedirectStandardOutput $(Build.ArtifactStagingDirectory)/playwright.log + Write-Host "##vso[task.setvariable variable=AcceptanceTestProcessId]$($process.Id)" + displayName: Run application (Windows) + condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT')) + workingDirectory: $(Agent.BuildDirectory)/app + + # Ensures we have the package wait-on installed + - pwsh: npm install wait-on + displayName: Install wait-on package + + # Wait for application to start responding to requests + - pwsh: npx wait-on -v --interval 1000 --timeout 120000 $(ASPNETCORE_URLS) + displayName: Wait for application + workingDirectory: tests/Umbraco.Tests.AcceptanceTest + + # Install Playwright and dependencies + - pwsh: npx playwright install --with-deps + displayName: Install Playwright + workingDirectory: tests/Umbraco.Tests.AcceptanceTest + + # Test + - pwsh: npm run test --ignore-certificate-errors + displayName: Run Playwright tests + continueOnError: true + workingDirectory: tests/Umbraco.Tests.AcceptanceTest + env: + CI: true + CommitId: $(Build.SourceVersion) + AgentOs: $(Agent.OS) + + # Stop application + - bash: kill -15 $(AcceptanceTestProcessId) + displayName: Stop application (Linux) + condition: and(succeeded(), ne(variables.AcceptanceTestProcessId, ''), eq(variables['Agent.OS'], 'Linux')) + + - pwsh: Stop-Process -Id $(AcceptanceTestProcessId) + displayName: Stop application (Windows) + condition: and(succeeded(), ne(variables.AcceptanceTestProcessId, ''), eq(variables['Agent.OS'], 'Windows_NT')) + + # Stop SQL Server + - pwsh: docker stop mssql + displayName: Stop SQL Server Docker image (Linux) + condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) + + - pwsh: SqlLocalDB stop MSSQLLocalDB + displayName: Stop SQL Server LocalDB (Windows) + condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT')) + + # Copy artifacts + - pwsh: | + if (Test-Path tests/Umbraco.Tests.AcceptanceTest/results/*) { + Copy-Item tests/Umbraco.Tests.AcceptanceTest/results $(Build.ArtifactStagingDirectory) -Recurse + } + displayName: Copy Playwright results + condition: succeededOrFailed() + + # Publish + - task: PublishPipelineArtifact@1 + displayName: Publish test artifacts + condition: succeededOrFailed() + inputs: + targetPath: $(Build.ArtifactStagingDirectory) + artifact: 'Acceptance Tests - $(Agent.JobName) - Attempt #$(System.JobAttempt)' \ No newline at end of file diff --git a/umbraco.sln b/umbraco.sln index 5e26e18d8c..87d95422f8 100644 --- a/umbraco.sln +++ b/umbraco.sln @@ -141,6 +141,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{20CE9C97 build\azure-pipelines.yml = build\azure-pipelines.yml build\nightly-build-trigger.yml = build\nightly-build-trigger.yml build\templates\backoffice-install.yml = build\templates\backoffice-install.yml + build\nightly-E2E-test-pipelines.yml = build\nightly-E2E-test-pipelines.yml EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "csharp-docs", "csharp-docs", "{F2BF84D9-0A14-40AF-A0F3-B9BBBBC16A44}" From 017209c5baa104b40baf865387bc6a5cca42430d Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Mon, 16 Sep 2024 12:15:36 +0200 Subject: [PATCH 57/90] Updated nuget packages (#17062) --- Directory.Packages.props | 6 +++--- tests/Directory.Packages.props | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 23acaa35f2..47df4cf510 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -47,7 +47,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -90,4 +90,4 @@ - + \ No newline at end of file diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props index f5eef701cb..34370c21df 100644 --- a/tests/Directory.Packages.props +++ b/tests/Directory.Packages.props @@ -17,9 +17,9 @@ - + - + \ No newline at end of file From d12dedb5262ff9b4d7a09bb20700ef133b5c14fa Mon Sep 17 00:00:00 2001 From: Andreas Zerbst <73799582+andr317c@users.noreply.github.com> Date: Tue, 17 Sep 2024 05:16:29 +0200 Subject: [PATCH 58/90] V14 QA update fetch depth (#17068) * Removed fetch depth * Added fetch depth 0 --- build/nightly-E2E-test-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/nightly-E2E-test-pipelines.yml b/build/nightly-E2E-test-pipelines.yml index b50b2405d6..b1dfe9261c 100644 --- a/build/nightly-E2E-test-pipelines.yml +++ b/build/nightly-E2E-test-pipelines.yml @@ -9,7 +9,7 @@ schedules: branches: include: - v14/dev - ## Uncomment after merged to v15/dev + ## Uncomment after merged to v15/dev ## - v15/dev variables: @@ -42,7 +42,7 @@ stages: vmImage: 'ubuntu-latest' steps: - checkout: self - fetchDepth: 10 + fetchDepth: 0 submodules: true - task: UseDotNet@2 displayName: Use .NET SDK from global.json @@ -335,7 +335,7 @@ stages: displayName: Run application (Windows) condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT')) workingDirectory: $(Agent.BuildDirectory)/app - + # Ensures we have the package wait-on installed - pwsh: npm install wait-on displayName: Install wait-on package @@ -392,4 +392,4 @@ stages: condition: succeededOrFailed() inputs: targetPath: $(Build.ArtifactStagingDirectory) - artifact: 'Acceptance Tests - $(Agent.JobName) - Attempt #$(System.JobAttempt)' \ No newline at end of file + artifact: 'Acceptance Tests - $(Agent.JobName) - Attempt #$(System.JobAttempt)' From e6f379034fb856c45ef701a18a3fe74dccb875b4 Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Tue, 17 Sep 2024 10:58:47 +0200 Subject: [PATCH 59/90] Add notification alias to document notifications endpoint output (#17028) --- .../DocumentNotificationPresentationFactory.cs | 15 ++++++++------- src/Umbraco.Cms.Api.Management/OpenApi.json | 4 ++++ .../DocumentNotificationsResponseModel.cs | 2 ++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Cms.Api.Management/Factories/DocumentNotificationPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/DocumentNotificationPresentationFactory.cs index 549163df91..7daf762b78 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/DocumentNotificationPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/DocumentNotificationPresentationFactory.cs @@ -27,13 +27,14 @@ internal sealed class DocumentNotificationPresentationFactory : IDocumentNotific .ToArray() ?? Array.Empty(); - var availableActionIds = _actionCollection.Where(a => a.ShowInNotifier).Select(a => a.Letter.ToString()).ToArray(); - - return await Task.FromResult( - availableActionIds.Select(actionId => new DocumentNotificationResponseModel + return await Task.FromResult(_actionCollection + .Where(action => action.ShowInNotifier) + .Select(action => new DocumentNotificationResponseModel { - ActionId = actionId, - Subscribed = subscribedActionIds.Contains(actionId) - }).ToArray()); + ActionId = action.Letter, + Alias = action.Alias, + Subscribed = subscribedActionIds.Contains(action.Letter) + }) + .ToArray()); } } diff --git a/src/Umbraco.Cms.Api.Management/OpenApi.json b/src/Umbraco.Cms.Api.Management/OpenApi.json index e5e2f04d42..d1b5eea473 100644 --- a/src/Umbraco.Cms.Api.Management/OpenApi.json +++ b/src/Umbraco.Cms.Api.Management/OpenApi.json @@ -36279,6 +36279,7 @@ "DocumentNotificationResponseModel": { "required": [ "actionId", + "alias", "subscribed" ], "type": "object", @@ -36286,6 +36287,9 @@ "actionId": { "type": "string" }, + "alias": { + "type": "string" + }, "subscribed": { "type": "boolean" } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentNotificationsResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentNotificationsResponseModel.cs index b3ae3b8f6e..cf7665a643 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentNotificationsResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentNotificationsResponseModel.cs @@ -4,5 +4,7 @@ public class DocumentNotificationResponseModel { public required string ActionId { get; set; } + public required string Alias { get; set; } + public required bool Subscribed { get; set; } } From 8ebc44f95968676fb06452adabc6554d4a89a495 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:01:30 +0200 Subject: [PATCH 60/90] update OpenApi.json --- src/Umbraco.Cms.Api.Management/OpenApi.json | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Cms.Api.Management/OpenApi.json b/src/Umbraco.Cms.Api.Management/OpenApi.json index d1b5eea473..6482df8801 100644 --- a/src/Umbraco.Cms.Api.Management/OpenApi.json +++ b/src/Umbraco.Cms.Api.Management/OpenApi.json @@ -9875,6 +9875,14 @@ "format": "int32", "default": 100 } + }, + { + "name": "parentId", + "in": "query", + "schema": { + "type": "string", + "format": "uuid" + } } ], "responses": { @@ -15545,6 +15553,14 @@ "format": "int32", "default": 100 } + }, + { + "name": "parentId", + "in": "query", + "schema": { + "type": "string", + "format": "uuid" + } } ], "responses": { @@ -37946,7 +37962,9 @@ }, "providerProperties": { "type": "object", - "additionalProperties": { }, + "additionalProperties": { + "nullable": true + }, "nullable": true } }, From 625366f82bcf1c15eb39aa19f5ab4bb6f9413777 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:46:51 +0200 Subject: [PATCH 61/90] update backoffice submodule --- src/Umbraco.Web.UI.Client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client index 8725950d3e..c1c99408ad 160000 --- a/src/Umbraco.Web.UI.Client +++ b/src/Umbraco.Web.UI.Client @@ -1 +1 @@ -Subproject commit 8725950d3e78d4bade333085110f606b73c4a966 +Subproject commit c1c99408ad5910e559f4f12318cfd34cb8a8ea76 From f32d40a35e709986ff02ce6ca61c46fac0bbfa52 Mon Sep 17 00:00:00 2001 From: Andreas Zerbst <73799582+andr317c@users.noreply.github.com> Date: Tue, 17 Sep 2024 12:13:10 +0200 Subject: [PATCH 62/90] V14 QA Content with vector graphics (#17065) * Added tests for Upload vector graphics * Run all content tests * Fixed indentation * Reverted smokeTest string --- .../ContentWithUploadVectorGraphics.spec.ts | 106 ++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadVectorGraphics.spec.ts diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadVectorGraphics.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadVectorGraphics.spec.ts new file mode 100644 index 0000000000..16491d2502 --- /dev/null +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadVectorGraphics.spec.ts @@ -0,0 +1,106 @@ +import {ConstantHelper, test, AliasHelper} from '@umbraco/playwright-testhelpers'; +import {expect} from "@playwright/test"; + +const contentName = 'TestContent'; +const documentTypeName = 'TestDocumentTypeForContent'; +const dataTypeName = 'Upload Vector Graphics'; +const uploadVectorGraphicsPath = './fixtures/mediaLibrary/'; + +test.beforeEach(async ({umbracoApi}) => { + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); + await umbracoApi.document.ensureNameNotExists(contentName); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); +}); + +test('can create content with the upload vector graphics data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Draft'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.clickActionsMenuAtRoot(); + await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.chooseDocumentType(documentTypeName); + await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +test('can publish content with the upload vector graphics data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Published'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickSaveAndPublishButton(); + + // Assert + await umbracoUi.content.doesSuccessNotificationsHaveCount(2); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +test(`can upload a file with the svg extension in the content`, async ({umbracoApi, umbracoUi}) => { + // Arrange + const vectorGraphicsName = 'VectorGraphics.svg'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.uploadFile(uploadVectorGraphicsPath + vectorGraphicsName); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value.src).toContain(AliasHelper.toAlias(vectorGraphicsName)); +}); + +// TODO: Remove skip when the front-end is ready. Currently the uploaded vector graphics file still displays after removing. +test.skip('can remove an svg file in the content', async ({umbracoApi, umbracoUi}) => { + // Arrange + const uploadVectorGraphicsName = 'VectorGraphics.svg'; + const mineType = 'image/svg+xml'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDocumentWithUploadFile(contentName, documentTypeId, dataTypeName, uploadVectorGraphicsName, mineType); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickRemoveFilesButton(); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values).toEqual([]); +}); From 66aeafe7979ceccb1675edf517cdf85e3e6722e4 Mon Sep 17 00:00:00 2001 From: Andreas Zerbst <73799582+andr317c@users.noreply.github.com> Date: Tue, 17 Sep 2024 12:13:35 +0200 Subject: [PATCH 63/90] V14 QA Content with upload video (#17066) * Added tests for upload video in content * Added ogv file * Added ogv to test * Reverted smokeTest command --- .../fixtures/mediaLibrary/Ogv.ogv | Bin 0 -> 9479 bytes .../fixtures/mediaLibrary/Webm.webm | Bin 0 -> 6017 bytes .../Content/ContentWithUploadVideo.spec.ts | 112 ++++++++++++++++++ 3 files changed, 112 insertions(+) create mode 100644 tests/Umbraco.Tests.AcceptanceTest/fixtures/mediaLibrary/Ogv.ogv create mode 100644 tests/Umbraco.Tests.AcceptanceTest/fixtures/mediaLibrary/Webm.webm create mode 100644 tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadVideo.spec.ts diff --git a/tests/Umbraco.Tests.AcceptanceTest/fixtures/mediaLibrary/Ogv.ogv b/tests/Umbraco.Tests.AcceptanceTest/fixtures/mediaLibrary/Ogv.ogv new file mode 100644 index 0000000000000000000000000000000000000000..e979ba49e91078c3a9aaa3a2d5d56594bfa74f06 GIT binary patch literal 9479 zcmeI2Pe>GT6vyA}Dk>C73VD#676T8h=F*`;Les*d2a667O*^yg;Lgr6GfsaFxrfNT zd6iixuS#@|Ej)SXARRgdN$5=o><%SW=pw?zajT`T?Lh;}`}&S77Oyhv%`DR;&~EuQv3o&kZPTKWeL> zLeJpf;21z0a4;T!_pNmO7J4;g-wzZ4PW?1WPhqN7TU(!l#HX)|TSs&J{_?6K52=7u zKq?>=kP1izqyka_sen{KDj*e*3P=T{0#X5~fK)&#AQg}bNCl2kfw$qG1?RDD8440G zU2NLC8$}}=WjHEvw7}7_QiZOyVl?~)L*-WGv*1-uaWt+hie5fPv&wVPtHRNW@C#uGOeSX9*34VXXuf(CgKWvuI$SfljMphW9iX;F= z5{!&6l3}F8$O0qFjQm}n#%q>s`?!-i%g^fAMl8M#aQr1GK*yf#J3%a*5AJy$)QjO? z{2x6>o4~=_-bA=&JmR<=4c8S-Sm&U1n~In=a50?NZRnnhy-p+NQsw~}M%a!U#)^+w zx~U;oEnU3#0mL8R#u80~WLD2PVGk?c)G?!B&u-$mJ*wsPoIyUZEz8Vju+#2aVbJJh zckA`BPTeuchm6LLO*%QX-jBU;y?Z(Azi>TwXG6$mhSDmqC5y%kK~oWLdlb7=$e2eR zN9vAR4bLuN)L{kFF=}gvNy|`nvNE8<^+J6qA}wZ81_)X^UN-4YMx06~vNQp-9ftnY zS6<`T<8Y*2A@4|Hx9teZNsKAWztI5qIc?XsEZkH2ss3wH_cUz3TSnN@@R{hlgYTQ8 z6$y=$_w}W7W+9!`tU_;^a*beSK5fxkJsou( zb_~rkRC+;eSAAf5S@ppAeMY`7bV?e!>Di8&R4GkKwevYMzdc{A51p$=Q*qUTW4NyE N?2){0IG*A3{s9L`yqN$1 literal 0 HcmV?d00001 diff --git a/tests/Umbraco.Tests.AcceptanceTest/fixtures/mediaLibrary/Webm.webm b/tests/Umbraco.Tests.AcceptanceTest/fixtures/mediaLibrary/Webm.webm new file mode 100644 index 0000000000000000000000000000000000000000..ac90535d4dc5ed90ab9f28442c8c3957a860bb9a GIT binary patch literal 6017 zcmeI0O=#3W6o6l{U2Kcmwf0b@Xu4ML;CAgIC{nbwMT+O@Nu+U;bwiWQlBDtHpnE8E zLBwlKQ0lQgc+$%vJxGs5i&v}ITR~7f2>!sX?`7L=c4k57MGtvoX5M`B=1uZu2EqdX zDd*fNYPM+rh(IltjO=EIjN<7b0BFxystVA3*id8#`(j4|Yw702wxgR1C&Ul65|rSX zAP6G>F~F+p*z5j7Q)ttce=}SH=zOe}XW@RWwz0VY$@gEEfA9AB_4#=vdZGwK5r`rX zMIeem6oDuLQ3Rq0>^1_g@F!L5IE8h`sF#Gf(*6VZzuG|KJj(H?%%dd+wU2tMLKV(l z+VPI$3rqZj@Uhv(&v0Z?SY~Woj?4>B8Jh}6)`feFO_e1c2-ll!yd+1)h4YL}jw5B^ z2xGIvk=57_*ywGF4@>++>~^z_pW(=)$oTPHj?9a!p9)9T_k4=YPKDmbud>90IAh}_ zIWpeWbgFRQa~vsiWQilI9Qnc$Kf#d2K zqY<5-P&EAi^?t=K7^dmso9c#}SFjC9Y!hJL0}z0ohBS2$GyRcU!^+hZ%&0ZwD)!9@xuEDO*@)i_t&l^d$29_{;nyBe>SKM1rIHN^ zjqjbYbg8b3FKy?Bj`|bZv9~vbY#vft4_lJ3&j7^fvnNocLc&?paj5RC)v$L4y^aZ( z4ycJMJ8(CETeGG7qvu1s}g8igl@Sih^BV+r`P=l6+`@^>eZ<-|+i*&GeWJRlA&D5e} zlEdSeqb4VGNFeVxMf+Sjoz=BsHZL2+!7OFD;n8B&p!+-*HXgH7*-<6Bnx-w?(ww~1 ya(-GZqywXrs%VaBNhygE { + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); + await umbracoApi.document.ensureNameNotExists(contentName); +}); + +test.afterEach(async ({umbracoApi}) => { + await umbracoApi.document.ensureNameNotExists(contentName); + await umbracoApi.documentType.ensureNameNotExists(documentTypeName); +}); + +test('can create content with the upload video data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Draft'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.clickActionsMenuAtRoot(); + await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.chooseDocumentType(documentTypeName); + await umbracoUi.content.enterContentName(contentName); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +test('can publish content with the upload video data type', async ({umbracoApi, umbracoUi}) => { + // Arrange + const expectedState = 'Published'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickSaveAndPublishButton(); + + // Assert + await umbracoUi.content.doesSuccessNotificationsHaveCount(2); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.variants[0].state).toBe(expectedState); + expect(contentData.values).toEqual([]); +}); + +const uploadVideos = [ + {fileExtension: 'mp4', fileName: 'Video.mp4'}, + {fileExtension: 'webm', fileName: 'Webm.webm'}, + {fileExtension: 'ogv', fileName: 'Ogv.ogv'} +]; +for (const uploadVideo of uploadVideos) { + test(`can upload a video with the ${uploadVideo.fileExtension} extension in the content`, async ({umbracoApi, umbracoUi}) => { + // Arrange + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDefaultDocument(contentName, documentTypeId); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.uploadFile(uploadVideoPath + uploadVideo.fileName); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(dataTypeName)); + expect(contentData.values[0].value.src).toContain(AliasHelper.toAlias(uploadVideo.fileName)); + }); +} + +// TODO: Remove skip when the front-end is ready. Currently the uploaded video still displays after removing. +test.skip('can remove a mp4 file in the content', async ({umbracoApi, umbracoUi}) => { + // Arrange + const uploadFileName = 'Video.mp4'; + const mineType = 'video/mp4'; + const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); + const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); + await umbracoApi.document.createDocumentWithUploadFile(contentName, documentTypeId, dataTypeName, uploadFileName, mineType); + await umbracoUi.goToBackOffice(); + await umbracoUi.content.goToSection(ConstantHelper.sections.content); + + // Act + await umbracoUi.content.goToContentWithName(contentName); + await umbracoUi.content.clickRemoveFilesButton(); + await umbracoUi.content.clickSaveButton(); + + // Assert + await umbracoUi.content.isSuccessNotificationVisible(); + expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); + const contentData = await umbracoApi.document.getByName(contentName); + expect(contentData.values).toEqual([]); +}); From 920591bcd17f7858ef52f1aa9e0dd69bcb9c975e Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 17 Sep 2024 14:41:29 +0200 Subject: [PATCH 64/90] Updated the assembly names to avoid a debug-warning in the log (#16997) --- src/Umbraco.Core/Constants-Composing.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Core/Constants-Composing.cs b/src/Umbraco.Core/Constants-Composing.cs index e55c32d01a..defdf2fa93 100644 --- a/src/Umbraco.Core/Constants-Composing.cs +++ b/src/Umbraco.Core/Constants-Composing.cs @@ -13,7 +13,7 @@ public static partial class Constants public static readonly string[] UmbracoCoreAssemblyNames = { "Umbraco.Core", "Umbraco.Infrastructure", "Umbraco.PublishedCache.NuCache", "Umbraco.Examine.Lucene", - "Umbraco.Web.Common", "Umbraco.Web.BackOffice", "Umbraco.Web.Website", + "Umbraco.Web.Common", "Umbraco.Cms.Api.Common","Umbraco.Cms.Api.Delivery","Umbraco.Cms.Api.Management", "Umbraco.Web.Website", }; } } From 991b9a791ee26ff37805e0d842fb1ddd8e23b6b0 Mon Sep 17 00:00:00 2001 From: Mole Date: Tue, 17 Sep 2024 14:42:25 +0200 Subject: [PATCH 65/90] Updaet template to reference 13.5 (#17063) --- templates/UmbracoProject/.template.config/template.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/UmbracoProject/.template.config/template.json b/templates/UmbracoProject/.template.config/template.json index e342cdaeb8..355ed6f7a8 100644 --- a/templates/UmbracoProject/.template.config/template.json +++ b/templates/UmbracoProject/.template.config/template.json @@ -98,7 +98,7 @@ }, { "condition": "(UmbracoRelease == 'LTS')", - "value": "13.4.1" + "value": "13.5.0" } ] } From f72c39ef591d2fb578945bf984e016a20f05e55f Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Tue, 17 Sep 2024 21:43:05 +0900 Subject: [PATCH 66/90] V14: Fix templates not having set master template on package install (#16978) * Reorder templates to save master templates first, and use new ITemplateService * Add obsoletion * Fix if statement * Refactor async calls into async method to avoid multiple get awaiters * Update interface * Avoid breaking changes --------- Co-authored-by: Sven Geusens Co-authored-by: Bjarke Berg --- Directory.Build.props | 2 +- .../Media/EmbedProviders/OEmbedResponse.cs | 13 ++- .../EmbedProviders/OEmbedResponseBase.cs | 2 +- src/Umbraco.Core/Services/FileService.cs | 2 - src/Umbraco.Core/Services/IDataTypeService.cs | 4 +- .../Services/IPackageDataInstallation.cs | 12 +++ .../ContentTypeOperationStatus.cs | 6 +- .../UmbracoBuilder.Services.cs | 4 +- .../Packaging/PackageDataInstallation.cs | 91 ++++++++++++++++--- 9 files changed, 110 insertions(+), 26 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 5f3055125f..52635c8fc2 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -28,7 +28,7 @@ - true + false true 14.0.0 true diff --git a/src/Umbraco.Core/Media/EmbedProviders/OEmbedResponse.cs b/src/Umbraco.Core/Media/EmbedProviders/OEmbedResponse.cs index 61c6b2d13f..9f0a224e76 100644 --- a/src/Umbraco.Core/Media/EmbedProviders/OEmbedResponse.cs +++ b/src/Umbraco.Core/Media/EmbedProviders/OEmbedResponse.cs @@ -6,5 +6,16 @@ namespace Umbraco.Cms.Core.Media.EmbedProviders; /// Wrapper class for OEmbed response. /// [DataContract] -public class OEmbedResponse : OEmbedResponseBase; +public class OEmbedResponse : OEmbedResponseBase +{ + + // these is only here to avoid breaking changes. In theory it should still be source code compatible to remove them. + public new double? ThumbnailHeight => base.ThumbnailHeight; + + public new double? ThumbnailWidth => base.ThumbnailWidth; + + public new double? Height => base.Height; + + public new double? Width => base.Width; +} diff --git a/src/Umbraco.Core/Media/EmbedProviders/OEmbedResponseBase.cs b/src/Umbraco.Core/Media/EmbedProviders/OEmbedResponseBase.cs index 57e4c878c7..c71ecb8391 100644 --- a/src/Umbraco.Core/Media/EmbedProviders/OEmbedResponseBase.cs +++ b/src/Umbraco.Core/Media/EmbedProviders/OEmbedResponseBase.cs @@ -34,7 +34,7 @@ public abstract class OEmbedResponseBase public string? ThumbnailUrl { get; set; } [DataMember(Name = "thumbnail_height")] - public T? ThumbnailHeight { get; set; } + public virtual T? ThumbnailHeight { get; set; } [DataMember(Name = "thumbnail_width")] public T? ThumbnailWidth { get; set; } diff --git a/src/Umbraco.Core/Services/FileService.cs b/src/Umbraco.Core/Services/FileService.cs index 8ef37b76bf..b9c435ebab 100644 --- a/src/Umbraco.Core/Services/FileService.cs +++ b/src/Umbraco.Core/Services/FileService.cs @@ -523,8 +523,6 @@ public class FileService : RepositoryService, IFileService /// /// List of to save /// Optional id of the user - // FIXME: we need to re-implement PackageDataInstallation.ImportTemplates so it imports templates in the correct order - // instead of relying on being able to save invalid templates (child templates whose master has yet to be created) [Obsolete("Please use ITemplateService for template operations - will be removed in Umbraco 15")] public void SaveTemplate(IEnumerable templates, int userId = Constants.Security.SuperUserId) { diff --git a/src/Umbraco.Core/Services/IDataTypeService.cs b/src/Umbraco.Core/Services/IDataTypeService.cs index 8536c8a528..e2f808cc7e 100644 --- a/src/Umbraco.Core/Services/IDataTypeService.cs +++ b/src/Umbraco.Core/Services/IDataTypeService.cs @@ -196,7 +196,7 @@ public interface IDataTypeService : IService /// /// Alias of the property editor /// Collection of configured for the property editor - Task> GetByEditorAliasAsync(string propertyEditorAlias); + Task> GetByEditorAliasAsync(string propertyEditorAlias) => Task.FromResult(GetByEditorAlias(propertyEditorAlias)); /// /// Gets all for a given editor UI alias @@ -246,5 +246,5 @@ public interface IDataTypeService : IService /// /// Aliases of the property editors /// Collection of configured for the property editors - Task> GetByEditorAliasAsync(string[] propertyEditorAlias); + Task> GetByEditorAliasAsync(string[] propertyEditorAlias) => Task.FromResult(propertyEditorAlias.SelectMany(x=>GetByEditorAlias(x))); } diff --git a/src/Umbraco.Core/Services/IPackageDataInstallation.cs b/src/Umbraco.Core/Services/IPackageDataInstallation.cs index 27eee95f32..f2dd94a78e 100644 --- a/src/Umbraco.Core/Services/IPackageDataInstallation.cs +++ b/src/Umbraco.Core/Services/IPackageDataInstallation.cs @@ -64,16 +64,28 @@ public interface IPackageDataInstallation /// An enumerable list of generated languages IReadOnlyList ImportLanguages(IEnumerable languageElements, int userId); + [Obsolete("Use Async version instead, Scheduled to be removed in v17")] IEnumerable ImportTemplate(XElement templateElement, int userId); + Task> ImportTemplateAsync(XElement templateElement, int userId) => Task.FromResult(ImportTemplate(templateElement, userId)); + /// /// Imports and saves package xml as /// /// Xml to import /// Optional user id /// An enumerable list of generated Templates + [Obsolete("Use Async version instead, Scheduled to be removed in v17")] IReadOnlyList ImportTemplates(IReadOnlyCollection templateElements, int userId); + /// + /// Imports and saves package xml as + /// + /// Xml to import + /// Optional user id + /// An enumerable list of generated Templates + Task> ImportTemplatesAsync(IReadOnlyCollection templateElements, int userId) => Task.FromResult(ImportTemplates(templateElements, userId)); + Guid GetContentTypeKey(XElement contentType); string? GetEntityTypeAlias(XElement entityType); diff --git a/src/Umbraco.Core/Services/OperationStatus/ContentTypeOperationStatus.cs b/src/Umbraco.Core/Services/OperationStatus/ContentTypeOperationStatus.cs index 32f28eaf16..2379f51c02 100644 --- a/src/Umbraco.Core/Services/OperationStatus/ContentTypeOperationStatus.cs +++ b/src/Umbraco.Core/Services/OperationStatus/ContentTypeOperationStatus.cs @@ -5,10 +5,7 @@ public enum ContentTypeOperationStatus Success, DuplicateAlias, InvalidAlias, - NameCannotBeEmpty, - NameTooLong, InvalidPropertyTypeAlias, - PropertyTypeAliasCannotEqualContentTypeAlias, DuplicatePropertyTypeAlias, DataTypeNotFound, InvalidInheritance, @@ -21,6 +18,9 @@ public enum ContentTypeOperationStatus NotFound, NotAllowed, CancelledByNotification, + PropertyTypeAliasCannotEqualContentTypeAlias, + NameCannotBeEmpty, + NameTooLong, InvalidElementFlagDocumentHasContent, InvalidElementFlagElementIsUsedInPropertyEditorConfiguration, InvalidElementFlagComparedToParent, diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs index b7bc79997f..5bd401be67 100644 --- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs +++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs @@ -113,7 +113,9 @@ public static partial class UmbracoBuilderExtensions factory.GetRequiredService(), factory.GetRequiredService(), factory.GetRequiredService(), - factory.GetRequiredService()); + factory.GetRequiredService(), + factory.GetRequiredService(), + factory.GetRequiredService()); private static LocalizedTextServiceFileSources CreateLocalizedTextServiceFileSourcesFactory( IServiceProvider container) diff --git a/src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs b/src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs index a6c3ea453e..4b0ab56f67 100644 --- a/src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs +++ b/src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs @@ -2,11 +2,13 @@ using System.Globalization; using System.Net; using System.Xml.Linq; using System.Xml.XPath; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Collections; using Umbraco.Cms.Core.Configuration.Models; +using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; @@ -34,6 +36,8 @@ namespace Umbraco.Cms.Infrastructure.Packaging private readonly IConfigurationEditorJsonSerializer _serializer; private readonly IMediaService _mediaService; private readonly IMediaTypeService _mediaTypeService; + private readonly ITemplateContentParserService _templateContentParserService; + private readonly ITemplateService _templateService; private readonly IEntityService _entityService; private readonly IContentTypeService _contentTypeService; private readonly IContentService _contentService; @@ -52,7 +56,9 @@ namespace Umbraco.Cms.Infrastructure.Packaging IShortStringHelper shortStringHelper, IConfigurationEditorJsonSerializer serializer, IMediaService mediaService, - IMediaTypeService mediaTypeService) + IMediaTypeService mediaTypeService, + ITemplateContentParserService templateContentParserService, + ITemplateService templateService) { _dataValueEditorFactory = dataValueEditorFactory; _logger = logger; @@ -68,6 +74,44 @@ namespace Umbraco.Cms.Infrastructure.Packaging _serializer = serializer; _mediaService = mediaService; _mediaTypeService = mediaTypeService; + _templateContentParserService = templateContentParserService; + _templateService = templateService; + } + + [Obsolete("Please use new constructor, scheduled for removal in v15")] + public PackageDataInstallation( + IDataValueEditorFactory dataValueEditorFactory, + ILogger logger, + IFileService fileService, + ILocalizationService localizationService, + IDataTypeService dataTypeService, + IEntityService entityService, + IContentTypeService contentTypeService, + IContentService contentService, + PropertyEditorCollection propertyEditors, + IScopeProvider scopeProvider, + IShortStringHelper shortStringHelper, + IConfigurationEditorJsonSerializer serializer, + IMediaService mediaService, + IMediaTypeService mediaTypeService) + : this( + dataValueEditorFactory, + logger, + fileService, + localizationService, + dataTypeService, + entityService, + contentTypeService, + contentService, + propertyEditors, + scopeProvider, + shortStringHelper, + serializer, + mediaService, + mediaTypeService, + StaticServiceProvider.Instance.GetRequiredService(), + StaticServiceProvider.Instance.GetRequiredService()) + { } // Also remove factory service registration when this constructor is removed @@ -103,7 +147,9 @@ namespace Umbraco.Cms.Infrastructure.Packaging shortStringHelper, serializer, mediaService, - mediaTypeService) + mediaTypeService, + StaticServiceProvider.Instance.GetRequiredService(), + StaticServiceProvider.Instance.GetRequiredService()) { } #region Install/Uninstall @@ -1651,16 +1697,25 @@ namespace Umbraco.Cms.Infrastructure.Packaging #region Templates + [Obsolete("Use Async version instead, Scheduled to be removed in v17")] public IEnumerable ImportTemplate(XElement templateElement, int userId) => ImportTemplates(new[] {templateElement}, userId); + public async Task> ImportTemplateAsync(XElement templateElement, int userId) + => ImportTemplatesAsync(new[] {templateElement}, userId).GetAwaiter().GetResult(); + + + [Obsolete("Use Async version instead, Scheduled to be removed in v17")] + public IReadOnlyList ImportTemplates(IReadOnlyCollection templateElements, int userId) + => ImportTemplatesAsync(templateElements, userId).GetAwaiter().GetResult(); + /// /// Imports and saves package xml as /// /// Xml to import /// Optional user id /// An enumerable list of generated Templates - public IReadOnlyList ImportTemplates(IReadOnlyCollection templateElements, int userId) + public async Task> ImportTemplatesAsync(IReadOnlyCollection templateElements, int userId) { var templates = new List(); @@ -1670,20 +1725,19 @@ namespace Umbraco.Cms.Infrastructure.Packaging { var dependencies = new List(); XElement elementCopy = tempElement; - //Ensure that the Master of the current template is part of the import, otherwise we ignore this dependency as part of the dependency sorting. - if (string.IsNullOrEmpty((string?)elementCopy.Element("Master")) == false && - templateElements.Any(x => (string?)x.Element("Alias") == (string?)elementCopy.Element("Master"))) + + //Ensure that the Master of the current template is part of the import, otherwise we ignore this dependency as part of the dependency sorting.' + var masterTemplate = _templateContentParserService.MasterTemplateAlias(tempElement.Value); + if (masterTemplate is not null && templateElements.Any(x => (string?)x.Element("Alias") == masterTemplate)) { - dependencies.Add((string)elementCopy.Element("Master")!); + dependencies.Add(masterTemplate); } - else if (string.IsNullOrEmpty((string?)elementCopy.Element("Master")) == false && - templateElements.Any(x => - (string?)x.Element("Alias") == (string?)elementCopy.Element("Master")) == false) + else { _logger.LogInformation( "Template '{TemplateAlias}' has an invalid Master '{TemplateMaster}', so the reference has been ignored.", (string?)elementCopy.Element("Alias"), - (string?)elementCopy.Element("Master")); + masterTemplate); } graph.AddItem(TopoGraph.CreateNode((string)elementCopy.Element("Alias")!, elementCopy, dependencies)); @@ -1700,9 +1754,9 @@ namespace Umbraco.Cms.Infrastructure.Packaging var design = templateElement.Element("Design")?.Value; XElement? masterElement = templateElement.Element("Master"); - var existingTemplate = _fileService.GetTemplate(alias) as Template; + var existingTemplate = await _templateService.GetAsync(alias) as Template; - Template? template = existingTemplate ?? new Template(_shortStringHelper, templateName, alias); + Template template = existingTemplate ?? new Template(_shortStringHelper, templateName, alias); // For new templates, use the serialized key if avaialble. if (existingTemplate == null && Guid.TryParse(templateElement.Element("Key")?.Value, out Guid key)) @@ -1725,9 +1779,16 @@ namespace Umbraco.Cms.Infrastructure.Packaging templates.Add(template); } - if (templates.Any()) + foreach (ITemplate template in templates) { - _fileService.SaveTemplate(templates, userId); + if (template.Id > 0) + { + await _templateService.UpdateAsync(template, Constants.Security.SuperUserKey); + } + else + { + await _templateService.CreateAsync(template, Constants.Security.SuperUserKey); + } } return templates; From 939b2aaa3d17a4741256421ca763a701d0cfa10e Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:45:21 +0200 Subject: [PATCH 67/90] update backoffice submodule to 14.3 release branch --- src/Umbraco.Web.UI.Client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client index c1c99408ad..662e2268cb 160000 --- a/src/Umbraco.Web.UI.Client +++ b/src/Umbraco.Web.UI.Client @@ -1 +1 @@ -Subproject commit c1c99408ad5910e559f4f12318cfd34cb8a8ea76 +Subproject commit 662e2268cbdbf7562fe9bcd4fc9222bb24e26563 From f8e26f5ba12b32723c19cfedf91b3faa19c4acf9 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 18 Sep 2024 12:56:19 +0200 Subject: [PATCH 68/90] Bump version --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 2fb06038d0..3b2f02bc66 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", - "version": "14.3.0-rc", + "version": "14.3.0", "assemblyVersion": { "precision": "build" }, From 5c857aa97d1efb70c960615d475ec3813b6ac3aa Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 18 Sep 2024 12:57:05 +0200 Subject: [PATCH 69/90] Bump version --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 3b2f02bc66..a9105a4057 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", - "version": "14.3.0", + "version": "14.4.0-rc", "assemblyVersion": { "precision": "build" }, From c5243e562e6cc869459b12a993cdec57f1fc762b Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 18 Sep 2024 13:10:15 +0200 Subject: [PATCH 70/90] Allow the client to send all content, with all languages, even when the user do not have permissions to save a specific language. (#17052) --- .../Document/CreateDocumentControllerBase.cs | 25 ++--- .../Document/UpdateDocumentControllerBase.cs | 25 ++--- .../Services/ContentEditingService.cs | 97 ++++++++++++++++++- 3 files changed, 123 insertions(+), 24 deletions(-) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/CreateDocumentControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/CreateDocumentControllerBase.cs index d6983964c5..669c2cdc93 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/CreateDocumentControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/CreateDocumentControllerBase.cs @@ -18,18 +18,21 @@ public abstract class CreateDocumentControllerBase : DocumentControllerBase protected async Task HandleRequest(CreateDocumentRequestModel requestModel, Func> authorizedHandler) { - IEnumerable cultures = requestModel.Variants - .Where(v => v.Culture is not null) - .Select(v => v.Culture!); - AuthorizationResult authorizationResult = await _authorizationService.AuthorizeResourceAsync( - User, - ContentPermissionResource.WithKeys(ActionNew.ActionLetter, requestModel.Parent?.Id, cultures), - AuthorizationPolicies.ContentPermissionByResource); + // TODO This have temporarily been uncommented, to support the client sends values from all cultures, even when the user do not have access to the languages. + // The values are ignored in the ContentEditingService - if (!authorizationResult.Succeeded) - { - return Forbidden(); - } + // IEnumerable cultures = requestModel.Variants + // .Where(v => v.Culture is not null) + // .Select(v => v.Culture!); + // AuthorizationResult authorizationResult = await _authorizationService.AuthorizeResourceAsync( + // User, + // ContentPermissionResource.WithKeys(ActionNew.ActionLetter, requestModel.Parent?.Id, cultures), + // AuthorizationPolicies.ContentPermissionByResource); + // + // if (!authorizationResult.Succeeded) + // { + // return Forbidden(); + // } return await authorizedHandler(); } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDocumentControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDocumentControllerBase.cs index 2d41fe94fe..4b585e78b9 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDocumentControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDocumentControllerBase.cs @@ -17,18 +17,21 @@ public abstract class UpdateDocumentControllerBase : DocumentControllerBase protected async Task HandleRequest(Guid id, UpdateDocumentRequestModel requestModel, Func> authorizedHandler) { - IEnumerable cultures = requestModel.Variants - .Where(v => v.Culture is not null) - .Select(v => v.Culture!); - AuthorizationResult authorizationResult = await _authorizationService.AuthorizeResourceAsync( - User, - ContentPermissionResource.WithKeys(ActionUpdate.ActionLetter, id, cultures), - AuthorizationPolicies.ContentPermissionByResource); + // TODO This have temporarily been uncommented, to support the client sends values from all cultures, even when the user do not have access to the languages. + // The values are ignored in the ContentEditingService - if (!authorizationResult.Succeeded) - { - return Forbidden(); - } + // IEnumerable cultures = requestModel.Variants + // .Where(v => v.Culture is not null) + // .Select(v => v.Culture!); + // AuthorizationResult authorizationResult = await _authorizationService.AuthorizeResourceAsync( + // User, + // ContentPermissionResource.WithKeys(ActionUpdate.ActionLetter, id, cultures), + // AuthorizationPolicies.ContentPermissionByResource); + // + // if (!authorizationResult.Succeeded) + // { + // return Forbidden(); + // } return await authorizedHandler(); } diff --git a/src/Umbraco.Core/Services/ContentEditingService.cs b/src/Umbraco.Core/Services/ContentEditingService.cs index 2ad8365bcf..bc15e7ea44 100644 --- a/src/Umbraco.Core/Services/ContentEditingService.cs +++ b/src/Umbraco.Core/Services/ContentEditingService.cs @@ -1,9 +1,13 @@ -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; +using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Scoping; using Umbraco.Cms.Core.Services.OperationStatus; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Services; @@ -12,7 +16,11 @@ internal sealed class ContentEditingService { private readonly ITemplateService _templateService; private readonly ILogger _logger; + private readonly IUserService _userService; + private readonly ILocalizationService _localizationService; + private readonly ILanguageService _languageService; + [Obsolete("Use non-obsolete constructor. This will be removed in Umbraco 16.")] public ContentEditingService( IContentService contentService, IContentTypeService contentTypeService, @@ -24,10 +32,46 @@ internal sealed class ContentEditingService IUserIdKeyResolver userIdKeyResolver, ITreeEntitySortingService treeEntitySortingService, IContentValidationService contentValidationService) + : this( + contentService, + contentTypeService, + propertyEditorCollection, + dataTypeService, + templateService, + logger, + scopeProvider, + userIdKeyResolver, + treeEntitySortingService, + contentValidationService, + StaticServiceProvider.Instance.GetRequiredService(), + StaticServiceProvider.Instance.GetRequiredService(), + StaticServiceProvider.Instance.GetRequiredService() + ) + { + + } + + public ContentEditingService( + IContentService contentService, + IContentTypeService contentTypeService, + PropertyEditorCollection propertyEditorCollection, + IDataTypeService dataTypeService, + ITemplateService templateService, + ILogger logger, + ICoreScopeProvider scopeProvider, + IUserIdKeyResolver userIdKeyResolver, + ITreeEntitySortingService treeEntitySortingService, + IContentValidationService contentValidationService, + IUserService userService, + ILocalizationService localizationService, + ILanguageService languageService) : base(contentService, contentTypeService, propertyEditorCollection, dataTypeService, logger, scopeProvider, userIdKeyResolver, contentValidationService, treeEntitySortingService) { _templateService = templateService; _logger = logger; + _userService = userService; + _localizationService = localizationService; + _languageService = languageService; } public async Task GetAsync(Guid key) @@ -65,7 +109,7 @@ internal sealed class ContentEditingService ContentEditingOperationStatus validationStatus = result.Status; ContentValidationResult validationResult = result.Result.ValidationResult; - IContent content = result.Result.Content!; + IContent content = await EnsureOnlyAllowedFieldsAreUpdated(result.Result.Content!, userKey); ContentEditingOperationStatus updateTemplateStatus = await UpdateTemplateAsync(content, createModel.TemplateKey); if (updateTemplateStatus != ContentEditingOperationStatus.Success) { @@ -78,6 +122,53 @@ internal sealed class ContentEditingService : Attempt.FailWithStatus(saveStatus, new ContentCreateResult { Content = content }); } + /// + /// A temporary method that ensures the data is sent in is overridden by the original data, in cases where the user do not have permissions to change the data. + /// + private async Task EnsureOnlyAllowedFieldsAreUpdated(IContent contentWithPotentialUnallowedChanges, Guid userKey) + { + if (contentWithPotentialUnallowedChanges.ContentType.VariesByCulture() is false) + { + return contentWithPotentialUnallowedChanges; + } + + IContent? existingContent = await GetAsync(contentWithPotentialUnallowedChanges.Key); + + IUser? user = await _userService.GetAsync(userKey); + + if (user is null) + { + return contentWithPotentialUnallowedChanges; + } + + var allowedLanguageIds = user.CalculateAllowedLanguageIds(_localizationService)!; + + var allowedCultures = (await _languageService.GetIsoCodesByIdsAsync(allowedLanguageIds)).ToHashSet(); + + foreach (var culture in contentWithPotentialUnallowedChanges.EditedCultures ?? contentWithPotentialUnallowedChanges.PublishedCultures) + { + if (allowedCultures.Contains(culture)) + { + continue; + } + + + // else override the updates values with the original values. + foreach (IProperty property in contentWithPotentialUnallowedChanges.Properties) + { + if (property.PropertyType.VariesByCulture() is false) + { + continue; + } + + var value = existingContent?.Properties.First(x=>x.Alias == property.Alias).GetValue(culture, null, false); + property.SetValue(value, culture, null); + } + } + + return contentWithPotentialUnallowedChanges; + } + public async Task> UpdateAsync(Guid key, ContentUpdateModel updateModel, Guid userKey) { IContent? content = ContentService.GetById(key); @@ -102,6 +193,8 @@ internal sealed class ContentEditingService ContentEditingOperationStatus validationStatus = result.Status; ContentValidationResult validationResult = result.Result.ValidationResult; + content = await EnsureOnlyAllowedFieldsAreUpdated(content, userKey); + ContentEditingOperationStatus updateTemplateStatus = await UpdateTemplateAsync(content, updateModel.TemplateKey); if (updateTemplateStatus != ContentEditingOperationStatus.Success) { From d2d6d3493fac34b761ea9482dbb264f5beebba98 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 18 Sep 2024 13:15:59 +0200 Subject: [PATCH 71/90] Revert "Bump version" This reverts commit f8e26f5ba12b32723c19cfedf91b3faa19c4acf9. --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 3b2f02bc66..2fb06038d0 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", - "version": "14.3.0", + "version": "14.3.0-rc", "assemblyVersion": { "precision": "build" }, From 234c2673f6520a0ff5b47445169b42e8451b6a96 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 18 Sep 2024 13:10:15 +0200 Subject: [PATCH 72/90] Allow the client to send all content, with all languages, even when the user do not have permissions to save a specific language. (#17052) (cherry picked from commit c5243e562e6cc869459b12a993cdec57f1fc762b) --- .../Document/CreateDocumentControllerBase.cs | 25 ++--- .../Document/UpdateDocumentControllerBase.cs | 25 ++--- .../Services/ContentEditingService.cs | 97 ++++++++++++++++++- 3 files changed, 123 insertions(+), 24 deletions(-) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/CreateDocumentControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/CreateDocumentControllerBase.cs index d6983964c5..669c2cdc93 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/CreateDocumentControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/CreateDocumentControllerBase.cs @@ -18,18 +18,21 @@ public abstract class CreateDocumentControllerBase : DocumentControllerBase protected async Task HandleRequest(CreateDocumentRequestModel requestModel, Func> authorizedHandler) { - IEnumerable cultures = requestModel.Variants - .Where(v => v.Culture is not null) - .Select(v => v.Culture!); - AuthorizationResult authorizationResult = await _authorizationService.AuthorizeResourceAsync( - User, - ContentPermissionResource.WithKeys(ActionNew.ActionLetter, requestModel.Parent?.Id, cultures), - AuthorizationPolicies.ContentPermissionByResource); + // TODO This have temporarily been uncommented, to support the client sends values from all cultures, even when the user do not have access to the languages. + // The values are ignored in the ContentEditingService - if (!authorizationResult.Succeeded) - { - return Forbidden(); - } + // IEnumerable cultures = requestModel.Variants + // .Where(v => v.Culture is not null) + // .Select(v => v.Culture!); + // AuthorizationResult authorizationResult = await _authorizationService.AuthorizeResourceAsync( + // User, + // ContentPermissionResource.WithKeys(ActionNew.ActionLetter, requestModel.Parent?.Id, cultures), + // AuthorizationPolicies.ContentPermissionByResource); + // + // if (!authorizationResult.Succeeded) + // { + // return Forbidden(); + // } return await authorizedHandler(); } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDocumentControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDocumentControllerBase.cs index 2d41fe94fe..4b585e78b9 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDocumentControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDocumentControllerBase.cs @@ -17,18 +17,21 @@ public abstract class UpdateDocumentControllerBase : DocumentControllerBase protected async Task HandleRequest(Guid id, UpdateDocumentRequestModel requestModel, Func> authorizedHandler) { - IEnumerable cultures = requestModel.Variants - .Where(v => v.Culture is not null) - .Select(v => v.Culture!); - AuthorizationResult authorizationResult = await _authorizationService.AuthorizeResourceAsync( - User, - ContentPermissionResource.WithKeys(ActionUpdate.ActionLetter, id, cultures), - AuthorizationPolicies.ContentPermissionByResource); + // TODO This have temporarily been uncommented, to support the client sends values from all cultures, even when the user do not have access to the languages. + // The values are ignored in the ContentEditingService - if (!authorizationResult.Succeeded) - { - return Forbidden(); - } + // IEnumerable cultures = requestModel.Variants + // .Where(v => v.Culture is not null) + // .Select(v => v.Culture!); + // AuthorizationResult authorizationResult = await _authorizationService.AuthorizeResourceAsync( + // User, + // ContentPermissionResource.WithKeys(ActionUpdate.ActionLetter, id, cultures), + // AuthorizationPolicies.ContentPermissionByResource); + // + // if (!authorizationResult.Succeeded) + // { + // return Forbidden(); + // } return await authorizedHandler(); } diff --git a/src/Umbraco.Core/Services/ContentEditingService.cs b/src/Umbraco.Core/Services/ContentEditingService.cs index 2ad8365bcf..bc15e7ea44 100644 --- a/src/Umbraco.Core/Services/ContentEditingService.cs +++ b/src/Umbraco.Core/Services/ContentEditingService.cs @@ -1,9 +1,13 @@ -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; +using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.Scoping; using Umbraco.Cms.Core.Services.OperationStatus; +using Umbraco.Extensions; namespace Umbraco.Cms.Core.Services; @@ -12,7 +16,11 @@ internal sealed class ContentEditingService { private readonly ITemplateService _templateService; private readonly ILogger _logger; + private readonly IUserService _userService; + private readonly ILocalizationService _localizationService; + private readonly ILanguageService _languageService; + [Obsolete("Use non-obsolete constructor. This will be removed in Umbraco 16.")] public ContentEditingService( IContentService contentService, IContentTypeService contentTypeService, @@ -24,10 +32,46 @@ internal sealed class ContentEditingService IUserIdKeyResolver userIdKeyResolver, ITreeEntitySortingService treeEntitySortingService, IContentValidationService contentValidationService) + : this( + contentService, + contentTypeService, + propertyEditorCollection, + dataTypeService, + templateService, + logger, + scopeProvider, + userIdKeyResolver, + treeEntitySortingService, + contentValidationService, + StaticServiceProvider.Instance.GetRequiredService(), + StaticServiceProvider.Instance.GetRequiredService(), + StaticServiceProvider.Instance.GetRequiredService() + ) + { + + } + + public ContentEditingService( + IContentService contentService, + IContentTypeService contentTypeService, + PropertyEditorCollection propertyEditorCollection, + IDataTypeService dataTypeService, + ITemplateService templateService, + ILogger logger, + ICoreScopeProvider scopeProvider, + IUserIdKeyResolver userIdKeyResolver, + ITreeEntitySortingService treeEntitySortingService, + IContentValidationService contentValidationService, + IUserService userService, + ILocalizationService localizationService, + ILanguageService languageService) : base(contentService, contentTypeService, propertyEditorCollection, dataTypeService, logger, scopeProvider, userIdKeyResolver, contentValidationService, treeEntitySortingService) { _templateService = templateService; _logger = logger; + _userService = userService; + _localizationService = localizationService; + _languageService = languageService; } public async Task GetAsync(Guid key) @@ -65,7 +109,7 @@ internal sealed class ContentEditingService ContentEditingOperationStatus validationStatus = result.Status; ContentValidationResult validationResult = result.Result.ValidationResult; - IContent content = result.Result.Content!; + IContent content = await EnsureOnlyAllowedFieldsAreUpdated(result.Result.Content!, userKey); ContentEditingOperationStatus updateTemplateStatus = await UpdateTemplateAsync(content, createModel.TemplateKey); if (updateTemplateStatus != ContentEditingOperationStatus.Success) { @@ -78,6 +122,53 @@ internal sealed class ContentEditingService : Attempt.FailWithStatus(saveStatus, new ContentCreateResult { Content = content }); } + /// + /// A temporary method that ensures the data is sent in is overridden by the original data, in cases where the user do not have permissions to change the data. + /// + private async Task EnsureOnlyAllowedFieldsAreUpdated(IContent contentWithPotentialUnallowedChanges, Guid userKey) + { + if (contentWithPotentialUnallowedChanges.ContentType.VariesByCulture() is false) + { + return contentWithPotentialUnallowedChanges; + } + + IContent? existingContent = await GetAsync(contentWithPotentialUnallowedChanges.Key); + + IUser? user = await _userService.GetAsync(userKey); + + if (user is null) + { + return contentWithPotentialUnallowedChanges; + } + + var allowedLanguageIds = user.CalculateAllowedLanguageIds(_localizationService)!; + + var allowedCultures = (await _languageService.GetIsoCodesByIdsAsync(allowedLanguageIds)).ToHashSet(); + + foreach (var culture in contentWithPotentialUnallowedChanges.EditedCultures ?? contentWithPotentialUnallowedChanges.PublishedCultures) + { + if (allowedCultures.Contains(culture)) + { + continue; + } + + + // else override the updates values with the original values. + foreach (IProperty property in contentWithPotentialUnallowedChanges.Properties) + { + if (property.PropertyType.VariesByCulture() is false) + { + continue; + } + + var value = existingContent?.Properties.First(x=>x.Alias == property.Alias).GetValue(culture, null, false); + property.SetValue(value, culture, null); + } + } + + return contentWithPotentialUnallowedChanges; + } + public async Task> UpdateAsync(Guid key, ContentUpdateModel updateModel, Guid userKey) { IContent? content = ContentService.GetById(key); @@ -102,6 +193,8 @@ internal sealed class ContentEditingService ContentEditingOperationStatus validationStatus = result.Status; ContentValidationResult validationResult = result.Result.ValidationResult; + content = await EnsureOnlyAllowedFieldsAreUpdated(content, userKey); + ContentEditingOperationStatus updateTemplateStatus = await UpdateTemplateAsync(content, updateModel.TemplateKey); if (updateTemplateStatus != ContentEditingOperationStatus.Success) { From 59aac9053fc23394ac636e43199309924957aa86 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 18 Sep 2024 13:17:16 +0200 Subject: [PATCH 73/90] Bump version --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 2fb06038d0..3b2f02bc66 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", - "version": "14.3.0-rc", + "version": "14.3.0", "assemblyVersion": { "precision": "build" }, From 753aa6f9db69875d879353c6c37b8e8a3b652a43 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 18 Sep 2024 13:46:05 +0200 Subject: [PATCH 74/90] Fixed version --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 3b2f02bc66..2fb06038d0 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", - "version": "14.3.0", + "version": "14.3.0-rc", "assemblyVersion": { "precision": "build" }, From fa7b81474cce45fae6bee6fe0832416099c06f24 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 18 Sep 2024 13:48:23 +0200 Subject: [PATCH 75/90] Bump version to 14.3.0 --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 2fb06038d0..3b2f02bc66 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", - "version": "14.3.0-rc", + "version": "14.3.0", "assemblyVersion": { "precision": "build" }, From c70c8d86f9ffe00660f835906cc06c1c627d3603 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Mon, 23 Sep 2024 09:58:52 +0200 Subject: [PATCH 76/90] update backoffice submodule --- src/Umbraco.Web.UI.Client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client index 662e2268cb..0880e2551d 160000 --- a/src/Umbraco.Web.UI.Client +++ b/src/Umbraco.Web.UI.Client @@ -1 +1 @@ -Subproject commit 662e2268cbdbf7562fe9bcd4fc9222bb24e26563 +Subproject commit 0880e2551d8f0e3dc095742795f5182b9467d6a1 From e92b4f317226af3417a6c0eec268cfa9fdca2955 Mon Sep 17 00:00:00 2001 From: Andreas Zerbst <73799582+andr317c@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:10:46 +0200 Subject: [PATCH 77/90] V15 QA Enabled Nightly E2E Pipeline to run on V15 (#17103) * Uncommented * Added timeout (cherry picked from commit 142db8c0fb543c154db30a5fe95b1f4abfd5a2fe) --- build/nightly-E2E-test-pipelines.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build/nightly-E2E-test-pipelines.yml b/build/nightly-E2E-test-pipelines.yml index b1dfe9261c..ce67b778e3 100644 --- a/build/nightly-E2E-test-pipelines.yml +++ b/build/nightly-E2E-test-pipelines.yml @@ -9,8 +9,7 @@ schedules: branches: include: - v14/dev - ## Uncomment after merged to v15/dev - ## - v15/dev + - v15/dev variables: nodeVersion: 20 @@ -109,7 +108,7 @@ stages: # E2E Tests - job: displayName: E2E Tests (SQLite) - timeoutInMinutes: 120 + timeoutInMinutes: 180 variables: # Connection string CONNECTIONSTRINGS__UMBRACODBDSN: Data Source=Umbraco;Mode=Memory;Cache=Shared;Foreign Keys=True;Pooling=True @@ -244,7 +243,7 @@ stages: - job: displayName: E2E Tests (SQL Server) condition: and(succeeded(), ${{ eq(parameters.runSqlServerE2ETests, true) }}) - timeoutInMinutes: 120 + timeoutInMinutes: 180 variables: # Connection string CONNECTIONSTRINGS__UMBRACODBDSN: Data Source=(localdb)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\Umbraco.mdf;Integrated Security=True From 264fbb698738b901667e4981e50a85b522bd3670 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Tue, 24 Sep 2024 14:34:00 +0200 Subject: [PATCH 78/90] update backoffice submodule --- src/Umbraco.Web.UI.Client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client index 662e2268cb..0880e2551d 160000 --- a/src/Umbraco.Web.UI.Client +++ b/src/Umbraco.Web.UI.Client @@ -1 +1 @@ -Subproject commit 662e2268cbdbf7562fe9bcd4fc9222bb24e26563 +Subproject commit 0880e2551d8f0e3dc095742795f5182b9467d6a1 From e4dacf5c8c1771360d7e2a2919727102308ac3bb Mon Sep 17 00:00:00 2001 From: Andreas Zerbst <73799582+andr317c@users.noreply.github.com> Date: Wed, 25 Sep 2024 07:04:12 +0200 Subject: [PATCH 79/90] V14 QA fixed E2E tests for SQL server (#17122) * Updated version of test helpers * Added option to run smoke tests * Found the issue * Fixed pipeline * Removed duplicate file creation * Removed * Always run sql server tests * Removed unused parameter * Enables sqlServer E2E to run on pipeline * Removed comment --- build/azure-pipelines.yml | 11 ++----- build/nightly-E2E-test-pipelines.yml | 30 +++++++++++-------- build/nightly-build-trigger.yml | 2 +- .../package-lock.json | 18 +++++------ .../Umbraco.Tests.AcceptanceTest/package.json | 4 +-- 5 files changed, 33 insertions(+), 32 deletions(-) diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index dc5ef96bde..9e7207bf07 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -5,10 +5,6 @@ parameters: displayName: Run SQL Server Integration Tests type: boolean default: false - - name: sqlServerAcceptanceTests - displayName: Run SQL Server Acceptance Tests - type: boolean - default: false - name: myGetDeploy displayName: Deploy to MyGet type: boolean @@ -553,8 +549,6 @@ stages: - job: displayName: E2E Tests (SQL Server) - # condition: or(eq(stageDependencies.Build.A.outputs['build.NBGV_PublicRelease'], 'True'), ${{parameters.sqlServerAcceptanceTests}}) # Outcommented due to timeouts - condition: eq(${{parameters.sqlServerAcceptanceTests}}, True) variables: # Connection string CONNECTIONSTRINGS__UMBRACODBDSN: Data Source=(localdb)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\Umbraco.mdf;Integrated Security=True @@ -590,7 +584,8 @@ stages: - pwsh: | "UMBRACO_USER_LOGIN=$(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSEREMAIL) UMBRACO_USER_PASSWORD=$(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD) - URL=$(ASPNETCORE_URLS)" | Out-File .env + URL=$(ASPNETCORE_URLS) + STORAGE_STAGE_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/playwright/.auth/user.json" | Out-File .env displayName: Generate .env workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest @@ -708,7 +703,7 @@ stages: dependsOn: - Unit - Integration -# - E2E + # - E2E condition: and(succeeded(), or(eq(dependencies.Build.outputs['A.build.NBGV_PublicRelease'], 'True'), ${{parameters.myGetDeploy}})) jobs: - job: diff --git a/build/nightly-E2E-test-pipelines.yml b/build/nightly-E2E-test-pipelines.yml index ce67b778e3..6a069ef38c 100644 --- a/build/nightly-E2E-test-pipelines.yml +++ b/build/nightly-E2E-test-pipelines.yml @@ -4,12 +4,12 @@ pr: none trigger: none schedules: -- cron: '0 0 * * *' - displayName: Daily midnight build - branches: - include: - - v14/dev - - v15/dev + - cron: '0 0 * * *' + displayName: Daily midnight build + branches: + include: + - v14/dev + - v15/dev variables: nodeVersion: 20 @@ -24,8 +24,8 @@ variables: NODE_OPTIONS: --max_old_space_size=16384 parameters: - - name: runSqlServerE2ETests - displayName: Run the SQL Server E2E Tests + - name: runSmokeTests + displayName: Run the smoke tests type: boolean default: false @@ -206,7 +206,10 @@ stages: workingDirectory: tests/Umbraco.Tests.AcceptanceTest # Test - - pwsh: npm run test --ignore-certificate-errors + - ${{ if eq(parameters.runSmokeTests, true) }}: + pwsh: npm run smokeTest --ignore-certificate-errors + ${{ else }}: + pwsh: npm run test --ignore-certificate-errors displayName: Run Playwright tests continueOnError: true workingDirectory: tests/Umbraco.Tests.AcceptanceTest @@ -242,7 +245,6 @@ stages: - job: displayName: E2E Tests (SQL Server) - condition: and(succeeded(), ${{ eq(parameters.runSqlServerE2ETests, true) }}) timeoutInMinutes: 180 variables: # Connection string @@ -279,7 +281,8 @@ stages: - pwsh: | "UMBRACO_USER_LOGIN=$(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSEREMAIL) UMBRACO_USER_PASSWORD=$(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD) - URL=$(ASPNETCORE_URLS)" | Out-File .env + URL=$(ASPNETCORE_URLS) + STORAGE_STAGE_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/playwright/.auth/user.json" | Out-File .env displayName: Generate .env workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest @@ -350,7 +353,10 @@ stages: workingDirectory: tests/Umbraco.Tests.AcceptanceTest # Test - - pwsh: npm run test --ignore-certificate-errors + - ${{ if eq(parameters.runSmokeTests, true) }}: + pwsh: npm run smokeTest --ignore-certificate-errors + ${{ else }}: + pwsh: npm run test --ignore-certificate-errors displayName: Run Playwright tests continueOnError: true workingDirectory: tests/Umbraco.Tests.AcceptanceTest diff --git a/build/nightly-build-trigger.yml b/build/nightly-build-trigger.yml index 16cc06533d..7e128b2af7 100644 --- a/build/nightly-build-trigger.yml +++ b/build/nightly-build-trigger.yml @@ -26,7 +26,7 @@ steps: useSameBranch: true waitForQueuedBuildsToFinish: false storeInEnvironmentVariable: false - templateParameters: 'sqlServerIntegrationTests: true, sqlServerAcceptanceTests: true, forceReleaseTestFilter: true, myGetDeploy: true, isNightly: true' + templateParameters: 'sqlServerIntegrationTests: true, forceReleaseTestFilter: true, myGetDeploy: true, isNightly: true' authenticationMethod: 'OAuth Token' enableBuildInQueueCondition: false dependentOnSuccessfulBuildCondition: false diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json index c8fe8a078f..bb227d8a12 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json @@ -7,8 +7,8 @@ "name": "acceptancetest", "hasInstallScript": true, "dependencies": { - "@umbraco/json-models-builders": "^2.0.17", - "@umbraco/playwright-testhelpers": "^2.0.0-beta.82", + "@umbraco/json-models-builders": "^2.0.20", + "@umbraco/playwright-testhelpers": "^2.0.0-beta.84", "camelize": "^1.0.0", "dotenv": "^16.3.1", "node-fetch": "^2.6.7" @@ -55,21 +55,21 @@ } }, "node_modules/@umbraco/json-models-builders": { - "version": "2.0.18", - "resolved": "https://registry.npmjs.org/@umbraco/json-models-builders/-/json-models-builders-2.0.18.tgz", - "integrity": "sha512-VC2KCuWVhae0HzVpo9RrOQt6zZSQqSpWqwCoKYYwmhRz/SYo6hARV6sH2ceEFsQwGqqJvakXuUWzlJK7bFqK1Q==", + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/@umbraco/json-models-builders/-/json-models-builders-2.0.20.tgz", + "integrity": "sha512-LmTtklne1HlhMr1nALA+P5FrjIC9jL3A6Pcxj4dy+IPnTgnU2vMYaQIfE8wwz5Z5fZ5AAhWx/Zpdi8xCTbVSuQ==", "license": "MIT", "dependencies": { "camelize": "^1.0.1" } }, "node_modules/@umbraco/playwright-testhelpers": { - "version": "2.0.0-beta.82", - "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-2.0.0-beta.82.tgz", - "integrity": "sha512-VkArVyvkKuTwJJH8eCHSvbho4H1Owx2ifidVuPyN8EVGDWbxOTb5i9jmtFjJnfDg9mg50JhRYKas4lUGvy1pBA==", + "version": "2.0.0-beta.84", + "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-2.0.0-beta.84.tgz", + "integrity": "sha512-vH13Lg48knTkkLVTwhMXUKTOdjtmixFj0wF5Qhgb++13u4AVDb+oW+TbFwTjSYaLeNMraq5Uhwmto/XuJPs2Rw==", "license": "MIT", "dependencies": { - "@umbraco/json-models-builders": "2.0.18", + "@umbraco/json-models-builders": "2.0.20", "node-fetch": "^2.6.7" } }, diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json index 78cbb58c73..30706ad5de 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package.json @@ -18,8 +18,8 @@ "typescript": "^4.8.3" }, "dependencies": { - "@umbraco/json-models-builders": "^2.0.17", - "@umbraco/playwright-testhelpers": "^2.0.0-beta.82", + "@umbraco/json-models-builders": "^2.0.20", + "@umbraco/playwright-testhelpers": "^2.0.0-beta.84", "camelize": "^1.0.0", "dotenv": "^16.3.1", "node-fetch": "^2.6.7" From 609b5f76d4c74e9a0ee9a7d1ffa62562ffbfaf23 Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Thu, 26 Sep 2024 07:47:33 +0200 Subject: [PATCH 80/90] Fix `IContentBase.GetUdi()` extension method to support document-blueprint entity type (#16939) * Add tests for all UDI entity types * Fix IContentBase UDI entity type for blueprints * Remove redundant switch statements and reorder methods --- .../Extensions/UdiGetterExtensions.cs | 424 +++++++++--------- .../Builders/ContentBuilder.cs | 10 + .../Extensions/UdiGetterExtensionsTests.cs | 268 ++++++++++- 3 files changed, 460 insertions(+), 242 deletions(-) diff --git a/src/Umbraco.Core/Extensions/UdiGetterExtensions.cs b/src/Umbraco.Core/Extensions/UdiGetterExtensions.cs index e4b11ccb6c..66c5002604 100644 --- a/src/Umbraco.Core/Extensions/UdiGetterExtensions.cs +++ b/src/Umbraco.Core/Extensions/UdiGetterExtensions.cs @@ -8,7 +8,7 @@ using Umbraco.Cms.Core.Models.Entities; namespace Umbraco.Extensions; /// -/// Provides extension methods that return udis for Umbraco entities. +/// Provides extension methods that return UDIs for Umbraco entities. /// public static class UdiGetterExtensions { @@ -19,11 +19,177 @@ public static class UdiGetterExtensions /// /// The entity identifier of the entity. /// - public static GuidUdi GetUdi(this ITemplate entity) + public static Udi GetUdi(this IEntity entity) { ArgumentNullException.ThrowIfNull(entity); - return new GuidUdi(Constants.UdiEntityType.Template, entity.Key).EnsureClosed(); + return entity switch + { + // Concrete types + EntityContainer container => container.GetUdi(), + Script script => script.GetUdi(), + Stylesheet stylesheet => stylesheet.GetUdi(), + // Interfaces + IContentBase contentBase => contentBase.GetUdi(), + IContentTypeComposition contentTypeComposition => contentTypeComposition.GetUdi(), + IDataType dataType => dataType.GetUdi(), + IDictionaryItem dictionaryItem => dictionaryItem.GetUdi(), + ILanguage language => language.GetUdi(), + IMemberGroup memberGroup => memberGroup.GetUdi(), + IPartialView partialView => partialView.GetUdi(), + IRelationType relationType => relationType.GetUdi(), + ITemplate template => template.GetUdi(), + IWebhook webhook => webhook.GetUdi(), + _ => throw new NotSupportedException($"Entity type {entity.GetType().FullName} is not supported."), + }; + } + + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static GuidUdi GetUdi(this EntityContainer entity) + { + ArgumentNullException.ThrowIfNull(entity); + + string entityType; + if (entity.ContainedObjectType == Constants.ObjectTypes.DataType) + { + entityType = Constants.UdiEntityType.DataTypeContainer; + } + else if (entity.ContainedObjectType == Constants.ObjectTypes.DocumentType) + { + entityType = Constants.UdiEntityType.DocumentTypeContainer; + } + else if (entity.ContainedObjectType == Constants.ObjectTypes.MediaType) + { + entityType = Constants.UdiEntityType.MediaTypeContainer; + } + else if (entity.ContainedObjectType == Constants.ObjectTypes.DocumentBlueprint) + { + entityType = Constants.UdiEntityType.DocumentBlueprintContainer; + } + else + { + throw new NotSupportedException($"Contained object type {entity.ContainedObjectType} is not supported."); + } + + return new GuidUdi(entityType, entity.Key).EnsureClosed(); + } + + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static StringUdi GetUdi(this Script entity) + { + ArgumentNullException.ThrowIfNull(entity); + + return GetUdiFromPath(Constants.UdiEntityType.Script, entity.Path); + } + + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static StringUdi GetUdi(this Stylesheet entity) + { + ArgumentNullException.ThrowIfNull(entity); + + return GetUdiFromPath(Constants.UdiEntityType.Stylesheet, entity.Path); + } + + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static GuidUdi GetUdi(this IContentBase entity) + { + ArgumentNullException.ThrowIfNull(entity); + + return entity switch + { + IContent content => content.GetUdi(), + IMedia media => media.GetUdi(), + IMember member => member.GetUdi(), + _ => throw new NotSupportedException($"Content base type {entity.GetType().FullName} is not supported."), + }; + } + + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static GuidUdi GetUdi(this IContent entity) + { + ArgumentNullException.ThrowIfNull(entity); + + string entityType = entity.Blueprint ? Constants.UdiEntityType.DocumentBlueprint : Constants.UdiEntityType.Document; + + return new GuidUdi(entityType, entity.Key).EnsureClosed(); + } + + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static GuidUdi GetUdi(this IMedia entity) + { + ArgumentNullException.ThrowIfNull(entity); + + return new GuidUdi(Constants.UdiEntityType.Media, entity.Key).EnsureClosed(); + } + + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static GuidUdi GetUdi(this IMember entity) + { + ArgumentNullException.ThrowIfNull(entity); + + return new GuidUdi(Constants.UdiEntityType.Member, entity.Key).EnsureClosed(); + } + + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static GuidUdi GetUdi(this IContentTypeComposition entity) + { + ArgumentNullException.ThrowIfNull(entity); + + return entity switch + { + IContentType contentType => contentType.GetUdi(), + IMediaType mediaType => mediaType.GetUdi(), + IMemberType memberType => memberType.GetUdi(), + _ => throw new NotSupportedException($"Composition type {entity.GetType().FullName} is not supported."), + }; } /// @@ -68,42 +234,6 @@ public static class UdiGetterExtensions return new GuidUdi(Constants.UdiEntityType.MemberType, entity.Key).EnsureClosed(); } - /// - /// Gets the entity identifier of the entity. - /// - /// The entity. - /// - /// The entity identifier of the entity. - /// - public static GuidUdi GetUdi(this IMemberGroup entity) - { - ArgumentNullException.ThrowIfNull(entity); - - return new GuidUdi(Constants.UdiEntityType.MemberGroup, entity.Key).EnsureClosed(); - } - - /// - /// Gets the entity identifier of the entity. - /// - /// The entity. - /// - /// The entity identifier of the entity. - /// - public static GuidUdi GetUdi(this IContentTypeComposition entity) - { - ArgumentNullException.ThrowIfNull(entity); - - string entityType = entity switch - { - IContentType => Constants.UdiEntityType.DocumentType, - IMediaType => Constants.UdiEntityType.MediaType, - IMemberType => Constants.UdiEntityType.MemberType, - _ => throw new NotSupportedException(string.Format("Composition type {0} is not supported.", entity.GetType().FullName)), - }; - - return new GuidUdi(entityType, entity.Key).EnsureClosed(); - } - /// /// Gets the entity identifier of the entity. /// @@ -118,129 +248,6 @@ public static class UdiGetterExtensions return new GuidUdi(Constants.UdiEntityType.DataType, entity.Key).EnsureClosed(); } - /// - /// Gets the entity identifier of the entity. - /// - /// The entity. - /// - /// The entity identifier of the entity. - /// - public static GuidUdi GetUdi(this EntityContainer entity) - { - ArgumentNullException.ThrowIfNull(entity); - - string entityType; - if (entity.ContainedObjectType == Constants.ObjectTypes.DataType) - { - entityType = Constants.UdiEntityType.DataTypeContainer; - } - else if (entity.ContainedObjectType == Constants.ObjectTypes.DocumentType) - { - entityType = Constants.UdiEntityType.DocumentTypeContainer; - } - else if (entity.ContainedObjectType == Constants.ObjectTypes.MediaType) - { - entityType = Constants.UdiEntityType.MediaTypeContainer; - } - else if (entity.ContainedObjectType == Constants.ObjectTypes.DocumentBlueprint) - { - entityType = Constants.UdiEntityType.DocumentBlueprintContainer; - } - else - { - throw new NotSupportedException(string.Format("Contained object type {0} is not supported.", entity.ContainedObjectType)); - } - - return new GuidUdi(entityType, entity.Key).EnsureClosed(); - } - - /// - /// Gets the entity identifier of the entity. - /// - /// The entity. - /// - /// The entity identifier of the entity. - /// - public static GuidUdi GetUdi(this IMedia entity) - { - ArgumentNullException.ThrowIfNull(entity); - - return new GuidUdi(Constants.UdiEntityType.Media, entity.Key).EnsureClosed(); - } - - /// - /// Gets the entity identifier of the entity. - /// - /// The entity. - /// - /// The entity identifier of the entity. - /// - public static GuidUdi GetUdi(this IContent entity) - { - ArgumentNullException.ThrowIfNull(entity); - - string entityType = entity.Blueprint ? Constants.UdiEntityType.DocumentBlueprint : Constants.UdiEntityType.Document; - - return new GuidUdi(entityType, entity.Key).EnsureClosed(); - } - - /// - /// Gets the entity identifier of the entity. - /// - /// The entity. - /// - /// The entity identifier of the entity. - /// - public static GuidUdi GetUdi(this IMember entity) - { - ArgumentNullException.ThrowIfNull(entity); - - return new GuidUdi(Constants.UdiEntityType.Member, entity.Key).EnsureClosed(); - } - - /// - /// Gets the entity identifier of the entity. - /// - /// The entity. - /// - /// The entity identifier of the entity. - /// - public static StringUdi GetUdi(this Stylesheet entity) - { - ArgumentNullException.ThrowIfNull(entity); - - return GetUdiFromPath(Constants.UdiEntityType.Stylesheet, entity.Path); - } - - /// - /// Gets the entity identifier of the entity. - /// - /// The entity. - /// - /// The entity identifier of the entity. - /// - public static StringUdi GetUdi(this Script entity) - { - ArgumentNullException.ThrowIfNull(entity); - - return GetUdiFromPath(Constants.UdiEntityType.Script, entity.Path); - } - - /// - /// Gets the UDI from a path. - /// - /// The type of the entity. - /// The path. - /// - /// The entity identifier of the entity. - /// - private static StringUdi GetUdiFromPath(string entityType, string path) - { - string id = path.TrimStart(Constants.CharArrays.ForwardSlash).Replace("\\", "/"); - - return new StringUdi(entityType, id).EnsureClosed(); - } - /// /// Gets the entity identifier of the entity. /// @@ -262,11 +269,11 @@ public static class UdiGetterExtensions /// /// The entity identifier of the entity. /// - public static StringUdi GetUdi(this IPartialView entity) + public static StringUdi GetUdi(this ILanguage entity) { ArgumentNullException.ThrowIfNull(entity); - return GetUdiFromPath(Constants.UdiEntityType.PartialView, entity.Path); + return new StringUdi(Constants.UdiEntityType.Language, entity.IsoCode).EnsureClosed(); } /// @@ -276,19 +283,25 @@ public static class UdiGetterExtensions /// /// The entity identifier of the entity. /// - public static GuidUdi GetUdi(this IContentBase entity) + public static GuidUdi GetUdi(this IMemberGroup entity) { ArgumentNullException.ThrowIfNull(entity); - string type = entity switch - { - IContent => Constants.UdiEntityType.Document, - IMedia => Constants.UdiEntityType.Media, - IMember => Constants.UdiEntityType.Member, - _ => throw new NotSupportedException(string.Format("Content base type {0} is not supported.", entity.GetType().FullName)), - }; + return new GuidUdi(Constants.UdiEntityType.MemberGroup, entity.Key).EnsureClosed(); + } - return new GuidUdi(type, entity.Key).EnsureClosed(); + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static StringUdi GetUdi(this IPartialView entity) + { + ArgumentNullException.ThrowIfNull(entity); + + return GetUdiFromPath(Constants.UdiEntityType.PartialView, entity.Path); } /// @@ -305,6 +318,20 @@ public static class UdiGetterExtensions return new GuidUdi(Constants.UdiEntityType.RelationType, entity.Key).EnsureClosed(); } + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static GuidUdi GetUdi(this ITemplate entity) + { + ArgumentNullException.ThrowIfNull(entity); + + return new GuidUdi(Constants.UdiEntityType.Template, entity.Key).EnsureClosed(); + } + /// /// Gets the entity identifier of the entity. /// @@ -320,56 +347,17 @@ public static class UdiGetterExtensions } /// - /// Gets the entity identifier of the entity. + /// Gets the UDI from a path. /// - /// The entity. + /// The type of the entity. + /// The path. /// /// The entity identifier of the entity. /// - public static StringUdi GetUdi(this ILanguage entity) + private static StringUdi GetUdiFromPath(string entityType, string path) { - ArgumentNullException.ThrowIfNull(entity); + string id = path.TrimStart(Constants.CharArrays.ForwardSlash).Replace("\\", "/"); - return new StringUdi(Constants.UdiEntityType.Language, entity.IsoCode).EnsureClosed(); - } - - /// - /// Gets the entity identifier of the entity. - /// - /// The entity. - /// - /// The entity identifier of the entity. - /// - public static Udi GetUdi(this IEntity entity) - { - ArgumentNullException.ThrowIfNull(entity); - - return entity switch - { - // Concrete types - EntityContainer container => container.GetUdi(), - Stylesheet stylesheet => stylesheet.GetUdi(), - Script script => script.GetUdi(), - // Content types - IContentType contentType => contentType.GetUdi(), - IMediaType mediaType => mediaType.GetUdi(), - IMemberType memberType => memberType.GetUdi(), - IContentTypeComposition contentTypeComposition => contentTypeComposition.GetUdi(), - // Content - IContent content => content.GetUdi(), - IMedia media => media.GetUdi(), - IMember member => member.GetUdi(), - IContentBase contentBase => contentBase.GetUdi(), - // Other - IDataType dataTypeComposition => dataTypeComposition.GetUdi(), - IDictionaryItem dictionaryItem => dictionaryItem.GetUdi(), - ILanguage language => language.GetUdi(), - IMemberGroup memberGroup => memberGroup.GetUdi(), - IPartialView partialView => partialView.GetUdi(), - IRelationType relationType => relationType.GetUdi(), - ITemplate template => template.GetUdi(), - IWebhook webhook => webhook.GetUdi(), - _ => throw new NotSupportedException(string.Format("Entity type {0} is not supported.", entity.GetType().FullName)), - }; + return new StringUdi(entityType, id).EnsureClosed(); } } diff --git a/tests/Umbraco.Tests.Common/Builders/ContentBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentBuilder.cs index 05cc4b80dd..53c2f50f10 100644 --- a/tests/Umbraco.Tests.Common/Builders/ContentBuilder.cs +++ b/tests/Umbraco.Tests.Common/Builders/ContentBuilder.cs @@ -53,6 +53,7 @@ public class ContentBuilder private int? _sortOrder; private bool? _trashed; private DateTime? _updateDate; + private bool? _blueprint; private int? _versionId; DateTime? IWithCreateDateBuilder.CreateDate @@ -145,6 +146,13 @@ public class ContentBuilder set => _updateDate = value; } + public ContentBuilder WithBlueprint(bool blueprint) + { + _blueprint = blueprint; + + return this; + } + public ContentBuilder WithVersionId(int versionId) { _versionId = versionId; @@ -217,6 +225,7 @@ public class ContentBuilder { var id = _id ?? 0; var versionId = _versionId ?? 0; + var blueprint = _blueprint ?? false; var key = _key ?? Guid.NewGuid(); var parentId = _parentId ?? -1; var parent = _parent; @@ -253,6 +262,7 @@ public class ContentBuilder content.Id = id; content.VersionId = versionId; + content.Blueprint = blueprint; content.Key = key; content.CreateDate = createDate; content.UpdateDate = updateDate; diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UdiGetterExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UdiGetterExtensionsTests.cs index b5da0a4f2f..f5a5e79234 100644 --- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UdiGetterExtensionsTests.cs +++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UdiGetterExtensionsTests.cs @@ -3,6 +3,7 @@ using NUnit.Framework; using Umbraco.Cms.Core; +using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; @@ -13,15 +14,22 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Extensions; [TestFixture] public class UdiGetterExtensionsTests { - [TestCase("style.css", "umb://stylesheet/style.css")] - [TestCase("editor\\style.css", "umb://stylesheet/editor/style.css")] - [TestCase("editor/style.css", "umb://stylesheet/editor/style.css")] - public void GetUdiForStylesheet(string path, string expected) + [TestCase(Constants.ObjectTypes.Strings.DataType, "6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://data-type-container/6ad82c70685c4e049b36d81bd779d16f")] + [TestCase(Constants.ObjectTypes.Strings.DocumentType, "6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://document-type-container/6ad82c70685c4e049b36d81bd779d16f")] + [TestCase(Constants.ObjectTypes.Strings.MediaType, "6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://media-type-container/6ad82c70685c4e049b36d81bd779d16f")] + [TestCase(Constants.ObjectTypes.Strings.DocumentBlueprint, "6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://document-blueprint-container/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForEntityContainer(Guid containedObjectType, Guid key, string expected) { - var builder = new StylesheetBuilder(); - var stylesheet = builder.WithPath(path).Build(); - var result = stylesheet.GetUdi(); - Assert.AreEqual(expected, result.ToString()); + EntityContainer entity = new EntityContainer(containedObjectType) + { + Key = key + }; + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); } [TestCase("script.js", "umb://script/script.js")] @@ -29,10 +37,195 @@ public class UdiGetterExtensionsTests [TestCase("editor/script.js", "umb://script/editor/script.js")] public void GetUdiForScript(string path, string expected) { - var builder = new ScriptBuilder(); - var script = builder.WithPath(path).Build(); - var result = script.GetUdi(); - Assert.AreEqual(expected, result.ToString()); + Script entity = new ScriptBuilder() + .WithPath(path) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("style.css", "umb://stylesheet/style.css")] + [TestCase("editor\\style.css", "umb://stylesheet/editor/style.css")] + [TestCase("editor/style.css", "umb://stylesheet/editor/style.css")] + public void GetUdiForStylesheet(string path, string expected) + { + Stylesheet entity = new StylesheetBuilder() + .WithPath(path) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", false, "umb://document/6ad82c70685c4e049b36d81bd779d16f")] + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", true, "umb://document-blueprint/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForContent(Guid key, bool blueprint, string expected) + { + Content entity = new ContentBuilder() + .WithKey(key) + .WithBlueprint(blueprint) + .WithContentType(ContentTypeBuilder.CreateBasicContentType()) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IContentBase)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://media/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForMedia(Guid key, string expected) + { + Media entity = new MediaBuilder() + .WithKey(key) + .WithMediaType(MediaTypeBuilder.CreateImageMediaType()) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IContentBase)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://member/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForMember(Guid key, string expected) + { + Member entity = new MemberBuilder() + .WithKey(key) + .WithMemberType(MemberTypeBuilder.CreateSimpleMemberType()) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IContentBase)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://document-type/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForContentType(Guid key, string expected) + { + IContentType entity = new ContentTypeBuilder() + .WithKey(key) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IContentTypeComposition)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://media-type/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForMediaType(Guid key, string expected) + { + IMediaType entity = new MediaTypeBuilder() + .WithKey(key) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IContentTypeComposition)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://member-type/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForMemberType(Guid key, string expected) + { + IMemberType entity = new MemberTypeBuilder() + .WithKey(key) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IContentTypeComposition)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://data-type/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForDataType(Guid key, string expected) + { + DataType entity = new DataTypeBuilder() + .WithKey(key) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://dictionary-item/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForDictionaryItem(Guid key, string expected) + { + DictionaryItem entity = new DictionaryItemBuilder() + .WithKey(key) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("en-US", "umb://language/en-US")] + [TestCase("en", "umb://language/en")] + public void GetUdiForLanguage(string isoCode, string expected) + { + ILanguage entity = new LanguageBuilder() + .WithCultureInfo(isoCode) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://member-group/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForMemberGroup(Guid key, string expected) + { + MemberGroup entity = new MemberGroupBuilder() + .WithKey(key) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); } [TestCase("test.cshtml", "umb://partial-view/test.cshtml")] @@ -40,26 +233,53 @@ public class UdiGetterExtensionsTests [TestCase("editor/test.cshtml", "umb://partial-view/editor/test.cshtml")] public void GetUdiForPartialView(string path, string expected) { - var builder = new PartialViewBuilder(); - var partialView = builder + IPartialView entity = new PartialViewBuilder() .WithPath(path) .Build(); - var result = partialView.GetUdi(); - Assert.AreEqual(expected, result.ToString()); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://relation-type/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForRelationType(Guid key, string expected) + { + IRelationTypeWithIsDependency entity = new RelationTypeBuilder() + .WithKey(key) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://template/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForTemplate(Guid key, string expected) + { + ITemplate entity = new TemplateBuilder() + .WithKey(key) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); } [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://webhook/6ad82c70685c4e049b36d81bd779d16f")] - public void GetUdiForWebhook(string key, string expected) + public void GetUdiForWebhook(Guid key, string expected) { - var builder = new WebhookBuilder(); - var webhook = builder - .WithKey(Guid.Parse(key)) + Webhook entity = new WebhookBuilder() + .WithKey(key) .Build(); - Udi result = webhook.GetUdi(); - Assert.AreEqual(expected, result.ToString()); + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); - result = ((IEntity)webhook).GetUdi(); - Assert.AreEqual(expected, result.ToString()); + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); } } From a76af1de9db3444d0bbaf6b324d9cbfe6276e49a Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Thu, 26 Sep 2024 07:47:33 +0200 Subject: [PATCH 81/90] Fix `IContentBase.GetUdi()` extension method to support document-blueprint entity type (#16939) * Add tests for all UDI entity types * Fix IContentBase UDI entity type for blueprints * Remove redundant switch statements and reorder methods (cherry picked from commit 609b5f76d4c74e9a0ee9a7d1ffa62562ffbfaf23) --- .../Extensions/UdiGetterExtensions.cs | 424 +++++++++--------- .../Builders/ContentBuilder.cs | 10 + .../Extensions/UdiGetterExtensionsTests.cs | 268 ++++++++++- 3 files changed, 460 insertions(+), 242 deletions(-) diff --git a/src/Umbraco.Core/Extensions/UdiGetterExtensions.cs b/src/Umbraco.Core/Extensions/UdiGetterExtensions.cs index e4b11ccb6c..66c5002604 100644 --- a/src/Umbraco.Core/Extensions/UdiGetterExtensions.cs +++ b/src/Umbraco.Core/Extensions/UdiGetterExtensions.cs @@ -8,7 +8,7 @@ using Umbraco.Cms.Core.Models.Entities; namespace Umbraco.Extensions; /// -/// Provides extension methods that return udis for Umbraco entities. +/// Provides extension methods that return UDIs for Umbraco entities. /// public static class UdiGetterExtensions { @@ -19,11 +19,177 @@ public static class UdiGetterExtensions /// /// The entity identifier of the entity. /// - public static GuidUdi GetUdi(this ITemplate entity) + public static Udi GetUdi(this IEntity entity) { ArgumentNullException.ThrowIfNull(entity); - return new GuidUdi(Constants.UdiEntityType.Template, entity.Key).EnsureClosed(); + return entity switch + { + // Concrete types + EntityContainer container => container.GetUdi(), + Script script => script.GetUdi(), + Stylesheet stylesheet => stylesheet.GetUdi(), + // Interfaces + IContentBase contentBase => contentBase.GetUdi(), + IContentTypeComposition contentTypeComposition => contentTypeComposition.GetUdi(), + IDataType dataType => dataType.GetUdi(), + IDictionaryItem dictionaryItem => dictionaryItem.GetUdi(), + ILanguage language => language.GetUdi(), + IMemberGroup memberGroup => memberGroup.GetUdi(), + IPartialView partialView => partialView.GetUdi(), + IRelationType relationType => relationType.GetUdi(), + ITemplate template => template.GetUdi(), + IWebhook webhook => webhook.GetUdi(), + _ => throw new NotSupportedException($"Entity type {entity.GetType().FullName} is not supported."), + }; + } + + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static GuidUdi GetUdi(this EntityContainer entity) + { + ArgumentNullException.ThrowIfNull(entity); + + string entityType; + if (entity.ContainedObjectType == Constants.ObjectTypes.DataType) + { + entityType = Constants.UdiEntityType.DataTypeContainer; + } + else if (entity.ContainedObjectType == Constants.ObjectTypes.DocumentType) + { + entityType = Constants.UdiEntityType.DocumentTypeContainer; + } + else if (entity.ContainedObjectType == Constants.ObjectTypes.MediaType) + { + entityType = Constants.UdiEntityType.MediaTypeContainer; + } + else if (entity.ContainedObjectType == Constants.ObjectTypes.DocumentBlueprint) + { + entityType = Constants.UdiEntityType.DocumentBlueprintContainer; + } + else + { + throw new NotSupportedException($"Contained object type {entity.ContainedObjectType} is not supported."); + } + + return new GuidUdi(entityType, entity.Key).EnsureClosed(); + } + + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static StringUdi GetUdi(this Script entity) + { + ArgumentNullException.ThrowIfNull(entity); + + return GetUdiFromPath(Constants.UdiEntityType.Script, entity.Path); + } + + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static StringUdi GetUdi(this Stylesheet entity) + { + ArgumentNullException.ThrowIfNull(entity); + + return GetUdiFromPath(Constants.UdiEntityType.Stylesheet, entity.Path); + } + + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static GuidUdi GetUdi(this IContentBase entity) + { + ArgumentNullException.ThrowIfNull(entity); + + return entity switch + { + IContent content => content.GetUdi(), + IMedia media => media.GetUdi(), + IMember member => member.GetUdi(), + _ => throw new NotSupportedException($"Content base type {entity.GetType().FullName} is not supported."), + }; + } + + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static GuidUdi GetUdi(this IContent entity) + { + ArgumentNullException.ThrowIfNull(entity); + + string entityType = entity.Blueprint ? Constants.UdiEntityType.DocumentBlueprint : Constants.UdiEntityType.Document; + + return new GuidUdi(entityType, entity.Key).EnsureClosed(); + } + + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static GuidUdi GetUdi(this IMedia entity) + { + ArgumentNullException.ThrowIfNull(entity); + + return new GuidUdi(Constants.UdiEntityType.Media, entity.Key).EnsureClosed(); + } + + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static GuidUdi GetUdi(this IMember entity) + { + ArgumentNullException.ThrowIfNull(entity); + + return new GuidUdi(Constants.UdiEntityType.Member, entity.Key).EnsureClosed(); + } + + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static GuidUdi GetUdi(this IContentTypeComposition entity) + { + ArgumentNullException.ThrowIfNull(entity); + + return entity switch + { + IContentType contentType => contentType.GetUdi(), + IMediaType mediaType => mediaType.GetUdi(), + IMemberType memberType => memberType.GetUdi(), + _ => throw new NotSupportedException($"Composition type {entity.GetType().FullName} is not supported."), + }; } /// @@ -68,42 +234,6 @@ public static class UdiGetterExtensions return new GuidUdi(Constants.UdiEntityType.MemberType, entity.Key).EnsureClosed(); } - /// - /// Gets the entity identifier of the entity. - /// - /// The entity. - /// - /// The entity identifier of the entity. - /// - public static GuidUdi GetUdi(this IMemberGroup entity) - { - ArgumentNullException.ThrowIfNull(entity); - - return new GuidUdi(Constants.UdiEntityType.MemberGroup, entity.Key).EnsureClosed(); - } - - /// - /// Gets the entity identifier of the entity. - /// - /// The entity. - /// - /// The entity identifier of the entity. - /// - public static GuidUdi GetUdi(this IContentTypeComposition entity) - { - ArgumentNullException.ThrowIfNull(entity); - - string entityType = entity switch - { - IContentType => Constants.UdiEntityType.DocumentType, - IMediaType => Constants.UdiEntityType.MediaType, - IMemberType => Constants.UdiEntityType.MemberType, - _ => throw new NotSupportedException(string.Format("Composition type {0} is not supported.", entity.GetType().FullName)), - }; - - return new GuidUdi(entityType, entity.Key).EnsureClosed(); - } - /// /// Gets the entity identifier of the entity. /// @@ -118,129 +248,6 @@ public static class UdiGetterExtensions return new GuidUdi(Constants.UdiEntityType.DataType, entity.Key).EnsureClosed(); } - /// - /// Gets the entity identifier of the entity. - /// - /// The entity. - /// - /// The entity identifier of the entity. - /// - public static GuidUdi GetUdi(this EntityContainer entity) - { - ArgumentNullException.ThrowIfNull(entity); - - string entityType; - if (entity.ContainedObjectType == Constants.ObjectTypes.DataType) - { - entityType = Constants.UdiEntityType.DataTypeContainer; - } - else if (entity.ContainedObjectType == Constants.ObjectTypes.DocumentType) - { - entityType = Constants.UdiEntityType.DocumentTypeContainer; - } - else if (entity.ContainedObjectType == Constants.ObjectTypes.MediaType) - { - entityType = Constants.UdiEntityType.MediaTypeContainer; - } - else if (entity.ContainedObjectType == Constants.ObjectTypes.DocumentBlueprint) - { - entityType = Constants.UdiEntityType.DocumentBlueprintContainer; - } - else - { - throw new NotSupportedException(string.Format("Contained object type {0} is not supported.", entity.ContainedObjectType)); - } - - return new GuidUdi(entityType, entity.Key).EnsureClosed(); - } - - /// - /// Gets the entity identifier of the entity. - /// - /// The entity. - /// - /// The entity identifier of the entity. - /// - public static GuidUdi GetUdi(this IMedia entity) - { - ArgumentNullException.ThrowIfNull(entity); - - return new GuidUdi(Constants.UdiEntityType.Media, entity.Key).EnsureClosed(); - } - - /// - /// Gets the entity identifier of the entity. - /// - /// The entity. - /// - /// The entity identifier of the entity. - /// - public static GuidUdi GetUdi(this IContent entity) - { - ArgumentNullException.ThrowIfNull(entity); - - string entityType = entity.Blueprint ? Constants.UdiEntityType.DocumentBlueprint : Constants.UdiEntityType.Document; - - return new GuidUdi(entityType, entity.Key).EnsureClosed(); - } - - /// - /// Gets the entity identifier of the entity. - /// - /// The entity. - /// - /// The entity identifier of the entity. - /// - public static GuidUdi GetUdi(this IMember entity) - { - ArgumentNullException.ThrowIfNull(entity); - - return new GuidUdi(Constants.UdiEntityType.Member, entity.Key).EnsureClosed(); - } - - /// - /// Gets the entity identifier of the entity. - /// - /// The entity. - /// - /// The entity identifier of the entity. - /// - public static StringUdi GetUdi(this Stylesheet entity) - { - ArgumentNullException.ThrowIfNull(entity); - - return GetUdiFromPath(Constants.UdiEntityType.Stylesheet, entity.Path); - } - - /// - /// Gets the entity identifier of the entity. - /// - /// The entity. - /// - /// The entity identifier of the entity. - /// - public static StringUdi GetUdi(this Script entity) - { - ArgumentNullException.ThrowIfNull(entity); - - return GetUdiFromPath(Constants.UdiEntityType.Script, entity.Path); - } - - /// - /// Gets the UDI from a path. - /// - /// The type of the entity. - /// The path. - /// - /// The entity identifier of the entity. - /// - private static StringUdi GetUdiFromPath(string entityType, string path) - { - string id = path.TrimStart(Constants.CharArrays.ForwardSlash).Replace("\\", "/"); - - return new StringUdi(entityType, id).EnsureClosed(); - } - /// /// Gets the entity identifier of the entity. /// @@ -262,11 +269,11 @@ public static class UdiGetterExtensions /// /// The entity identifier of the entity. /// - public static StringUdi GetUdi(this IPartialView entity) + public static StringUdi GetUdi(this ILanguage entity) { ArgumentNullException.ThrowIfNull(entity); - return GetUdiFromPath(Constants.UdiEntityType.PartialView, entity.Path); + return new StringUdi(Constants.UdiEntityType.Language, entity.IsoCode).EnsureClosed(); } /// @@ -276,19 +283,25 @@ public static class UdiGetterExtensions /// /// The entity identifier of the entity. /// - public static GuidUdi GetUdi(this IContentBase entity) + public static GuidUdi GetUdi(this IMemberGroup entity) { ArgumentNullException.ThrowIfNull(entity); - string type = entity switch - { - IContent => Constants.UdiEntityType.Document, - IMedia => Constants.UdiEntityType.Media, - IMember => Constants.UdiEntityType.Member, - _ => throw new NotSupportedException(string.Format("Content base type {0} is not supported.", entity.GetType().FullName)), - }; + return new GuidUdi(Constants.UdiEntityType.MemberGroup, entity.Key).EnsureClosed(); + } - return new GuidUdi(type, entity.Key).EnsureClosed(); + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static StringUdi GetUdi(this IPartialView entity) + { + ArgumentNullException.ThrowIfNull(entity); + + return GetUdiFromPath(Constants.UdiEntityType.PartialView, entity.Path); } /// @@ -305,6 +318,20 @@ public static class UdiGetterExtensions return new GuidUdi(Constants.UdiEntityType.RelationType, entity.Key).EnsureClosed(); } + /// + /// Gets the entity identifier of the entity. + /// + /// The entity. + /// + /// The entity identifier of the entity. + /// + public static GuidUdi GetUdi(this ITemplate entity) + { + ArgumentNullException.ThrowIfNull(entity); + + return new GuidUdi(Constants.UdiEntityType.Template, entity.Key).EnsureClosed(); + } + /// /// Gets the entity identifier of the entity. /// @@ -320,56 +347,17 @@ public static class UdiGetterExtensions } /// - /// Gets the entity identifier of the entity. + /// Gets the UDI from a path. /// - /// The entity. + /// The type of the entity. + /// The path. /// /// The entity identifier of the entity. /// - public static StringUdi GetUdi(this ILanguage entity) + private static StringUdi GetUdiFromPath(string entityType, string path) { - ArgumentNullException.ThrowIfNull(entity); + string id = path.TrimStart(Constants.CharArrays.ForwardSlash).Replace("\\", "/"); - return new StringUdi(Constants.UdiEntityType.Language, entity.IsoCode).EnsureClosed(); - } - - /// - /// Gets the entity identifier of the entity. - /// - /// The entity. - /// - /// The entity identifier of the entity. - /// - public static Udi GetUdi(this IEntity entity) - { - ArgumentNullException.ThrowIfNull(entity); - - return entity switch - { - // Concrete types - EntityContainer container => container.GetUdi(), - Stylesheet stylesheet => stylesheet.GetUdi(), - Script script => script.GetUdi(), - // Content types - IContentType contentType => contentType.GetUdi(), - IMediaType mediaType => mediaType.GetUdi(), - IMemberType memberType => memberType.GetUdi(), - IContentTypeComposition contentTypeComposition => contentTypeComposition.GetUdi(), - // Content - IContent content => content.GetUdi(), - IMedia media => media.GetUdi(), - IMember member => member.GetUdi(), - IContentBase contentBase => contentBase.GetUdi(), - // Other - IDataType dataTypeComposition => dataTypeComposition.GetUdi(), - IDictionaryItem dictionaryItem => dictionaryItem.GetUdi(), - ILanguage language => language.GetUdi(), - IMemberGroup memberGroup => memberGroup.GetUdi(), - IPartialView partialView => partialView.GetUdi(), - IRelationType relationType => relationType.GetUdi(), - ITemplate template => template.GetUdi(), - IWebhook webhook => webhook.GetUdi(), - _ => throw new NotSupportedException(string.Format("Entity type {0} is not supported.", entity.GetType().FullName)), - }; + return new StringUdi(entityType, id).EnsureClosed(); } } diff --git a/tests/Umbraco.Tests.Common/Builders/ContentBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentBuilder.cs index 05cc4b80dd..53c2f50f10 100644 --- a/tests/Umbraco.Tests.Common/Builders/ContentBuilder.cs +++ b/tests/Umbraco.Tests.Common/Builders/ContentBuilder.cs @@ -53,6 +53,7 @@ public class ContentBuilder private int? _sortOrder; private bool? _trashed; private DateTime? _updateDate; + private bool? _blueprint; private int? _versionId; DateTime? IWithCreateDateBuilder.CreateDate @@ -145,6 +146,13 @@ public class ContentBuilder set => _updateDate = value; } + public ContentBuilder WithBlueprint(bool blueprint) + { + _blueprint = blueprint; + + return this; + } + public ContentBuilder WithVersionId(int versionId) { _versionId = versionId; @@ -217,6 +225,7 @@ public class ContentBuilder { var id = _id ?? 0; var versionId = _versionId ?? 0; + var blueprint = _blueprint ?? false; var key = _key ?? Guid.NewGuid(); var parentId = _parentId ?? -1; var parent = _parent; @@ -253,6 +262,7 @@ public class ContentBuilder content.Id = id; content.VersionId = versionId; + content.Blueprint = blueprint; content.Key = key; content.CreateDate = createDate; content.UpdateDate = updateDate; diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UdiGetterExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UdiGetterExtensionsTests.cs index b5da0a4f2f..f5a5e79234 100644 --- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UdiGetterExtensionsTests.cs +++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UdiGetterExtensionsTests.cs @@ -3,6 +3,7 @@ using NUnit.Framework; using Umbraco.Cms.Core; +using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Tests.Common.Builders; using Umbraco.Cms.Tests.Common.Builders.Extensions; @@ -13,15 +14,22 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Extensions; [TestFixture] public class UdiGetterExtensionsTests { - [TestCase("style.css", "umb://stylesheet/style.css")] - [TestCase("editor\\style.css", "umb://stylesheet/editor/style.css")] - [TestCase("editor/style.css", "umb://stylesheet/editor/style.css")] - public void GetUdiForStylesheet(string path, string expected) + [TestCase(Constants.ObjectTypes.Strings.DataType, "6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://data-type-container/6ad82c70685c4e049b36d81bd779d16f")] + [TestCase(Constants.ObjectTypes.Strings.DocumentType, "6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://document-type-container/6ad82c70685c4e049b36d81bd779d16f")] + [TestCase(Constants.ObjectTypes.Strings.MediaType, "6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://media-type-container/6ad82c70685c4e049b36d81bd779d16f")] + [TestCase(Constants.ObjectTypes.Strings.DocumentBlueprint, "6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://document-blueprint-container/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForEntityContainer(Guid containedObjectType, Guid key, string expected) { - var builder = new StylesheetBuilder(); - var stylesheet = builder.WithPath(path).Build(); - var result = stylesheet.GetUdi(); - Assert.AreEqual(expected, result.ToString()); + EntityContainer entity = new EntityContainer(containedObjectType) + { + Key = key + }; + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); } [TestCase("script.js", "umb://script/script.js")] @@ -29,10 +37,195 @@ public class UdiGetterExtensionsTests [TestCase("editor/script.js", "umb://script/editor/script.js")] public void GetUdiForScript(string path, string expected) { - var builder = new ScriptBuilder(); - var script = builder.WithPath(path).Build(); - var result = script.GetUdi(); - Assert.AreEqual(expected, result.ToString()); + Script entity = new ScriptBuilder() + .WithPath(path) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("style.css", "umb://stylesheet/style.css")] + [TestCase("editor\\style.css", "umb://stylesheet/editor/style.css")] + [TestCase("editor/style.css", "umb://stylesheet/editor/style.css")] + public void GetUdiForStylesheet(string path, string expected) + { + Stylesheet entity = new StylesheetBuilder() + .WithPath(path) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", false, "umb://document/6ad82c70685c4e049b36d81bd779d16f")] + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", true, "umb://document-blueprint/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForContent(Guid key, bool blueprint, string expected) + { + Content entity = new ContentBuilder() + .WithKey(key) + .WithBlueprint(blueprint) + .WithContentType(ContentTypeBuilder.CreateBasicContentType()) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IContentBase)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://media/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForMedia(Guid key, string expected) + { + Media entity = new MediaBuilder() + .WithKey(key) + .WithMediaType(MediaTypeBuilder.CreateImageMediaType()) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IContentBase)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://member/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForMember(Guid key, string expected) + { + Member entity = new MemberBuilder() + .WithKey(key) + .WithMemberType(MemberTypeBuilder.CreateSimpleMemberType()) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IContentBase)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://document-type/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForContentType(Guid key, string expected) + { + IContentType entity = new ContentTypeBuilder() + .WithKey(key) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IContentTypeComposition)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://media-type/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForMediaType(Guid key, string expected) + { + IMediaType entity = new MediaTypeBuilder() + .WithKey(key) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IContentTypeComposition)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://member-type/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForMemberType(Guid key, string expected) + { + IMemberType entity = new MemberTypeBuilder() + .WithKey(key) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IContentTypeComposition)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://data-type/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForDataType(Guid key, string expected) + { + DataType entity = new DataTypeBuilder() + .WithKey(key) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://dictionary-item/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForDictionaryItem(Guid key, string expected) + { + DictionaryItem entity = new DictionaryItemBuilder() + .WithKey(key) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("en-US", "umb://language/en-US")] + [TestCase("en", "umb://language/en")] + public void GetUdiForLanguage(string isoCode, string expected) + { + ILanguage entity = new LanguageBuilder() + .WithCultureInfo(isoCode) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://member-group/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForMemberGroup(Guid key, string expected) + { + MemberGroup entity = new MemberGroupBuilder() + .WithKey(key) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); } [TestCase("test.cshtml", "umb://partial-view/test.cshtml")] @@ -40,26 +233,53 @@ public class UdiGetterExtensionsTests [TestCase("editor/test.cshtml", "umb://partial-view/editor/test.cshtml")] public void GetUdiForPartialView(string path, string expected) { - var builder = new PartialViewBuilder(); - var partialView = builder + IPartialView entity = new PartialViewBuilder() .WithPath(path) .Build(); - var result = partialView.GetUdi(); - Assert.AreEqual(expected, result.ToString()); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://relation-type/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForRelationType(Guid key, string expected) + { + IRelationTypeWithIsDependency entity = new RelationTypeBuilder() + .WithKey(key) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + } + + [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://template/6ad82c70685c4e049b36d81bd779d16f")] + public void GetUdiForTemplate(Guid key, string expected) + { + ITemplate entity = new TemplateBuilder() + .WithKey(key) + .Build(); + + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); + + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); } [TestCase("6ad82c70-685c-4e04-9b36-d81bd779d16f", "umb://webhook/6ad82c70685c4e049b36d81bd779d16f")] - public void GetUdiForWebhook(string key, string expected) + public void GetUdiForWebhook(Guid key, string expected) { - var builder = new WebhookBuilder(); - var webhook = builder - .WithKey(Guid.Parse(key)) + Webhook entity = new WebhookBuilder() + .WithKey(key) .Build(); - Udi result = webhook.GetUdi(); - Assert.AreEqual(expected, result.ToString()); + Udi udi = entity.GetUdi(); + Assert.AreEqual(expected, udi.ToString()); - result = ((IEntity)webhook).GetUdi(); - Assert.AreEqual(expected, result.ToString()); + udi = ((IEntity)entity).GetUdi(); + Assert.AreEqual(expected, udi.ToString()); } } From 14a0e622781278ec6212c4daebd873de04677df4 Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Thu, 26 Sep 2024 07:51:16 +0200 Subject: [PATCH 82/90] Use version of the assembly with the same name as the package ID (#16544) --- .../Services/Implement/PackagingService.cs | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs b/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs index c4e152e0b5..53d6c8ba6c 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs @@ -1,3 +1,6 @@ +using System.Diagnostics.CodeAnalysis; +using System.Reflection; +using System.Runtime.Loader; using System.Xml.Linq; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.FileProviders; @@ -354,8 +357,16 @@ public class PackagingService : IPackagingService if (!string.IsNullOrEmpty(packageManifest.Version)) { + // Always use package version from manifest installedPackage.Version = packageManifest.Version; } + else if (string.IsNullOrEmpty(installedPackage.Version) && + string.IsNullOrEmpty(installedPackage.PackageId) is false && + TryGetAssemblyInformationalVersion(installedPackage.PackageId, out string? version)) + { + // Use version of the assembly with the same name as the package ID + installedPackage.Version = version; + } } // Return all packages with an ID or name in the package manifest or package migrations @@ -414,4 +425,20 @@ public class PackagingService : IPackagingService return packageFile.CreateReadStream(); } + + private static bool TryGetAssemblyInformationalVersion(string name, [NotNullWhen(true)] out string? version) + { + foreach (Assembly assembly in AssemblyLoadContext.Default.Assemblies) + { + AssemblyName assemblyName = assembly.GetName(); + if (string.Equals(assemblyName.Name, name, StringComparison.OrdinalIgnoreCase) && + assembly.TryGetInformationalVersion(out version)) + { + return true; + } + } + + version = null; + return false; + } } From 635d9b83f9e1837cd9a640a024b54bae2bdf9644 Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Thu, 26 Sep 2024 07:51:16 +0200 Subject: [PATCH 83/90] Use version of the assembly with the same name as the package ID (#16544) (cherry picked from commit 14a0e622781278ec6212c4daebd873de04677df4) --- .../Services/Implement/PackagingService.cs | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs b/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs index c4e152e0b5..53d6c8ba6c 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs @@ -1,3 +1,6 @@ +using System.Diagnostics.CodeAnalysis; +using System.Reflection; +using System.Runtime.Loader; using System.Xml.Linq; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.FileProviders; @@ -354,8 +357,16 @@ public class PackagingService : IPackagingService if (!string.IsNullOrEmpty(packageManifest.Version)) { + // Always use package version from manifest installedPackage.Version = packageManifest.Version; } + else if (string.IsNullOrEmpty(installedPackage.Version) && + string.IsNullOrEmpty(installedPackage.PackageId) is false && + TryGetAssemblyInformationalVersion(installedPackage.PackageId, out string? version)) + { + // Use version of the assembly with the same name as the package ID + installedPackage.Version = version; + } } // Return all packages with an ID or name in the package manifest or package migrations @@ -414,4 +425,20 @@ public class PackagingService : IPackagingService return packageFile.CreateReadStream(); } + + private static bool TryGetAssemblyInformationalVersion(string name, [NotNullWhen(true)] out string? version) + { + foreach (Assembly assembly in AssemblyLoadContext.Default.Assemblies) + { + AssemblyName assemblyName = assembly.GetName(); + if (string.Equals(assemblyName.Name, name, StringComparison.OrdinalIgnoreCase) && + assembly.TryGetInformationalVersion(out version)) + { + return true; + } + } + + version = null; + return false; + } } From 0c1daa290b677351d37e647afd4170e91dfa256c Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Thu, 26 Sep 2024 07:52:39 +0200 Subject: [PATCH 84/90] Add `RemoveDefault()` extension method to fluent API for CMS webhook events (#15424) * Add RemoveDefault extension method * Move default webhook event types to single list (cherry picked from commit 8f26263178656f092972e845e332962e9e158f1e) --- ...hookEventCollectionBuilderCmsExtensions.cs | 33 +++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsExtensions.cs b/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsExtensions.cs index 361891de6a..679e105b72 100644 --- a/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsExtensions.cs +++ b/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsExtensions.cs @@ -9,6 +9,15 @@ namespace Umbraco.Cms.Core.DependencyInjection; /// public static class WebhookEventCollectionBuilderCmsExtensions { + private static readonly Type[] _defaultTypes = + [ + typeof(ContentDeletedWebhookEvent), + typeof(ContentPublishedWebhookEvent), + typeof(ContentUnpublishedWebhookEvent), + typeof(MediaDeletedWebhookEvent), + typeof(MediaSavedWebhookEvent), + ]; + /// /// Adds the default webhook events. /// @@ -21,12 +30,24 @@ public static class WebhookEventCollectionBuilderCmsExtensions /// public static WebhookEventCollectionBuilderCms AddDefault(this WebhookEventCollectionBuilderCms builder) { - builder.Builder - .Add() - .Add() - .Add() - .Add() - .Add(); + builder.Builder.Add(_defaultTypes); + + return builder; + } + + /// + /// Removes the default webhook events. + /// + /// The builder. + /// + /// The builder. + /// + public static WebhookEventCollectionBuilderCms RemoveDefault(this WebhookEventCollectionBuilderCms builder) + { + foreach (Type type in _defaultTypes) + { + builder.Builder.Remove(type); + } return builder; } From 910d70302e695e0864296ef420a5a2ff77549c16 Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Thu, 26 Sep 2024 08:45:08 +0200 Subject: [PATCH 85/90] Move all V14 User and User Group migration to pre-migrations (#17130) --- .../Migrations/Upgrade/UmbracoPlan.cs | 8 ++++---- .../Upgrade/UmbracoPremigrationPlan.cs | 4 ++++ .../Upgrade/V_14_0_0/AddGuidsToUserGroups.cs | 17 ++++++----------- .../Upgrade/V_14_0_0/AddGuidsToUsers.cs | 11 ++++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs index 7d6537d4da..713168a6c7 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs @@ -67,15 +67,15 @@ public class UmbracoPlan : MigrationPlan // To 14.0.0 To("{419827A0-4FCE-464B-A8F3-247C6092AF55}"); - To("{69E12556-D9B3-493A-8E8A-65EC89FB658D}"); - To("{F2B16CD4-F181-4BEE-81C9-11CF384E6025}"); - To("{A8E01644-9F2E-4988-8341-587EF5B7EA69}"); + To("{69E12556-D9B3-493A-8E8A-65EC89FB658D}"); + To("{F2B16CD4-F181-4BEE-81C9-11CF384E6025}"); + To("{A8E01644-9F2E-4988-8341-587EF5B7EA69}"); To("{E073DBC0-9E8E-4C92-8210-9CB18364F46E}"); To("{80D282A4-5497-47FF-991F-BC0BCE603121}"); To("{96525697-E9DC-4198-B136-25AD033442B8}"); To("{7FC5AC9B-6F56-415B-913E-4A900629B853}"); To("{1539A010-2EB5-4163-8518-4AE2AA98AFC6}"); - To("{C567DE81-DF92-4B99-BEA8-CD34EF99DA5D}"); + To("{C567DE81-DF92-4B99-BEA8-CD34EF99DA5D}"); To("{0D82C836-96DD-480D-A924-7964E458BD34}"); To("{1A0FBC8A-6FC6-456C-805C-B94816B2E570}"); To("{302DE171-6D83-4B6B-B3C0-AC8808A16CA1}"); diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPremigrationPlan.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPremigrationPlan.cs index c9d23acb90..a8131a0da4 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPremigrationPlan.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPremigrationPlan.cs @@ -53,5 +53,9 @@ public class UmbracoPremigrationPlan : MigrationPlan // To 14.0.0 To("{76FBF80E-37E6-462E-ADC1-25668F56151D}"); + To("{37CF4AC3-8489-44BC-A7E8-64908FEEC656}"); + To("{7BCB5352-B2ED-4D4B-B27D-ECDED930B50A}"); + To("{3E69BF9B-BEAB-41B1-BB11-15383CCA1C7F}"); + To("{F12C609B-86B9-4386-AFA4-78E02857247C}"); } } diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUserGroups.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUserGroups.cs index ad8e5091ea..67bdaf7395 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUserGroups.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUserGroups.cs @@ -20,6 +20,12 @@ public class AddGuidsToUserGroups : UnscopedMigrationBase protected override void Migrate() { + // If the new column already exists we'll do nothing. + if (ColumnExists(Constants.DatabaseSchema.Tables.UserGroup, NewColumnName)) + { + return; + } + // SQL server can simply add the column, but for SQLite this won't work, // so we'll have to create a new table and copy over data. if (DatabaseType != DatabaseType.SQLite) @@ -37,11 +43,6 @@ public class AddGuidsToUserGroups : UnscopedMigrationBase using IDisposable notificationSuppression = scope.Notifications.Suppress(); ScopeDatabase(scope); - if (ColumnExists(Constants.DatabaseSchema.Tables.UserGroup, NewColumnName)) - { - return; - } - var columns = SqlSyntax.GetColumnsInSchema(Context.Database).ToList(); AddColumnIfNotExists(columns, NewColumnName); @@ -68,12 +69,6 @@ public class AddGuidsToUserGroups : UnscopedMigrationBase using IDisposable notificationSuppression = scope.Notifications.Suppress(); ScopeDatabase(scope); - // If the new column already exists we'll do nothing. - if (ColumnExists(Constants.DatabaseSchema.Tables.UserGroup, NewColumnName)) - { - return; - } - // This isn't pretty, // But since you cannot alter columns, we have to copy the data over and delete the old table. // However we cannot do this due to foreign keys, so temporarily disable these keys while migrating. diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUsers.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUsers.cs index fe730fd2b8..6d5dbce1d8 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUsers.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUsers.cs @@ -26,6 +26,12 @@ internal class AddGuidsToUsers : UnscopedMigrationBase protected override void Migrate() { + if (ColumnExists(Constants.DatabaseSchema.Tables.User, NewColumnName)) + { + Context.Complete(); + return; + } + InvalidateBackofficeUserAccess = true; using IScope scope = _scopeProvider.CreateScope(); using IDisposable notificationSuppression = scope.Notifications.Suppress(); @@ -75,11 +81,6 @@ internal class AddGuidsToUsers : UnscopedMigrationBase private void MigrateSqlite() { - if (ColumnExists(Constants.DatabaseSchema.Tables.User, NewColumnName)) - { - return; - } - /* * We commit the initial transaction started by the scope. This is required in order to disable the foreign keys. * We then begin a new transaction, this transaction will be committed or rolled back by the scope, like normal. From d3a67fe4e0c2b22b6fb948ef52130e46d1591ea1 Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Thu, 26 Sep 2024 08:45:08 +0200 Subject: [PATCH 86/90] Move all V14 User and User Group migration to pre-migrations (#17130) (cherry picked from commit 910d70302e695e0864296ef420a5a2ff77549c16) --- .../Migrations/Upgrade/UmbracoPlan.cs | 8 ++++---- .../Upgrade/UmbracoPremigrationPlan.cs | 4 ++++ .../Upgrade/V_14_0_0/AddGuidsToUserGroups.cs | 17 ++++++----------- .../Upgrade/V_14_0_0/AddGuidsToUsers.cs | 11 ++++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs index 7d6537d4da..713168a6c7 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs @@ -67,15 +67,15 @@ public class UmbracoPlan : MigrationPlan // To 14.0.0 To("{419827A0-4FCE-464B-A8F3-247C6092AF55}"); - To("{69E12556-D9B3-493A-8E8A-65EC89FB658D}"); - To("{F2B16CD4-F181-4BEE-81C9-11CF384E6025}"); - To("{A8E01644-9F2E-4988-8341-587EF5B7EA69}"); + To("{69E12556-D9B3-493A-8E8A-65EC89FB658D}"); + To("{F2B16CD4-F181-4BEE-81C9-11CF384E6025}"); + To("{A8E01644-9F2E-4988-8341-587EF5B7EA69}"); To("{E073DBC0-9E8E-4C92-8210-9CB18364F46E}"); To("{80D282A4-5497-47FF-991F-BC0BCE603121}"); To("{96525697-E9DC-4198-B136-25AD033442B8}"); To("{7FC5AC9B-6F56-415B-913E-4A900629B853}"); To("{1539A010-2EB5-4163-8518-4AE2AA98AFC6}"); - To("{C567DE81-DF92-4B99-BEA8-CD34EF99DA5D}"); + To("{C567DE81-DF92-4B99-BEA8-CD34EF99DA5D}"); To("{0D82C836-96DD-480D-A924-7964E458BD34}"); To("{1A0FBC8A-6FC6-456C-805C-B94816B2E570}"); To("{302DE171-6D83-4B6B-B3C0-AC8808A16CA1}"); diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPremigrationPlan.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPremigrationPlan.cs index c9d23acb90..a8131a0da4 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPremigrationPlan.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPremigrationPlan.cs @@ -53,5 +53,9 @@ public class UmbracoPremigrationPlan : MigrationPlan // To 14.0.0 To("{76FBF80E-37E6-462E-ADC1-25668F56151D}"); + To("{37CF4AC3-8489-44BC-A7E8-64908FEEC656}"); + To("{7BCB5352-B2ED-4D4B-B27D-ECDED930B50A}"); + To("{3E69BF9B-BEAB-41B1-BB11-15383CCA1C7F}"); + To("{F12C609B-86B9-4386-AFA4-78E02857247C}"); } } diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUserGroups.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUserGroups.cs index ad8e5091ea..67bdaf7395 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUserGroups.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUserGroups.cs @@ -20,6 +20,12 @@ public class AddGuidsToUserGroups : UnscopedMigrationBase protected override void Migrate() { + // If the new column already exists we'll do nothing. + if (ColumnExists(Constants.DatabaseSchema.Tables.UserGroup, NewColumnName)) + { + return; + } + // SQL server can simply add the column, but for SQLite this won't work, // so we'll have to create a new table and copy over data. if (DatabaseType != DatabaseType.SQLite) @@ -37,11 +43,6 @@ public class AddGuidsToUserGroups : UnscopedMigrationBase using IDisposable notificationSuppression = scope.Notifications.Suppress(); ScopeDatabase(scope); - if (ColumnExists(Constants.DatabaseSchema.Tables.UserGroup, NewColumnName)) - { - return; - } - var columns = SqlSyntax.GetColumnsInSchema(Context.Database).ToList(); AddColumnIfNotExists(columns, NewColumnName); @@ -68,12 +69,6 @@ public class AddGuidsToUserGroups : UnscopedMigrationBase using IDisposable notificationSuppression = scope.Notifications.Suppress(); ScopeDatabase(scope); - // If the new column already exists we'll do nothing. - if (ColumnExists(Constants.DatabaseSchema.Tables.UserGroup, NewColumnName)) - { - return; - } - // This isn't pretty, // But since you cannot alter columns, we have to copy the data over and delete the old table. // However we cannot do this due to foreign keys, so temporarily disable these keys while migrating. diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUsers.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUsers.cs index fe730fd2b8..6d5dbce1d8 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUsers.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUsers.cs @@ -26,6 +26,12 @@ internal class AddGuidsToUsers : UnscopedMigrationBase protected override void Migrate() { + if (ColumnExists(Constants.DatabaseSchema.Tables.User, NewColumnName)) + { + Context.Complete(); + return; + } + InvalidateBackofficeUserAccess = true; using IScope scope = _scopeProvider.CreateScope(); using IDisposable notificationSuppression = scope.Notifications.Suppress(); @@ -75,11 +81,6 @@ internal class AddGuidsToUsers : UnscopedMigrationBase private void MigrateSqlite() { - if (ColumnExists(Constants.DatabaseSchema.Tables.User, NewColumnName)) - { - return; - } - /* * We commit the initial transaction started by the scope. This is required in order to disable the foreign keys. * We then begin a new transaction, this transaction will be committed or rolled back by the scope, like normal. From 8c4780380d7523e21906d2cc17b806c0db839bf1 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Thu, 26 Sep 2024 08:51:36 +0200 Subject: [PATCH 87/90] update backoffice submodule --- src/Umbraco.Web.UI.Client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client index 0880e2551d..a5500fd8de 160000 --- a/src/Umbraco.Web.UI.Client +++ b/src/Umbraco.Web.UI.Client @@ -1 +1 @@ -Subproject commit 0880e2551d8f0e3dc095742795f5182b9467d6a1 +Subproject commit a5500fd8de2fb14285d8f99cd3d5edeb1c5eb462 From a43db4ff0550d62f0263c14d9c9d3652e3fcb1a0 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Thu, 26 Sep 2024 08:52:40 +0200 Subject: [PATCH 88/90] update backoffice submodule --- src/Umbraco.Web.UI.Client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client index 0880e2551d..a5500fd8de 160000 --- a/src/Umbraco.Web.UI.Client +++ b/src/Umbraco.Web.UI.Client @@ -1 +1 @@ -Subproject commit 0880e2551d8f0e3dc095742795f5182b9467d6a1 +Subproject commit a5500fd8de2fb14285d8f99cd3d5edeb1c5eb462 From fdb9cfa3e7ada8db6effb6ce7cb9a58f09817538 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Thu, 26 Sep 2024 09:54:43 +0200 Subject: [PATCH 89/90] Missing context complete --- .../Migrations/Upgrade/V_14_0_0/AddGuidsToUserGroups.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUserGroups.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUserGroups.cs index 67bdaf7395..461ed59c8e 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUserGroups.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUserGroups.cs @@ -23,6 +23,7 @@ public class AddGuidsToUserGroups : UnscopedMigrationBase // If the new column already exists we'll do nothing. if (ColumnExists(Constants.DatabaseSchema.Tables.UserGroup, NewColumnName)) { + Context.Complete(); return; } @@ -31,10 +32,12 @@ public class AddGuidsToUserGroups : UnscopedMigrationBase if (DatabaseType != DatabaseType.SQLite) { MigrateSqlServer(); + Context.Complete(); return; } MigrateSqlite(); + Context.Complete(); } private void MigrateSqlServer() From 6bd558c01662bbbc806f2ead5256b9006fe0be56 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Thu, 26 Sep 2024 14:38:27 +0200 Subject: [PATCH 90/90] update backoffice submodule --- src/Umbraco.Web.UI.Client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client index a5500fd8de..b2c598f6ef 160000 --- a/src/Umbraco.Web.UI.Client +++ b/src/Umbraco.Web.UI.Client @@ -1 +1 @@ -Subproject commit a5500fd8de2fb14285d8f99cd3d5edeb1c5eb462 +Subproject commit b2c598f6ef0b62bb64186c61125f4d00177b48ca