From 8128a6fc0020e4814d697e7305db9d245ffef37e Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 26 Aug 2022 13:06:40 +0200 Subject: [PATCH] add member group data and data type data to entity data --- .../data-types/tree-data-types.context.ts | 2 +- .../tree-member-groups.context.ts | 2 +- .../src/mocks/data/entity.data.ts | 58 ++++++++++++++++++- 3 files changed, 59 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/data-types/tree-data-types.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/tree/data-types/tree-data-types.context.ts index 465f038705..094451089f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/tree/data-types/tree-data-types.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/tree/data-types/tree-data-types.context.ts @@ -35,6 +35,6 @@ export class UmbTreeDataTypesContext implements UmbTreeContext { this.entityStore.update(data); }); - return this.entityStore.entities.pipe(map((items) => items.filter((item) => item.key === key))); + return this.entityStore.entities.pipe(map((items) => items.filter((item) => item.parentKey === key))); } } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/member-groups/tree-member-groups.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/tree/member-groups/tree-member-groups.context.ts index 9cee354e2b..6ae9ceab8d 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/tree/member-groups/tree-member-groups.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/tree/member-groups/tree-member-groups.context.ts @@ -35,6 +35,6 @@ export class UmbTreeMemberGroupsContext implements UmbTreeContext { this.entityStore.update(data); }); - return this.entityStore.entities.pipe(map((items) => items.filter((item) => item.key === key))); + return this.entityStore.entities.pipe(map((items) => items.filter((item) => item.parentKey === key))); } } diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/entity.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/entity.data.ts index 9b1bf730ac..a1384a6cfe 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/entity.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/entity.data.ts @@ -28,13 +28,69 @@ export const data: Array = [ hasChildren: true, }, { - id: 2, + id: 3, key: '725a26c4-158d-4dc0-8aaa-b64473b11aa8', type: 'member', parentKey: '06c6919c-6fa7-4aa5-8214-0582c721c472', name: 'Member 3', hasChildren: false, }, + { + id: 4, + key: '14be0f66-1472-452a-abde-9da6b4136073', + parentKey: 'd46d144e-33d8-41e3-bf7a-545287e16e3c', + type: 'memberGroup', + name: 'Member Group 1', + hasChildren: false, + }, + { + id: 5, + key: '8d5cf29a-e73b-4bf5-ad56-8adf6cbf8766', + parentKey: 'd46d144e-33d8-41e3-bf7a-545287e16e3c', + type: 'memberGroup', + name: 'Member Group 2', + hasChildren: false, + }, + { + id: 1245, + key: 'dt-1', + parentKey: '3fd3eba5-c893-4d3c-af67-f574e6eded38', + name: 'Text', + hasChildren: false, + type: 'dataType', + }, + { + id: 1244, + key: 'dt-2', + parentKey: '3fd3eba5-c893-4d3c-af67-f574e6eded38', + name: 'Textarea', + hasChildren: false, + type: 'dataType', + }, + { + id: 1246, + key: 'dt-3', + parentKey: '3fd3eba5-c893-4d3c-af67-f574e6eded38', + name: 'My JS Property Editor', + hasChildren: false, + type: 'dataType', + }, + { + id: 1247, + key: 'dt-4', + parentKey: '3fd3eba5-c893-4d3c-af67-f574e6eded38', + name: 'Context Example', + hasChildren: false, + type: 'dataType', + }, + { + id: 1248, + key: 'dt-5', + parentKey: '3fd3eba5-c893-4d3c-af67-f574e6eded38', + name: 'Content Picker (DataType)', + hasChildren: false, + type: 'dataType', + }, ]; // Temp mocked database