From 3d1a08f7af2a4a115c0f543bfc37346522e25266 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Wed, 2 Nov 2022 16:33:12 +0100 Subject: [PATCH] Changed default entity grouping on the frontend. Changed from `type` to `category`, which is basically the `name_plural` attribute of the associated entity type metadata. This allows us to define distinct entity metadata entries that we still want to share the same grouping - for instance, `temperature_sensor`, `humidity_sensor` and `battery` should all be grouped under `Sensors` on the frontend. --- .../src/components/panels/Entities/Index.vue | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/platypush/backend/http/webapp/src/components/panels/Entities/Index.vue b/platypush/backend/http/webapp/src/components/panels/Entities/Index.vue index 9f1d03b56e..9673ce1756 100644 --- a/platypush/backend/http/webapp/src/components/panels/Entities/Index.vue +++ b/platypush/backend/http/webapp/src/components/panels/Entities/Index.vue @@ -27,16 +27,14 @@
- + -
-
+
@@ -99,7 +97,7 @@ export default { modalEntityId: null, modalVisible: false, selector: { - grouping: 'type', + grouping: 'category', selectedEntities: {}, }, } @@ -114,13 +112,24 @@ export default { return icons }, + entityTypes() { + return this.groupEntities('type') + }, + + typesByCategory() { + return Object.entries(meta).reduce((obj, [type, meta]) => { + obj[meta.name_plural] = type + return obj + }, {}) + }, + entityGroups() { return { 'id': Object.entries(this.groupEntities('id')).reduce((obj, [id, entities]) => { obj[id] = entities[0] return obj }, {}), - 'type': this.groupEntities('type'), + 'category': this.groupEntities('category'), 'plugin': this.groupEntities('plugin'), } }, @@ -148,6 +157,7 @@ export default { return Object.values(this.entities).reduce((obj, entity) => { const entities = obj[entity[attr]] || {} entities[entity.id] = entity + obj[entity[attr]] = Object.values(entities).sort((a, b) => { return a.name.localeCompare(b.name) }) @@ -198,6 +208,7 @@ export default { try { this.entities = (await this.request('entities.get')).reduce((obj, entity) => { entity.name = entity?.meta?.name_override || entity.name + entity.category = meta[entity.type].name_plural entity.meta = { ...(meta[entity.type] || {}), ...(entity.meta || {}), @@ -225,6 +236,7 @@ export default { }, onEntityInput(entity) { + entity.category = meta[entity.type].name_plural this.entities[entity.id] = entity this.clearEntityTimeouts(entity.id) if (this.loadingEntities[entity.id]) @@ -247,6 +259,7 @@ export default { else entity.name = event.entity?.name || this.entities[entityId]?.name + entity.category = meta[entity.type].name_plural entity.meta = { ...(meta[event.entity.type] || {}), ...(this.entities[entityId]?.meta || {}),