From 3f1de0b34a35ad7da9a7a42d6326f25ffd4d43b7 Mon Sep 17 00:00:00 2001
From: hamza221 <hamzamahjoubi221@gmail.com>
Date: Mon, 25 Sep 2023 13:10:55 +0200
Subject: [PATCH] fixup! feat: delete tags

Signed-off-by: hamza221 <hamzamahjoubi221@gmail.com>
---
 appinfo/routes.php                     |  2 +-
 src/components/DeleteTagModal.vue      | 16 +++++++++++-----
 src/components/TagModal.vue            | 11 +++++------
 src/service/MessageService.js          |  4 ++--
 src/store/mutations.js                 |  4 ++++
 tests/Unit/Service/MailManagerTest.php |  8 ++++++++
 6 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 42705a6202..9c714c55c1 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -132,7 +132,7 @@
 		],
 		[
 			'name' => 'tags#delete',
-			'url' => '/api/tags/{id}/tags/{accountId}',
+			'url' => '/api/tags/{accountId}/delete/{id}',
 			'verb' => 'DELETE'
 		],
 		[
diff --git a/src/components/DeleteTagModal.vue b/src/components/DeleteTagModal.vue
index bb903c97e9..ab8d266368 100644
--- a/src/components/DeleteTagModal.vue
+++ b/src/components/DeleteTagModal.vue
@@ -1,7 +1,7 @@
 <!--
-  - @copyright 2023 Hamza Mahjoubi <hamza.mahjoubi221@proton.me>
+  - @copyright 2023 Hamza Mahjoubi <hamzamahjoubi221@proton.me>
   -
-  - @author 2023 Hamza Mahjoubi <hamza.mahjoubi221@proton.me>
+  - @author 2023 Hamza Mahjoubi <hamzamahjoubi221@proton.me>
   -
   - @license AGPL-3.0-or-later
   -
@@ -19,12 +19,15 @@
   - along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <template>
-	<Modal class="modal" size="large" @close="onClose">
+	<Modal class="modal"
+		size="large"
+		container="body"
+		@close="onClose">
 		<div class="modal__content">
 			{{ t('mail', 'The tag will be deleted from all messages.') }}
 		</div>
 		<div class="modal__footer">
-			<Button @click="onClose">
+			<Button :disabled="deleting" @click="onClose">
 				{{ t('mail', 'Cancel') }}
 			</Button>
 			<Button :disabled="deleting" @click="deleteTag">
@@ -68,11 +71,14 @@ export default {
 					tag: this.tag,
 					accountId: this.accountId,
 				})
+				this.$store.commit('deleteTag', {
+					tagId: this.tag.id,
+				})
 				showSuccess(t('mail', 'Tag: {name} deleted', { name: this.tag.displayName }))
-				this.$emit('close')
 			} catch (error) {
 				showInfo(t('mail', 'An error occurred, unable to delete the tag.'))
 			}
+			this.$emit('close')
 
 		},
 	},
diff --git a/src/components/TagModal.vue b/src/components/TagModal.vue
index f11c256080..751f415a0e 100644
--- a/src/components/TagModal.vue
+++ b/src/components/TagModal.vue
@@ -21,7 +21,11 @@
   -->
 
 <template>
-	<Modal size="large" @close="onClose">
+	<DeleteTagModal v-if="deleteTagModal"
+		:tag="tagToDelete"
+		:account-id="envelopes[0].accountId"
+		@close="closeDeleteModal" />
+	<Modal v-else size="large" @close="onClose">
 		<div class="modal-content">
 			<h2 class="tag-title">
 				{{ t('mail', 'Add default tags') }}
@@ -97,10 +101,6 @@
 				</ActionText>
 			</div>
 		</div>
-		<DeleteTagModal v-if="deleteTagModal"
-			:tag="tagToDelete"
-			:account-id="envelopes[0].accountId"
-			@close="closeDeleteModal" />
 	</Modal>
 </template>
 
@@ -186,7 +186,6 @@ export default {
 		},
 		closeDeleteModal() {
 			this.deleteTagModal = false
-			this.onClose()
 		},
 		isSet(imapLabel) {
 			return this.envelopes.some(
diff --git a/src/service/MessageService.js b/src/service/MessageService.js
index 3c776e5d2f..f0c3125ec9 100644
--- a/src/service/MessageService.js
+++ b/src/service/MessageService.js
@@ -146,8 +146,8 @@ export async function updateEnvelopeTag(id, displayName, color) {
 }
 
 export async function deleteTag(id, accountId) {
-	const url = generateUrl('/apps/mail/api/tags/{id}/tags/{accountId}', {
-		id, accountId,
+	const url = generateUrl('/apps/mail/api/tags/{accountId}/delete/{id}', {
+		accountId, id,
 	})
 
 	await axios.delete(url)
diff --git a/src/store/mutations.js b/src/store/mutations.js
index fb8de67e50..3de9244fc4 100644
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -333,6 +333,10 @@ export default {
 		Vue.set(state.tags, tag.id, tag)
 		state.tagList.push(tag.id)
 	},
+	deleteTag(state, { tagId }) {
+		Vue.delete(state.tags, tagId)
+		state.tagList = state.tagList.filter((id) => id !== tagId)
+	},
 	addEnvelopeTag(state, { envelope, tagId }) {
 		Vue.set(envelope, 'tags', uniq([...envelope.tags, tagId]))
 	},
diff --git a/tests/Unit/Service/MailManagerTest.php b/tests/Unit/Service/MailManagerTest.php
index 1a8f472480..a9f3cfeffd 100644
--- a/tests/Unit/Service/MailManagerTest.php
+++ b/tests/Unit/Service/MailManagerTest.php
@@ -33,6 +33,7 @@
 use OCA\Mail\Db\MailboxMapper;
 use OCA\Mail\Db\Message;
 use OCA\Mail\Db\MessageMapper as DbMessageMapper;
+use OCA\Mail\Db\MessageTagsMapper;
 use OCA\Mail\Db\Tag;
 use OCA\Mail\Db\TagMapper;
 use OCA\Mail\Db\ThreadMapper;
@@ -80,9 +81,14 @@ class MailManagerTest extends TestCase {
 	/** @var MockObject|TagMapper */
 	private $tagMapper;
 
+	/** @var MessageTagsMapper|MockObject */
+	private $messageTagsMapper;
+
 	/** @var ThreadMapper|MockObject */
 	private $threadMapper;
 
+	
+
 	protected function setUp(): void {
 		parent::setUp();
 
@@ -95,6 +101,7 @@ protected function setUp(): void {
 		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
 		$this->logger = $this->createMock(LoggerInterface::class);
 		$this->tagMapper = $this->createMock(TagMapper::class);
+		$this->messageTagsMapper = $this->createMock(MessageTagsMapper::class);
 		$this->threadMapper = $this->createMock(ThreadMapper::class);
 
 		$this->manager = new MailManager(
@@ -107,6 +114,7 @@ protected function setUp(): void {
 			$this->eventDispatcher,
 			$this->logger,
 			$this->tagMapper,
+			$this->messageTagsMapper,
 			$this->threadMapper
 		);
 	}