From 91e8dd326b352fa7ca17949c8352d13a27af58d9 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Tue, 11 Oct 2022 13:32:24 -0700
Subject: [PATCH] Make emit typing safe

---
 src/components/EditDate.vue        | 8 +++++---
 src/components/FaceDeleteModal.vue | 9 ++++-----
 src/components/FaceEditModal.vue   | 9 ++++-----
 src/components/FaceMergeModal.vue  | 9 ++++-----
 src/components/Modal.vue           | 7 +++++--
 src/components/Tag.vue             | 8 ++++----
 6 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/components/EditDate.vue b/src/components/EditDate.vue
index d61763b7..5238ea1a 100644
--- a/src/components/EditDate.vue
+++ b/src/components/EditDate.vue
@@ -100,7 +100,7 @@
 </template>
 
 <script lang="ts">
-import { Component, Mixins } from 'vue-property-decorator';
+import { Component, Emit, Mixins } from 'vue-property-decorator';
 import GlobalMixin from '../mixins/GlobalMixin';
 import { IPhoto } from '../types';
 
@@ -123,6 +123,8 @@ const EDIT_API_URL = '/apps/memories/api/edit/{id}';
     }
 })
 export default class EditDate extends Mixins(GlobalMixin) {
+    @Emit('refresh') emitRefresh(val: boolean) {}
+
     private photos: IPhoto[] = [];
     private photosDone: number = 0;
     private processing: boolean = false;
@@ -236,7 +238,7 @@ export default class EditDate extends Mixins(GlobalMixin) {
             const res = await axios.patch<any>(generateUrl(EDIT_API_URL, { id: this.photos[0].fileid }), {
                 date: this.getExifFormat(this.getDate()),
             });
-            this.$emit('refresh', true);
+            this.emitRefresh(true);
             this.close();
         } catch (e) {
             if (e.response?.data?.message) {
@@ -314,7 +316,7 @@ export default class EditDate extends Mixins(GlobalMixin) {
             // nothing to do
         }
         this.processing = false;
-        this.$emit('refresh', true);
+        this.emitRefresh(true);
         this.close();
     }
 
diff --git a/src/components/FaceDeleteModal.vue b/src/components/FaceDeleteModal.vue
index 8cf52dfa..7a8b04bc 100644
--- a/src/components/FaceDeleteModal.vue
+++ b/src/components/FaceDeleteModal.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script lang="ts">
-import { Component, Mixins, Watch } from 'vue-property-decorator';
+import { Component, Emit, Mixins, Watch } from 'vue-property-decorator';
 import { NcButton, NcTextField } from '@nextcloud/vue';
 import { showError } from '@nextcloud/dialogs'
 import Modal from './Modal.vue';
@@ -33,6 +33,9 @@ export default class FaceDeleteModal extends Mixins(GlobalMixin) {
     private user: string = "";
     private name: string = "";
 
+    @Emit('close')
+    public close() {}
+
     @Watch('$route')
     async routeChange(from: any, to: any) {
         this.refreshParams();
@@ -59,9 +62,5 @@ export default class FaceDeleteModal extends Mixins(GlobalMixin) {
             }));
 		}
     }
-
-    public close() {
-        this.$emit('close');
-    }
 }
 </script>
\ No newline at end of file
diff --git a/src/components/FaceEditModal.vue b/src/components/FaceEditModal.vue
index 93300fce..10d4cfb9 100644
--- a/src/components/FaceEditModal.vue
+++ b/src/components/FaceEditModal.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script lang="ts">
-import { Component, Mixins, Watch } from 'vue-property-decorator';
+import { Component, Emit, Mixins, Watch } from 'vue-property-decorator';
 import { NcButton, NcTextField } from '@nextcloud/vue';
 import { showError } from '@nextcloud/dialogs'
 import Modal from './Modal.vue';
@@ -40,6 +40,9 @@ export default class FaceEditModal extends Mixins(GlobalMixin) {
     private name: string = "";
     private oldName: string = "";
 
+    @Emit('close')
+    public close() {}
+
     @Watch('$route')
     async routeChange(from: any, to: any) {
         this.refreshParams();
@@ -71,10 +74,6 @@ export default class FaceEditModal extends Mixins(GlobalMixin) {
             }));
 		}
     }
-
-    public close() {
-        this.$emit('close');
-    }
 }
 </script>
 
diff --git a/src/components/FaceMergeModal.vue b/src/components/FaceMergeModal.vue
index 0f945b06..132d6f0b 100644
--- a/src/components/FaceMergeModal.vue
+++ b/src/components/FaceMergeModal.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script lang="ts">
-import { Component, Mixins, Watch } from 'vue-property-decorator';
+import { Component, Emit, Mixins, Watch } from 'vue-property-decorator';
 import { NcButton, NcTextField } from '@nextcloud/vue';
 import { showError } from '@nextcloud/dialogs'
 import { IFileInfo, IPhoto, ITag } from '../types';
@@ -52,6 +52,9 @@ export default class FaceMergeModal extends Mixins(GlobalMixin) {
     private processing = 0;
     private procesingTotal = 0;
 
+    @Emit('close')
+    public close() {}
+
     @Watch('$route')
     async routeChange(from: any, to: any) {
         this.refreshParams();
@@ -137,10 +140,6 @@ export default class FaceMergeModal extends Mixins(GlobalMixin) {
             }));
 		}
     }
-
-    public close() {
-        this.$emit('close');
-    }
 }
 </script>
 
diff --git a/src/components/Modal.vue b/src/components/Modal.vue
index 85dc181f..2d147357 100644
--- a/src/components/Modal.vue
+++ b/src/components/Modal.vue
@@ -1,7 +1,7 @@
 <template>
     <NcModal
         :size="size"
-        @close="$emit('close')"
+        @close="close"
         :outTransition="true">
         <div class="container">
             <div class="head">
@@ -18,7 +18,7 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Vue } from 'vue-property-decorator';
+import { Component, Emit, Prop, Vue } from 'vue-property-decorator';
 import { NcModal } from '@nextcloud/vue';
 
 @Component({
@@ -28,6 +28,9 @@ import { NcModal } from '@nextcloud/vue';
 })
 export default class Modal extends Vue {
     @Prop({default: 'small'}) private size?: string;
+
+    @Emit('close')
+    public close() {}
 }
 </script>
 
diff --git a/src/components/Tag.vue b/src/components/Tag.vue
index 925dc098..a65a3fca 100644
--- a/src/components/Tag.vue
+++ b/src/components/Tag.vue
@@ -5,7 +5,7 @@
         hasError: error,
         isFace: isFace,
     }"
-        @click="openTag()"
+        @click="openTag(data)"
         v-bind:style="{
             width: rowHeight + 'px',
             height: rowHeight + 'px',
@@ -32,7 +32,7 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Watch, Mixins } from 'vue-property-decorator';
+import { Component, Prop, Watch, Mixins, Emit } from 'vue-property-decorator';
 import { IPhoto, ITag } from '../types';
 import { generateUrl } from '@nextcloud/router'
 import { getPreviewUrl } from "../services/FileUtils";
@@ -112,8 +112,8 @@ export default class Tag extends Mixins(GlobalMixin) {
     }
 
     /** Open tag */
-    openTag() {
-        this.$emit('open', this.data);
+    @Emit('open')
+    openTag(tag: ITag) {
         if (this.noNavigate) {
             return;
         }