Tagging UI

Co-authored-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: GretaD <gretadoci@gmail.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

2 files changed, 11 insertions, 1 deletions

diff --git a/lib/Controller/MessagesController.php b/lib/Controller/MessagesController.php
index 62bcd1fb1..548ffa713 100755
--- a/lib/Controller/MessagesController.php
+++ b/lib/Controller/MessagesController.php
@@ -707,7 +707,7 @@ class MessagesController extends Controller {
 		}
 
 		$this->mailManager->tagMessage($account, $mailbox->getName(), $message, $tag, false);
-		return new JSONResponse();
+		return new JSONResponse($tag);
 	}
 
 	/**
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 0cbd52ed7..cff03a324 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -29,6 +29,7 @@ namespace OCA\Mail\Controller;
 use Exception;
 use OCA\Mail\Contracts\IMailManager;
 use OCA\Mail\Contracts\IUserPreferences;
+use OCA\Mail\Db\TagMapper;
 use OCA\Mail\Service\AccountService;
 use OCA\Mail\Service\AliasesService;
 use OCP\AppFramework\Controller;
@@ -69,6 +70,9 @@ class PageController extends Controller {
 	/** @var IMailManager */
 	private $mailManager;
 
+	/** @var TagMapper */
+	private $tagMapper;
+
 	/** @var IInitialState */
 	private $initialStateService;
 
@@ -85,6 +89,7 @@ class PageController extends Controller {
 								IUserSession $userSession,
 								IUserPreferences $preferences,
 								IMailManager $mailManager,
+								TagMapper $tagMapper,
 								IInitialState $initialStateService,
 								LoggerInterface $logger) {
 		parent::__construct($appName, $request);
@@ -97,6 +102,7 @@ class PageController extends Controller {
 		$this->userSession = $userSession;
 		$this->preferences = $preferences;
 		$this->mailManager = $mailManager;
+		$this->tagMapper = $tagMapper;
 		$this->initialStateService = $initialStateService;
 		$this->logger = $logger;
 	}
@@ -139,6 +145,10 @@ class PageController extends Controller {
 			'account-settings',
 			json_decode($this->preferences->getPreference('account-settings', '[]'), true, 512, JSON_THROW_ON_ERROR) ?? []
 		);
+		$this->initialStateService->provideInitialState(
+			'tags',
+			$this->tagMapper->getAllTagsForUser($this->currentUserId)
+		);
 
 		$user = $this->userSession->getUser();
 		$response = new TemplateResponse($this->appName, 'index',