Standard form validation mixin

OHFLesvos · Apr 21, 2022 · d171180 · d171180
1 parent 7f155f8
commit d171180
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 50 deletions.
diff --git a/resources/js/components/accounting/SupplierForm.vue b/resources/js/components/accounting/SupplierForm.vue
@@ -361,7 +361,9 @@
 </template>
 
 <script>
+import formValidationMixin from "@/mixins/formValidationMixin";
 export default {
+    mixins: [formValidationMixin],
     props: {
         supplier: {
             type: Object,
@@ -403,9 +405,6 @@ export default {
         }
     },
     methods: {
-        getValidationState ({ dirty, validated, valid = null }) {
-            return dirty || validated ? valid : null;
-        },
         onSubmit () {
             this.$emit('submit', this.form)
         },

diff --git a/resources/js/components/accounting/WalletForm.vue b/resources/js/components/accounting/WalletForm.vue
@@ -94,7 +94,9 @@
 
 <script>
 import rolesApi from '@/api/user_management/roles'
+import formValidationMixin from "@/mixins/formValidationMixin";
 export default {
+    mixins: [formValidationMixin],
     props: {
         wallet: {
             type: Object,
@@ -118,9 +120,6 @@ export default {
         this.fetchRoles()
     },
     methods: {
-        getValidationState ({ dirty, validated, valid = null }) {
-            return dirty || validated ? valid : null;
-        },
         onSubmit () {
             this.$emit('submit', this.form)
         },

diff --git a/resources/js/components/fundraising/DonorForm.vue b/resources/js/components/fundraising/DonorForm.vue
@@ -306,7 +306,9 @@
 <script>
 import commonApi from '@/api/common'
 import donorsApi from '@/api/fundraising/donors'
+import formValidationMixin from "@/mixins/formValidationMixin";
 export default {
+    mixins: [formValidationMixin],
     props: {
         donor: {
             type: Object,
@@ -364,9 +366,6 @@ export default {
             let data = await commonApi.listLanguages()
             this.languages = Object.values(data)
         },
-        getValidationState ({ dirty, validated, valid = null }) {
-            return dirty || validated ? valid : null;
-        },
         onSubmit () {
             this.$emit('submit', this.form)
         },

diff --git a/resources/js/components/userprofile/ChangePasswordDialog.vue b/resources/js/components/userprofile/ChangePasswordDialog.vue
@@ -95,7 +95,9 @@
 <script>
 import userprofileApi from "@/api/userprofile"
 import { showSnackbar } from '@/utils'
+import formValidationMixin from "@/mixins/formValidationMixin";
 export default {
+    mixins: [formValidationMixin],
     data() {
         return {
             old_password: '',
@@ -123,9 +125,6 @@ export default {
             }
             this.isBusy = false
         },
-        getValidationState ({ dirty, validated, valid = null }) {
-            return dirty || validated ? valid : null;
-        },
     }
 }
 </script>
diff --git a/resources/js/components/userprofile/UserProfileDialog.vue b/resources/js/components/userprofile/UserProfileDialog.vue
@@ -95,7 +95,9 @@
 import userprofileApi from "@/api/userprofile"
 import { showSnackbar } from '@/utils'
 import moment from 'moment'
+import formValidationMixin from "@/mixins/formValidationMixin";
 export default {
+    mixins: [formValidationMixin],
     props: {
         user: {
             required: true,
@@ -143,9 +145,6 @@ export default {
             }
             this.isBusy = false
         },
-        getValidationState ({ dirty, validated, valid = null }) {
-            return dirty || validated ? valid : null;
-        },
     }
 }
 </script>
diff --git a/resources/js/components/visitors/VisitorForm.vue b/resources/js/components/visitors/VisitorForm.vue
@@ -149,11 +149,12 @@
 </template>
 
 <script>
-import formInputMixin from "@/mixins/formInputMixin";
+import formValidationMixin from "@/mixins/formValidationMixin";
 import { mapState } from "vuex";
 import moment from "moment";
 import DateOfBirthInput from "@/components/common/DateOfBirthInput";
 export default {
+    mixins: [formValidationMixin],
     components: {
         DateOfBirthInput,
     },
@@ -163,7 +164,6 @@ export default {
         },
         disabled: Boolean,
     },
-    mixins: [formInputMixin],
     data() {
         const search = this.$route.query.search;
         const searchType = this.detectValueType(search);

diff --git a/resources/js/mixins/formInputMixin.js b/resources/js/mixins/formInputMixin.js
diff --git a/resources/js/mixins/formValidationMixin.js b/resources/js/mixins/formValidationMixin.js
@@ -0,0 +1,7 @@
+export default {
+    methods: {
+        getValidationState ({ dirty, validated, valid = null }) {
+            return dirty || validated ? valid : null;
+        },
+    }
+}
diff --git a/resources/js/pages/fundraising/DonationsImportPage.vue b/resources/js/pages/fundraising/DonationsImportPage.vue
@@ -55,7 +55,9 @@
 <script>
 import donationsApi from '@/api/fundraising/donations'
 import { showSnackbar } from '@/utils'
+import formValidationMixin from "@/mixins/formValidationMixin";
 export default {
+    mixins: [formValidationMixin],
     title() {
         return this.$t("Import");
     },
@@ -75,9 +77,6 @@ export default {
         }
     },
     methods: {
-        getValidationState ({ dirty, validated, valid = null }) {
-            return dirty || validated ? valid : null;
-        },
         async onSubmit () {
             this.isBusy = true
             try {

diff --git a/resources/js/pages/users/UserProfile2FAPage.vue b/resources/js/pages/users/UserProfile2FAPage.vue
@@ -135,7 +135,9 @@
 import AlertWithRetry from '@/components/alerts/AlertWithRetry'
 import userprofileApi from "@/api/userprofile";
 import { showSnackbar } from '@/utils'
+import formValidationMixin from "@/mixins/formValidationMixin";
 export default {
+    mixins: [formValidationMixin],
     components: {
         AlertWithRetry,
     },
@@ -189,9 +191,6 @@ export default {
             }
             this.isBusy = false
         },
-        getValidationState ({ dirty, validated, valid = null }) {
-            return dirty || validated ? valid : null;
-        },
     }
 }
 </script>