Merge pull request #3324 from kiva/VUE-727

feat: keep error and warning tip messages visible VUE-727
kiva · Oct 13, 2021 · c0b4a88 · c0b4a88
2 parents 7d01571 + 52fb6c0
commit c0b4a88
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/components/WwwFrame/TheTipMessage.vue b/src/components/WwwFrame/TheTipMessage.vue
@@ -31,7 +31,7 @@ export default {
 					this.messageType = data?.tip?.type ?? '';
 					this.persist = data?.tip?.persist ?? false;
 
-					this.$refs.tip.show(this.safeMessage, this.messageType, this.persist);
+					this.$refs.tip.show(this.safeMessage, this.messageType, this.preventAutoDismiss);
 					this.initialPath = this.$route.path;
 				} else {
 					this.$refs.tip.close();
@@ -47,6 +47,11 @@ export default {
 			initialPath: null
 		};
 	},
+	computed: {
+		preventAutoDismiss() {
+			return this.persist || this.messageType === 'error' || this.messageType === 'warning';
+		}
+	},
 	watch: {
 		/*
 			Observe $route.path for changes
@@ -59,7 +64,7 @@ export default {
 			if (to !== this.initialPath && this.persist !== true) {
 				this.$refs.tip.close();
 			} else if (to === this.initialPath) {
-				this.$refs.tip.show(this.safeMessage, this.messageType, this.persist);
+				this.$refs.tip.show(this.safeMessage, this.messageType, this.preventAutoDismiss);
 			}
 		},
 	}