From a3cf59d318306f7e034911bf011cd9c049c7803c Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Tue, 10 Jun 2025 12:38:04 +0200 Subject: [PATCH] Fixes broken content creation based on blueprints Fixes preset not overriding values in the various createScaffold methods. --- .../repository/detail/document-detail.server.data-source.ts | 2 +- .../repository/detail/media-detail.server.data-source.ts | 2 +- .../repository/detail/member-detail.server.data-source.ts | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts index cfe9e123f488..9adeb01d11d2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts @@ -56,7 +56,7 @@ export class UmbDocumentServerDataSource variants: [], }; - const scaffold = umbDeepMerge(defaultData, preset) as UmbDocumentDetailModel; + const scaffold = umbDeepMerge(preset, defaultData); return { data: scaffold }; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts index fbee9cb0e8e8..614e79d94e10 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts @@ -57,7 +57,7 @@ export class UmbMediaServerDataSource extends UmbControllerBase implements UmbDe ], }; - const scaffold = umbDeepMerge(defaultData, preset) as UmbMediaDetailModel; + const scaffold = umbDeepMerge(preset, defaultData); return { data: scaffold }; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/repository/detail/member-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/repository/detail/member-detail.server.data-source.ts index 881c450f5802..adda4eb2aa8c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/repository/detail/member-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/repository/detail/member-detail.server.data-source.ts @@ -6,7 +6,7 @@ import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; import type { CreateMemberRequestModel, UpdateMemberRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { MemberService } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecute } from '@umbraco-cms/backoffice/resources'; -import { umbDeepMerge } from '@umbraco-cms/backoffice/utils'; +import {umbDeepMerge, type UmbDeepPartialObject} from '@umbraco-cms/backoffice/utils'; import { UmbMemberTypeDetailServerDataSource } from '@umbraco-cms/backoffice/member-type'; import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; @@ -22,7 +22,7 @@ export class UmbMemberServerDataSource extends UmbControllerBase implements UmbD * @returns { CreateMemberRequestModel } * @memberof UmbMemberServerDataSource */ - async createScaffold(preset: Partial = {}) { + async createScaffold(preset: UmbDeepPartialObject = {}) { let memberTypeIcon = ''; const memberTypeUnique = preset.memberType?.unique; @@ -64,7 +64,7 @@ export class UmbMemberServerDataSource extends UmbControllerBase implements UmbD ], }; - const scaffold = umbDeepMerge(defaultData, preset) as UmbMemberDetailModel; + const scaffold = umbDeepMerge(preset, defaultData); return { data: scaffold }; }