feat(ui): smart start view improvements (#3684)

zwave-js · Apr 26, 2024 · 425a817 · 425a817
1 parent 0209b55
commit 425a817
Show file tree

Hide file tree

Showing 16 changed files with 770 additions and 637 deletions.
diff --git a/api/lib/ZwaveClient.ts b/api/lib/ZwaveClient.ts
@@ -4928,7 +4928,15 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 		const result = this.driver.controller.getProvisioningEntries()
 
 		for (const entry of result) {
-			if (
+			const node = this.nodes.get(entry.nodeId)
+			if (node) {
+				if (node.deviceConfig) {
+					entry.manufacturer = node.deviceConfig.manufacturer
+					entry.label = node.deviceConfig.label
+					entry.description = node.deviceConfig.description
+				}
+				entry.protocol = node.protocol
+			} else if (
 				typeof entry.manufacturerId === 'number' &&
 				typeof entry.productType === 'number' &&
 				typeof entry.productId === 'number' &&

diff --git a/src/components/custom/MissingKeysAlert.vue b/src/components/custom/MissingKeysAlert.vue
@@ -0,0 +1,43 @@
+<template>
+	<v-alert
+		max-width="600px"
+		dense
+		border="left"
+		type="warning"
+		v-if="missingKeys.length > 0"
+	>
+		Some security keys are missing:
+		<strong>{{ missingKeys.join(', ') }}</strong
+		>. Please check your Z-Wave settings.
+	</v-alert>
+</template>
+
+<script>
+import { mapState } from 'pinia'
+import useBaseStore from '../../stores/base'
+
+export default {
+	computed: {
+		...mapState(useBaseStore, ['zwave']),
+		missingKeys() {
+			const keys = this.zwave.securityKeys || {}
+
+			const requiredKeys = [
+				'S2_Unauthenticated',
+				'S2_Authenticated',
+				'S2_AccessControl',
+				'S0_Legacy',
+			]
+			const missing = []
+			for (const key of requiredKeys) {
+				if (!keys[key] || keys[key].length !== 32) {
+					missing.push(key)
+				}
+			}
+			return missing
+		},
+	},
+}
+</script>
+
+<style></style>
diff --git a/src/components/dialogs/DialogHealthCheck.vue b/src/components/dialogs/DialogHealthCheck.vue
@@ -197,7 +197,7 @@
 						justify="space-around"
 					>
 						<v-col
-							v-if="averages.numNeighbors && !isLR()"
+							v-if="averages.numNeighbors && !isLR"
 							class="text-center"
 						>
 							<p class="mb-1 subtitle-1 font-weight-bold">

diff --git a/src/components/dialogs/DialogNodesManager.vue b/src/components/dialogs/DialogNodesManager.vue
@@ -212,18 +212,7 @@
 										v-model="s.values.inclusionMode"
 										mandatory
 									>
-										<v-alert
-											dense
-											border="left"
-											type="warning"
-											v-if="missingKeys.length > 0"
-										>
-											Some security keys are missing:
-											<strong>{{
-												missingKeys.join(', ')
-											}}</strong
-											>. Please check your zwave settings.
-										</v-alert>
+										<missing-keys-alert />
 										<v-radio
 											:value="InclusionStrategy.Default"
 										>
@@ -697,6 +686,9 @@ export default {
 	props: {
 		socket: Object,
 	},
+	components: {
+		MissingKeysAlert: () => import('../custom/MissingKeysAlert.vue'),
+	},
 	mixins: [InstancesMixin],
 	data() {
 		return {
@@ -799,23 +791,6 @@ export default {
 		controllerStatus() {
 			return this.appInfo.controllerStatus?.status
 		},
-		missingKeys() {
-			const keys = this.zwave.securityKeys || {}
-
-			const requiredKeys = [
-				'S2_Unauthenticated',
-				'S2_Authenticated',
-				'S2_AccessControl',
-				'S0_Legacy',
-			]
-			const missing = []
-			for (const key of requiredKeys) {
-				if (!keys[key] || keys[key].length !== 32) {
-					missing.push(key)
-				}
-			}
-			return missing
-		},
 	},
 	watch: {
 		commandEndDate(newVal) {

diff --git a/src/components/nodes-table/AssociationGroups.vue b/src/components/nodes-table/AssociationGroups.vue
@@ -135,7 +135,7 @@ export default {
 		async getAssociations(ask = false) {
 			let refresh = false
 			if (ask && this.node.status !== 'Dead') {
-				refresh = await this.$listeners.showConfirm(
+				refresh = await this.app.confirm(
 					'Info',
 					`Do you want to force query associations?${
 						this.node.status === 'Alive'
@@ -218,7 +218,7 @@ export default {
 			const args = [this.node.id]
 
 			if (
-				!(await this.$listeners.showConfirm(
+				!(await this.app.confirm(
 					'Attention',
 					`Are you sure you want to remove all associations from this node? This will also remove lifeline association if it exists.`,
 					'alert',

diff --git a/src/components/nodes-table/ExpandedNode.vue b/src/components/nodes-table/ExpandedNode.vue
@@ -174,16 +174,12 @@
 					key="homeassistant"
 					transition="slide-y-transition"
 				>
-					<home-assistant
-						:node="node"
-						:socket="socket"
-						v-on="$listeners"
-					/>
+					<home-assistant :node="node" :socket="socket" />
 				</v-tab-item>
 
 				<!-- TAB GROUPS -->
 				<v-tab-item key="groups" transition="slide-y-transition">
-					<association-groups :node="node" v-on="$listeners" />
+					<association-groups :node="node" />
 				</v-tab-item>
 
 				<!-- TAB USERS -->
@@ -201,11 +197,7 @@
 					key="ota"
 					transition="slide-y-transition"
 				>
-					<OTAUpdates
-						:node="node"
-						:socket="socket"
-						v-on="$listeners"
-					/>
+					<OTAUpdates :node="node" :socket="socket" />
 				</v-tab-item>
 
 				<!-- TAB EVENTS -->
@@ -715,14 +707,18 @@ export default {
 			}
 		},
 		exportNode() {
-			this.$listeners.export(this.node, 'node_' + this.node.id, 'json')
+			this.app.exportConfiguration(
+				this.node,
+				'node_' + this.node.id,
+				'json',
+			)
 		},
 		async sendMqttAction(action, confirmMessage) {
 			if (this.node) {
 				let ok = true
 
 				if (confirmMessage) {
-					ok = await this.$listeners.showConfirm(
+					ok = await this.app.confirm(
 						'Info',
 						confirmMessage,
 						'info',

diff --git a/src/components/nodes-table/HomeAssistant.vue b/src/components/nodes-table/HomeAssistant.vue
@@ -198,12 +198,14 @@
 import { inboundEvents as socketActions } from '@server/lib/SocketEvents'
 import { mapActions, mapState } from 'pinia'
 import useBaseStore from '../../stores/base'
+import InstancesMixin from '../../mixins/InstancesMixin'
 
 export default {
 	props: {
 		node: Object,
 		socket: Object,
 	},
+	mixins: [InstancesMixin],
 	data() {
 		return {
 			deviceJSON: '',
@@ -289,7 +291,7 @@ export default {
 			const device = this.selectedDevice
 			if (
 				device &&
-				(await this.$listeners.showConfirm(
+				(await this.app.confirm(
 					'Attention',
 					'Are you sure you want to delete selected device?',
 					'alert',
@@ -309,7 +311,7 @@ export default {
 		async disableDiscovery() {
 			if (
 				this.node &&
-				(await this.$listeners.showConfirm(
+				(await this.app.confirm(
 					'Rediscover node',
 					'Are you sure you want to disable discovery of all values? In order to make this persistent remember to click on Store',
 				))
@@ -331,7 +333,7 @@ export default {
 			const device = this.selectedDevice
 			if (
 				device &&
-				(await this.$listeners.showConfirm(
+				(await this.app.confirm(
 					'Rediscover Device',
 					'Are you sure you want to re-discover selected device?',
 				))
@@ -353,7 +355,7 @@ export default {
 		async rediscoverNode() {
 			if (
 				this.node &&
-				(await this.$listeners.showConfirm(
+				(await this.app.confirm(
 					'Rediscover node',
 					'Are you sure you want to re-discover all node values?',
 				))

diff --git a/src/components/nodes-table/OTAUpdates.vue b/src/components/nodes-table/OTAUpdates.vue
@@ -204,7 +204,7 @@ export default {
 		},
 		async updateFirmware(update) {
 			if (
-				await this.$listeners.showConfirm(
+				await this.app.confirm(
 					`OTA ${update.downgrade ? 'Downgrade' : 'Upgrade'}`,
 					`<p>Are you sure you want to ${
 						update.downgrade ? 'downgrade' : 'upgrade'

diff --git a/src/components/nodes-table/SmartView.vue b/src/components/nodes-table/SmartView.vue
@@ -219,7 +219,6 @@
 
 											<reinterview-badge
 												:node="item"
-												v-on="$listeners"
 												:b-style="{
 													position: 'absolute',
 													top: '0',
@@ -322,11 +321,7 @@
 					<v-icon>close</v-icon>
 				</v-btn>
 				<v-card-text class="pt-3">
-					<expanded-node
-						:node="expandedNode"
-						:socket="socket"
-						v-on="$listeners"
-					/>
+					<expanded-node :node="expandedNode" :socket="socket" />
 				</v-card-text>
 			</v-card>
 		</v-dialog>

diff --git a/src/components/nodes-table/index.vue b/src/components/nodes-table/index.vue
@@ -154,10 +154,7 @@
 			<div class="d-flex">
 				<v-chip>{{ item.id.toString().padStart(3, '0') }}</v-chip>
 
-				<reinterview-badge
-					:node="item"
-					v-on="$listeners"
-				></reinterview-badge>
+				<reinterview-badge :node="item"></reinterview-badge>
 			</div>
 		</template>
 		<template v-slot:[`item.minBatteryLevel`]="{ item }">
@@ -326,7 +323,6 @@
 					:isMobile="isMobile"
 					:node="item"
 					:socket="socket"
-					v-on="$listeners"
 				/>
 			</td>
 		</template>