Merge pull request #6125 from FlowFuse/expose-remote-instance-device-group

Expose and display remote instance device group

Author: knolleary

forge/db/models/Device.js

@@ -348,7 +348,8 @@ module.exports = {
                                 }
                             },
                             { model: M.ProjectSnapshot, as: 'targetSnapshot', attributes: ['id', 'hashid', 'name'] },
-                            { model: M.ProjectSnapshot, as: 'activeSnapshot', attributes: ['id', 'hashid', 'name'] }
+                            { model: M.ProjectSnapshot, as: 'activeSnapshot', attributes: ['id', 'hashid', 'name'] },
+                            { model: M.DeviceGroup }
                         ]
                     }
                     return this.findOne({

frontend/src/pages/device/Overview.vue

@@ -61,6 +61,19 @@
                             <span v-else>None</span>
                         </template>
                     </InfoCardRow>
+                    <InfoCardRow property="Group:" v-if="device?.application && device.deviceGroup">
+                        <template #value>
+                            <ff-team-link
+                                :to="{ name: 'ApplicationDeviceGroupIndex',
+                                       params: {
+                                           deviceGroupId: device.deviceGroup.id,
+                                           applicationId: device.application.id
+                                       }}"
+                            >
+                                {{ device.deviceGroup.name }}
+                            </ff-team-link>
+                        </template>
+                    </InfoCardRow>
                     <InfoCardRow v-if="device.ownerType!=='application'" property="Instance:">
                         <template #value>
                             <router-link v-if="device?.instance" :to="{name: 'Instance', params: { id: device.instance.id }}">