fix(ui): including a node shows security class twice

Fixes #2321
zwave-js · Aug 8, 2022 · 1178e16 · 1178e16
1 parent 5c2434f
commit 1178e16
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -357,7 +357,14 @@ export default {
 	},
 	name: 'app',
 	computed: {
-		...mapGetters(['user', 'auth', 'appInfo', 'navTabs', 'darkMode']),
+		...mapGetters([
+			'user',
+			'auth',
+			'appInfo',
+			'navTabs',
+			'darkMode',
+			'nodesManagerOpen',
+		]),
 		updateAvailable() {
 			return this.appInfo.newConfigVersion ? 1 : 0
 		},
@@ -466,21 +473,23 @@ export default {
 			this.dialog_password = true
 		},
 		async onNodeAdded({ node }) {
-			await this.confirm(
-				'Node added',
-				`<div class="d-flex flex-column align-center col">
+			if (!this.nodesManagerOpen) {
+				await this.confirm(
+					'Node added',
+					`<div class="d-flex flex-column align-center col">
 					<i aria-hidden="true" class="v-icon notranslate material-icons theme--light success--text" style="font-size: 60px;">check_circle</i>
 					<p class="mt-3 headline text-center">
 						Node ${node.id} added with security "${node.security || 'None'}"
 					</p>
 				</div>`,
-				'info',
-				{
-					width: 500,
-					confirmText: 'Close',
-					cancelText: '',
-				}
-			)
+					'info',
+					{
+						width: 500,
+						confirmText: 'Close',
+						cancelText: '',
+					}
+				)
+			}
 		},
 		toggleDrawer() {
 			if (

diff --git a/src/components/dialogs/DialogNodesManager.vue b/src/components/dialogs/DialogNodesManager.vue
@@ -736,6 +736,7 @@ export default {
 	watch: {
 		value(v) {
 			this.init(v)
+			this.$store.commit('setNodesManagerOpen', v)
 		},
 		commandEndDate(newVal) {
 			if (this.commandTimer) {

diff --git a/src/store/mutations.js b/src/store/mutations.js
@@ -5,6 +5,7 @@ const settings = new Settings(localStorage);
 
 export const state = {
   auth: undefined,
+  nodesManagerOpen: false,
   serial_ports: [],
   scales: [],
   nodes: [],
@@ -113,7 +114,8 @@ export const getters = {
   appInfo: state => state.appInfo,
   scales: state => state.scales,
 	darkMode: state => state.ui.darkMode,
-	navTabs: state => state.ui.navTabs
+	navTabs: state => state.ui.navTabs,
+  nodesManagerOpen: state => state.nodesManagerOpen
 }
 
 export const actions = {
@@ -167,6 +169,9 @@ export const mutations = {
   showSnackbar() {
     // empty mutation, will be caught in App.vue from store subscribe
   },
+  setNodesManagerOpen(store, opened) {
+    state.nodesManagerOpen = opened
+  },
   setAuth(store, enabled) {
     state.auth = enabled
   },