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

save grouping

Browse Source
This commit is contained in:
Lone Iversen
2024-01-23 13:42:21 +01:00
parent 626dbedb68
commit 1e5d751d59
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-type-configuration/property-editor-ui-block-grid-type-configuration.element.ts
View File

@@ -19,8 +19,14 @@ export class UmbPropertyEditorUIBlockGridTypeConfigurationElement
{
#datasetContext?: UmbPropertyDatasetContext;
private _value: Array<UmbBlockTypeWithGroupKey> = [];
@property({ attribute: false })
value: UmbBlockTypeWithGroupKey[] = [];
get value() {
return this._value;
}
set value(value: Array<UmbBlockTypeWithGroupKey>) {
this._value = value ?? [];
}
@property({ type: Object, attribute: false })
public config?: UmbPropertyEditorConfigCollection;
@@ -43,7 +49,7 @@ export class UmbPropertyEditorUIBlockGridTypeConfigurationElement
if (!this.#datasetContext) return;
this.observe(await this.#datasetContext.propertyValueByAlias('blockGroups'), (value) => {
this._blockGroups = value as Array<UmbBlockGridGroupType>;
this._blockGroups = (value as Array<UmbBlockGridGroupType>) ?? [];
this.#mapValuesToBlockGroups();
});
this.observe(await this.#datasetContext.propertyValueByAlias('blocks'), () => {
@@ -53,10 +59,10 @@ export class UmbPropertyEditorUIBlockGridTypeConfigurationElement
#mapValuesToBlockGroups() {
// What if a block is in a group that does not exist in the block groups? Should it be removed? (Right now they will never be rendered)
const valuesWithNoGroup = this.value.filter((value) => !value.groupKey);
const valuesWithNoGroup = this._value.filter((value) => !value.groupKey);
const valuesWithGroup = this._blockGroups.map((group) => {
return { name: group.name, key: group.key, blocks: this.value.filter((value) => value.groupKey === group.key) };
return { name: group.name, key: group.key, blocks: this._value.filter((value) => value.groupKey === group.key) };
});
this._mappedValuesAndGroups = [{ blocks: valuesWithNoGroup }, ...valuesWithGroup];
@@ -76,7 +82,7 @@ export class UmbPropertyEditorUIBlockGridTypeConfigurationElement
const groupName = e.target.value as string;
this.#datasetContext?.setPropertyValue(
'blockGroups',
this._blockGroups.map((group) => ({ ...group, groupName: groupKey === group.key ? groupName : group.name })),
this._blockGroups.map((group) => (group.key === groupKey ? { ...group, name: groupName } : group)),
);
}
@@ -87,7 +93,7 @@ export class UmbPropertyEditorUIBlockGridTypeConfigurationElement
);
// Should blocks that belonged to the removed group be deleted as well?
this.value = this.value.filter((block) => block.groupKey !== groupKey);
this.value = this._value.filter((block) => block.groupKey !== groupKey);
}
#renderGroupInput(groupKey: string, groupName?: string) {

4
src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/input-block-type/input-block-type.element.ts
View File

@@ -59,6 +59,7 @@ export class UmbInputBlockTypeElement<
typeof UMB_WORKSPACE_MODAL.VALUE
>;
/*
#datasetContext?: UmbPropertyDatasetContext;
#filter: Array<UmbBlockTypeBaseModel> = [];
@@ -71,6 +72,7 @@ export class UmbInputBlockTypeElement<
});
});
}
*/
create() {
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, async (modalManager) => {
@@ -84,7 +86,7 @@ export class UmbInputBlockTypeElement<
// Only pick elements:
docType.isElement &&
// Prevent picking the an already used element type:
this.#filter.find((x) => x.contentElementTypeKey === docType.unique) === undefined,
this._items.find((x) => x.contentElementTypeKey === docType.unique) === undefined,
},
});