From c8253ff42592a45b304c1e34f8917421a2641f83 Mon Sep 17 00:00:00 2001
From: kevin3ssen <kevin3ssen@gmail.com>
Date: Sun, 27 Dec 2020 20:33:42 +0100
Subject: [PATCH] rename form-type to form-widget

---
 assets/components/Form/CheckboxGroupType.vue           | 10 +++++-----
 assets/components/Form/CheckboxType.vue                |  4 ++--
 assets/components/Form/ChoiceType.vue                  |  4 ++--
 assets/components/Form/CollectionType.vue              |  6 +++---
 assets/components/Form/DateType.vue                    |  4 ++--
 .../components/Form/{FormType.vue => FormWidget.vue}   | 10 +++++-----
 .../Form/{FormTypeMixin.js => FormWidgetMixin.js}      |  4 ++--
 assets/components/Form/HiddenType.vue                  |  4 ++--
 assets/components/Form/PasswordType.vue                |  4 ++--
 assets/components/Form/RadioGroupType.vue              |  6 +++---
 assets/components/Form/RadioType.vue                   |  4 ++--
 assets/components/Form/SwitchType.vue                  |  4 ++--
 assets/components/Form/TextType.vue                    |  6 +++---
 assets/components/Form/TextareaType.vue                |  4 ++--
 assets/globalComponents.js                             |  4 ++--
 15 files changed, 39 insertions(+), 39 deletions(-)
 rename assets/components/Form/{FormType.vue => FormWidget.vue} (90%)
 rename assets/components/Form/{FormTypeMixin.js => FormWidgetMixin.js} (84%)

diff --git a/assets/components/Form/CheckboxGroupType.vue b/assets/components/Form/CheckboxGroupType.vue
index d5ca8dd..27df89e 100644
--- a/assets/components/Form/CheckboxGroupType.vue
+++ b/assets/components/Form/CheckboxGroupType.vue
@@ -4,16 +4,16 @@
             {{ form.vars.label }}
         </label>
         <div v-for="(child, key) in form.children" :key="key" v-bind="child.vars.row_attr" style="margin-bottom: -10px;">
-            <form-type :form="child" />
+            <form-widget :form="child" />
         </div>
     </div>
 </template>
 <script>
-    import {formTypeMixin} from "./FormTypeMixin";
-    import FormType from "./FormType";
+    import {formWidgetMixin} from "./FormWidgetMixin";
+    import FormWidget from "./FormWidget";
 
     export default {
-        components: {FormType},
-        mixins: [formTypeMixin],
+        components: {FormWidget},
+        mixins: [formWidgetMixin],
     };
 </script>
\ No newline at end of file
diff --git a/assets/components/Form/CheckboxType.vue b/assets/components/Form/CheckboxType.vue
index 0d38fe6..cf447df 100644
--- a/assets/components/Form/CheckboxType.vue
+++ b/assets/components/Form/CheckboxType.vue
@@ -2,10 +2,10 @@
     <v-checkbox v-model="form.vars.data" v-bind="attributes"/>
 </template>
 <script>
-    import {formTypeMixin} from "./FormTypeMixin";
+    import {formWidgetMixin} from "./FormWidgetMixin";
 
     export default {
-        mixins: [formTypeMixin],
+        mixins: [formWidgetMixin],
         created() {
             this.attributes['value'] = this.form.vars.value;
             this.form.vars.data = this.form.vars.data === true ? this.form.vars.value : null
diff --git a/assets/components/Form/ChoiceType.vue b/assets/components/Form/ChoiceType.vue
index 8cfaa05..4e1a959 100644
--- a/assets/components/Form/ChoiceType.vue
+++ b/assets/components/Form/ChoiceType.vue
@@ -2,10 +2,10 @@
     <v-select v-model="form.vars.data" v-bind="attributes"/>
 </template>
 <script>
-    import {formTypeMixin} from "./FormTypeMixin";
+    import {formWidgetMixin} from "./FormWidgetMixin";
 
     export default {
-        mixins: [formTypeMixin],
+        mixins: [formWidgetMixin],
         created() {
             this.form.vars.data = this.form.vars.data === true ? this.form.vars.value : null;
             this.attributes['value'] = this.form.vars.value;
diff --git a/assets/components/Form/CollectionType.vue b/assets/components/Form/CollectionType.vue
index 7a5fadf..4218e44 100644
--- a/assets/components/Form/CollectionType.vue
+++ b/assets/components/Form/CollectionType.vue
@@ -6,7 +6,7 @@
         <table>
             <tr v-for="(child, key) in form.children" :key="key">
                 <td v-for="subChild in child.children" v-bind="subChild.vars.row_attr">
-                    <FormType :form="subChild" :parentForm="subChild" />
+                    <form-widget :form="subChild" :parentForm="subChild"></form-widget>
                 </td>
                 <td>
                     <v-btn v-if="form.vars.allow_delete" @click.stop="removeItem(key)">
@@ -25,10 +25,10 @@
 </template>
 
 <script>
-    import {formTypeMixin} from "./FormTypeMixin";
+    import {formWidgetMixin} from "./FormWidgetMixin";
 
     export default {
-        mixins: [formTypeMixin],
+        mixins: [formWidgetMixin],
         computed: {
             prototypeName() {
                 return this.form.vars.prototype.vars.name;
diff --git a/assets/components/Form/DateType.vue b/assets/components/Form/DateType.vue
index 54ab879..4a39fd8 100644
--- a/assets/components/Form/DateType.vue
+++ b/assets/components/Form/DateType.vue
@@ -23,10 +23,10 @@
         </v-menu>
 </template>
 <script>
-    import {formTypeMixin} from "./FormTypeMixin";
+    import {formWidgetMixin} from "./FormWidgetMixin";
 
     export default {
-        mixins: [formTypeMixin],
+        mixins: [formWidgetMixin],
         data: () => ({
             locale: 'nl', // get locale from config-value
             fromDateMenu: false,
diff --git a/assets/components/Form/FormType.vue b/assets/components/Form/FormWidget.vue
similarity index 90%
rename from assets/components/Form/FormType.vue
rename to assets/components/Form/FormWidget.vue
index de2f9a7..73d27cc 100644
--- a/assets/components/Form/FormType.vue
+++ b/assets/components/Form/FormWidget.vue
@@ -5,7 +5,7 @@
                 {{ form.vars.label }}
             </label>
             <div v-for="(child, key) in form.children" :key="key" v-bind="child.vars.row_attr">
-                <form-type :form="child" />
+                <form-widget :form="child" />
             </div>
         </template>
 
@@ -19,11 +19,11 @@
 </template>
 
 <script>
-    import { formTypeMixin } from "./FormTypeMixin";
+    import { formWidgetMixin } from "./FormWidgetMixin";
 
     export default {
-        name: 'FormType',
-        mixins: [formTypeMixin],
+        name: 'FormWidget',
+        mixins: [formWidgetMixin],
         data: () => ({
             componentType: null,
         }),
@@ -47,7 +47,7 @@
             setAttributes() {
                 let attr = {};
                 attr['form'] = this.form;
-                attr['label'] = this.form.vars.label;
+                attr['label'] = this.form.vars.label ?? this.form.vars.name;
                 attr['hint'] = this.form.vars.help;
                 attr['error-messages'] = this.form.vars.errors;
                 attr['error'] = !!this.form.vars.errors;
diff --git a/assets/components/Form/FormTypeMixin.js b/assets/components/Form/FormWidgetMixin.js
similarity index 84%
rename from assets/components/Form/FormTypeMixin.js
rename to assets/components/Form/FormWidgetMixin.js
index 1c8e31e..12e17b0 100644
--- a/assets/components/Form/FormTypeMixin.js
+++ b/assets/components/Form/FormWidgetMixin.js
@@ -1,4 +1,4 @@
-const formTypeMixin = {
+const formWidgetMixin = {
     data: () => ({
         alreadyRendered: false,
         attributes: {},
@@ -12,4 +12,4 @@ const formTypeMixin = {
         this.form.rendered = true;
     },
 };
-export { formTypeMixin };
\ No newline at end of file
+export { formWidgetMixin };
\ No newline at end of file
diff --git a/assets/components/Form/HiddenType.vue b/assets/components/Form/HiddenType.vue
index 39ea80e..2475108 100644
--- a/assets/components/Form/HiddenType.vue
+++ b/assets/components/Form/HiddenType.vue
@@ -2,9 +2,9 @@
     <input type="hidden" v-model="form.vars.data" v-bind="attributes"/>
 </template>
 <script>
-    import {formTypeMixin} from "./FormTypeMixin";
+    import {formWidgetMixin} from "./FormWidgetMixin";
 
     export default {
-        mixins: [formTypeMixin],
+        mixins: [formWidgetMixin],
     };
 </script>
\ No newline at end of file
diff --git a/assets/components/Form/PasswordType.vue b/assets/components/Form/PasswordType.vue
index 02abc7e..818b395 100644
--- a/assets/components/Form/PasswordType.vue
+++ b/assets/components/Form/PasswordType.vue
@@ -2,9 +2,9 @@
     <v-text-field type="password" v-model="form.vars.data" v-bind="attributes"/>
 </template>
 <script>
-    import {formTypeMixin} from "./FormTypeMixin";
+    import {formWidgetMixin} from "./FormWidgetMixin";
 
     export default {
-        mixins: [formTypeMixin],
+        mixins: [formWidgetMixin],
     };
 </script>
\ No newline at end of file
diff --git a/assets/components/Form/RadioGroupType.vue b/assets/components/Form/RadioGroupType.vue
index 82f93d1..45dcac3 100644
--- a/assets/components/Form/RadioGroupType.vue
+++ b/assets/components/Form/RadioGroupType.vue
@@ -4,14 +4,14 @@
             v-model="form.vars.data"
         >
             <div v-for="(child, key) in form.children" :key="key">
-                <FormType :form="child" />
+                <form-widget :form="child"></form-widget>
             </div>
         </v-radio-group>
 </template>
 <script>
-    import {formTypeMixin} from "./FormTypeMixin";
+    import {formWidgetMixin} from "./FormWidgetMixin";
     export default {
-        mixins: [formTypeMixin],
+        mixins: [formWidgetMixin],
         created() {
             for (const child of this.form.children) {
                 if (child.vars.data === true) {
diff --git a/assets/components/Form/RadioType.vue b/assets/components/Form/RadioType.vue
index a4fdeae..44af4f0 100644
--- a/assets/components/Form/RadioType.vue
+++ b/assets/components/Form/RadioType.vue
@@ -2,10 +2,10 @@
     <v-radio v-model="form.vars.data" v-bind="attributes"/>
 </template>
 <script>
-    import {formTypeMixin} from "./FormTypeMixin";
+    import {formWidgetMixin} from "./FormWidgetMixin";
 
     export default {
-        mixins: [formTypeMixin],
+        mixins: [formWidgetMixin],
         created() {
             this.attributes['value'] = this.form.vars.value;
             this.form.vars.data = this.form.vars.data === true ? this.form.vars.value : null
diff --git a/assets/components/Form/SwitchType.vue b/assets/components/Form/SwitchType.vue
index 9ba46ac..b746ac2 100644
--- a/assets/components/Form/SwitchType.vue
+++ b/assets/components/Form/SwitchType.vue
@@ -2,10 +2,10 @@
     <v-switch v-model="form.vars.data" v-bind="attributes"/>
 </template>
 <script>
-    import {formTypeMixin} from "./FormTypeMixin";
+    import {formWidgetMixin} from "./FormWidgetMixin";
 
     export default {
-        mixins: [formTypeMixin],
+        mixins: [formWidgetMixin],
         created() {
             this.attributes['value'] = this.form.vars.value;
             this.form.vars.data = this.form.vars.data === true ? this.form.vars.value : null
diff --git a/assets/components/Form/TextType.vue b/assets/components/Form/TextType.vue
index f81cd96..21e47ce 100644
--- a/assets/components/Form/TextType.vue
+++ b/assets/components/Form/TextType.vue
@@ -1,10 +1,10 @@
 <template>
-    <v-text-field v-model="form.vars.data" v-bind="attributes"/>
+    <v-text-field v-model="form.data" v-bind="attributes"/>
 </template>
 <script>
-    import {formTypeMixin} from "./FormTypeMixin";
+    import {formWidgetMixin} from "./FormWidgetMixin";
 
     export default {
-        mixins: [formTypeMixin],
+        mixins: [formWidgetMixin],
     };
 </script>
\ No newline at end of file
diff --git a/assets/components/Form/TextareaType.vue b/assets/components/Form/TextareaType.vue
index b281dea..bc8683a 100644
--- a/assets/components/Form/TextareaType.vue
+++ b/assets/components/Form/TextareaType.vue
@@ -2,9 +2,9 @@
     <v-textarea v-model="form.vars.data" v-bind="attributes"/>
 </template>
 <script>
-    import {formTypeMixin} from "./FormTypeMixin";
+    import {formWidgetMixin} from "./FormWidgetMixin";
 
     export default {
-        mixins: [formTypeMixin],
+        mixins: [formWidgetMixin],
     };
 </script>
\ No newline at end of file
diff --git a/assets/globalComponents.js b/assets/globalComponents.js
index 8f3f60c..162b58b 100644
--- a/assets/globalComponents.js
+++ b/assets/globalComponents.js
@@ -10,12 +10,12 @@ for (const i in VuetifyComponents) {
 // Note that the custom components below aren't imported using "import * as components from '.components'"
 // This is because importing the components like below will help IDE to provide autocompletion.
 
-// FormTypes
+// FormWidgets
 Vue.component('CheckboxGroupType', () => import('./components/Form/CheckboxGroupType'));
 Vue.component('CheckboxType', () => import('./components/Form/CheckboxType'));
 Vue.component('ChoiceType', () => import('./components/Form/ChoiceType'));
 Vue.component('CollectionType', () => import('./components/Form/CollectionType'));
-Vue.component('FormType', () => import('./components/Form/FormType'));
+Vue.component('FormWidget', () => import('./components/Form/FormWidget'));
 Vue.component('DateType', () => import('./components/Form/DateType'));
 Vue.component('HiddenType', () => import('./components/Form/HiddenType'));
 Vue.component('PasswordType', () => import('./components/Form/PasswordType'));