From 98320f13195eb97d5b464a7142185df71a5aca93 Mon Sep 17 00:00:00 2001
From: Hamza Mahjoubi <hamzamahjoubi221@gmail.com>
Date: Wed, 18 Sep 2024 19:00:48 +0200
Subject: [PATCH] fixup! feat: mail filters

Signed-off-by: Hamza Mahjoubi <hamzamahjoubi221@gmail.com>
---
 .../mailFilter/MailFilterDeleteModal.vue           |  9 ++++-----
 src/components/mailFilter/MailFilterTest.vue       |  5 +----
 src/components/mailFilter/MailFilters.vue          | 14 ++++++++------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/components/mailFilter/MailFilterDeleteModal.vue b/src/components/mailFilter/MailFilterDeleteModal.vue
index a98f6eeffe..b87a063952 100644
--- a/src/components/mailFilter/MailFilterDeleteModal.vue
+++ b/src/components/mailFilter/MailFilterDeleteModal.vue
@@ -4,9 +4,10 @@
 -->
 <template>
 	<NcDialog :name="t('mail','Delete mail filter {filterName}?', {filterName: filter.name})"
+		:open="open"
 		:message="t('mail', 'Are you sure to delete the mail filter?')"
 		:buttons="buttons"
-		@close="closeModal()" />
+		@closing="closeModal()" />
 </template>
 
 <script>
@@ -17,8 +18,6 @@ import IconCheck from '@mdi/svg/svg/check.svg'
 export default {
 	name: 'MailFilterDeleteModal',
 	components: {
-		IconCancel,
-		IconCheck,
 		NcDialog,
 	},
 	props: {
@@ -26,9 +25,9 @@ export default {
 			type: Object,
 			required: true,
 		},
-		loading: {
+		open: {
 			type: Boolean,
-			required: false,
+			required: true,
 		},
 	},
 	data() {
diff --git a/src/components/mailFilter/MailFilterTest.vue b/src/components/mailFilter/MailFilterTest.vue
index bd4c2844f3..cc8cbc642b 100644
--- a/src/components/mailFilter/MailFilterTest.vue
+++ b/src/components/mailFilter/MailFilterTest.vue
@@ -50,15 +50,12 @@
 	</div>
 </template>
 <script>
-import { NcActionButton, NcActions, NcButton, NcLoadingIcon, NcSelect } from '@nextcloud/vue'
+import { NcButton, NcSelect } from '@nextcloud/vue'
 import DeleteIcon from 'vue-material-design-icons/Delete.vue'
 
 export default {
 	name: 'MailFilterTest',
 	components: {
-		NcLoadingIcon,
-		NcActions,
-		NcActionButton,
 		NcButton,
 		NcSelect,
 		DeleteIcon,
diff --git a/src/components/mailFilter/MailFilters.vue b/src/components/mailFilter/MailFilters.vue
index 43083ca539..273ca941ca 100644
--- a/src/components/mailFilter/MailFilters.vue
+++ b/src/components/mailFilter/MailFilters.vue
@@ -36,8 +36,9 @@
 			:loading="loading"
 			@update-filter="updateFilter"
 			@close="closeModal" />
-		<MailFilterDeleteModal v-if="showDeleteModal && currentFilter"
+		<MailFilterDeleteModal v-if="currentFilter"
 			:filter="currentFilter"
+			:open="showDeleteModal"
 			:loading="loading"
 			@delete-filter="deleteFilter"
 			@close="closeModal" />
@@ -45,7 +46,7 @@
 </template>
 
 <script>
-import { NcLoadingIcon as IconLoading, NcActionButton, NcListItem, NcButton } from '@nextcloud/vue'
+import { NcActionButton, NcListItem, NcButton } from '@nextcloud/vue'
 import MailFilterUpdateModal from './MailFilterUpdateModal.vue'
 import { randomId } from '../../util/randomId.js'
 import logger from '../../logger.js'
@@ -59,7 +60,6 @@ export default {
 	name: 'MailFilters',
 	components: {
 		NcButton,
-		IconLoading,
 		NcListItem,
 		NcActionButton,
 		MailFilterUpdateModal,
@@ -173,16 +173,18 @@ export default {
 			})
 
 			try {
-				await this.mailFilterStore.update(this.account.id)
+				await this.mailFilterStore.update(this.account.id).then(() => {
+					showSuccess(t('mail', 'Filter deleted'))
+				})
 			} catch (e) {
-				// TODO error toast
+				logger.error(e)
+				showError(t('mail', 'Could not delete filter'))
 			} finally {
 				this.loading = false
 			}
 
 			await this.$store.dispatch('fetchActiveSieveScript', { accountId: this.account.id })
 
-			this.closeModal()
 		},
 		closeModal() {
 			this.showUpdateModal = false