Merge branch 'v15/dev' into v15/bugfix/18000

Author: nielslyngsoe

src/Umbraco.Cms.Api.Management/Controllers/Document/CreateDocumentControllerBase.cs

@@ -18,21 +18,18 @@ protected CreateDocumentControllerBase(IAuthorizationService authorizationServic
 
     protected async Task<IActionResult> HandleRequest(CreateDocumentRequestModel requestModel, Func<Task<IActionResult>> authorizedHandler)
     {
-        // TODO This have temporarily been uncommented, to support the client sends values from all cultures, even when the user do not have access to the languages.
-        // The values are ignored in the ContentEditingService
+        // We intentionally don't pass in cultures here.
+        // This is to support the client sending values for all cultures even if the user doesn't have access to the language.
+        // Values for unauthorized languages are later ignored in the ContentEditingService.
+        AuthorizationResult authorizationResult = await _authorizationService.AuthorizeResourceAsync(
+            User,
+            ContentPermissionResource.WithKeys(ActionNew.ActionLetter, requestModel.Parent?.Id),
+            AuthorizationPolicies.ContentPermissionByResource);
 
-        // IEnumerable<string> cultures = requestModel.Variants
-        //     .Where(v => v.Culture is not null)
-        //     .Select(v => v.Culture!);
-        // AuthorizationResult authorizationResult = await _authorizationService.AuthorizeResourceAsync(
-        //     User,
-        //     ContentPermissionResource.WithKeys(ActionNew.ActionLetter, requestModel.Parent?.Id, cultures),
-        //     AuthorizationPolicies.ContentPermissionByResource);
-        //
-        // if (!authorizationResult.Succeeded)
-        // {
-        //     return Forbidden();
-        // }
+        if (authorizationResult.Succeeded is false)
+        {
+            return Forbidden();
+        }
 
         return await authorizedHandler();
     }

src/Umbraco.Web.UI.Client/src/packages/property-editors/toggle/Umbraco.TrueFalse.ts

@@ -2,7 +2,7 @@ import type { ManifestPropertyEditorSchema } from '@umbraco-cms/backoffice/prope
 
 export const manifest: ManifestPropertyEditorSchema = {
 	type: 'propertyEditorSchema',
-	name: 'Date/Time',
+	name: 'True/False',
 	alias: 'Umbraco.TrueFalse',
 	meta: {
 		defaultPropertyEditorUiAlias: 'Umb.PropertyEditorUi.Toggle',

tests/Umbraco.Tests.AcceptanceTest/package-lock.json

@@ -13,15 +13,15 @@
     "smokeTestSqlite": "npx playwright test DefaultConfig --grep \"@smoke\" --grep-invert \"Users\""
   },
   "devDependencies": {
-    "@playwright/test": "^1.43",
+    "@playwright/test": "^1.50",
     "@types/node": "^20.9.0",
     "prompt": "^1.2.0",
     "tslib": "^2.4.0",
     "typescript": "^4.8.3"
   },
   "dependencies": {
-    "@umbraco/json-models-builders": "^2.0.26",
-    "@umbraco/playwright-testhelpers": "^15.0.7",
+    "@umbraco/json-models-builders": "^2.0.27",
+    "@umbraco/playwright-testhelpers": "^15.0.13",
     "camelize": "^1.0.0",
     "dotenv": "^16.3.1",
     "node-fetch": "^2.6.7"

tests/Umbraco.Tests.AcceptanceTest/package.json

@@ -19,7 +19,7 @@ test.describe('User Tests', () => {
 
   test('can create a user', async ({umbracoApi}) => {
     // Act
-    userId = await umbracoApi.user.createDefaultUser(userName, userEmail, userGroupId);
+    userId = await umbracoApi.user.createDefaultUser(userName, userEmail, [userGroupId]);
 
     // Assert
     expect(await umbracoApi.user.doesExist(userId)).toBeTruthy();
@@ -28,7 +28,7 @@ test.describe('User Tests', () => {
   test('can update a user', async ({umbracoApi}) => {
     // Arrange
     const anotherUserGroup = await umbracoApi.userGroup.getByName("Translators");
-    userId = await umbracoApi.user.createDefaultUser(userName, userEmail, userGroupId);
+    userId = await umbracoApi.user.createDefaultUser(userName, userEmail, [userGroupId]);
     const userData = await umbracoApi.user.get(userId);
     const newUserGroupData = [
       userGroupId,
@@ -48,7 +48,7 @@ test.describe('User Tests', () => {
 
   test('can delete a user', async ({umbracoApi}) => {
     // Arrange
-    userId = await umbracoApi.user.createDefaultUser(userName, userEmail, userGroupId);
+    userId = await umbracoApi.user.createDefaultUser(userName, userEmail, [userGroupId]);
     expect(await umbracoApi.user.doesExist(userId)).toBeTruthy();
 
     // Act

tests/Umbraco.Tests.AcceptanceTest/tests/ApiTesting/User/User.spec.ts

@@ -33,8 +33,6 @@ test('can create child node', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) =
   await umbracoUi.content.clickActionsMenuForContent(contentName);
   await umbracoUi.content.clickCreateButton();
   await umbracoUi.content.chooseDocumentType(childDocumentTypeName);
-  // This wait is needed
-  await umbracoUi.waitForTimeout(500);
   await umbracoUi.content.enterContentName(childContentName);
   await umbracoUi.content.clickSaveButton();
 
@@ -74,7 +72,6 @@ test('can create child node in child node', async ({umbracoApi, umbracoUi}) => {
   await umbracoUi.content.clickCreateButton();
   await umbracoUi.content.chooseDocumentType(childOfChildDocumentTypeName);
   // This wait is needed
-  await umbracoUi.waitForTimeout(500);
   await umbracoUi.content.enterContentName(childOfChildContentName);
   await umbracoUi.content.clickSaveButton();
 

tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ChildrenContent.spec.ts

@@ -34,7 +34,6 @@ test('can see correct information when published', async ({umbracoApi, umbracoUi
 
   // Assert
   await umbracoUi.content.isSuccessNotificationVisible();
-  await umbracoUi.waitForTimeout(2000);
   const contentData = await umbracoApi.document.getByName(contentName);
   await umbracoUi.content.doesIdHaveText(contentData.id);
   const expectedCreatedDate = new Date(contentData.variants[0].createDate).toLocaleString("en-US", {
@@ -134,8 +133,6 @@ test('cannot change to a template that is not allowed in the document type', asy
   await umbracoUi.content.clickEditTemplateByName(firstTemplateName);
 
   // Assert
-  // This wait is needed to make sure the template name is visible when the modal is opened
-  await umbracoUi.waitForTimeout(1000);
   await umbracoUi.content.isTemplateNameDisabled(secondTemplateName);
 
   // Clean

tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentInfoTab.spec.ts

@@ -11,7 +11,7 @@ test.beforeEach(async ({umbracoApi, umbracoUi}) => {
 });
 
 test.afterEach(async ({umbracoApi}) => {
-  await umbracoApi.document.ensureNameNotExists(contentName); 
+  await umbracoApi.document.ensureNameNotExists(contentName);
   await umbracoApi.documentType.ensureNameNotExists(documentTypeName);
 });
 
@@ -29,7 +29,7 @@ test('can create content with allowed child node enabled', async ({umbracoApi, u
   await umbracoUi.content.chooseDocumentType(documentTypeName);
   await umbracoUi.content.enterContentName(contentName);
   await umbracoUi.content.clickSaveButton();
-  
+
   // Assert
   await umbracoUi.content.isSuccessNotificationVisible();
   expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy();
@@ -71,8 +71,6 @@ test('can create multiple child nodes with different document types', async ({um
   await umbracoUi.content.clickActionsMenuForContent(contentName);
   await umbracoUi.content.clickCreateButton();
   await umbracoUi.content.chooseDocumentType(secondChildDocumentTypeName);
-  // This wait is needed
-  await umbracoUi.waitForTimeout(500);
   await umbracoUi.content.enterContentName(secondChildContentName);
   await umbracoUi.content.clickSaveButton();
 
@@ -95,4 +93,4 @@ test('can create multiple child nodes with different document types', async ({um
   await umbracoApi.document.ensureNameNotExists(secondChildContentName);
   await umbracoApi.documentType.ensureNameNotExists(firstChildDocumentTypeName);
   await umbracoApi.documentType.ensureNameNotExists(secondChildDocumentTypeName);
-});
+});

tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowedChildNodes.spec.ts

@@ -53,8 +53,6 @@ test('can create child content in a collection', async ({umbracoApi, umbracoUi})
   await umbracoUi.content.clickActionsMenuForContent(contentName);
   await umbracoUi.content.clickCreateButton();
   await umbracoUi.content.chooseDocumentType(childDocumentTypeName);
-  // This wait is needed
-  await umbracoUi.waitForTimeout(500);
   await umbracoUi.content.enterContentName(firstChildContentName);
   await umbracoUi.content.clickSaveButton();
 
@@ -63,11 +61,9 @@ test('can create child content in a collection', async ({umbracoApi, umbracoUi})
   expect(childData.length).toBe(expectedNames.length);
   expect(childData[0].variants[0].name).toBe(firstChildContentName);
   // verify that the child content displays in collection list after reloading tree
-  await umbracoUi.waitForTimeout(1000);
   await umbracoUi.content.clickActionsMenuForContent(contentName);
   await umbracoUi.content.clickReloadButton();
   await umbracoUi.content.goToContentWithName(contentName);
-  await umbracoUi.waitForTimeout(500);
   await umbracoUi.content.doesDocumentTableColumnNameValuesMatch(expectedNames);
 
   // Clean
@@ -89,8 +85,6 @@ test('can create multiple child nodes in a collection', async ({umbracoApi, umbr
   await umbracoUi.content.clickActionsMenuForContent(contentName);
   await umbracoUi.content.clickCreateButton();
   await umbracoUi.content.chooseDocumentType(childDocumentTypeName);
-  // This wait is needed
-  await umbracoUi.waitForTimeout(500);
   await umbracoUi.content.enterContentName(secondChildContentName);
   await umbracoUi.content.clickSaveButton();
 
@@ -100,11 +94,9 @@ test('can create multiple child nodes in a collection', async ({umbracoApi, umbr
   expect(childData[0].variants[0].name).toBe(firstChildContentName);
   expect(childData[1].variants[0].name).toBe(secondChildContentName);
   // verify that the child content displays in collection list after reloading tree
-  await umbracoUi.waitForTimeout(1000);
   await umbracoUi.content.clickActionsMenuForContent(contentName);
   await umbracoUi.content.clickReloadButton();
   await umbracoUi.content.goToContentWithName(contentName);
-  await umbracoUi.waitForTimeout(500);
   await umbracoUi.content.doesDocumentTableColumnNameValuesMatch(expectedNames);
 
   // Clean

tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithCollections.spec.ts

@@ -75,8 +75,10 @@ test('can publish content with the image cropper data type', {tag: '@smoke'}, as
 test('can create content with the custom image cropper data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => {
   // Arrange
   const customDataTypeName = 'CustomImageCropper';
-  const cropValue = ['TestCropLabel', 100, 50];
-  const customDataTypeId = await umbracoApi.dataType.createImageCropperDataTypeWithOneCrop(customDataTypeName, cropValue[0], cropValue[1], cropValue[2]);
+  const cropAlias = 'TestCropLabel';
+  const cropWidth = 100;
+  const cropHeight = 50;
+  const customDataTypeId = await umbracoApi.dataType.createImageCropperDataTypeWithOneCrop(customDataTypeName, AliasHelper.toAlias(cropAlias), cropWidth, cropHeight);
   const documentTypeId = await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, customDataTypeName, customDataTypeId);
   await umbracoApi.document.createDefaultDocument(contentName, documentTypeId);
   await umbracoUi.content.goToSection(ConstantHelper.sections.content);
@@ -93,9 +95,9 @@ test('can create content with the custom image cropper data type', {tag: '@smoke
   expect(contentData.values[0].alias).toEqual(AliasHelper.toAlias(customDataTypeName));
   expect(contentData.values[0].value.src).toContain(AliasHelper.toAlias(imageFileName));
   expect(contentData.values[0].value.focalPoint).toEqual(defaultFocalPoint);
-  expect(contentData.values[0].value.crops[0].alias).toEqual(AliasHelper.toAlias(cropValue[0]));
-  expect(contentData.values[0].value.crops[0].width).toEqual(cropValue[1]);
-  expect(contentData.values[0].value.crops[0].height).toEqual(cropValue[2]);
+  expect(contentData.values[0].value.crops[0].alias).toEqual(AliasHelper.toAlias(cropAlias));
+  expect(contentData.values[0].value.crops[0].width).toEqual(cropWidth);
+  expect(contentData.values[0].value.crops[0].height).toEqual(cropHeight);
 
   // Clean
   await umbracoApi.dataType.ensureNameNotExists(customDataTypeName);