Refactor: Use ModelForm instead of copy-and-paste

pinry-spa/src/components/BoardEdit.vue

@@ -32,14 +32,14 @@
 
 <script>
 import API from './api';
-import formUtils from './utils/form';
+import ModelForm from './utils/ModelForm';
 
 const fields = ['name'];
 
 export default {
   name: 'BoardEditModal',
   data() {
-    const model = formUtils.fromFields(fields);
+    const model = ModelForm.fromFields(fields);
     return {
       form: model.form,
       helper: model,
@@ -55,18 +55,7 @@ export default {
           self.$parent.close();
         },
         (resp) => {
-          Object.entries(resp.data).forEach(
+          self.helper.markFieldsAsDanger(resp.data);
-            (errorTuple) => {
-              const [key, error] = errorTuple;
-              let msg;
-              if (Array.isArray(error)) {
-                [msg] = error;
-              } else {
-                msg = error;
-              }
-              this.helper.markFieldAsDanger(key, msg);
-            },
-          );
         },
       );
     },

pinry-spa/src/components/LoginForm.vue

@@ -7,11 +7,11 @@
         </header>
         <section class="modal-card-body">
           <b-field label="Username"
-                   :type="username.type"
+                   :type="form.username.type"
-                   :message="username.error">
+                   :message="form.username.error">
             <b-input
               type="string"
-              v-model="username.value"
+              v-model="form.username.value"
               placeholder="Your Username"
               maxlength="30"
               required>
@@ -19,11 +19,11 @@
           </b-field>
 
           <b-field label="Password"
-                   :type="password.type"
+                   :type="form.password.type"
-                   :message="password.error">
+                   :message="form.password.error">
             <b-input
               type="password"
-              v-model="password.value"
+              v-model="form.password.value"
               password-reveal
               placeholder="Your password"
               required>
@@ -43,36 +43,34 @@
 
 <script>
 import api from './api';
-import form from './utils/form';
+import ModelForm from './utils/ModelForm';
 
 const fields = ['username', 'password'];
 
 export default {
   name: 'LoginForm',
   data() {
-    return form.createFormModel(fields);
+    const model = ModelForm.fromFields(fields);
+    return {
+      form: model.form,
+      helper: model,
+    };
   },
   methods: {
-    resetStatus() {
-      form.FormHelper(this, fields).resetAllFields();
-    },
     doLogin() {
-      this.resetStatus();
+      this.helper.resetAllFields();
       const self = this;
-      const promise = api.User.logIn(self.username.value, self.password.value);
+      const promise = api.User.logIn(
-      const helper = form.FormHelper(self);
+        self.form.username.value,
+        self.form.password.value,
+      );
       promise.then(
         (user) => {
           self.$emit('login.succeed', user);
           self.$parent.close();
         },
         (resp) => {
-          if (resp.data.username) {
+          self.helper.markFieldsAsDanger(resp.data);
-            helper.markFieldAsDanger('username', resp.data.username);
-          }
-          if (resp.data.password) {
-            helper.markFieldAsDanger('password', resp.data.password);
-          }
         },
       );
     },

pinry-spa/src/components/SignUpForm.vue

@@ -7,11 +7,11 @@
         </header>
         <section class="modal-card-body">
           <b-field label="Username"
-                   :type="username.type"
+                   :type="form.username.type"
-                   :message="username.error">
+                   :message="form.username.error">
             <b-input
               type="string"
-              v-model="username.value"
+              v-model="form.username.value"
               placeholder="Your Username"
               maxlength="30"
               required>
@@ -19,33 +19,33 @@
           </b-field>
 
           <b-field label="Email"
-                   :type="email.type"
+                   :type="form.email.type"
-                   :message="email.error">
+                   :message="form.email.error">
             <b-input
               type="email"
-              v-model="email.value"
+              v-model="form.email.value"
               password-reveal
               placeholder="Your email"
               required>
             </b-input>
           </b-field>
           <b-field label="Password"
-                   :type="password.type"
+                   :type="form.password.type"
-                   :message="password.error">
+                   :message="form.password.error">
             <b-input
               type="password"
-              v-model="password.value"
+              v-model="form.password.value"
               password-reveal
               placeholder="Your password"
               required>
             </b-input>
           </b-field>
           <b-field label="Password repeat"
-                   :type="password_repeat.type"
+                   :type="form.password_repeat.type"
-                   :message="password_repeat.error">
+                   :message="form.password_repeat.error">
             <b-input
               type="password"
-              v-model="password_repeat.value"
+              v-model="form.password_repeat.value"
               password-reveal
               placeholder="Your password again"
               required>
@@ -65,56 +65,33 @@
 
 <script>
 import api from './api';
+import ModelForm from './utils/ModelForm';
+
+const fields = [
+  'username',
+  'email',
+  'password',
+  'password_repeat',
+];
 
 export default {
   name: 'SignUpForm',
   data() {
+    const model = ModelForm.fromFields(fields);
     return {
-      username: {
+      form: model.form,
-        value: null,
+      helper: model,
-        error: null,
-        type: null,
-      },
-      email: {
-        value: null,
-        error: null,
-        type: null,
-      },
-      password: {
-        value: null,
-        error: null,
-        type: null,
-      },
-      password_repeat: {
-        value: null,
-        error: null,
-        type: null,
-      },
     };
   },
   methods: {
-    resetStatus() {
-      this.resetField('username');
-      this.resetField('email');
-      this.resetField('password');
-      this.resetField('password_repeat');
-    },
-    resetField(fieldName) {
-      this[fieldName].type = 'is-info';
-      this[fieldName].error = null;
-    },
-    markFieldAsDanger(fieldName, errorMsg) {
-      this[fieldName].error = errorMsg;
-      this[fieldName].type = 'is-danger';
-    },
     doRegister() {
-      this.resetStatus();
+      this.helper.resetAllFields();
       const self = this;
       const promise = api.User.signUp(
-        self.username.value,
+        self.form.username.value,
-        self.email.value,
+        self.form.email.value,
-        self.password.value,
+        self.form.password.value,
-        self.password_repeat.value,
+        self.form.password_repeat.value,
       );
       promise.then(
         (user) => {
@@ -122,18 +99,7 @@ export default {
           self.$parent.close();
         },
         (resp) => {
-          Object.entries(resp.data).forEach(
+          self.helper.markFieldsAsDanger(resp.data);
-            (errorTuple) => {
-              const [key, error] = errorTuple;
-              let msg;
-              if (Array.isArray(error)) {
-                [msg] = error;
-              } else {
-                msg = error;
-              }
-              this.markFieldAsDanger(key, msg);
-            },
-          );
         },
       );
     },

pinry-spa/src/components/pin_create/PinCreateModal.vue

@@ -76,25 +76,25 @@
 import API from '../api';
 import FileUpload from './FileUpload.vue';
 import bus from '../utils/bus';
+import ModelForm from '../utils/ModelForm';
 
 function isURLBlank(url) {
   return url !== null && url !== '';
 }
 
+const fields = ['url', 'referer', 'description', 'tags'];
+
 export default {
   name: 'PinCreateModal',
   components: {
     FileUpload,
   },
   data() {
+    const form = ModelForm.createFormModel(fields);
+    form.tags.value = [];
     return {
       disableUrlField: false,
-      form: {
+      form,
-        url: { value: null, error: null, type: null },
-        referer: { value: null, error: null, type: null },
-        description: { value: null, error: null, type: null },
-        tags: { value: [], error: null, type: null },
-      },
       formUpload: {
         imageId: null,
       },

pinry-spa/src/components/utils/ModelForm.js

@@ -24,6 +24,20 @@ function FormHelper(form, fields = []) {
     self[fieldName].error = errorMsg;
     self[fieldName].type = 'is-danger';
   }
+  function markFieldsAsDanger(errorRespObjecct) {
+    Object.entries(errorRespObjecct).forEach(
+      (errorTuple) => {
+        const [key, error] = errorTuple;
+        let msg;
+        if (Array.isArray(error)) {
+          [msg] = error;
+        } else {
+          msg = error;
+        }
+        markFieldAsDanger(key, msg);
+      },
+    );
+  }
   function resetAllFields() {
     fields.forEach(
       (fieldName) => {
@@ -34,6 +48,7 @@ function FormHelper(form, fields = []) {
   return {
     form,
     fields,
+    markFieldsAsDanger,
     markFieldAsDanger,
     resetField,
     resetAllFields,