From 4922144528e00e56aeeba484dd4ee58caa25022c Mon Sep 17 00:00:00 2001 From: Anders Bjerner Date: Thu, 20 Oct 2022 17:34:52 +0200 Subject: [PATCH 001/114] Added shortcut="esc" to RTE HTML editor close button --- .../src/views/propertyeditors/rte/codeeditor.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/codeeditor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/codeeditor.html index 11d77d4dd4..2bccd039db 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/codeeditor.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/codeeditor.html @@ -25,6 +25,7 @@ type="button" button-style="link" label-key="general_close" + shortcut="esc" action="vm.close()"> - \ No newline at end of file + From 7d9ee69fbc06c0166a7acc62abc36734a5cba4d5 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 21 Oct 2022 17:47:51 +0200 Subject: [PATCH 002/114] Changed Logo button behavior to be more consistent with the rest of the header --- .../EmbeddedResources/Lang/en.xml | 1 + .../EmbeddedResources/Lang/en_us.xml | 1 + .../application/umbappheader.directive.js | 4 +++ .../application/umb-app-header.html | 31 +++++++++++++++---- 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml index 82311e4311..57fdb22b4c 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml @@ -827,6 +827,7 @@ Retry Permissions Scheduled Publishing + Umbraco info Search Sorry, we can not find what you are looking for. No items have been added diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml index c0bc8763f7..7b7163626b 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml @@ -855,6 +855,7 @@ Retry Permissions Scheduled Publishing + Umbraco info Search Sorry, we can not find what you are looking for. No items have been added diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js index dd83f6546b..a184967ca2 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbappheader.directive.js @@ -97,6 +97,8 @@ if(anchorLink) { anchorLink.focus(); } + const anchorButton = element[0].querySelector('#umbraco-logo-mark'); + anchorButton.classList.add("active"); }); }; scope.keepLogoModal = function() { @@ -108,6 +110,8 @@ scope.logoModal.timer = $timeout(function () { scope.logoModal.show = false; }, 100); + const anchorButton = element[0].querySelector('#umbraco-logo-mark'); + anchorButton.classList.remove("active"); } }; scope.stopClickEvent = function($event) { diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html index 7936a7848e..9d673ce8bb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html @@ -2,13 +2,32 @@
-
+
Change Database -
@@ -159,7 +159,7 @@ -
+ + +
+
+ + +
    + + +
  • +
    + +
    +
    • - -
      +
    • +
      +
      + {{ file.name }} + + {{message.header}}: {{message.message}} + + "{{maxFileSize}}" + +
      -
    • -
      - - -
      -
      • + + + + -
    • + + + +
      • -
      -
      - {{ file.name }} - - {{message.header}}: {{message.message}} - - "{{maxFileSize}}" - -
      + +
    • +
      {{file.name}} {{file.uploadProgress + '%'}}
      +
      + +
      +
      • - - - - +
    • +
      {{ file.name }}
      +
      • - - -
      - - -
    • -
      {{currentFile.name}} {{currentFile.uploadProgress + '%'}}
      -
      - -
      -
      • - -
    • -
      {{ file.name }}
      -
      • - -
    - +
+ From bd4553d8a4960f509cbf4f89a966bdcb4ad77b28 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Mon, 14 Nov 2022 10:01:34 +0000 Subject: [PATCH 027/114] Adds the SSH feature to allow the GitHub CLI SSH command to work --- .devcontainer/devcontainer.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2819ccf8b0..e5aaa046fc 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -18,6 +18,12 @@ // https://github.com/devcontainers/templates/issues/38#issuecomment-1310803259 "ghcr.io/devcontainers/features/dotnet:1": { "version": "7" + }, + + // Adds SSH support to the container + // Allowing the Github CLI `gh codespace ssh` to work + "ghcr.io/devcontainers/features/sshd:1": { + "version": "latest" } }, From 3c709cfa2470efcfff872ee5bafae34bf8360178 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Mon, 14 Nov 2022 14:10:52 +0000 Subject: [PATCH 028/114] Adds dotnet build command for onCreateCommand to use in Prebuilds of CodeSpaces --- .devcontainer/devcontainer.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e5aaa046fc..a8d73e9304 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -32,8 +32,11 @@ "ms-dotnettools.csharp" ], - // Use 'forwardPorts' to make a list of ports inside the container available locally. - "forwardPorts": [9000, 5000, 25] + // Use 'forwardPorts' to make a list of ports inside the container available locallAdd "forwardPorts": [9000, 5000, 25], + + // Use OnCreateCommand to run commands after the container is created + // This is used in the prebuilds - so dotnet build (nuget restore and node stuff) is done + "onCreateCommand": "dotnet build umbraco.sln", // [Optional] To reuse of your local HTTPS dev cert: // From cf96aefb861b1f769512bb692dbc285001717f62 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Mon, 14 Nov 2022 14:36:26 +0000 Subject: [PATCH 029/114] Adds Open in GitHub Codespaces to main readme Adds Open in GitHub Codespaces to main readme next to other badges we have at the top of the readme --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index b686ce13b7..bfa80ed735 100644 --- a/.github/README.md +++ b/.github/README.md @@ -1,4 +1,4 @@ -# [Umbraco CMS](https://umbraco.com) · [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](../LICENSE.md) [![Build status](https://umbraco.visualstudio.com/Umbraco%20Cms/_apis/build/status/Cms%208%20Continuous?branchName=v8/contrib)](https://umbraco.visualstudio.com/Umbraco%20Cms/_build?definitionId=75) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](CONTRIBUTING.md) [![Twitter](https://img.shields.io/twitter/follow/umbraco.svg?style=social&label=Follow)](https://twitter.com/intent/follow?screen_name=umbraco) [![Discord](https://img.shields.io/discord/869656431308189746)](https://discord.gg/umbraco) +# [Umbraco CMS](https://umbraco.com) · [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](../LICENSE.md) [![Build status](https://umbraco.visualstudio.com/Umbraco%20Cms/_apis/build/status/Cms%208%20Continuous?branchName=v8/contrib)](https://umbraco.visualstudio.com/Umbraco%20Cms/_build?definitionId=75) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](CONTRIBUTING.md) [![Twitter](https://img.shields.io/twitter/follow/umbraco.svg?style=social&label=Follow)](https://twitter.com/intent/follow?screen_name=umbraco) [![Discord](https://img.shields.io/discord/869656431308189746)](https://discord.gg/umbraco) [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?hide_repo_select=true&ref=v11%2Fcontrib&repo=10601208&machine=basicLinux32gb&devcontainer_path=.devcontainer%2Fdevcontainer.json&location=WestEurope) Umbraco is the friendliest, most flexible and fastest growing ASP.NET CMS, and used by more than 500,000 websites worldwide. Our mission is to help you deliver delightful digital experiences by making Umbraco friendly, simpler and social. From a4f8a51c57c11dd35e9dd6ebab9a7b7965d30a4e Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Mon, 14 Nov 2022 15:11:15 +0000 Subject: [PATCH 030/114] Trying Codespace prebuilds to use updateContentCommand that the docs refer to --- .devcontainer/devcontainer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a8d73e9304..2040a05912 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -34,9 +34,9 @@ // Use 'forwardPorts' to make a list of ports inside the container available locallAdd "forwardPorts": [9000, 5000, 25], - // Use OnCreateCommand to run commands after the container is created + // This is used in the prebuilds - so dotnet build (nuget restore and node stuff) is done - "onCreateCommand": "dotnet build umbraco.sln", + "updateContentCommand": "dotnet build umbraco.sln", // [Optional] To reuse of your local HTTPS dev cert: // From 5d3b2e2e8a9212865e448a94297633c5441253ed Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Tue, 15 Nov 2022 08:43:21 +0000 Subject: [PATCH 031/114] Enable CodeSpaces PortForwarding Config as SMTP4Dev did not auto appear in new prebuilds --- .devcontainer/devcontainer.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2040a05912..b56869cea1 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -37,6 +37,18 @@ // This is used in the prebuilds - so dotnet build (nuget restore and node stuff) is done "updateContentCommand": "dotnet build umbraco.sln", + "portsAttributes": { + "9000": { + "label": "Umbraco HTTP", + "protocol": "http", + "onAutoForward": "notify" + }, + "44331": { + "label": "Umbraco HTTPS", + "protocol": "https", + "onAutoForward": "notify" + } + } // [Optional] To reuse of your local HTTPS dev cert: // From 0cad30a8fa342c8b42bf7ab3525489eacc379bca Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Tue, 15 Nov 2022 08:55:39 +0000 Subject: [PATCH 032/114] Adds SMTP4Dev and opens browser to HTTPs Umbraco --- .devcontainer/devcontainer.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b56869cea1..b4d5c395cd 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -38,6 +38,11 @@ // This is used in the prebuilds - so dotnet build (nuget restore and node stuff) is done "updateContentCommand": "dotnet build umbraco.sln", "portsAttributes": { + "5000": { + "label": "SMTP4Dev", + "protocol": "http", + "onAutoForward": "notify" + }, "9000": { "label": "Umbraco HTTP", "protocol": "http", @@ -46,7 +51,7 @@ "44331": { "label": "Umbraco HTTPS", "protocol": "https", - "onAutoForward": "notify" + "onAutoForward": "openBrowser" } } From b32b0371ae82aae57aeb79cd44d9c5b5c25ff8ab Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Tue, 15 Nov 2022 09:47:10 +0000 Subject: [PATCH 033/114] Open Browser config is not working for some unknown reason --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b4d5c395cd..b51248d798 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -51,7 +51,7 @@ "44331": { "label": "Umbraco HTTPS", "protocol": "https", - "onAutoForward": "openBrowser" + "onAutoForward": "notify" } } From c365c64beae09c391dab4a86c35117c7d153c726 Mon Sep 17 00:00:00 2001 From: Sean Maloney Date: Tue, 15 Nov 2022 10:12:10 +0000 Subject: [PATCH 034/114] 13402 - Update PreviewAuthenticationMiddleware to support chunked authentication cookies --- .../PreviewAuthenticationMiddleware.cs | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web.Common/Middleware/PreviewAuthenticationMiddleware.cs b/src/Umbraco.Web.Common/Middleware/PreviewAuthenticationMiddleware.cs index 55001ca28c..0748f5cbb4 100644 --- a/src/Umbraco.Web.Common/Middleware/PreviewAuthenticationMiddleware.cs +++ b/src/Umbraco.Web.Common/Middleware/PreviewAuthenticationMiddleware.cs @@ -51,17 +51,23 @@ public class PreviewAuthenticationMiddleware : IMiddleware // If we've gotten this far it means a preview cookie has been set and a front-end umbraco document request is executing. // In this case, authentication will not have occurred for an Umbraco back office User, however we need to perform the authentication // for the user here so that the preview capability can be authorized otherwise only the non-preview page will be rendered. - if (cookieOptions.Cookie.Name is not null && - request.Cookies.TryGetValue(cookieOptions.Cookie.Name, out var cookie)) + if (cookieOptions.Cookie.Name != null) { - AuthenticationTicket? unprotected = cookieOptions.TicketDataFormat.Unprotect(cookie); - ClaimsIdentity? backOfficeIdentity = unprotected?.Principal.GetUmbracoIdentity(); - if (backOfficeIdentity != null) + var chunkingCookieManager = new ChunkingCookieManager(); + var cookie = chunkingCookieManager.GetRequestCookie(context, cookieOptions.Cookie.Name); + + if (!string.IsNullOrEmpty(cookie)) { - // Ok, we've got a real ticket, now we can add this ticket's identity to the current - // Principal, this means we'll have 2 identities assigned to the principal which we can - // use to authorize the preview and allow for a back office User. - context.User.AddIdentity(backOfficeIdentity); + AuthenticationTicket? unprotected = cookieOptions.TicketDataFormat.Unprotect(cookie); + ClaimsIdentity? backOfficeIdentity = unprotected?.Principal.GetUmbracoIdentity(); + + if (backOfficeIdentity != null) + { + // Ok, we've got a real ticket, now we can add this ticket's identity to the current + // Principal, this means we'll have 2 identities assigned to the principal which we can + // use to authorize the preview and allow for a back office User. + context.User.AddIdentity(backOfficeIdentity); + } } } } From 1d78a0650993931db044455a277e7ff80a2674b5 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Tue, 15 Nov 2022 10:14:29 +0000 Subject: [PATCH 035/114] The devcert in the docker was not working so moved to updateContentCommand --- .devcontainer/Dockerfile | 4 ---- .devcontainer/devcontainer.json | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index a6303468cc..7ab6093623 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -22,7 +22,3 @@ RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/ # https://docs.npmjs.com/cli/v6/using-npm/config#unsafe-perm # Default: false if running as root, true otherwise (we are ROOT) #RUN npm -g config set user vscode && npm -g config set unsafe-perm - -# Generate and trust a local developer certificate for Kestrel -# This is needed for Kestrel to bind on https -RUN dotnet dev-certs https --trust diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2040a05912..6e63138669 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -36,7 +36,7 @@ // This is used in the prebuilds - so dotnet build (nuget restore and node stuff) is done - "updateContentCommand": "dotnet build umbraco.sln", + "updateContentCommand": "dotnet build umbraco.sln && dotnet dev-certs https --trust", // [Optional] To reuse of your local HTTPS dev cert: // From 704dda9575f9b8711c18467041347b703ee5997d Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Tue, 15 Nov 2022 11:23:53 +0000 Subject: [PATCH 036/114] Removes the explicit build before attaching debugger launch task --- .vscode/launch.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 65a3d08583..f40f2a8270 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,7 +8,6 @@ "name": ".NET Core Launch (web)", "type": "coreclr", "request": "launch", - "preLaunchTask": "Dotnet build", "program": "dotnet", "args": ["run"], "cwd": "${workspaceFolder}/src/Umbraco.Web.UI", From 2f976b41b442d523a61aa182a239586422a05d32 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Tue, 15 Nov 2022 13:33:26 +0000 Subject: [PATCH 037/114] Adds SQLite extension & ensures SQLite thats needed for it --- .devcontainer/devcontainer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 937d206a08..47ab4ca6d5 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -29,14 +29,15 @@ // Add the IDs of extensions you want installed when the container is created. "extensions": [ - "ms-dotnettools.csharp" + "ms-dotnettools.csharp", + "alexcvzz.vscode-sqlite" ], // Use 'forwardPorts' to make a list of ports inside the container available locallAdd "forwardPorts": [9000, 5000, 25], // This is used in the prebuilds - so dotnet build (nuget restore and node stuff) is done - "updateContentCommand": "dotnet build umbraco.sln && dotnet dev-certs https --trust", + "updateContentCommand": "dotnet build umbraco.sln && dotnet dev-certs https --trust && sudo apt-get update && sudo apt install sqlite3", "portsAttributes": { "5000": { "label": "SMTP4Dev", From d3905b4c5c694537407aa6f5707e1e68c751cc0c Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Tue, 15 Nov 2022 16:16:08 +0000 Subject: [PATCH 038/114] Scaffold out a file for a specific Codespace readme --- .devcontainer/devcontainer.json | 9 ++++++++- .github/codespaces-readme.md | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .github/codespaces-readme.md diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 47ab4ca6d5..2ff07fb4e3 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -54,7 +54,14 @@ "protocol": "https", "onAutoForward": "notify" } - } + }, + "customizations": { + "codespaces": { + "openFiles": [ + ".github/codespaces-readme.md" + ] + } + } // [Optional] To reuse of your local HTTPS dev cert: // diff --git a/.github/codespaces-readme.md b/.github/codespaces-readme.md new file mode 100644 index 0000000000..48dbe16b0a --- /dev/null +++ b/.github/codespaces-readme.md @@ -0,0 +1,2 @@ +# GitHub CodeSpaces +Get help at hackathon with this readme to list out steps or specific useful info to get up and running \ No newline at end of file From dbc8c2680e410b861d307bcf8ddb0fbff82ac7c7 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Wed, 16 Nov 2022 16:21:05 +0000 Subject: [PATCH 039/114] List port 5000 for Smtp4Dev --- .devcontainer/devcontainer.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2ff07fb4e3..dcada3212a 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -6,6 +6,7 @@ "service": "app", "workspaceFolder": "/workspace", + // Set *default* container specific settings.json values on container create. "settings": { "omnisharp.defaultLaunchSolution": "umbraco.sln", @@ -38,6 +39,12 @@ // This is used in the prebuilds - so dotnet build (nuget restore and node stuff) is done "updateContentCommand": "dotnet build umbraco.sln && dotnet dev-certs https --trust && sudo apt-get update && sudo apt install sqlite3", + + // Port needed to help discover SMTP4Dev + "forwardPorts": [ + 5000 + ], + "portsAttributes": { "5000": { "label": "SMTP4Dev", @@ -61,7 +68,7 @@ ".github/codespaces-readme.md" ] } - } + } // [Optional] To reuse of your local HTTPS dev cert: // From 5ffc2b1ccb46690924be1c3aa81e0a1dccaaa0e1 Mon Sep 17 00:00:00 2001 From: Anders Bjerner Date: Tue, 8 Nov 2022 09:22:23 +0100 Subject: [PATCH 040/114] NullOrWhiteSpaceAsNull should be nullable --- src/Umbraco.Core/Extensions/StringExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Core/Extensions/StringExtensions.cs b/src/Umbraco.Core/Extensions/StringExtensions.cs index d30ef9ccba..eb1a125c5f 100644 --- a/src/Umbraco.Core/Extensions/StringExtensions.cs +++ b/src/Umbraco.Core/Extensions/StringExtensions.cs @@ -1239,7 +1239,7 @@ public static class StringExtensions /// /// Turns an null-or-whitespace string into a null string. /// - public static string? NullOrWhiteSpaceAsNull(this string text) + public static string? NullOrWhiteSpaceAsNull(this string? text) => string.IsNullOrWhiteSpace(text) ? null : text; /// From 74b7ee142ca6fe1cf5c6f6637b976f3fa19d8a62 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Thu, 17 Nov 2022 10:35:18 +0000 Subject: [PATCH 041/114] Updated readme --- .github/codespaces-readme.md | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.github/codespaces-readme.md b/.github/codespaces-readme.md index 48dbe16b0a..b71a6b5284 100644 --- a/.github/codespaces-readme.md +++ b/.github/codespaces-readme.md @@ -1,2 +1,21 @@ # GitHub CodeSpaces -Get help at hackathon with this readme to list out steps or specific useful info to get up and running \ No newline at end of file +Umbraco source code can be edited inside the browser with VSCode and CodeSpaces. + +This development environment comes with all the tools you need to build Umbraco source code. + + +## Debugging and Running +From VSCode browse to the Run and Debug section and then click the green button. This will build the Umbraco source code and attach a debugger and launch the site. + +## Default Umbraco credentials +Username: test@umbraco.com +Password: password1234 + +## Test Email Server + A SMTP4Dev instance for testing email is available on port 5000. + +## SQLite Database +The SQLite extension is preinstalled and allows you to open, query, edit the data inside the Umbraco SQLite database for ease of use. + + + From 0415ed826706576fd13b3777a715b93183ce5d20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Nov 2022 01:18:51 +0000 Subject: [PATCH 042/114] Bump socket.io-parser from 4.0.4 to 4.0.5 in /src/Umbraco.Web.UI.Client Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 4.0.4 to 4.0.5. - [Release notes](https://github.com/socketio/socket.io-parser/releases) - [Changelog](https://github.com/socketio/socket.io-parser/blob/main/CHANGELOG.md) - [Commits](https://github.com/socketio/socket.io-parser/compare/4.0.4...4.0.5) --- updated-dependencies: - dependency-name: socket.io-parser dependency-type: indirect ... Signed-off-by: dependabot[bot] --- src/Umbraco.Web.UI.Client/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 23ed392f82..bf9fd3d5f0 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -15152,9 +15152,9 @@ "dev": true }, "node_modules/socket.io-parser": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz", - "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz", + "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==", "dev": true, "dependencies": { "@types/component-emitter": "^1.2.10", @@ -29080,9 +29080,9 @@ "dev": true }, "socket.io-parser": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz", - "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz", + "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==", "dev": true, "requires": { "@types/component-emitter": "^1.2.10", From 7239a78ad1575b8e5618483afe9015cec9222d59 Mon Sep 17 00:00:00 2001 From: Blake Watt Date: Thu, 17 Nov 2022 05:10:37 -0800 Subject: [PATCH 043/114] update block grid panel name (#13325) Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> --- src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml | 2 +- .../prevalue/blockgrid.blockconfiguration.overlay.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml index 2f3e444a29..79695de3e4 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml @@ -2921,7 +2921,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Settings Areas Advanced - permissions + Permissions Install Sample Configuration Install diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html index 27c1a2f006..4d398844ed 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html @@ -200,7 +200,7 @@
- Allowance + Permissions
From cf6042ce379831d32d6f08c4a1fa6c2eae1b19e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Oct 2022 14:43:54 +0000 Subject: [PATCH 044/114] Bump async from 2.6.3 to 2.6.4 in /src/Umbraco.Web.UI.Client Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md) - [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4) --- updated-dependencies: - dependency-name: async dependency-type: indirect ... Signed-off-by: dependabot[bot] --- src/Umbraco.Web.UI.Client/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index bf9fd3d5f0..bc5d34d915 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -3333,9 +3333,9 @@ } }, "node_modules/async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", "dev": true, "dependencies": { "lodash": "^4.17.14" @@ -19845,9 +19845,9 @@ "dev": true }, "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", "dev": true, "requires": { "lodash": "^4.17.14" From 55b7897d86325339e2a7cce5d96b88291cdeafdd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Oct 2022 14:43:36 +0000 Subject: [PATCH 045/114] Bump minimist from 1.2.5 to 1.2.7 in /src/Umbraco.Web.UI.Client Bumps [minimist](https://github.com/minimistjs/minimist) from 1.2.5 to 1.2.7. - [Release notes](https://github.com/minimistjs/minimist/releases) - [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md) - [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.7) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- src/Umbraco.Web.UI.Client/package-lock.json | 40 ++++++--------------- 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index bc5d34d915..d2eb0e013c 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -11867,10 +11867,13 @@ } }, "node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", + "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/minimize": { "version": "2.2.0", @@ -12385,7 +12388,6 @@ "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", "dev": true, - "optional": true, "dependencies": { "boolbase": "^1.0.0" }, @@ -13775,18 +13777,6 @@ "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", "dev": true }, - "node_modules/postcss-svgo/node_modules/nth-check": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", - "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", - "dev": true, - "dependencies": { - "boolbase": "^1.0.0" - }, - "funding": { - "url": "https://github.com/fb55/nth-check?sponsor=1" - } - }, "node_modules/postcss-svgo/node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -26606,9 +26596,9 @@ } }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", + "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", "dev": true }, "minimize": { @@ -27019,7 +27009,6 @@ "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", "dev": true, - "optional": true, "requires": { "boolbase": "^1.0.0" } @@ -27990,15 +27979,6 @@ "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", "dev": true }, - "nth-check": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", - "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", - "dev": true, - "requires": { - "boolbase": "^1.0.0" - } - }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", From d1f10f486dfb408baa59e7b2127f6bfd2a5784a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 13:38:14 +0000 Subject: [PATCH 046/114] Bump eventsource from 1.1.0 to 1.1.2 in /src/Umbraco.Web.UI.Client Bumps [eventsource](https://github.com/EventSource/eventsource) from 1.1.0 to 1.1.2. - [Release notes](https://github.com/EventSource/eventsource/releases) - [Changelog](https://github.com/EventSource/eventsource/blob/master/HISTORY.md) - [Commits](https://github.com/EventSource/eventsource/compare/v1.1.0...v1.1.2) --- updated-dependencies: - dependency-name: eventsource dependency-type: indirect ... Signed-off-by: dependabot[bot] --- src/Umbraco.Web.UI.Client/package-lock.json | 68 +++------------------ 1 file changed, 10 insertions(+), 58 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index d2eb0e013c..d7f97debde 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -6660,12 +6660,9 @@ "dev": true }, "node_modules/eventsource": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz", - "integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==", - "dependencies": { - "original": "^1.0.0" - }, + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.2.tgz", + "integrity": "sha512-xAH3zWhgO2/3KIniEKYPr8plNSzlGINOUqYj0m0u7AB81iRw8b/3E73W6AuU+6klLbaSFmZnaETQ2lXPfAydrA==", "engines": { "node": ">=0.12.0" } @@ -12748,14 +12745,6 @@ "readable-stream": "^2.0.1" } }, - "node_modules/original": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", - "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", - "dependencies": { - "url-parse": "^1.4.3" - } - }, "node_modules/os-filter-obj": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-2.0.0.tgz", @@ -14005,11 +13994,6 @@ "node": ">=0.10.0" } }, - "node_modules/querystringify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" - }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -14444,7 +14428,8 @@ "node_modules/requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", + "dev": true }, "node_modules/resolve": { "version": "1.20.0", @@ -16609,15 +16594,6 @@ "deprecated": "Please see https://github.com/lydell/urix#deprecated", "dev": true }, - "node_modules/url-parse": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", - "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", - "dependencies": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, "node_modules/url-parse-lax": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", @@ -22546,12 +22522,9 @@ "dev": true }, "eventsource": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz", - "integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==", - "requires": { - "original": "^1.0.0" - } + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.2.tgz", + "integrity": "sha512-xAH3zWhgO2/3KIniEKYPr8plNSzlGINOUqYj0m0u7AB81iRw8b/3E73W6AuU+6klLbaSFmZnaETQ2lXPfAydrA==" }, "exec-buffer": { "version": "3.2.0", @@ -27281,14 +27254,6 @@ "readable-stream": "^2.0.1" } }, - "original": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", - "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", - "requires": { - "url-parse": "^1.4.3" - } - }, "os-filter-obj": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-2.0.0.tgz", @@ -28156,11 +28121,6 @@ "strict-uri-encode": "^1.0.0" } }, - "querystringify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" - }, "queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -28499,7 +28459,8 @@ "requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", + "dev": true }, "resolve": { "version": "1.20.0", @@ -30231,15 +30192,6 @@ "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", "dev": true }, - "url-parse": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", - "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", - "requires": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, "url-parse-lax": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", From 98da07cfb4f6a1b068cd5518255a954a2e0b4045 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Nov 2022 14:07:42 +0000 Subject: [PATCH 047/114] Bump minimatch from 3.0.4 to 3.1.2 in /src/Umbraco.Web.UI.Client Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] --- src/Umbraco.Web.UI.Client/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index d7f97debde..aa0d0c856e 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -11852,9 +11852,9 @@ } }, "node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "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" @@ -26560,9 +26560,9 @@ "optional": true }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "requires": { "brace-expansion": "^1.1.7" From fb48ecb57fb2cc4fa134463b6312f2c26c28b76f Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Fri, 18 Nov 2022 09:00:43 +0100 Subject: [PATCH 048/114] V11: merge dev to contrib (#13438) * V11: add test flakyness reporting (#13386) * update json-models-builders * Add reporting to all before each loops * Add commitId to env for pipelines * Test reports correctly * Bumb testhelper version * Update playwright-testhelpers version * Bumb playwright test-helper version * Bumb playwright-testhelpers version * Add AgentOs to yaml env * Bumb playwright-testhelper version * Try different AgentOS * Revert "Try different AgentOS" This reverts commit fc90620aef7af01ceffcdfbea7c9ef4dd02007f3. * Revert logo test * Add missing semicolons * Update package-lock.json * Add reports to Blocklist tests Co-authored-by: Zeegaan * V10: AllowedUploadFiles appsetting not working (#13408) * Add new Settings * Use new settings instead of old ones * Implement AllowedUploadedFiles value to be copied to AllowedUplayedFileExtensions * Obsolete old settings * Rename DisallowedUploadFileExtensions * Implement same fix for DisallowedUploadFiles * Use new settings for backoffice server variables * Update the correct setting Co-authored-by: Zeegaan * V11: Add compatibility suppressions (#13425) * Add suprressions * Revert "Add suprressions" This reverts commit 1c924ee967375870b6d86be9e9480ced0e22f8c7. * Update CompatibilitySuppressions.xml Co-authored-by: Ronald Barendse * Bump socket.io-parser from 4.0.4 to 4.0.5 in /src/Umbraco.Web.UI.Client Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 4.0.4 to 4.0.5. - [Release notes](https://github.com/socketio/socket.io-parser/releases) - [Changelog](https://github.com/socketio/socket.io-parser/blob/main/CHANGELOG.md) - [Commits](https://github.com/socketio/socket.io-parser/compare/4.0.4...4.0.5) --- updated-dependencies: - dependency-name: socket.io-parser dependency-type: indirect ... Signed-off-by: dependabot[bot] * update block grid panel name (#13325) Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> * Bump async from 2.6.3 to 2.6.4 in /src/Umbraco.Web.UI.Client Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md) - [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4) --- updated-dependencies: - dependency-name: async dependency-type: indirect ... Signed-off-by: dependabot[bot] * Bump eventsource from 1.1.0 to 1.1.2 in /src/Umbraco.Web.UI.Client Bumps [eventsource](https://github.com/EventSource/eventsource) from 1.1.0 to 1.1.2. - [Release notes](https://github.com/EventSource/eventsource/releases) - [Changelog](https://github.com/EventSource/eventsource/blob/master/HISTORY.md) - [Commits](https://github.com/EventSource/eventsource/compare/v1.1.0...v1.1.2) --- updated-dependencies: - dependency-name: eventsource dependency-type: indirect ... Signed-off-by: dependabot[bot] * Bump minimist from 1.2.5 to 1.2.7 in /src/Umbraco.Web.UI.Client Bumps [minimist](https://github.com/minimistjs/minimist) from 1.2.5 to 1.2.7. - [Release notes](https://github.com/minimistjs/minimist/releases) - [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md) - [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.7) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] * Management API: SearchController improvements (#13420) * remove typo of double PagedViewModel in response * add providerProperties with custom formatter * use a more descriptive variable name * use a more descriptive variable name for property types * generate new schema Co-authored-by: Zeegaan * Bump minimatch from 3.0.4 to 3.1.2 in /src/Umbraco.Web.UI.Client Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: Zeegaan Co-authored-by: Mole Co-authored-by: Ronald Barendse Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Blake Watt Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> --- build/azure-pipelines.yml | 2 + .../Search/SearcherSearchSearchController.cs | 2 +- .../Factories/IndexViewModelFactory.cs | 16 ++++++++ src/Umbraco.Cms.ManagementApi/OpenApi.json | 38 ++++++++----------- .../ViewModels/Search/IndexViewModel.cs | 11 +++++- .../CompatibilitySuppressions.xml | 28 ++++++++++++++ .../ContentSettingsExtensions.cs | 6 +-- .../Configuration/Models/ContentSettings.cs | 13 +++++++ .../UmbracoBuilder.Configuration.cs | 26 +++++++++++++ .../CompatibilitySuppressions.xml | 28 ++++++++++++++ .../Controllers/BackOfficeServerVariables.cs | 4 +- .../package-lock.json | 14 +++---- .../Umbraco.Tests.AcceptanceTest/package.json | 2 +- .../blockListEditorContent.spec.ts | 3 +- .../blockListEditorDataType.spec.ts | 3 +- .../blockListEditorDocument.spec.ts | 3 +- .../tests/DefaultConfig/Branding/logo.spec.ts | 6 +-- .../DefaultConfig/Content/content.spec.ts | 3 +- .../DefaultConfig/Content/recycleBin.spec.ts | 3 +- .../DefaultConfig/Content/routing.spec.ts | 3 +- .../DefaultConfig/DataTypes/dataTypes.spec.ts | 3 +- .../DataTypes/textBoxVariation.spec.ts | 3 +- .../HelpPanel/systemInformation.spec.ts | 3 +- .../DefaultConfig/Languages/languages.spec.ts | 3 +- .../tests/DefaultConfig/Login/login.spec.ts | 7 +++- .../DefaultConfig/Media/mediaFiles.spec.ts | 3 +- .../DefaultConfig/Media/mediaSection.spec.ts | 3 +- .../Members/memberGroups.spec.ts | 3 +- .../DefaultConfig/Members/members.spec.ts | 3 +- .../ModelsBuilder/modelsbuilder.spec.ts | 3 +- .../DefaultConfig/Packages/packages.spec.ts | 3 +- .../DefaultConfig/Settings/dataType.spec.ts | 5 ++- .../Settings/documentTypes.spec.ts | 3 +- .../DefaultConfig/Settings/languages.spec.ts | 3 +- .../DefaultConfig/Settings/macro.spec.ts | 3 +- .../DefaultConfig/Settings/mediaTypes.ts | 3 +- .../Settings/memberTypes.spec.ts | 3 +- .../Settings/partialViewMacroFiles.spec.ts | 3 +- .../Settings/partialViews.spec.ts | 3 +- .../Settings/relationTypes.spec.ts | 3 +- .../DefaultConfig/Settings/scripts.spec.ts | 3 +- .../Settings/stylesheets.spec.ts | 3 +- .../DefaultConfig/Settings/templates.spec.ts | 3 +- .../tests/DefaultConfig/Tabs/tabs.spec.ts | 5 ++- .../tests/DefaultConfig/Tour/tours.spec.ts | 3 +- .../Translation/translation.spec.ts | 6 +-- .../DefaultConfig/Users/userGroups.spec.ts | 3 +- .../tests/DefaultConfig/Users/users.spec.ts | 5 ++- 48 files changed, 228 insertions(+), 83 deletions(-) diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index e2abf8767d..345e3bde88 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -452,6 +452,8 @@ stages: workingDirectory: tests/Umbraco.Tests.AcceptanceTest env: CI: true + CommitId: $(Build.SourceVersion) + AgentOs: $(Agent.OS) - pwsh: | docker logs $(dockerImageName) > $(Build.ArtifactStagingDirectory)/playwright.log 2>&1 docker stop $(dockerImageName) diff --git a/src/Umbraco.Cms.ManagementApi/Controllers/Search/SearcherSearchSearchController.cs b/src/Umbraco.Cms.ManagementApi/Controllers/Search/SearcherSearchSearchController.cs index 36463ac3d8..3b9f7f6f85 100644 --- a/src/Umbraco.Cms.ManagementApi/Controllers/Search/SearcherSearchSearchController.cs +++ b/src/Umbraco.Cms.ManagementApi/Controllers/Search/SearcherSearchSearchController.cs @@ -19,7 +19,7 @@ public class SearcherSearchSearchController : SearchControllerBase [HttpGet("searcher/{searcherName}/search")] [MapToApiVersion("1.0")] - [ProducesResponseType(typeof(PagedViewModel>), StatusCodes.Status200OK)] + [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)] public async Task>> GetSearchResults(string searcherName, string? query, int skip, int take) { diff --git a/src/Umbraco.Cms.ManagementApi/Factories/IndexViewModelFactory.cs b/src/Umbraco.Cms.ManagementApi/Factories/IndexViewModelFactory.cs index 902d05a9cd..a23e22156e 100644 --- a/src/Umbraco.Cms.ManagementApi/Factories/IndexViewModelFactory.cs +++ b/src/Umbraco.Cms.ManagementApi/Factories/IndexViewModelFactory.cs @@ -37,6 +37,21 @@ public class IndexViewModelFactory : IIndexViewModelFactory Attempt isHealthy = indexDiag.IsHealthy(); + var properties = new Dictionary(); + + foreach (var property in indexDiag.Metadata) + { + if (property.Value is null) + { + properties[property.Key] = null; + } + else + { + var propertyType = property.Value.GetType(); + properties[property.Key] = propertyType.IsClass && !propertyType.IsArray ? property.Value?.ToString() : property.Value; + } + } + var indexerModel = new IndexViewModel { Name = index.Name, @@ -45,6 +60,7 @@ public class IndexViewModelFactory : IIndexViewModelFactory SearcherName = index.Searcher.Name, DocumentCount = indexDiag.GetDocumentCount(), FieldCount = indexDiag.GetFieldNames().Count(), + ProviderProperties = properties, }; return indexerModel; diff --git a/src/Umbraco.Cms.ManagementApi/OpenApi.json b/src/Umbraco.Cms.ManagementApi/OpenApi.json index 1e5a80b5a1..d2c27c5746 100644 --- a/src/Umbraco.Cms.ManagementApi/OpenApi.json +++ b/src/Umbraco.Cms.ManagementApi/OpenApi.json @@ -2827,7 +2827,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/PagedPaged" + "$ref": "#/components/schemas/PagedSearchResult" } } } @@ -4854,11 +4854,18 @@ "additionalProperties": false }, "Index": { + "required": [ + "canRebuild", + "documentCount", + "fieldCount", + "isHealthy", + "name" + ], "type": "object", "properties": { "name": { - "type": "string", - "nullable": true + "minLength": 1, + "type": "string" }, "healthStatus": { "type": "string", @@ -4882,6 +4889,11 @@ "fieldCount": { "type": "integer", "format": "int32" + }, + "providerProperties": { + "type": "object", + "additionalProperties": {}, + "nullable": true } }, "additionalProperties": false @@ -5754,26 +5766,6 @@ }, "additionalProperties": false }, - "PagedPaged": { - "required": [ - "items", - "total" - ], - "type": "object", - "properties": { - "total": { - "type": "integer", - "format": "int64" - }, - "items": { - "type": "array", - "items": { - "$ref": "#/components/schemas/PagedSearchResult" - } - } - }, - "additionalProperties": false - }, "PagedRecycleBinItem": { "required": [ "items", diff --git a/src/Umbraco.Cms.ManagementApi/ViewModels/Search/IndexViewModel.cs b/src/Umbraco.Cms.ManagementApi/ViewModels/Search/IndexViewModel.cs index c28b6c5e02..9a63bc8886 100644 --- a/src/Umbraco.Cms.ManagementApi/ViewModels/Search/IndexViewModel.cs +++ b/src/Umbraco.Cms.ManagementApi/ViewModels/Search/IndexViewModel.cs @@ -1,18 +1,27 @@ -namespace Umbraco.Cms.ManagementApi.ViewModels.Search; +using System.ComponentModel.DataAnnotations; + +namespace Umbraco.Cms.ManagementApi.ViewModels.Search; public class IndexViewModel { + [Required] public string Name { get; init; } = null!; public string? HealthStatus { get; init; } + [Required] public bool IsHealthy => HealthStatus == "Healthy"; + [Required] public bool CanRebuild { get; init; } public string SearcherName { get; init; } = null!; + [Required] public long DocumentCount { get; init; } + [Required] public int FieldCount { get; init; } + + public IReadOnlyDictionary? ProviderProperties { get; init; } } diff --git a/src/Umbraco.Core/CompatibilitySuppressions.xml b/src/Umbraco.Core/CompatibilitySuppressions.xml index e34b117b9a..f580fa9458 100644 --- a/src/Umbraco.Core/CompatibilitySuppressions.xml +++ b/src/Umbraco.Core/CompatibilitySuppressions.xml @@ -1,5 +1,33 @@  + + CP0002 + M:Umbraco.Cms.Core.Models.Blocks.BlockGridItem.get_ForceLeft + lib/net7.0/Umbraco.Core.dll + lib/net7.0/Umbraco.Core.dll + true + + + CP0002 + M:Umbraco.Cms.Core.Models.Blocks.BlockGridItem.get_ForceRight + lib/net7.0/Umbraco.Core.dll + lib/net7.0/Umbraco.Core.dll + true + + + CP0002 + M:Umbraco.Cms.Core.Models.Blocks.BlockGridItem.set_ForceLeft(System.Boolean) + lib/net7.0/Umbraco.Core.dll + lib/net7.0/Umbraco.Core.dll + true + + + CP0002 + M:Umbraco.Cms.Core.Models.Blocks.BlockGridItem.set_ForceRight(System.Boolean) + lib/net7.0/Umbraco.Core.dll + lib/net7.0/Umbraco.Core.dll + true + CP0006 M:Umbraco.Cms.Core.Deploy.IDataTypeConfigurationConnector.FromArtifact(Umbraco.Cms.Core.Models.IDataType,System.String,Umbraco.Cms.Core.Deploy.IContextCache) diff --git a/src/Umbraco.Core/Configuration/ContentSettingsExtensions.cs b/src/Umbraco.Core/Configuration/ContentSettingsExtensions.cs index 315cee4627..23a67f3267 100644 --- a/src/Umbraco.Core/Configuration/ContentSettingsExtensions.cs +++ b/src/Umbraco.Core/Configuration/ContentSettingsExtensions.cs @@ -10,9 +10,9 @@ public static class ContentSettingsExtensions /// Allow upload if extension is whitelisted OR if there is no whitelist and extension is NOT blacklisted. ///
public static bool IsFileAllowedForUpload(this ContentSettings contentSettings, string extension) => - contentSettings.AllowedUploadFiles.Any(x => x.InvariantEquals(extension)) || - (contentSettings.AllowedUploadFiles.Any() == false && - contentSettings.DisallowedUploadFiles.Any(x => x.InvariantEquals(extension)) == false); + contentSettings.AllowedUploadedFileExtensions.Any(x => x.InvariantEquals(extension)) || + (contentSettings.AllowedUploadedFileExtensions.Any() == false && + contentSettings.DisallowedUploadedFileExtensions.Any(x => x.InvariantEquals(extension)) == false); /// /// Gets the auto-fill configuration for a specified property alias. diff --git a/src/Umbraco.Core/Configuration/Models/ContentSettings.cs b/src/Umbraco.Core/Configuration/Models/ContentSettings.cs index f4f3040b79..4014930a5c 100644 --- a/src/Umbraco.Core/Configuration/Models/ContentSettings.cs +++ b/src/Umbraco.Core/Configuration/Models/ContentSettings.cs @@ -196,11 +196,13 @@ public class ContentSettings /// Gets or sets a value for the collection of file extensions that are disallowed for upload. /// [DefaultValue(StaticDisallowedUploadFiles)] + [Obsolete("Please use DisAllowedUploadedFileExtensions instead, scheduled for removal in V13")] public IEnumerable DisallowedUploadFiles { get; set; } = StaticDisallowedUploadFiles.Split(','); /// /// Gets or sets a value for the collection of file extensions that are allowed for upload. /// + [Obsolete("Please use AllowedUploadedFileExtensions instead, scheduled for removal in V13")] public IEnumerable AllowedUploadFiles { get; set; } = Array.Empty(); /// @@ -249,4 +251,15 @@ public class ContentSettings /// [DefaultValue(StaticAllowEditInvariantFromNonDefault)] public bool AllowEditInvariantFromNonDefault { get; set; } = StaticAllowEditInvariantFromNonDefault; + + /// + /// Gets or sets a value for the collection of file extensions that are allowed for upload. + /// + public string[] AllowedUploadedFileExtensions { get; set; } = Array.Empty(); + + /// + /// Gets or sets a value for the collection of file extensions that are disallowed for upload. + /// + [DefaultValue(StaticDisallowedUploadFiles)] + public string[] DisallowedUploadedFileExtensions { get; set; } = StaticDisallowedUploadFiles.Split(','); } diff --git a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs index 3be3815afa..28fc05907e 100644 --- a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs +++ b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs @@ -117,6 +117,32 @@ public static partial class UmbracoBuilderExtensions } }); + // TODO: Remove this in V13 + // This is to avoid a breaking change in ContentSettings, if the old AllowedFileUploads has a value, and the new + // AllowedFileUploadExtensions does not, copy the value over, if the new has a value, use that instead. + builder.Services.Configure(settings => + { + // We have to use Config.GetSection().Get, as the GetSection.GetValue simply cannot retrieve a string array + var allowedUploadedFileExtensionsValue = builder.Config.GetSection($"{Constants.Configuration.ConfigContent}:{nameof(ContentSettings.AllowedUploadedFileExtensions)}").Get(); + var allowedUploadFilesValue = builder.Config.GetSection($"{Constants.Configuration.ConfigContent}:{nameof(ContentSettings.AllowedUploadFiles)}").Get(); + + if (allowedUploadedFileExtensionsValue is null && allowedUploadFilesValue is not null) + { + settings.AllowedUploadedFileExtensions = allowedUploadFilesValue; + } + }); + + // TODO: Remove this in V13 + builder.Services.Configure(settings => + { + var disallowedUploadedFileExtensionsValue = builder.Config.GetSection($"{Constants.Configuration.ConfigContent}:{nameof(ContentSettings.DisallowedUploadedFileExtensions)}").Get(); + var disallowedUploadFilesValue = builder.Config.GetSection($"{Constants.Configuration.ConfigContent}:{nameof(ContentSettings.DisallowedUploadFiles)}").Get(); + + if (disallowedUploadedFileExtensionsValue is null && disallowedUploadFilesValue is not null) + { + settings.DisallowedUploadedFileExtensions = disallowedUploadFilesValue; + } + }); return builder; } } diff --git a/src/Umbraco.Infrastructure/CompatibilitySuppressions.xml b/src/Umbraco.Infrastructure/CompatibilitySuppressions.xml index 2095a0c798..f48f361244 100644 --- a/src/Umbraco.Infrastructure/CompatibilitySuppressions.xml +++ b/src/Umbraco.Infrastructure/CompatibilitySuppressions.xml @@ -1,5 +1,33 @@  + + CP0002 + M:Umbraco.Cms.Core.Models.Blocks.BlockGridLayoutItem.get_ForceLeft + lib/net7.0/Umbraco.Infrastructure.dll + lib/net7.0/Umbraco.Infrastructure.dll + true + + + CP0002 + M:Umbraco.Cms.Core.Models.Blocks.BlockGridLayoutItem.get_ForceRight + lib/net7.0/Umbraco.Infrastructure.dll + lib/net7.0/Umbraco.Infrastructure.dll + true + + + CP0002 + M:Umbraco.Cms.Core.Models.Blocks.BlockGridLayoutItem.set_ForceLeft(System.Boolean) + lib/net7.0/Umbraco.Infrastructure.dll + lib/net7.0/Umbraco.Infrastructure.dll + true + + + CP0002 + M:Umbraco.Cms.Core.Models.Blocks.BlockGridLayoutItem.set_ForceRight(System.Boolean) + lib/net7.0/Umbraco.Infrastructure.dll + lib/net7.0/Umbraco.Infrastructure.dll + true + CP0006 M:Umbraco.Cms.Core.Deploy.IGridCellValueConnector.GetValue(Umbraco.Cms.Core.Models.GridValue.GridControl,System.Collections.Generic.ICollection{Umbraco.Cms.Core.Deploy.ArtifactDependency},Umbraco.Cms.Core.Deploy.IContextCache) diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs index c8a3c710ec..768fe382f9 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs @@ -543,11 +543,11 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers }, { "disallowedUploadFiles", - string.Join(",", _contentSettings.DisallowedUploadFiles) + string.Join(",", _contentSettings.DisallowedUploadedFileExtensions) }, { "allowedUploadFiles", - string.Join(",", _contentSettings.AllowedUploadFiles) + string.Join(",", _contentSettings.AllowedUploadedFileExtensions) }, { "maxFileSize", diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json index 92b5121640..0c44f7f6cc 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": "^1.0.2", - "@umbraco/playwright-testhelpers": "^1.0.12", + "@umbraco/playwright-testhelpers": "^1.0.18", "camelize": "^1.0.0", "dotenv": "^16.0.2", "faker": "^4.1.0", @@ -138,9 +138,9 @@ } }, "node_modules/@umbraco/playwright-testhelpers": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-1.0.12.tgz", - "integrity": "sha512-O6P307ocTaBzaNE0QjFS100w94DalTx9nXUGczpwku3oAZZyoNaG//A7xh5zmlmgAGHqyKnAMQBoH/RX3t8C6g==", + "version": "1.0.18", + "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-1.0.18.tgz", + "integrity": "sha512-SLtZqs3IxtuBfKBp25ZgAxjrXTIoR/mWQ8qfEFTpsebdQcnZVXxPXbCe2CwPT3zdTpjdjdh/HOfn/ONjtpL8Cw==", "dependencies": { "@umbraco/json-models-builders": "^1.0.2", "camelize": "^1.0.0", @@ -1064,9 +1064,9 @@ } }, "@umbraco/playwright-testhelpers": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-1.0.12.tgz", - "integrity": "sha512-O6P307ocTaBzaNE0QjFS100w94DalTx9nXUGczpwku3oAZZyoNaG//A7xh5zmlmgAGHqyKnAMQBoH/RX3t8C6g==", + "version": "1.0.18", + "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-1.0.18.tgz", + "integrity": "sha512-SLtZqs3IxtuBfKBp25ZgAxjrXTIoR/mWQ8qfEFTpsebdQcnZVXxPXbCe2CwPT3zdTpjdjdh/HOfn/ONjtpL8Cw==", "requires": { "@umbraco/json-models-builders": "^1.0.2", "camelize": "^1.0.0", diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json index 997514c470..72a314a060 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@umbraco/json-models-builders": "^1.0.2", - "@umbraco/playwright-testhelpers": "^1.0.12", + "@umbraco/playwright-testhelpers": "^1.0.18", "camelize": "^1.0.0", "faker": "^4.1.0", "form-data": "^4.0.0", diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorContent.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorContent.spec.ts index ffc14e1a18..242f93d6ce 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorContent.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorContent.spec.ts @@ -14,7 +14,8 @@ test.describe('BlockListEditorContent', () => { // Won't work if I use the to alias for the elementAlias const elementAlias = 'testElement'; - test.beforeEach(async ({page, umbracoApi, umbracoUi}) => { + test.beforeEach(async ({page, umbracoApi, umbracoUi}, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); await umbracoApi.documentTypes.ensureNameNotExists(documentName); await umbracoApi.documentTypes.ensureNameNotExists(elementName); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorDataType.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorDataType.spec.ts index 70c4112c25..0c2c7d9a8f 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorDataType.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorDataType.spec.ts @@ -10,7 +10,8 @@ test.describe('BlockListEditorDataType', () => { const elementAlias = AliasHelper.toAlias(elementName); - test.beforeEach(async ({page, umbracoApi, umbracoUi}) => { + test.beforeEach(async ({page, umbracoApi, umbracoUi}, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); await umbracoApi.documentTypes.ensureNameNotExists(documentName); await umbracoApi.dataTypes.ensureNameNotExists(blockListName); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorDocument.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorDocument.spec.ts index e38236f3dd..55588a2848 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorDocument.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/BlockListEditor/blockListEditorDocument.spec.ts @@ -11,7 +11,8 @@ test.describe('BlockListEditorDocument', () => { const blockListAlias = AliasHelper.toAlias(blockListName); const elementAlias = AliasHelper.toAlias(elementName); - test.beforeEach(async ({page, umbracoApi, umbracoUi}) => { + test.beforeEach(async ({page, umbracoApi, umbracoUi}, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); await umbracoApi.documentTypes.ensureNameNotExists(documentName); await umbracoApi.dataTypes.ensureNameNotExists(blockListName); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Branding/logo.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Branding/logo.spec.ts index c9e28e69a6..eaa8f4a72a 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Branding/logo.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Branding/logo.spec.ts @@ -3,10 +3,8 @@ import { expect } from "@playwright/test"; test.describe('Umbraco Logo Information', () => { - test.beforeEach(async ({ page, umbracoApi }) => { - // TODO: REMOVE THIS WHEN SQLITE IS FIXED - // Wait so we don't bombard the API - await page.waitForTimeout(1000); + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/content.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/content.spec.ts index 603e86470a..eb1965a628 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/content.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/content.spec.ts @@ -10,7 +10,8 @@ import { test.describe('Content tests', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/recycleBin.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/recycleBin.spec.ts index 135a7ade07..f55ea4379b 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/recycleBin.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/recycleBin.spec.ts @@ -4,7 +4,8 @@ import {ContentBuilder, DocumentTypeBuilder} from "@umbraco/json-models-builders test.describe('Recycle bin', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/routing.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/routing.spec.ts index 0838b5acde..2a40de0c6f 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/routing.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/routing.spec.ts @@ -11,7 +11,8 @@ test.describe('Routing', () => { const grandChildNodeName = "Grandchild"; const rootDocTypeName = "Test document type"; - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); await umbracoApi.content.deleteAllContent(); await umbracoApi.documentTypes.ensureNameNotExists(rootDocTypeName); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataTypes/dataTypes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataTypes/dataTypes.spec.ts index ba6637c693..208f2b2708 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataTypes/dataTypes.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataTypes/dataTypes.spec.ts @@ -8,7 +8,8 @@ import { test.describe('DataTypes', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataTypes/textBoxVariation.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataTypes/textBoxVariation.spec.ts index 9222301db1..cbdd445e20 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataTypes/textBoxVariation.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataTypes/textBoxVariation.spec.ts @@ -4,7 +4,8 @@ import {ContentBuilder, DocumentTypeBuilder, DomainBuilder} from "@umbraco/json- test.describe('Vary by culture for TextBox', () => { - test.beforeEach(async ({page, umbracoApi, umbracoUi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/HelpPanel/systemInformation.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/HelpPanel/systemInformation.spec.ts index 76199001a6..fb46e6ee52 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/HelpPanel/systemInformation.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/HelpPanel/systemInformation.spec.ts @@ -5,7 +5,8 @@ test.describe('System Information', () => { const enCulture = "en-US"; const dkCulture = "da-DK"; - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); await umbracoApi.users.setCurrentLanguage(enCulture); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Languages/languages.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Languages/languages.spec.ts index 6e6c2bf4e0..d12ca73678 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Languages/languages.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Languages/languages.spec.ts @@ -3,7 +3,8 @@ import {expect} from "@playwright/test"; test.describe('Languages', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts index 3d3000b5b0..25eaa34ae5 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts @@ -1,7 +1,10 @@ -import { test, expect } from '@playwright/test'; +import {expect } from '@playwright/test'; +import {test} from "@umbraco/playwright-testhelpers"; + test.describe('Login', () => { - test.beforeEach(async ({ page }) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await page.goto(process.env.URL + '/umbraco'); }); test('Login with correct username and password', async ({page}) => { diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/mediaFiles.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/mediaFiles.spec.ts index a894801968..4805cc5af0 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/mediaFiles.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/mediaFiles.spec.ts @@ -3,7 +3,8 @@ import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; test.describe('media File Types', () => { - test.beforeEach(async ({page, umbracoApi, umbracoUi}) => { + test.beforeEach(async ({page, umbracoApi, umbracoUi}, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); await umbracoUi.goToSection(ConstantHelper.sections.media); await umbracoApi.media.deleteAllMedia(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/mediaSection.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/mediaSection.spec.ts index 2620e21a34..2e55aa82b0 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/mediaSection.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/mediaSection.spec.ts @@ -3,7 +3,8 @@ import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; test.describe('Media', () => { - test.beforeEach(async ({page, umbracoApi, umbracoUi}) => { + test.beforeEach(async ({page, umbracoApi, umbracoUi}, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); await umbracoUi.goToSection(ConstantHelper.sections.media); await umbracoApi.media.deleteAllMedia() 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 2e577e9548..e547036f05 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/memberGroups.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/memberGroups.spec.ts @@ -2,7 +2,8 @@ import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; test.describe('Packages', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); 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 0af21e38a4..506f879614 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/members.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/members.spec.ts @@ -2,7 +2,8 @@ import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; test.describe('Packages', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/ModelsBuilder/modelsbuilder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/ModelsBuilder/modelsbuilder.spec.ts index 998a738e2f..0215d617ee 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/ModelsBuilder/modelsbuilder.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/ModelsBuilder/modelsbuilder.spec.ts @@ -6,7 +6,8 @@ import { test.describe('Modelsbuilder tests', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Packages/packages.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Packages/packages.spec.ts index a6acdee170..07bd1812e8 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Packages/packages.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Packages/packages.spec.ts @@ -7,7 +7,8 @@ test.describe('Packages', () => { const packageName = "TestPackage"; const rootDocTypeName = "Test document type"; const nodeName = "1) Home"; - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/dataType.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/dataType.spec.ts index 70c12486a9..4f719deab9 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/dataType.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/dataType.spec.ts @@ -3,8 +3,9 @@ import {expect} from "@playwright/test"; import {LabelDataTypeBuilder} from "@umbraco/json-models-builders"; test.describe('Data Types', () => { - - test.beforeEach(async ({page, umbracoApi}) => { + + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/documentTypes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/documentTypes.spec.ts index 7ab96953d3..99f578dbd6 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/documentTypes.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/documentTypes.spec.ts @@ -3,7 +3,8 @@ import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; import {DocumentTypeBuilder} from "@umbraco/json-models-builders"; test.describe('Document types', () => { - test.beforeEach(async ({ page, umbracoApi }) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/languages.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/languages.spec.ts index 879c696f65..41b4f4d0a7 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/languages.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/languages.spec.ts @@ -2,7 +2,8 @@ import {test, ApiHelpers, UiHelpers, ConstantHelper} from '@umbraco/playwright-t import {expect} from "@playwright/test"; test.describe('Languages', () => { - test.beforeEach(async ({ page, umbracoApi }) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/macro.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/macro.spec.ts index c54907d315..11f99b3a95 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/macro.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/macro.spec.ts @@ -3,7 +3,8 @@ import {PartialViewMacroBuilder} from "@umbraco/json-models-builders"; test.describe('Macros', () => { - test.beforeEach(async ({ page, umbracoApi }) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/mediaTypes.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/mediaTypes.ts index 1db083cd13..e92f4fb624 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/mediaTypes.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/mediaTypes.ts @@ -3,7 +3,8 @@ import {expect} from "@playwright/test"; test.describe('Media types', () => { - test.beforeEach(async ({ page, umbracoApi }) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/memberTypes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/memberTypes.spec.ts index 661c4c842b..609116c112 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/memberTypes.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/memberTypes.spec.ts @@ -1,7 +1,8 @@ import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; test.describe('Member Types', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/partialViewMacroFiles.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/partialViewMacroFiles.spec.ts index 88939ab10f..15b9202e28 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/partialViewMacroFiles.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/partialViewMacroFiles.spec.ts @@ -4,7 +4,8 @@ import {PartialViewMacroBuilder} from "@umbraco/json-models-builders"; test.describe('Partial View Macro Files', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/partialViews.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/partialViews.spec.ts index c8dc16b51d..56fbe936a9 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/partialViews.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/partialViews.spec.ts @@ -4,7 +4,8 @@ import {PartialViewBuilder} from "@umbraco/json-models-builders"; test.describe('Partial Views', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/relationTypes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/relationTypes.spec.ts index 6ba20a619c..34b00c7fc3 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/relationTypes.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/relationTypes.spec.ts @@ -3,7 +3,8 @@ import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; test.describe('Relation Types', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/scripts.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/scripts.spec.ts index 5f8d93a6db..b6ca8a09ee 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/scripts.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/scripts.spec.ts @@ -3,7 +3,8 @@ import {expect} from "@playwright/test"; import {ScriptBuilder} from "@umbraco/json-models-builders"; test.describe('Scripts', () => { - test.beforeEach(async ({ page, umbracoApi }) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/stylesheets.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/stylesheets.spec.ts index 6c82a85165..9639de6553 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/stylesheets.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/stylesheets.spec.ts @@ -7,7 +7,8 @@ test.describe('Stylesheets', () => { const name = "TestStylesheet"; const fileName = name + ".css"; - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/templates.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/templates.spec.ts index e3d5c7c943..bef67819d6 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/templates.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/templates.spec.ts @@ -3,7 +3,8 @@ import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; import {TemplateBuilder} from "@umbraco/json-models-builders"; test.describe('Templates', () => { - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tabs/tabs.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tabs/tabs.spec.ts index e9b0e42c83..8ffeb6c685 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tabs/tabs.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tabs/tabs.spec.ts @@ -6,8 +6,9 @@ const tabsDocTypeName = 'Tabs Test Document'; const tabsDocTypeAlias = AliasHelper.toAlias(tabsDocTypeName); test.describe('Tabs', () => { - - test.beforeEach(async ({ umbracoApi, page }) => { + + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tour/tours.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tour/tours.spec.ts index e0512acbc2..560be634aa 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tour/tours.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tour/tours.spec.ts @@ -3,7 +3,8 @@ import {test} from '@umbraco/playwright-testhelpers'; test.describe('Tours', () => { const timeout = 60000; - test.beforeEach(async ({page, umbracoApi}) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); await resetTourData(umbracoApi); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Translation/translation.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Translation/translation.spec.ts index e3c3bc2ada..80e55daae9 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Translation/translation.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Translation/translation.spec.ts @@ -2,10 +2,8 @@ import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; test.describe('Translation', () => { - test.beforeEach(async ({page, umbracoApi}) => { - // TODO: REMOVE THIS WHEN SQLITE IS FIXED - // Wait so we don't bombard the API - await page.waitForTimeout(1000); + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/userGroups.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/userGroups.spec.ts index 86a94ec144..0edce122b5 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/userGroups.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/userGroups.spec.ts @@ -9,7 +9,8 @@ test.describe('User groups', () => { await page.locator('[data-element="sub-view-userGroups"]').click(); } - test.beforeEach(async ({ umbracoApi, page }) => { + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/users.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/users.spec.ts index 164f778e62..fa8829bd07 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/users.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/users.spec.ts @@ -22,8 +22,9 @@ test.describe('Users', () => { "userGroups": userGroups, "message": "" }; - - test.beforeEach(async ({ umbracoApi, page }) => { + + test.beforeEach(async ({ page, umbracoApi }, testInfo) => { + await umbracoApi.report.report(testInfo); await umbracoApi.login(); }); From 2288d98481071501e9994b4c4b8840cffe9eb9f6 Mon Sep 17 00:00:00 2001 From: Jan Skovgaard <1932158+BatJan@users.noreply.github.com> Date: Mon, 21 Nov 2022 16:52:51 +0100 Subject: [PATCH 049/114] Block Grid Editor: Replace "TODO" text in titles (#13433) --- src/Umbraco.Core/EmbeddedResources/Lang/en.xml | 2 ++ src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml | 2 ++ .../prevalue/umb-block-grid-configuration-area-entry.html | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml index c30e36f8db..f5e9f6971e 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml @@ -2825,6 +2825,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Sort mode End sort mode This Areas Alias must be unique compared to the other Areas of this Block. + Configure area + Delete area What are Content Templates? diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml index 79695de3e4..1ab2c5b010 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml @@ -2928,6 +2928,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Sort mode End sort mode This Areas Alias must be unique compared to the other Areas of this Block. + Configure area + Delete area What are Content Templates? diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-configuration-area-entry.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-configuration-area-entry.html index 524be4f4cd..b479890d75 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-configuration-area-entry.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-configuration-area-entry.html @@ -4,14 +4,14 @@
- -