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

Merge remote-tracking branch 'origin/release/14.1'

Browse Source
This commit is contained in:
Jacob Overgaard
2024-07-10 11:49:09 +02:00
parent 39b787243c 59ea7a2469
commit 8d16b0595b
2 changed files with 65 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,6 +141,70 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
'observeLayoutInitially',
);
this.#observeBlockData(unique);
if (this.#liveEditingMode) {
this.#establishLiveSync();
}
}
async create(contentElementTypeId: string) {
await this.#retrieveBlockEntries;
await this.#retrieveModalContext;
if (!this.#blockEntries) {
throw new Error('Block Entries not found');
return;
}
if (!this.#modalContext) {
throw new Error('Modal Context not found');
return;
}
// TODO: Missing some way to append more layout data... this could be part of modal data, (or context api?)
this.setIsNew(true);
const blockCreated = await this.#blockEntries.create(
contentElementTypeId,
{},
this.#modalContext.data as UmbBlockWorkspaceData,
);
if (!blockCreated) {
throw new Error('Block Entries could not create block');
}
// TODO: We should investigate if it makes sense to gather
if (!this.#liveEditingMode) {
this.#layout.setValue(blockCreated.layout as LayoutDataType);
this.content.setData(blockCreated.content);
if (blockCreated.settings) {
this.settings.setData(blockCreated.settings);
}
} else {
// Insert already, cause we are in live editing mode:
const blockInserted = await this.#blockEntries.insert(
blockCreated.layout,
blockCreated.content,
blockCreated.settings,
this.#modalContext.data as UmbBlockWorkspaceData,
);
if (!blockInserted) {
throw new Error('Block Entries could not insert block');
}
const unique = blockCreated.layout.contentUdi;
this.#observeBlockData(unique);
this.#establishLiveSync();
}
}
#observeBlockData(unique: string) {
if (!this.#blockEntries) {
throw new Error('Block Entries not found');
return;
}
this.observe(
this.#blockEntries.layoutOf(unique),
(layoutData) => {
@@ -194,56 +258,6 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
},
'observeLayout',
);
if (this.#liveEditingMode) {
this.#establishLiveSync();
}
}
async create(contentElementTypeId: string) {
await this.#retrieveBlockEntries;
await this.#retrieveModalContext;
if (!this.#blockEntries) {
throw new Error('Block Entries not found');
return;
}
if (!this.#modalContext) {
throw new Error('Modal Context not found');
return;
}
// TODO: Missing some way to append more layout data... this could be part of modal data, (or context api?)
this.setIsNew(true);
const blockCreated = await this.#blockEntries.create(
contentElementTypeId,
{},
this.#modalContext.data as UmbBlockWorkspaceData,
);
if (!blockCreated) {
throw new Error('Block Entries could not create block');
}
this.#layout.setValue(blockCreated.layout as LayoutDataType);
this.content.setData(blockCreated.content);
if (blockCreated.settings) {
this.settings.setData(blockCreated.settings);
}
if (this.#liveEditingMode) {
// Insert already, cause we are in live editing mode:
const blockInserted = await this.#blockEntries.insert(
blockCreated.layout,
blockCreated.content,
blockCreated.settings,
this.#modalContext.data as UmbBlockWorkspaceData,
);
if (!blockInserted) {
throw new Error('Block Entries could not insert block');
}
this.#establishLiveSync();
}
}
#establishLiveSync() {

1
src/Umbraco.Web.UI.Client/src/packages/ufm/components/ufm-render/ufm-render.element.ts
View File

@@ -97,6 +97,7 @@ export class UmbUfmRenderElement extends UmbLitElement {
css`
* {
max-width: 100%;
word-wrap: break-word;
}
pre {