From d29a0dad8f9d9e588470788f9af3515f599df5f7 Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@biribiri.dev>
Date: Wed, 20 Jul 2022 18:15:55 -0400
Subject: [PATCH 1/3] Refactor form-dialog.vue to use Composition API

---
 .../client/src/components/form-dialog.vue     | 100 ++++++++----------
 1 file changed, 46 insertions(+), 54 deletions(-)

diff --git a/packages/client/src/components/form-dialog.vue b/packages/client/src/components/form-dialog.vue
index f05dde16f..995b521e6 100644
--- a/packages/client/src/components/form-dialog.vue
+++ b/packages/client/src/components/form-dialog.vue
@@ -35,11 +35,11 @@
 				</FormSwitch>
 				<FormSelect v-else-if="form[item].type === 'enum'" v-model="values[item]" class="_formBlock">
 					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span></template>
-					<option v-for="item in form[item].enum" :key="item.value" :value="item.value">{{ item.label }}</option>
+					<option v-for="blockItem in form[item].enum" :key="blockItem.value" :value="blockItem.value">{{ blockItem.label }}</option>
 				</FormSelect>
 				<FormRadios v-else-if="form[item].type === 'radio'" v-model="values[item]" class="_formBlock">
 					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span></template>
-					<option v-for="item in form[item].options" :key="item.value" :value="item.value">{{ item.label }}</option>
+					<option v-for="blockItem in form[item].options" :key="blockItem.value" :value="blockItem.value">{{ blockItem.label }}</option>
 				</FormRadios>
 				<FormRange v-else-if="form[item].type === 'range'" v-model="values[item]" :min="form[item].min" :max="form[item].max" :step="form[item].step" :text-converter="form[item].textConverter" class="_formBlock">
 					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span></template>
@@ -54,8 +54,7 @@
 </XModalWindow>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
 import FormInput from './form/input.vue';
 import FormTextarea from './form/textarea.vue';
 import FormSwitch from './form/switch.vue';
@@ -65,63 +64,56 @@ import MkButton from './ui/button.vue';
 import FormRadios from './form/radios.vue';
 import XModalWindow from '@/components/ui/modal-window.vue';
 
-export default defineComponent({
-	components: {
-		XModalWindow,
-		FormInput,
-		FormTextarea,
-		FormSwitch,
-		FormSelect,
-		FormRange,
-		MkButton,
-		FormRadios,
-	},
+let dialog = $ref<InstanceType<typeof XModalWindow>>();
+let values: object = $ref({});
 
-	props: {
-		title: {
-			type: String,
-			required: true,
-		},
-		form: {
-			type: Object,
-			required: true,
-		},
-	},
+const props = defineProps<{
+	title: string,
+	form: object,
+}>();
 
-	emits: ['done'],
+const emit = defineEmits<{
+	(ev: 'done', v: { result?: object, canceled?: boolean }): void,
+	(ev: 'closed'): void
+}>();
 
-	data() {
-		return {
-			values: {},
-		};
-	},
+function ok(): void {
+	emit('done', {
+		result: values,
+	});
+	dialog.close();
+}
 
-	created() {
-		for (const item in this.form) {
-			this.values[item] = this.form[item].default ?? null;
-		}
-	},
+function cancel(): void {
+	emit('done', {
+		canceled: true,
+	});
+	dialog.close();
+}
 
-	methods: {
-		ok() {
-			this.$emit('done', {
-				result: this.values,
-			});
-			this.$refs.dialog.close();
-		},
+for (const item in props.form) {
+	values[item] = props.form[item].default ?? null;
+}
 
-		cancel() {
-			this.$emit('done', {
-				canceled: true,
-			});
-			this.$refs.dialog.close();
-		},
-	},
-});
+// export default defineComponent({
+// 	components: {
+// 		XModalWindow,
+// 		FormInput,
+// 		FormTextarea,
+// 		FormSwitch,
+// 		FormSelect,
+// 		FormRange,
+// 		MkButton,
+// 		FormRadios,
+// 	},
+
+// 	created() {
+// 		for (const item in this.form) {
+// 			this.values[item] = this.form[item].default ?? null;
+// 		}
+// 	},
+// });
 </script>
 
 <style lang="scss" scoped>
-.xkpnjxcv {
-
-}
 </style>

From 929203b2f315721bc8c942d7ada090d81b0e67bd Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@biribiri.dev>
Date: Wed, 20 Jul 2022 18:17:24 -0400
Subject: [PATCH 2/3] Remove leftover comments from form-dialog

---
 .../client/src/components/form-dialog.vue     | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/packages/client/src/components/form-dialog.vue b/packages/client/src/components/form-dialog.vue
index 995b521e6..d220bf7fd 100644
--- a/packages/client/src/components/form-dialog.vue
+++ b/packages/client/src/components/form-dialog.vue
@@ -55,6 +55,7 @@
 </template>
 
 <script lang="ts" setup>
+import { } from 'vue';
 import FormInput from './form/input.vue';
 import FormTextarea from './form/textarea.vue';
 import FormSwitch from './form/switch.vue';
@@ -94,25 +95,6 @@ function cancel(): void {
 for (const item in props.form) {
 	values[item] = props.form[item].default ?? null;
 }
-
-// export default defineComponent({
-// 	components: {
-// 		XModalWindow,
-// 		FormInput,
-// 		FormTextarea,
-// 		FormSwitch,
-// 		FormSelect,
-// 		FormRange,
-// 		MkButton,
-// 		FormRadios,
-// 	},
-
-// 	created() {
-// 		for (const item in this.form) {
-// 			this.values[item] = this.form[item].default ?? null;
-// 		}
-// 	},
-// });
 </script>
 
 <style lang="scss" scoped>

From 2d245d62cfcfffa824826f99098451bf70a22067 Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@biribiri.dev>
Date: Wed, 20 Jul 2022 19:23:17 -0400
Subject: [PATCH 3/3] form-dialog: use Record<string, any> for form prop

---
 packages/client/src/components/form-dialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/form-dialog.vue b/packages/client/src/components/form-dialog.vue
index d220bf7fd..ea78d6894 100644
--- a/packages/client/src/components/form-dialog.vue
+++ b/packages/client/src/components/form-dialog.vue
@@ -70,7 +70,7 @@ let values: object = $ref({});
 
 const props = defineProps<{
 	title: string,
-	form: object,
+	form: Record<string, any>,
 }>();
 
 const emit = defineEmits<{