From 17f3e7de35174f27dda3d95a053b31b7626b566e Mon Sep 17 00:00:00 2001
From: Corentin Thomasset <corentin.thomasset74@gmail.com>
Date: Tue, 9 Jun 2020 07:47:20 +0200
Subject: [PATCH] refactor: proper validation rules

Signed-off-by: Corentin Thomasset <corentin.thomasset74@gmail.com>
---
 CHANGELOG.md                       |  2 +-
 src/routes/tools/UuidGenerator.vue | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81698d54..282b808b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Next
-- [fix] [UuidGenerator] added quantity validation rules (prevent < 0)
+- [fix] [UuidGenerator] added quantity validation rules
 
 ## 1.2.0
 - [feat] [UuidGenerator] can generate multiple uuids 
diff --git a/src/routes/tools/UuidGenerator.vue b/src/routes/tools/UuidGenerator.vue
index 16df536e..5eb5c8b1 100644
--- a/src/routes/tools/UuidGenerator.vue
+++ b/src/routes/tools/UuidGenerator.vue
@@ -6,6 +6,7 @@
             <v-text-field
                     outlined
                     v-model="quantity"
+                    ref="quantity"
                     type="number"
                     label="Quantity"
                     dense
@@ -24,7 +25,7 @@
 </template>
 
 <script>
-    import {copyToClipboard} from "../../utils/helpers";
+    import {copyToClipboard, isInt} from "../../utils/helpers";
 
     const noop = () => {
     };
@@ -39,10 +40,15 @@
             rules: {
                 quantity: [
                     v => !!v || 'Quantity is required',
-                    v => v > 0 || 'Quantity should be > 0'
+                    v => (v > 0 && v <= 50 ) || 'Quantity should be > 0 and <= 50',
+                    v => isInt(v) || 'Quantity should be an integer'
                 ]
-            }
+            },
+            isMounted:false
         }),
+        mounted() {
+            this.isMounted = true;
+        },
         methods: {
             copyToken() {
                 copyToClipboard(this.token);
@@ -51,9 +57,13 @@
         },
         computed: {
             token() {
-                if (this.refreshBool) noop(); // To force recomputation
+                if (this.isMounted && this.$refs.quantity.validate()) {
+                    if (this.refreshBool) noop(); // To force recomputation
 
-                return Array.from({length: this.quantity}, generateUuid).join('\n');
+                    return Array.from({length: this.quantity}, generateUuid).join('\n');
+                } else {
+                    return '';
+                }
             }
         }
     }