Skip to content

15.1/hotfix/block editors discard changes on document load #17774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nielslyngsoe merged 4 commits into from
Dec 11, 2024
Merged

15.1/hotfix/block editors discard changes on document load #17774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d514454
prevent the block list editor from setting an empty value on startup
madsrasmussen Dec 11, 2024
8ccc394
prevent block grid from setting and initial empty block object value
madsrasmussen Dec 11, 2024
ffd1d47
fix import
nielslyngsoe Dec 11, 2024
5cffe11
Merge branch 'release/15.1' into 15.1/hotfix/block-editors-discard-ch…
nielslyngsoe Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...rty-editors/block-grid-areas-config/property-editor-ui-block-grid-areas-config.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
import { incrementString } from '@umbraco-cms/backoffice/utils';

import '../../components/block-grid-area-config-entry/index.js';
@customElement('umb-property-editor-ui-block-grid-areas-config')
export class UmbPropertyEditorUIBlockGridAreasConfigElement
extends UmbLitElement
Expand Down
43 changes: 29 additions & 14 deletions ...ck/block-grid/property-editors/block-grid-editor/property-editor-ui-block-grid.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,9 @@ export class UmbPropertyEditorUIBlockGridElement
#settingsDataPathTranslator?: UmbBlockElementDataValidationPathTranslator;
#managerContext = new UmbBlockGridManagerContext(this);
//
private _value: UmbBlockGridValueModel = {
layout: {},
contentData: [],
settingsData: [],
expose: [],
};
private _value: UmbBlockGridValueModel | undefined = undefined;

#lastValue: UmbBlockGridValueModel | undefined = undefined;

public set config(config: UmbPropertyEditorConfigCollection | undefined) {
if (!config) return;
Expand All @@ -68,6 +65,13 @@ export class UmbPropertyEditorUIBlockGridElement

@property({ attribute: false })
public override set value(value: UmbBlockGridValueModel | undefined) {
this.#lastValue = value;

if (!value) {
this._value = undefined;
return;
}

const buildUpValue: Partial<UmbBlockGridValueModel> = value ? { ...value } : {};
buildUpValue.layout ??= {};
buildUpValue.contentData ??= [];
Expand All @@ -80,7 +84,7 @@ export class UmbPropertyEditorUIBlockGridElement
this.#managerContext.setSettings(this._value.settingsData);
this.#managerContext.setExposes(this._value.expose);
}
public override get value(): UmbBlockGridValueModel {
public override get value(): UmbBlockGridValueModel | undefined {
return this._value;
}

Expand Down Expand Up @@ -116,13 +120,24 @@ export class UmbPropertyEditorUIBlockGridElement
this.#managerContext.exposes,
]).pipe(debounceTime(20)),
([layouts, contents, settings, exposes]) => {
this._value = {
...this._value,
layout: { [UMB_BLOCK_GRID_PROPERTY_EDITOR_SCHEMA_ALIAS]: layouts },
contentData: contents,
settingsData: settings,
expose: exposes,
};
if (layouts.length === 0) {
this._value = undefined;
} else {
this._value = {
...this._value,
layout: { [UMB_BLOCK_GRID_PROPERTY_EDITOR_SCHEMA_ALIAS]: layouts },
contentData: contents,
settingsData: settings,
expose: exposes,
};
}

// If we don't have a value set from the outside or an internal value, we don't want to set the value.
// This is added to prevent the block grid from setting an empty value on startup.
if (this.#lastValue === undefined && this._value === undefined) {
return;
}

propertyContext.setValue(this._value);
},
'motherObserver',
Expand Down
41 changes: 28 additions & 13 deletions ...ck/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,19 @@ export class UmbPropertyEditorUIBlockListElement

//#catalogueModal: UmbModalRouteRegistrationController<typeof UMB_BLOCK_CATALOGUE_MODAL.DATA, undefined>;

private _value: UmbBlockListValueModel = {
layout: {},
contentData: [],
settingsData: [],
expose: [],
};
private _value: UmbBlockListValueModel | undefined = undefined;

#lastValue: UmbBlockListValueModel | undefined = undefined;

@property({ attribute: false })
public override set value(value: UmbBlockListValueModel | undefined) {
this.#lastValue = value;

if (!value) {
this._value = undefined;
return;
}

const buildUpValue: Partial<UmbBlockListValueModel> = value ? { ...value } : {};
buildUpValue.layout ??= {};
buildUpValue.contentData ??= [];
Expand Down Expand Up @@ -188,13 +192,24 @@ export class UmbPropertyEditorUIBlockListElement
this.#managerContext.exposes,
]).pipe(debounceTime(20)),
([layouts, contents, settings, exposes]) => {
this._value = {
...this._value,
layout: { [UMB_BLOCK_LIST_PROPERTY_EDITOR_SCHEMA_ALIAS]: layouts },
contentData: contents,
settingsData: settings,
expose: exposes,
};
if (layouts.length === 0) {
this._value = undefined;
} else {
this._value = {
...this._value,
layout: { [UMB_BLOCK_LIST_PROPERTY_EDITOR_SCHEMA_ALIAS]: layouts },
contentData: contents,
settingsData: settings,
expose: exposes,
};
}

// If we don't have a value set from the outside or an internal value, we don't want to set the value.
// This is added to prevent the block list from setting an empty value on startup.
if (this.#lastValue === undefined && this._value === undefined) {
return;
}

context.setValue(this._value);
},
'motherObserver',
Expand Down