fixup! add thread summary ui

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

lib/Controller/SettingsController.php

@@ -119,6 +119,7 @@ public function deleteAntiSpamEmail(): JSONResponse {
 	public function setAllowNewMailAccounts(bool $allowed) {
 		$this->config->setAppValue('mail', 'allow_new_mail_accounts', $allowed ? 'yes' : 'no');
 	}
+
 	public function setEnabledThreadSummary(bool $enabled) {
 		$this->config->setAppValue('mail', 'enabled_thread_summary', $enabled ? 'yes' : 'no');
 	}

lib/Controller/ThreadController.php

@@ -44,16 +44,14 @@ class ThreadController extends Controller {
 	private LoggerInterface $logger;
 
 
-	public function __construct(string                $appName,
-		IRequest              $request,
-		string                $UserId,
-		AccountService        $accountService,
-		IMailManager          $mailManager,
+	public function __construct(string $appName,
+		IRequest $request,
+		string $UserId,
+		AccountService $accountService,
+		IMailManager $mailManager,
 		AiIntegrationsService $aiIntergrationsService,
-		LoggerInterface       $logger,
-	) {
+		LoggerInterface $logger) {
 		parent::__construct($appName, $request);
-
 		$this->currentUserId = $UserId;
 		$this->accountService = $accountService;
 		$this->mailManager = $mailManager;

src/components/LoadingSkeleton.vue

@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<div v-for="i in numberOfLines" :key="i" class="item-list__entry">
-			<div
+			<div v-if="withAvatar"
 				class="item-avatar" />
 			<div class="item__details">
 				<h3>&nbsp;</h3>

src/components/Thread.vue

@@ -38,7 +38,7 @@
 					</div>
 				</div>
 			</div>
-			<ThreadSummary v-if="thread.length > 2 && enabledThreadSummary" :loading="summaryLoading" :summary="summaryText" />
+			<ThreadSummary v-if="showSummaryBox" :loading="summaryLoading" :summary="summaryText" />
 			<ThreadEnvelope v-for="env in thread"
 				:key="env.databaseId"
 				:envelope="env"
@@ -55,6 +55,7 @@
 
 <script>
 import { NcAppContentDetails as AppContentDetails, NcPopover as Popover } from '@nextcloud/vue'
+import { showError } from '@nextcloud/dialogs'
 
 import { prop, uniqBy } from 'ramda'
 import debounce from 'lodash/fp/debounce'
@@ -99,6 +100,7 @@ export default {
 			resizeDebounced: debounce(500, this.updateParticipantsToDisplay),
 			enabledThreadSummary: loadState('mail', 'enabled_thread_summary', false),
 			summaryText: '',
+			summaryError: false,
 		}
 	},
 
@@ -148,6 +150,9 @@ export default {
 			}
 			return thread[0].subject || this.t('mail', 'No subject')
 		},
+		showSummaryBox() {
+			return this.thread.length > 2 && this.enabledThreadSummary && !this.summaryError
+		},
 	},
 	watch: {
 		$route(to, from) {
@@ -173,12 +178,18 @@ export default {
 	},
 	methods: {
 		async updateSummary() {
-			if (this.thread.length < 2 && !this.enabledThreadSummary) return
+			if (this.thread.length < 2 || !this.enabledThreadSummary) return
 
 			this.summaryLoading = true
-			const summary = await summarizeThread(this.thread[0].databaseId)
-			this.summaryText = summary
-			this.summaryLoading = false
+			try {
+				this.summaryText = await summarizeThread(this.thread[0].databaseId)
+			} catch (error) {
+				this.summaryError = true
+				showError(t('mail', 'Summarizing thread failed.'))
+				logger.error('Summarizing thread failed',{ error})
+			} finally {
+				this.summaryLoading = false
+			}
 		},
 		updateParticipantsToDisplay() {
 			// Wait until everything is in place

src/service/AiIntergrationsService.js

@@ -1,11 +1,16 @@
 import { generateUrl } from '@nextcloud/router'
 import axios from '@nextcloud/axios'
+import { convertAxiosError } from '../errors/convert'
 
-export const summarizeThread = async (threadId, accountId) => {
+export const summarizeThread = async (threadId) => {
 	const url = generateUrl('/apps/mail/api/thread/{threadId}/summary', {
 		threadId,
 	})
 
-	const resp = await axios.get(url)
-	return resp.data.data
+	try {
+		const resp = await axios.get(url)
+		return resp.data.data
+	} catch (e) {
+		throw convertAxiosError(e)
+	}
 }

src/service/SettingsService.js

@@ -82,5 +82,6 @@ export const updateEnabledThreadSummary = async (enabled) => {
 	const data = {
 		enabled,
 	}
-	return await axios.post(url, data).then((resp) => resp.data)
+	const resp = await axios.post(url, data)
+	return resp.data
 }