feat: manually refresh folder list

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

Author: hamza221

lib/Contracts/IMailManager.php

@@ -35,12 +35,13 @@ public function getMailbox(string $uid, int $id): Mailbox;
 
 	/**
 	 * @param Account $account
+	 * @param bool $forceSync
 	 *
 	 * @return Mailbox[]
 	 *
 	 * @throws ServiceException
 	 */
-	public function getMailboxes(Account $account): array;
+	public function getMailboxes(Account $account, bool $forceSync = false): array;
 
 	/**
 	 * @param Account $account

lib/Controller/MailboxesController.php

@@ -61,17 +61,18 @@ public function __construct(
 	 * @NoAdminRequired
 	 *
 	 * @param int $accountId
+	 * @param bool $forceSync
 	 *
 	 * @return JSONResponse
 	 *
 	 * @throws ClientException
 	 * @throws ServiceException
 	 */
 	#[TrapError]
-	public function index(int $accountId): JSONResponse {
+	public function index(int $accountId, bool $forceSync = false): JSONResponse {
 		$account = $this->accountService->find($this->currentUserId, $accountId);
 
-		$mailboxes = $this->mailManager->getMailboxes($account);
+		$mailboxes = $this->mailManager->getMailboxes($account, $forceSync);
 		return new JSONResponse([
 			'id' => $accountId,
 			'email' => $account->getEmail(),

lib/Service/MailManager.php

@@ -130,13 +130,14 @@ public function getMailbox(string $uid, int $id): Mailbox {
 
 	/**
 	 * @param Account $account
+	 * @param bool $forceSync
 	 *
 	 * @return Mailbox[]
 	 * @throws ServiceException
 	 */
 	#[\Override]
-	public function getMailboxes(Account $account): array {
-		$this->mailboxSync->sync($account, $this->logger);
+	public function getMailboxes(Account $account, bool $forceSync = false): array {
+		$this->mailboxSync->sync($account, $this->logger, $forceSync);
 
 		return $this->mailboxMapper->findAll($account);
 	}

src/components/AppSettingsMenu.vue

@@ -112,7 +112,7 @@
 						<List
 							:text-blocks="getMyTextBlocks()"
 							@show-toolbar="handleShowToolbar" />
-						<NcButton variant="secondary" @click="() => textBlockDialogOpen = true" wide>
+						<NcButton variant="secondary" wide @click="() => textBlockDialogOpen = true">
 							{{ t('mail', 'New text block') }}
 						</NcButton>
 						<template v-if="getSharedTextBlocks().length > 0">

src/components/NewMessageButtonHeader.vue

@@ -72,6 +72,10 @@ export default {
 			}
 			return undefined
 		},
+
+		account() {
+			return this.mainStore.getAccount(this.currentMailbox.accountId)
+		},
 	},
 
 	methods: {
@@ -83,6 +87,7 @@ export default {
 			this.refreshing = true
 			try {
 				await this.mainStore.syncEnvelopes({ mailboxId: this.currentMailbox.databaseId })
+				await this.mainStore.syncMailboxesForAccount(this.account)
 				logger.debug('Current folder is sync\'ing ')
 			} catch (error) {
 				logger.error('could not sync current folder', { error })

src/service/MailboxService.js

@@ -5,8 +5,8 @@
 import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 
-export async function fetchAll(accountId) {
-	const url = generateUrl('/apps/mail/api/mailboxes?accountId={accountId}', {
+export async function fetchAll(accountId, forceSync = false) {
+	const url = generateUrl(`/apps/mail/api/mailboxes?accountId={accountId}&forceSync=${forceSync}`, {
 		accountId,
 	})
 

src/store/mainStore/actions.js

@@ -219,6 +219,13 @@ export default function mainStoreActions() {
 			logger.debug(`account ${account.id} created`, { account })
 			return account
 		},
+		async syncMailboxesForAccount(account) {
+			logger.debug(`Fetching mailboxes for account ${account.id},  …`, { account })
+			account.mailboxes = await fetchAllMailboxes(account.id, true)
+			const mailboxes = sortMailboxes(account.mailboxes || [], account)
+			Vue.set(account, 'mailboxes', [])
+			mailboxes.map(addMailboxToState(this.mailboxes, account))
+		},
 		async finishAccountSetup({ account }) {
 			logger.debug(`Fetching mailboxes for account ${account.id},  …`, { account })
 			account.mailboxes = await fetchAllMailboxes(account.id)