Merge branch 'master' of https://github.com/zwave-js/zwave-js-ui into…

… zwave-js-13

api/lib/ZwaveClient.ts

@@ -158,6 +158,7 @@ export const allowedApis = validateMethods([
 	'getNodeNeighbors',
 	'discoverNodeNeighbors',
 	'getAssociations',
+	'checkAssociation',
 	'addAssociations',
 	'removeAssociations',
 	'removeAllAssociations',
@@ -1759,6 +1760,21 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 		return toReturn
 	}
 
+	/**
+	 * Check if a given association is allowed
+	 */
+	checkAssociation(
+		source: AssociationAddress,
+		groupId: number,
+		association: AssociationAddress,
+	) {
+		return this.driver.controller.checkAssociation(
+			source,
+			groupId,
+			association,
+		)
+	}
+
 	/**
 	 * Add a node to the array of specified [associations](https://zwave-js.github.io/node-zwave-js/#/api/controller?id=association-interface)
 	 */

src/components/dialogs/DialogAssociation.vue

@@ -94,6 +94,12 @@
 										:items="targetEndpoints"
 									></v-select>
 								</v-col>
+
+								<v-col v-if="associationError" cols="12">
+									<v-alert text dense type="error">
+										{{ associationError }}
+									</v-alert>
+								</v-col>
 							</v-col>
 						</v-row>
 					</v-form>
@@ -108,7 +114,7 @@
 				<v-btn
 					color="blue darken-1"
 					text
-					:disabled="nodesInGroup >= maxNodes"
+					:disabled="nodesInGroup >= maxNodes || associationError"
 					@click="$refs.form.validate() && $emit('add', group)"
 					>ADD</v-btn
 				>
@@ -121,8 +127,13 @@
 import { Protocols } from '@zwave-js/core/safe'
 import { mapState } from 'pinia'
 import useBaseStore from '../../stores/base.js'
+import { getAssociationAddress } from '../../lib/utils'
+import { AssociationCheckResult } from '@zwave-js/cc/safe'
+import { getEnumMemberName } from 'zwave-js/safe'
+import InstancesMixin from '../../mixins/InstancesMixin.js'
 
 export default {
+	mixins: [InstancesMixin],
 	props: {
 		value: Boolean,
 		associations: Array,
@@ -132,6 +143,15 @@ export default {
 		value() {
 			this.$refs.form && this.$refs.form.resetValidation()
 			this.resetGroup()
+			this.associationError = ''
+		},
+		group: {
+			deep: true,
+			handler() {
+				if (this.$refs.form?.validate()) {
+					this.allowedAssociation()
+				}
+			},
 		},
 	},
 	computed: {
@@ -185,11 +205,83 @@ export default {
 		return {
 			valid: true,
 			group: {},
+			associationError: '',
 			defaultGroup: { endpoint: null },
 			required: (v) => !!v || 'This field is required',
 		}
 	},
 	methods: {
+		getAssociationAddress,
+		async allowedAssociation() {
+			const association = this.group
+			const target = !isNaN(association.target)
+				? parseInt(association.target)
+				: association.target?.id
+
+			if (isNaN(target)) {
+				this.associationError = ''
+				return
+			}
+
+			const group = association.group
+
+			if (!group) {
+				this.associationError = ''
+				return
+			}
+
+			const toAdd = { nodeId: target }
+
+			if (group.multiChannel && association.targetEndpoint >= 0) {
+				toAdd.endpoint = association.targetEndpoint
+			}
+
+			const args = [
+				this.getAssociationAddress({
+					nodeId: this.node.id,
+					endpoint: association.endpoint,
+				}),
+				group.value,
+				toAdd,
+			]
+
+			const response = await this.app.apiRequest(
+				'checkAssociation',
+				args,
+				{
+					showInfo: false,
+				},
+			)
+
+			if (response.success) {
+				const checkResult = response.result
+
+				if (checkResult === AssociationCheckResult.OK) {
+					this.associationError = ''
+				} else if (
+					checkResult ===
+					AssociationCheckResult.Forbidden_SecurityClassMismatch
+				) {
+					this.associationError = `Association not allowed: Node ${this.node.id} does not have the same security class as Node ${target}!`
+				} else if (
+					checkResult ===
+					AssociationCheckResult.Forbidden_DestinationSecurityClassNotGranted
+				) {
+					this.associationError = `Association not allowed: Node ${this.node.id} was not granted the highest security class of Node ${target}!`
+				} else if (
+					checkResult ===
+					AssociationCheckResult.Forbidden_NoSupportedCCs
+				) {
+					this.associationError = `Association not allowed: Node ${this.node.id} sends no commands in this group that Node ${target} supports!`
+				} else {
+					// This should not happen, but just in case
+					this.associationError = `Association not allowed: ${getEnumMemberName(
+						AssociationCheckResult,
+						checkResult,
+					)}`
+				}
+			}
+		},
 		resetGroup() {
 			this.group = Object.assign({}, this.defaultGroup)
 		},

src/components/nodes-table/AssociationGroups.vue

@@ -81,6 +81,7 @@ import useBaseStore from '../../stores/base.js'
 import InstancesMixin from '../../mixins/InstancesMixin.js'
 import { getEnumMemberName } from 'zwave-js/safe'
 import { AssociationCheckResult } from '@zwave-js/cc/safe'
+import { getAssociationAddress } from '../../lib/utils'
 
 export default {
 	components: {
@@ -112,12 +113,7 @@ export default {
 	},
 	methods: {
 		...mapActions(useBaseStore, ['showSnackbar']),
-		getAssociationAddress(ass) {
-			return {
-				nodeId: ass.nodeId,
-				endpoint: ass.endpoint === null ? undefined : ass.endpoint,
-			}
-		},
+		getAssociationAddress,
 		getNodeName(nodeId) {
 			const node = this.nodes[this.nodesMap.get(nodeId)]
 			return node ? node._name : 'NodeID_' + nodeId

src/lib/utils.js

@@ -329,3 +329,10 @@ export function getProtocolIcon(protocol) {
 		description: getProtocol({ protocol }),
 	}
 }
+
+export function getAssociationAddress(ass) {
+	return {
+		nodeId: ass.nodeId,
+		endpoint: ass.endpoint === null ? undefined : ass.endpoint,
+	}
+}