diff --git a/global.json b/global.json index 33b94ff507..d46d21e50b 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "10.0.100-rc.2.25502.107", + "version": "10.0.100", "rollForward": "latestFeature", - "allowPrerelease": true + "allowPrerelease": false } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/RootMemberTypeTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/RootMemberTypeTreeController.cs index 2b4e89e175..1d8127f6aa 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/RootMemberTypeTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/RootMemberTypeTreeController.cs @@ -30,6 +30,7 @@ public class RootMemberTypeTreeController : MemberTypeTreeControllerBase public async Task>> Root( CancellationToken cancellationToken, int skip = 0, - int take = 100) + int take = 100, + bool foldersOnly = false) => await GetRoot(skip, take); } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/SiblingMemberTypeTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/SiblingMemberTypeTreeController.cs index 4ed8e9f949..bda2fd3e2c 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/SiblingMemberTypeTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/SiblingMemberTypeTreeController.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Api.Management.Services.Flags; @@ -23,6 +23,7 @@ public class SiblingMemberTypeTreeController : MemberTypeTreeControllerBase CancellationToken cancellationToken, Guid target, int before, - int after) + int after, + bool foldersOnly = false) => await GetSiblings(target, before, after); } diff --git a/src/Umbraco.Core/Configuration/Models/GlobalSettings.cs b/src/Umbraco.Core/Configuration/Models/GlobalSettings.cs index 8bd2e04dae..1b71e5677c 100644 --- a/src/Umbraco.Core/Configuration/Models/GlobalSettings.cs +++ b/src/Umbraco.Core/Configuration/Models/GlobalSettings.cs @@ -19,7 +19,7 @@ public class GlobalSettings internal const string StaticTimeOut = "00:20:00"; internal const string StaticDefaultUILanguage = "en-US"; internal const bool StaticHideTopLevelNodeFromPath = true; - internal const bool StaticUseHttps = false; + internal const bool StaticUseHttps = true; internal const int StaticVersionCheckPeriod = 7; internal const string StaticIconsPath = "umbraco/assets/icons"; internal const string StaticUmbracoCssPath = "~/css"; diff --git a/src/Umbraco.Core/Models/EntityContainer.cs b/src/Umbraco.Core/Models/EntityContainer.cs index 6033c6dfa9..b6770913a6 100644 --- a/src/Umbraco.Core/Models/EntityContainer.cs +++ b/src/Umbraco.Core/Models/EntityContainer.cs @@ -12,6 +12,7 @@ public sealed class EntityContainer : TreeEntityBase, IUmbracoEntity { Constants.ObjectTypes.DataType, Constants.ObjectTypes.DataTypeContainer }, { Constants.ObjectTypes.DocumentType, Constants.ObjectTypes.DocumentTypeContainer }, { Constants.ObjectTypes.MediaType, Constants.ObjectTypes.MediaTypeContainer }, + { Constants.ObjectTypes.MemberType, Constants.ObjectTypes.MemberTypeContainer }, { Constants.ObjectTypes.DocumentBlueprint, Constants.ObjectTypes.DocumentBlueprintContainer }, }; diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityContainerRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityContainerRepository.cs index 9a4927b39c..7941ff1668 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityContainerRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityContainerRepository.cs @@ -32,8 +32,11 @@ internal class EntityContainerRepository : EntityRepositoryBase - /// A no-op implementation of , as containers aren't supported for members. - /// - /// - /// Introduced to avoid inconsistencies with nullability of dependencies for type repositories for content, media and members. - /// - internal sealed class MemberTypeContainerRepository : IMemberTypeContainerRepository + public MemberTypeContainerRepository( + IScopeAccessor scopeAccessor, + AppCaches cache, + ILogger logger, + IRepositoryCacheVersionService repositoryCacheVersionService, + ICacheSyncService cacheSyncService) + : base( + scopeAccessor, + cache, + logger, + Constants.ObjectTypes.MemberTypeContainer, + repositoryCacheVersionService, + cacheSyncService) { - public void Delete(EntityContainer entity) - { - } - - public bool Exists(int id) => false; - - public EntityContainer? Get(Guid id) => null; - - public IEnumerable Get(string name, int level) => Enumerable.Empty(); - - public bool HasDuplicateName(Guid parentKey, string name) => false; - - public bool HasDuplicateName(int parentId, string name) => false; - - public EntityContainer? Get(int id) => null; - - public IEnumerable GetMany(params int[]? ids) => Enumerable.Empty(); - - public void Save(EntityContainer entity) - { - } } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor-properties.element.ts b/src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor-properties.element.ts index 90c6c59528..3c4d7a7919 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor-properties.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor-properties.element.ts @@ -207,24 +207,22 @@ export class UmbContentTypeDesignEditorPropertiesElement extends UmbLitElement { this._ownerContentTypeUnique = workspaceContext?.structure.getOwnerContentTypeUnique(); this.#createPropertyTypeWorkspaceRoutes(); - const varyByCulturePromise = - this.observe( - workspaceContext?.variesByCulture, - (variesByCulture) => { - this._ownerContentTypeVariesByCulture = variesByCulture; - }, - 'observeOwnerVariesByCulture', - )?.asPromise() ?? Promise.reject(); - const varyBySegmentPromise = - this.observe( - workspaceContext?.variesBySegment, - (variesBySegment) => { - this._ownerContentTypeVariesBySegment = variesBySegment; - }, - 'observeOwnerVariesBySegment', - )?.asPromise() ?? Promise.reject(); + const varyByCulturePromise = this.observe( + workspaceContext?.variesByCulture, + (variesByCulture) => { + this._ownerContentTypeVariesByCulture = variesByCulture; + }, + 'observeOwnerVariesByCulture', + )?.asPromise(); + const varyBySegmentPromise = this.observe( + workspaceContext?.variesBySegment, + (variesBySegment) => { + this._ownerContentTypeVariesBySegment = variesBySegment; + }, + 'observeOwnerVariesBySegment', + )?.asPromise(); - if (this.#initResolver) { + if (varyByCulturePromise && varyBySegmentPromise && this.#initResolver) { Promise.all([varyByCulturePromise, varyBySegmentPromise]) .then(() => { this.#initResolver?.();