Merge branch 'v15/dev' into contrib

umbraco · Nov 12, 2024 · 178c5dc · 178c5dc
2 parents 0c668ee + f916229
commit 178c5dc
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 10 deletions.
diff --git a/...aco.Cms.Api.Management/Controllers/MemberType/AvailableCompositionMemberTypeController.cs b/...aco.Cms.Api.Management/Controllers/MemberType/AvailableCompositionMemberTypeController.cs
@@ -1,14 +1,17 @@
 using Asp.Versioning;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.Factories;
 using Umbraco.Cms.Api.Management.ViewModels.MemberType;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services.ContentTypeEditing;
+using Umbraco.Cms.Web.Common.Authorization;
 
 namespace Umbraco.Cms.Api.Management.Controllers.MemberType;
 
 [ApiVersion("1.0")]
+[Authorize(Policy = AuthorizationPolicies.TreeAccessMemberTypes)]
 public class AvailableCompositionMemberTypeController : MemberTypeControllerBase
 {
     private readonly IMemberTypeEditingService _memberTypeEditingService;

diff --git a/...aco.Cms.Api.Management/Controllers/MemberType/CompositionReferenceMemberTypeController.cs b/...aco.Cms.Api.Management/Controllers/MemberType/CompositionReferenceMemberTypeController.cs
@@ -1,15 +1,18 @@
 using Asp.Versioning;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.ViewModels.MemberType;
 using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Services.OperationStatus;
+using Umbraco.Cms.Web.Common.Authorization;
 
 namespace Umbraco.Cms.Api.Management.Controllers.MemberType;
 
 [ApiVersion("1.0")]
+[Authorize(Policy = AuthorizationPolicies.TreeAccessMemberTypes)]
 public class CompositionReferenceMemberTypeController : MemberTypeControllerBase
 {
     private readonly IMemberTypeService _memberTypeService;

diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/ConfigurationMemberTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/ConfigurationMemberTypeController.cs
@@ -9,6 +9,7 @@
 namespace Umbraco.Cms.Api.Management.Controllers.MemberType;
 
 [ApiVersion("1.0")]
+[Authorize(Policy = AuthorizationPolicies.TreeAccessMemberTypes)]
 public class ConfigurationMemberTypeController : MemberTypeControllerBase
 {
     private readonly IConfigurationPresentationFactory _configurationPresentationFactory;

diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/CopyMemberTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/CopyMemberTypeController.cs
@@ -1,14 +1,17 @@
 using Asp.Versioning;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Services.OperationStatus;
+using Umbraco.Cms.Web.Common.Authorization;
 
 namespace Umbraco.Cms.Api.Management.Controllers.MemberType;
 
 [ApiVersion("1.0")]
+[Authorize(Policy = AuthorizationPolicies.TreeAccessMemberTypes)]
 public class CopyMemberTypeController : MemberTypeControllerBase
 {
     private readonly IMemberTypeService _memberTypeService;

diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/CreateMemberTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/CreateMemberTypeController.cs
@@ -1,4 +1,5 @@
 using Asp.Versioning;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.Factories;
@@ -9,10 +10,12 @@
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services.ContentTypeEditing;
 using Umbraco.Cms.Core.Services.OperationStatus;
+using Umbraco.Cms.Web.Common.Authorization;
 
 namespace Umbraco.Cms.Api.Management.Controllers.MemberType;
 
 [ApiVersion("1.0")]
+[Authorize(Policy = AuthorizationPolicies.TreeAccessMemberTypes)]
 public class CreateMemberTypeController : MemberTypeControllerBase
 {
     private readonly IMemberTypeEditingPresentationFactory _memberTypeEditingPresentationFactory;

diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/DeleteMemberTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/DeleteMemberTypeController.cs
@@ -1,13 +1,16 @@
 using Asp.Versioning;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Services.OperationStatus;
+using Umbraco.Cms.Web.Common.Authorization;
 
 namespace Umbraco.Cms.Api.Management.Controllers.MemberType;
 
 [ApiVersion("1.0")]
+[Authorize(Policy = AuthorizationPolicies.TreeAccessMemberTypes)]
 public class DeleteMemberTypeController : MemberTypeControllerBase
 {
     private readonly IMemberTypeService _memberTypeService;

diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/MemberTypeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/MemberTypeControllerBase.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Cms.Api.Management.Controllers.MemberType;
 
 [VersionedApiBackOfficeRoute(Constants.UdiEntityType.MemberType)]
 [ApiExplorerSettings(GroupName = "Member Type")]
-[Authorize(Policy = AuthorizationPolicies.TreeAccessMemberTypes)]
+[Authorize(Policy = AuthorizationPolicies.TreeAccessMembersOrMemberTypes)]
 public abstract class MemberTypeControllerBase : ManagementApiControllerBase
 {
     protected IActionResult OperationStatusResult(ContentTypeOperationStatus status)

diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/MemberTypeTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/MemberTypeTreeControllerBase.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Cms.Api.Management.Controllers.MemberType.Tree;
 
 [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.MemberType}")]
 [ApiExplorerSettings(GroupName = "Member Type")]
-[Authorize(Policy = AuthorizationPolicies.TreeAccessMemberTypes)]
+[Authorize(Policy = AuthorizationPolicies.TreeAccessMembersOrMemberTypes)]
 public class MemberTypeTreeControllerBase : NamedEntityTreeControllerBase<MemberTypeTreeItemResponseModel>
 {
     private readonly IMemberTypeService _memberTypeService;

diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/UpdateMemberTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/UpdateMemberTypeController.cs
@@ -1,4 +1,5 @@
 using Asp.Versioning;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.Factories;
@@ -10,10 +11,12 @@
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Services.ContentTypeEditing;
 using Umbraco.Cms.Core.Services.OperationStatus;
+using Umbraco.Cms.Web.Common.Authorization;
 
 namespace Umbraco.Cms.Api.Management.Controllers.MemberType;
 
 [ApiVersion("1.0")]
+[Authorize(Policy = AuthorizationPolicies.TreeAccessMemberTypes)]
 public class UpdateMemberTypeController : MemberTypeControllerBase
 {
     private readonly IMemberTypeEditingPresentationFactory _memberTypeEditingPresentationFactory;

diff --git a/src/Umbraco.Cms.Api.Management/DependencyInjection/BackOfficeAuthPolicyBuilderExtensions.cs b/src/Umbraco.Cms.Api.Management/DependencyInjection/BackOfficeAuthPolicyBuilderExtensions.cs
@@ -87,6 +87,7 @@ void AddAllowedApplicationsPolicy(string policyName, params string[] allowedClai
         AddAllowedApplicationsPolicy(AuthorizationPolicies.TreeAccessMediaOrMediaTypes, Constants.Applications.Media, Constants.Applications.Settings);
         AddAllowedApplicationsPolicy(AuthorizationPolicies.TreeAccessMemberGroups, Constants.Applications.Members);
         AddAllowedApplicationsPolicy(AuthorizationPolicies.TreeAccessMemberTypes, Constants.Applications.Settings);
+        AddAllowedApplicationsPolicy(AuthorizationPolicies.TreeAccessMembersOrMemberTypes, Constants.Applications.Settings, Constants.Applications.Members);
         AddAllowedApplicationsPolicy(AuthorizationPolicies.TreeAccessPartialViews, Constants.Applications.Settings);
         AddAllowedApplicationsPolicy(AuthorizationPolicies.TreeAccessRelationTypes, Constants.Applications.Settings);
         AddAllowedApplicationsPolicy(AuthorizationPolicies.TreeAccessScripts, Constants.Applications.Settings);

diff --git a/src/Umbraco.Web.Common/Authorization/AuthorizationPolicies.cs b/src/Umbraco.Web.Common/Authorization/AuthorizationPolicies.cs
@@ -54,6 +54,7 @@ public static class AuthorizationPolicies
     public const string TreeAccessDictionaryOrTemplates = nameof(TreeAccessDictionaryOrTemplates);
     public const string TreeAccessDocumentOrMediaOrContentTypes = nameof(TreeAccessDocumentOrMediaOrContentTypes);
     public const string TreeAccessStylesheetsOrDocumentOrMediaOrMember = nameof(TreeAccessStylesheetsOrDocumentOrMediaOrMember);
+    public const string TreeAccessMembersOrMemberTypes = nameof(TreeAccessMembersOrMemberTypes);
 
     // other
     public const string DictionaryPermissionByResource = nameof(DictionaryPermissionByResource);

diff --git a/...ages/core/content-type/workspace/views/design/content-type-design-editor-group.element.ts b/...ages/core/content-type/workspace/views/design/content-type-design-editor-group.element.ts
@@ -172,7 +172,8 @@ export class UmbContentTypeWorkspaceViewEditGroupElement extends UmbLitElement {
 						?disabled=${!this._hasOwnerContainer}
 						@blur=${this.#blurGroup}
 						@change=${this.#renameGroup}
-						${this._group!.name === '' ? umbFocus() : nothing}></uui-input>
+						${this._group!.name === '' ? umbFocus() : nothing}
+						auto-width></uui-input>
 				</div>
 			</div>
 			<div slot="header-actions">
@@ -208,10 +209,10 @@ export class UmbContentTypeWorkspaceViewEditGroupElement extends UmbLitElement {
 						<uui-input
 							type="number"
 							label=${this.localize.term('sort_sortOrder')}
-							.value=${this.group!.sortOrder ?? 0}
+							.value=${this.group!.sortOrder.toString()}
 							?disabled=${!this._hasOwnerContainer}
 							@change=${(e: UUIInputEvent) =>
-								this._singleValueUpdate('sortOrder', parseInt(e.target.value as string) || 0)}></uui-input>
+								this._singleValueUpdate('sortOrder', parseInt(e.target.value as string) ?? 0)}></uui-input>
 					`,
 				)}
 			</div>
@@ -245,7 +246,7 @@ export class UmbContentTypeWorkspaceViewEditGroupElement extends UmbLitElement {
 
 			#group-name {
 				--uui-input-border-color: transparent;
-				width: 100%;
+				min-width: 200px;
 			}
 
 			uui-input[type='number'] {

diff --git a/...s/core/content-type/workspace/views/design/content-type-design-editor-property.element.ts b/...s/core/content-type/workspace/views/design/content-type-design-editor-property.element.ts
@@ -235,7 +235,8 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
 							.value=${this.property.description}
 							@input=${(e: CustomEvent) => {
 								if (e.target) this.#singleValueUpdate('description', (e.target as HTMLInputElement).value);
-							}}></uui-textarea>
+							}}
+							auto-height></uui-textarea>
 					</p>
 				</div>
 				<uui-button

diff --git a/...Web.UI.Client/src/packages/core/menu/section-sidebar-menu/section-sidebar-menu.element.ts b/...Web.UI.Client/src/packages/core/menu/section-sidebar-menu/section-sidebar-menu.element.ts
@@ -27,6 +27,10 @@ export class UmbSectionSidebarMenuElement<
 	manifest?: ManifestType;
 
 	renderHeader() {
+		/*
+		Notice we are not using the UUI-H3 here, we would need to wrap it into uui-text for this to take action,
+		but it does look odd so lets return to this later. I have made a few corrections especially for this component. [NL]
+		*/
 		return html`<h3>${this.localize.string(this.manifest?.meta?.label ?? '')}</h3>`;
 	}
 
@@ -44,7 +48,9 @@ export class UmbSectionSidebarMenuElement<
 		UmbTextStyles,
 		css`
 			h3 {
+				margin: var(--uui-size-5) 0;
 				padding: var(--uui-size-4) var(--uui-size-8);
+				font-size: 15px;
 			}
 		`,
 	];

diff --git a/...s/core/property-type/workspace/views/settings/property-workspace-view-settings.element.ts b/...s/core/property-type/workspace/views/settings/property-workspace-view-settings.element.ts
@@ -247,7 +247,8 @@ export class UmbPropertyTypeWorkspaceViewSettingsElement extends UmbLitElement i
 						@input=${this.#onDescriptionChange}
 						label=${this.localize.term('placeholders_enterDescription')}
 						placeholder=${this.localize.term('placeholders_enterDescription')}
-						.value=${this._data?.description}></uui-textarea>
+						.value=${this._data?.description}
+						auto-height></uui-textarea>
 				</div>
 				<umb-form-validation-message>
 					<umb-data-type-flow-input

diff --git a/...es/documents/documents/workspace/views/info/document-workspace-view-info-links.element.ts b/...es/documents/documents/workspace/views/info/document-workspace-view-info-links.element.ts
@@ -48,8 +48,7 @@ export class UmbDocumentWorkspaceViewInfoLinksElement extends UmbLitElement {
 
 	async #requestUrls() {
 		if (this._isNew) return;
-
-		if (!this._unique) throw new Error('Document unique is required');
+		if (!this._unique) return;
 
 		const { data } = await this.#documentUrlRepository.requestItems([this._unique]);