From d392e002cadd5d761d6a688606c48906dae3fcc2 Mon Sep 17 00:00:00 2001 From: Jimmy Tanagra Date: Tue, 5 Mar 2024 19:03:36 +1000 Subject: [PATCH 1/2] Item Details: hide undefined group type Signed-off-by: Jimmy Tanagra --- .../web/src/pages/settings/items/item-details.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bundles/org.openhab.ui/web/src/pages/settings/items/item-details.vue b/bundles/org.openhab.ui/web/src/pages/settings/items/item-details.vue index 33791c561d..42e8811654 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/items/item-details.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/items/item-details.vue @@ -19,7 +19,7 @@

{{ item.label }}

- {{ item.type === 'Group' ? `${item.type} (${item.groupType})` : item.type }} + {{ itemTypeDisplay }}
@@ -178,6 +178,10 @@ export default { return { store: this.$store.getters.trackedItems } + }, + itemTypeDisplay () { + if (this.item.type !== 'Group' || !this.item.groupType) return this.item.type + return `${this.item.type} (${this.item.groupType})` } }, methods: { From 306d4d8e72ba3bd7d1dbb6c34c84693d35b87c13 Mon Sep 17 00:00:00 2001 From: Florian Hotze Date: Thu, 7 Mar 2024 00:03:23 +0100 Subject: [PATCH 2/2] Also hide group type in Items list if undefined & Use Item mixin Signed-off-by: Florian Hotze --- .../org.openhab.ui/web/src/components/item/item-mixin.js | 8 ++++++-- .../web/src/pages/settings/items/item-details.vue | 8 +++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/bundles/org.openhab.ui/web/src/components/item/item-mixin.js b/bundles/org.openhab.ui/web/src/components/item/item-mixin.js index fd50336345..64d1e7a254 100644 --- a/bundles/org.openhab.ui/web/src/components/item/item-mixin.js +++ b/bundles/org.openhab.ui/web/src/components/item/item-mixin.js @@ -3,11 +3,15 @@ import TagMixin from '@/components/tags/tag-mixin' export default { mixins: [TagMixin], methods: { - getItemTypeAndMetaLabel (item) { + getItemTypeLabel (item) { let ret = item.type - if (item.type === 'Group') { + if (item.type === 'Group' && item.groupType) { ret += ` (${item.groupType})` } + return ret + }, + getItemTypeAndMetaLabel (item) { + let ret = this.getItemTypeLabel(item) if (item.metadata && item.metadata.semantics) { ret += ' ยท ' const classParts = item.metadata.semantics.value.split('_') diff --git a/bundles/org.openhab.ui/web/src/pages/settings/items/item-details.vue b/bundles/org.openhab.ui/web/src/pages/settings/items/item-details.vue index 42e8811654..fc2439f2fd 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/items/item-details.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/items/item-details.vue @@ -19,7 +19,7 @@

{{ item.label }}

- {{ itemTypeDisplay }} + {{ getItemTypeLabel(item) }}
@@ -157,8 +157,10 @@ import ItemStatePreview from '@/components/item/item-state-preview.vue' import LinkDetails from '@/components/model/link-details.vue' import GroupMembers from '@/components/item/group-members.vue' import MetadataMenu from '@/components/item/metadata/item-metadata-menu.vue' +import ItemMixin from '@/components/item/item-mixin' export default { + mixins: [ItemMixin], props: ['itemName'], components: { LinkDetails, @@ -178,10 +180,6 @@ export default { return { store: this.$store.getters.trackedItems } - }, - itemTypeDisplay () { - if (this.item.type !== 'Group' || !this.item.groupType) return this.item.type - return `${this.item.type} (${this.item.groupType})` } }, methods: {