fix(ui): move firmware update to fw version column

zwave-js · Dec 29, 2021 · fb59d33 · fb59d33
1 parent 6238696
commit fb59d33
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/src/components/nodes-table/index.vue b/src/components/nodes-table/index.vue
@@ -228,15 +228,20 @@
 			</div>
 			<div v-else></div>
 		</template>
-		<template v-slot:[`item.firmwareUpdate`]="{ item }">
-			<v-progress-circular
-				v-if="item.firmwareUpdate"
-				:value="item.firmwareUpdate.progress"
-				size="40"
-				color="primary"
-			>
-				<span class="caption">{{ item.firmwareUpdate.progress }}</span>
-			</v-progress-circular>
+		<template v-slot:[`item.firmwareVersion`]="{ item }">
+			<div style="text-align: center">
+				<v-progress-circular
+					v-if="item.firmwareUpdate"
+					:value="item.firmwareUpdate.progress"
+					size="40"
+					color="primary"
+				>
+					<span class="caption">{{
+						item.firmwareUpdate.progress
+					}}</span>
+				</v-progress-circular>
+				<div v-else>v{{ item.firmwareVersion }}</div>
+			</div>
 		</template>
 		<template v-slot:[`item.lastActive`]="{ item }">
 			<v-tooltip bottom>

diff --git a/src/components/nodes-table/nodes-table.js b/src/components/nodes-table/nodes-table.js
@@ -210,7 +210,6 @@ export default {
 					},
 				},
 				healProgress: { type: 'string', label: 'Heal' },
-				firmwareUpdate: { type: 'string', label: 'FW Update' },
 				interviewStage: { type: 'string', label: 'Interview' },
 				lastActive: {
 					type: 'date',