yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix originData parsing

Browse Source
This commit is contained in:
Niels Lyngsø
2024-08-28 14:05:39 +02:00
parent 8ac0f63a7a
commit b6ea281bf7
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-manager.context.ts
View File

@@ -167,6 +167,7 @@ export class UmbBlockGridManagerContext<
settings: UmbBlockDataType | undefined,
originData: UmbBlockGridWorkspaceOriginData,
) {
console.log('originData', originData);
this.setOneLayout(layoutEntry, originData);
this.insertBlockData(layoutEntry, content, settings, originData);

15
src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.context.ts
View File

@@ -9,11 +9,12 @@ import {
import { UmbClassState, UmbObjectState, UmbStringState } from '@umbraco-cms/backoffice/observable-api';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import type { ManifestWorkspace } from '@umbraco-cms/backoffice/extension-registry';
import { UMB_MODAL_CONTEXT } from '@umbraco-cms/backoffice/modal';
import { UMB_MODAL_CONTEXT, type UmbModalContext } from '@umbraco-cms/backoffice/modal';
import { decodeFilePath } from '@umbraco-cms/backoffice/utils';
import {
UMB_BLOCK_ENTRIES_CONTEXT,
UMB_BLOCK_MANAGER_CONTEXT,
type UmbBlockWorkspaceOriginData,
type UmbBlockWorkspaceData,
} from '@umbraco-cms/backoffice/block';
import { UMB_PROPERTY_CONTEXT } from '@umbraco-cms/backoffice/property';
@@ -32,7 +33,7 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
#retrieveBlockManager;
#blockEntries?: typeof UMB_BLOCK_ENTRIES_CONTEXT.TYPE;
#retrieveBlockEntries;
#modalContext?: typeof UMB_MODAL_CONTEXT.TYPE;
#modalContext?: UmbModalContext<UmbBlockWorkspaceData>;
#retrieveModalContext;
#entityType: string;
@@ -68,7 +69,7 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
this.addValidationContext(this.settings.validation);
this.#retrieveModalContext = this.consumeContext(UMB_MODAL_CONTEXT, (context) => {
this.#modalContext = context;
this.#modalContext = context as any;
context.onSubmit().catch(this.#modalRejected);
}).asPromise();
@@ -180,7 +181,7 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
const blockCreated = await this.#blockEntries.create(
contentElementTypeId,
{},
this.#modalContext.data as UmbBlockWorkspaceData,
this.#modalContext.data.originData as UmbBlockWorkspaceOriginData,
);
if (!blockCreated) {
throw new Error('Block Entries could not create block');
@@ -200,7 +201,7 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
blockCreated.layout,
blockCreated.content,
blockCreated.settings,
this.#modalContext.data as UmbBlockWorkspaceData,
this.#modalContext.data.originData as UmbBlockWorkspaceOriginData,
);
if (!blockInserted) {
throw new Error('Block Entries could not insert block');
@@ -360,7 +361,7 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
layoutData,
contentData,
settingsData,
this.#modalContext.data as UmbBlockWorkspaceData,
this.#modalContext.data.originData as UmbBlockWorkspaceOriginData,
);
if (!blockInserted) {
throw new Error('Block Entries could not insert block');
@@ -368,7 +369,7 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
} else {
// Update data:
this.#blockManager.setOneLayout(layoutData, this.#modalContext.data as UmbBlockWorkspaceData);
this.#blockManager.setOneLayout(layoutData, this.#modalContext.data.originData as UmbBlockWorkspaceOriginData);
if (contentData) {
this.#blockManager.setOneContent(contentData);
}