Merge branch 'refs/heads/v14/dev' into release/14.0

Author: iOvergaard

build/azure-pipelines.yml

@@ -525,7 +525,10 @@ stages:
             workingDirectory: tests/Umbraco.Tests.AcceptanceTest
 
           # Test
-          - pwsh: npm run test --ignore-certificate-errors
+          - ${{ if eq(parameters.isNightly, true) }}:
+              pwsh: npm run test --ignore-certificate-errors
+            ${{ else }}:
+              pwsh: npm run smokeTest --ignore-certificate-errors           
             displayName: Run Playwright tests
             continueOnError: true
             workingDirectory: tests/Umbraco.Tests.AcceptanceTest
@@ -665,7 +668,10 @@ stages:
             workingDirectory: tests/Umbraco.Tests.AcceptanceTest
 
           # Test
-          - pwsh: npm run test --ignore-certificate-errors
+          - ${{ if eq(parameters.isNightly, true) }}:
+              pwsh: npm run test --ignore-certificate-errors
+            ${{ else }}:
+              pwsh: npm run smokeTest --ignore-certificate-errors
             displayName: Run Playwright tests
             continueOnError: true
             workingDirectory: tests/Umbraco.Tests.AcceptanceTest

build/nightly-build-trigger.yml

@@ -26,7 +26,7 @@ steps:
     useSameBranch: true
     waitForQueuedBuildsToFinish: false
     storeInEnvironmentVariable: false
-    templateParameters: 'sqlServerIntegrationTests: true, forceReleaseTestFilter: true, myGetDeploy: true, isNightly: true'
+    templateParameters: 'sqlServerIntegrationTests: true, sqlServerAcceptanceTests: true, forceReleaseTestFilter: true, myGetDeploy: true, isNightly: true'
     authenticationMethod: 'OAuth Token'
     enableBuildInQueueCondition: false
     dependentOnSuccessfulBuildCondition: false

src/Umbraco.Cms.Api.Management/Controllers/AuditLog/AuditLogControllerBase.cs

@@ -68,10 +68,6 @@ protected IActionResult ContentCollectionOperationStatusResult(ContentCollection
                 .WithTitle("Data type id does not belong to a collection")
                 .WithDetail("The specified data type does not represent a collection")
                 .Build()),
-            ContentCollectionOperationStatus.DataTypeNotContentCollection => new BadRequestObjectResult(problemDetailsBuilder
-                .WithTitle("Data type id does not represent the configured collection")
-                .WithDetail($"The specified data type is not the configured collection for the given {type} item")
-                .Build()),
             ContentCollectionOperationStatus.DataTypeNotContentProperty => new BadRequestObjectResult(problemDetailsBuilder
                 .WithTitle($"Data type id is not a {type} property")
                 .WithDetail($"The specified data type is not part of the {type} properties")

src/Umbraco.Cms.Api.Management/Controllers/AuditLog/ByKeyAuditLogController.cs

@@ -17,7 +17,7 @@ protected IActionResult ContentEditingOperationStatusResult(ContentEditingOperat
                 .WithDetail("A notification handler prevented the content operation.")
                 .Build()),
             ContentEditingOperationStatus.ContentTypeNotFound => NotFound(problemDetailsBuilder
-                .WithTitle("The requested content could not be found")
+                .WithTitle("The requested content type could not be found")
                 .Build()),
             ContentEditingOperationStatus.ContentTypeCultureVarianceMismatch => BadRequest(problemDetailsBuilder
                 .WithTitle("Content type culture variance mismatch")

src/Umbraco.Cms.Api.Management/Controllers/AuditLog/ByTypeAuditLogController.cs

@@ -23,7 +23,7 @@ public ItemDatatypeItemController(IDataTypeService dataTypeService, IUmbracoMapp
     [HttpGet]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(IEnumerable<DataTypeItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<ActionResult> Item(
+    public async Task<IActionResult> Item(
         CancellationToken cancellationToken,
         [FromQuery(Name = "id")] HashSet<Guid> ids)
     {

src/Umbraco.Cms.Api.Management/Controllers/AuditLog/CurrentUserAuditLogController.cs

@@ -26,7 +26,7 @@ public SearchDataTypeItemController(IEntitySearchService entitySearchService, ID
     [HttpGet("search")]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(PagedModel<DataTypeItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<ActionResult> Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100)
+    public async Task<IActionResult> Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100)
     {
         PagedModel<IEntitySlim> searchResult = _entitySearchService.Search(UmbracoObjectTypes.DataType, query, skip, take);
         if (searchResult.Items.Any() is false)