From ab4e6ece2c42cabde42059fc1edb3195d097bb1f Mon Sep 17 00:00:00 2001
From: "Petter H. Juliussen" <petter.juliussen@origo.oslo.kommune.no>
Date: Wed, 6 Sep 2023 13:31:15 +0200
Subject: [PATCH] Make form validation less eager

---
 CHANGELOG.md                                |  2 +
 src/components/drawers/EditItemDrawer.vue   |  6 +--
 src/components/drawers/EditKeyResult.vue    |  6 +--
 src/components/drawers/EditObjective.vue    |  6 +--
 src/components/forms/KpiAdminForm.vue       |  2 +-
 src/components/generic/form/FormSection.vue |  4 +-
 src/config/validation.js                    | 42 +++++++++++++++++++++
 src/main.js                                 | 33 +++-------------
 8 files changed, 61 insertions(+), 40 deletions(-)
 create mode 100644 src/config/validation.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1330eeb0c..ee6ba59a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,8 @@ All notable changes to this project will be documented in this file. The format
 - Made links clickable in the description of objects, key results and goals.
 - It is no longer possible to close open modals or drawers by clicking outside
   them. This is meant to prevent accidental data loss in unsaved forms.
+- Validation in forms are now less "eager" and errors are only displayed after
+  attempted form submissions.
 
 ## [3.9.0] 2023-09-01
 
diff --git a/src/components/drawers/EditItemDrawer.vue b/src/components/drawers/EditItemDrawer.vue
index f20ea0f8f..9e8c45b1d 100644
--- a/src/components/drawers/EditItemDrawer.vue
+++ b/src/components/drawers/EditItemDrawer.vue
@@ -16,7 +16,7 @@
     </template>
 
     <template #page="{ pageIndex, prev }">
-      <form-section :hide-errors="true">
+      <form-section>
         <template v-if="pageIndex === 1">
           <form-component
             v-model="thisItem.name"
@@ -102,7 +102,7 @@
           </form-component>
         </template>
 
-        <template v-if="!thisItem?.archived" #actions="{ handleSubmit }">
+        <template v-if="!thisItem?.archived" #actions="{ handleSubmit, submitDisabled }">
           <pkt-button
             v-if="pageIndex === 1"
             :text="$t('btn.cancel')"
@@ -120,7 +120,7 @@
 
           <btn-save
             :label="pageIndex === pageCount ? $t('btn.complete') : $t('btn.continue')"
-            :disabled="loading"
+            :disabled="submitDisabled || loading"
             variant="label-only"
             @click="handleSubmit(save)"
           />
diff --git a/src/components/drawers/EditKeyResult.vue b/src/components/drawers/EditKeyResult.vue
index cea8ccce4..2b1656110 100644
--- a/src/components/drawers/EditKeyResult.vue
+++ b/src/components/drawers/EditKeyResult.vue
@@ -16,7 +16,7 @@
     </template>
 
     <template #page="{ pageIndex, prev }">
-      <form-section :hide-errors="true">
+      <form-section>
         <template v-if="pageIndex === 1">
           <form-component
             v-model="thisKeyResult.name"
@@ -79,7 +79,7 @@
           </div>
         </template>
 
-        <template v-if="!keyResult?.archived" #actions="{ handleSubmit }">
+        <template v-if="!keyResult?.archived" #actions="{ handleSubmit, submitDisabled }">
           <pkt-button
             v-if="pageIndex === 1"
             :text="$t('btn.cancel')"
@@ -97,7 +97,7 @@
 
           <btn-save
             :label="pageIndex === pageCount ? $t('btn.complete') : $t('btn.continue')"
-            :disabled="loading"
+            :disabled="submitDisabled || loading"
             variant="label-only"
             @click="handleSubmit(save)"
           />
diff --git a/src/components/drawers/EditObjective.vue b/src/components/drawers/EditObjective.vue
index 8efaca8b0..9c4f24f74 100644
--- a/src/components/drawers/EditObjective.vue
+++ b/src/components/drawers/EditObjective.vue
@@ -11,7 +11,7 @@
     </template>
 
     <template #page>
-      <form-section :hide-errors="true">
+      <form-section>
         <form-component
           v-model="thisObjective.name"
           input-type="textarea"
@@ -52,12 +52,12 @@
           {{ formattedPeriod(newestObjective) }}
         </pkt-button>
 
-        <template v-if="!objective?.archived" #actions="{ handleSubmit }">
+        <template v-if="!objective?.archived" #actions="{ handleSubmit, submitDisabled }">
           <btn-cancel :disabled="loading" @click="close" />
           <btn-save
             :label="objective ? $t('btn.updateObjective') : $t('btn.createObjective')"
             variant="label-only"
-            :disabled="loading"
+            :disabled="submitDisabled || loading"
             @click="handleSubmit(save)"
           />
         </template>
diff --git a/src/components/forms/KpiAdminForm.vue b/src/components/forms/KpiAdminForm.vue
index a8aed5e16..d106d9acd 100644
--- a/src/components/forms/KpiAdminForm.vue
+++ b/src/components/forms/KpiAdminForm.vue
@@ -6,7 +6,7 @@
       @close="showEditGoalsModal = false"
     />
 
-    <form-section>
+    <form-section error-summary>
       <form-component
         v-model="localKpi.name"
         input-type="input"
diff --git a/src/components/generic/form/FormSection.vue b/src/components/generic/form/FormSection.vue
index e791b4b49..7f136578b 100644
--- a/src/components/generic/form/FormSection.vue
+++ b/src/components/generic/form/FormSection.vue
@@ -8,7 +8,7 @@
     <slot />
 
     <pkt-alert
-      v-if="validated && !valid && !hideErrors"
+      v-if="errorSummary && validated && !valid"
       skin="error"
       class="form-errors"
       :title="$t('general.formErrors')"
@@ -43,7 +43,7 @@ export default {
   },
 
   props: {
-    hideErrors: {
+    errorSummary: {
       type: Boolean,
       required: false,
       default: false,
diff --git a/src/config/validation.js b/src/config/validation.js
new file mode 100644
index 000000000..dfcb70533
--- /dev/null
+++ b/src/config/validation.js
@@ -0,0 +1,42 @@
+import { extend, configure, setInteractionMode } from 'vee-validate';
+import {
+  email,
+  max,
+  min,
+  min_value as minValue,
+  numeric,
+  required,
+} from 'vee-validate/dist/rules';
+import i18n from '@/locale/i18n';
+
+export default function configureFormValidation() {
+  // Set custom interaction mode for VeeValidate - a combination of 'passive' and
+  // 'eager' (default: 'aggressive').
+  // https://vee-validate.logaretm.com/v3/guide/interaction-and-ux.html#interaction-modes
+  // https://github.com/logaretm/vee-validate/blob/v3/src/modes.ts
+  setInteractionMode('custom', ({ errors }) => {
+    return {
+      on: errors.length ? ['input', 'change'] : [],
+    };
+  });
+
+  // https://vee-validate.logaretm.com/v3/configuration.html#configuration
+  // https://vee-validate.logaretm.com/v3/guide/localization.html#using-other-i18n-libraries
+  configure({
+    defaultMessage: (field, values) => {
+      values._field_ = i18n.t(`fields.${field}`);
+
+      return i18n.t(`validation.${values._rule_}`, values);
+    },
+  });
+
+  // https://vee-validate.logaretm.com/v3/api/extend.html#extend
+  extend('required', required);
+  extend('email', email);
+  extend('numeric', numeric);
+  extend('min', min);
+  extend('min_value', minValue);
+  extend('max', max);
+  extend('decimal', (num) => typeof num === 'number');
+  extend('positiveNotZero', (num) => typeof num === 'number' && num > 0);
+}
diff --git a/src/main.js b/src/main.js
index adf3f61c4..e3f80ba93 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,16 +4,7 @@ import Toasted from 'vue-toasted';
 import VTooltip from 'v-tooltip';
 import VueMeta from 'vue-meta';
 import VueFlatPickr from 'vue-flatpickr-component';
-import { ValidationProvider, ValidationObserver, extend, configure } from 'vee-validate';
-import {
-  email,
-  max,
-  min,
-  min_value as minValue,
-  numeric,
-  required,
-} from 'vee-validate/dist/rules';
-
+import { ValidationProvider, ValidationObserver } from 'vee-validate';
 import { firestorePlugin } from 'vuefire';
 
 import { PktIcon } from '@oslokommune/punkt-vue2';
@@ -27,6 +18,7 @@ import PageLayout from '@/components/layout/PageLayout.vue';
 import FormComponent from '@/components/FormComponent.vue';
 
 import { auth } from './config/firebaseConfig';
+import configureFormValidation from './config/validation';
 
 // import plugin styles
 import 'flatpickr/dist/flatpickr.css';
@@ -66,24 +58,9 @@ Vue.component('FormComponent', FormComponent);
 Vue.component('VSpinner', Spinner);
 Vue.component('PktIcon', PktIcon);
 
-/* eslint-disable */
-configure({
-  defaultMessage: (field, values) => {
-    values._field_ = i18n.t(`fields.${field}`);
-
-    return i18n.t(`validation.${values._rule_}`, values);
-  },
-});
-/* eslint-enable */
-
-extend('required', required);
-extend('email', email);
-extend('numeric', numeric);
-extend('min', min);
-extend('min_value', minValue);
-extend('max', max);
-extend('decimal', (num) => typeof num === 'number');
-extend('positiveNotZero', (num) => typeof num === 'number' && num > 0);
+// Configure VeeValidate for form validation.
+// https://vee-validate.logaretm.com/v3/
+configureFormValidation();
 
 Vue.config.productionTip = false;