Skip to content
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

Jump to bottom

Item list & details: Hide group type if not set #2453

Merged
merged 2 commits into from
Mar 6, 2024
Merged

Item list & details: Hide group type if not set #2453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d392e00
Item Details: hide undefined group type
jimtng Mar 5, 2024
306d4d8
Also hide group type in Items list if undefined & Use Item mixin
florian-h05 Mar 6, 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
8 changes: 6 additions & 2 deletions bundles/org.openhab.ui/web/src/components/item/item-mixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('_')
Expand Down
4 changes: 3 additions & 1 deletion bundles/org.openhab.ui/web/src/pages/settings/items/item-details.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<h2>{{ item.label }}</h2>
<!-- <h4 v-show="item.label">{{item.name}}</h4> -->
<h5 v-show="item.type">
<small>{{ item.type === 'Group' ? `${item.type} (${item.groupType})` : item.type }}</small>
<small>{{ getItemTypeLabel(item) }}</small>
</h5>
</f7-subnavbar>
</f7-navbar>
Expand Down Expand Up @@ -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,
Expand Down
Loading