fixup! feat: delete tags

Signed-off-by: hamza221 <[email protected]>

lib/Contracts/IMailManager.php

@@ -318,15 +318,16 @@ public function createTag(string $displayName, string $color, string $userId): T
 	public function updateTag(int $id, string $displayName, string $color, string $userId): Tag;
 
 	/**
-	 * Update a mail tag
+	 * Delete a mail tag
 	 *
-	 * @param string $userId
 	 * @param int $id
+	 * @param string $userId
+	 * @param Account $account
 	 *
-	 * @return int
-	 * @throws ClientException if the given tag does not exist
+	 * @return Tag
+	 * @throws ClientException
 	 */
-	public function deleteTag(int $id, string $userId, array $messages, Account $account): Tag;
+	public function deleteTag(int $id, string $userId, Account $account): Tag;
 
 	/**
 	 * @param Account $srcAccount

lib/Controller/TagsController.php

@@ -43,7 +43,8 @@ class TagsController extends Controller {
 
 	public function __construct(IRequest $request,
 		string $UserId,
-		IMailManager $mailManager, AccountService $accountService,
+		IMailManager $mailManager,
+		AccountService $accountService,
 	) {
 		parent::__construct(Application::APP_ID, $request);
 		$this->currentUserId = $UserId;
@@ -99,11 +100,10 @@ public function update(int $id, string $displayName, string $color): JSONRespons
 	public function delete(int $id, int $accountId): JSONResponse {
 		try {
 			$account = $this->accountService->find($this->currentUserId, $accountId);
-			$messages = $this->mailManager->getMessagesByTag($this->currentUserId, $id, $account);
 		} catch (DoesNotExistException $e) {
 			return new JSONResponse([], Http::STATUS_FORBIDDEN);
 		}
-		$this->mailManager->deleteTag($id, $this->currentUserId, $messages, $account);
+		$this->mailManager->deleteTag($id, $this->currentUserId, $account);
 		return new JSONResponse($id);
 	}
 

lib/Db/MessageTags.php

@@ -39,6 +39,9 @@ class MessageTags extends Entity implements JsonSerializable {
 	protected $imapMessageId;
 	protected $tagId;
 
+	public function __construct() {
+		$this->addType('tagId', 'integer');
+	}
 
 	#[ReturnTypeWillChange]
 	public function jsonSerialize() {

lib/Db/MessageTagsMapper.php

@@ -28,19 +28,14 @@
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
-use OCP\IL10N;
 
 /**
  * @template-extends QBMapper<MessageTags>
  */
 class MessageTagsMapper extends QBMapper {
-	/** @var IL10N */
-	private $l10n;
 
-	public function __construct(IDBConnection $db,
-		IL10N $l10n) {
+	public function __construct(IDBConnection $db) {
 		parent::__construct($db, 'mail_message_tags');
-		$this->l10n = $l10n;
 	}
 
 	public function getMessagesByTag(int $id): array {

lib/Service/MailManager.php

@@ -253,18 +253,6 @@ public function getMessage(string $uid, int $id): Message {
 		return $this->dbMessageMapper->findByUserId($uid, $id);
 	}
 
-	public function getMessagesByTag(string $uid, int $tagId, Account $account): array {
-		try {
-			$messageTags = $this->messageTagsMapper->getMessagesByTag($tagId);
-			$messages = array_map(function ($messageTag) use ($uid, $account) {
-				return $this->getByMessageId($account, $messageTag->getImapMessageId());
-			}, $messageTags);
-		} catch (DoesNotExistException $e) {
-			throw new ClientException('Messages not found', 0, $e);
-		}
-		return array_merge(...$messages);
-	}
-
 	/**
 	 * @param Horde_Imap_Client_Socket $client
 	 * @param Account $account
@@ -836,7 +824,16 @@ public function updateTag(int $id, string $displayName, string $color, string $u
 
 		return $this->tagMapper->update($tag);
 	}
-	public function deleteTag(int $id, string $userId, array $messages, Account $account): Tag {
+	public function deleteTag(int $id, string $userId, Account $account): Tag {
+		try {
+			$messageTags = $this->messageTagsMapper->getMessagesByTag($id);
+			$messages = array_merge(... array_map(function ($messageTag) use ($account) {
+				return $this->getByMessageId($account, $messageTag->getImapMessageId());
+			}, $messageTags));
+		} catch (DoesNotExistException $e) {
+			throw new ClientException('Messages not found', 0, $e);
+		}
+
 		try {
 			$tag = $this->tagMapper->getTagForUser($id, $userId);
 		} catch (DoesNotExistException $e) {

src/components/TagItem.vue

@@ -12,6 +12,14 @@
 				@click="openEditTag">
 				{{ t('mail','Edit name or color') }}
 			</NcActionButton>
+			<NcActionButton v-if="!tag.isDefaultTag"
+				@click="deleteTag">
+				<template #icon>
+					<DeleteIcon :size="20" />
+				</template>
+				{{ t('mail','Delete tag') }}
+			</NcActionButton>
+
 			<ActionInput v-if="renameTagInput"
 				:value="tag.displayName"
 				@submit="renameTag(tag, $event)" />
@@ -46,6 +54,8 @@
 <script>
 import { NcColorPicker, NcActions as Actions, NcActionButton, NcActionText as ActionText, NcActionInput as ActionInput, NcLoadingIcon as IconLoading } from '@nextcloud/vue'
 import { showInfo } from '@nextcloud/dialogs'
+import DeleteIcon from 'vue-material-design-icons/Delete'
+
 export default {
 	name: 'TagItem',
 	components: {
@@ -55,6 +65,7 @@ export default {
 		ActionText,
 		ActionInput,
 		IconLoading,
+		DeleteIcon,
 	},
 	props: {
 		tag: {
@@ -79,6 +90,9 @@ export default {
 		}
 	},
 	methods: {
+		deleteTag() {
+			this.$emit('delete-tag', this.tag)
+		},
 		async updateColor(newColor) {
 			this.editColor = newColor
 			this.showSaving = false

src/components/TagModal.vue

@@ -33,7 +33,8 @@
 			<TagItem v-for="tag in tags"
 				:key="tag.id"
 				:tag="tag"
-				:envelopes="envelopes" />
+				:envelopes="envelopes"
+				@delete-tag="deleteTag" />
 
 			<h2 class="tag-title">
 				{{ t('mail', 'Add tag') }}
@@ -65,13 +66,13 @@
 </template>
 
 <script>
-import { NcButton, NcModal as Modal, NcActionText as ActionText, NcActionInput as ActionInput, NcLoadingIcon as IconLoading } from '@nextcloud/vue'
+import { NcModal as Modal, NcActionText as ActionText, NcActionInput as ActionInput, NcLoadingIcon as IconLoading, NcButton } from '@nextcloud/vue'
 import DeleteTagModal from './DeleteTagModal.vue'
+import TagItem from './TagItem.vue'
 import IconTag from 'vue-material-design-icons/Tag'
-import DeleteIcon from 'vue-material-design-icons/Delete'
+import IconAdd from 'vue-material-design-icons/Plus'
 import { showError, showInfo } from '@nextcloud/dialogs'
 import { hiddenTags } from './tags.js'
-import TagItem from './TagItem'
 
 function randomColor() {
 	let randomHexColor = ((1 << 24) * Math.random() | 0).toString(16)
@@ -84,17 +85,14 @@ export default {
 	name: 'TagModal',
 	components: {
 		Modal,
-		NcButton,
 		ActionText,
 		ActionInput,
-		ActionButton,
 		DeleteTagModal,
-		IconRename,
 		IconTag,
-		IconAdd,
 		IconLoading,
-		DeleteIcon,
-	},
+		TagItem,
+		NcButton,
+		IconAdd,},
 	props: {
 		envelopes: {
 			// The envelopes on which this menu will act