feat: Allow disabling of threaded view

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

Author: SebastianKrupinski

Diff for: appinfo/routes.php

@@ -345,6 +345,11 @@
 			'url' => '/api/settings/importance-classification-default',
 			'verb' => 'PUT'
 		],
+		[
+			'name' => 'settings#setLayoutMessageView',
+			'url' => '/api/settings/layout-message-view',
+			'verb' => 'PUT'
+		],
 		[
 			'name' => 'trusted_senders#setTrusted',
 			'url' => '/api/trustedsenders/{email}',

Diff for: lib/Controller/PageController.php

@@ -211,6 +211,7 @@ public function index(): TemplateResponse {
 			'app-version' => $this->config->getAppValue('mail', 'installed_version'),
 			'external-avatars' => $this->preferences->getPreference($this->currentUserId, 'external-avatars', 'true'),
 			'layout-mode' => $this->preferences->getPreference($this->currentUserId, 'layout-mode', 'vertical-split'),
+			'layout-message-view' => $this->preferences->getPreference($this->currentUserId, 'layout-message-view', $this->config->getAppValue('mail', 'layout_message_view', 'threaded')),
 			'reply-mode' => $this->preferences->getPreference($this->currentUserId, 'reply-mode', 'top'),
 			'collect-data' => $this->preferences->getPreference($this->currentUserId, 'collect-data', 'true'),
 			'search-priority-body' => $this->preferences->getPreference($this->currentUserId, 'search-priority-body', 'false'),

Diff for: lib/Controller/SettingsController.php

@@ -124,4 +124,9 @@ public function setImportanceClassificationEnabledByDefault(bool $enabledByDefau
 		return new JSONResponse([]);
 	}
 
+	public function setLayoutMessageView(string $value): JSONResponse {
+		$this->config->setAppValue('mail', 'layout_message_view', $value);
+		return new JSONResponse([]);
+	}
+
 }

Diff for: lib/Settings/AdminSettings.php

@@ -80,6 +80,12 @@ public function getForm() {
 			$this->config->getAppValue('mail', 'allow_new_mail_accounts', 'yes') === 'yes'
 		);
 
+		$this->initialStateService->provideInitialState(
+			Application::APP_ID,
+			'layout_message_view',
+			$this->config->getAppValue('mail', 'layout_message_view', 'threaded')
+		);
+
 		$this->initialStateService->provideInitialState(
 			Application::APP_ID,
 			'llm_processing',

Diff for: src/components/AppSettingsMenu.vue

@@ -72,6 +72,24 @@
 					{{ t('mail', 'Horizontal split') }}
 				</NcCheckboxRadioSwitch>
 
+				<h6>{{ t('mail', 'Message View Mode') }}</h6>
+				<div class="sorting">
+					<NcCheckboxRadioSwitch type="radio"
+						name="message_view_mode_radio"
+						value="threaded"
+						:checked="layoutMessageView"
+						@update:checked="setLayoutMessageView('threaded')">
+						{{ t('mail', 'Show all messages in thread') }}
+					</NcCheckboxRadioSwitch>
+					<NcCheckboxRadioSwitch type="radio"
+						name="message_view_mode_radio"
+						value="singleton"
+						:checked="layoutMessageView"
+						@update:checked="setLayoutMessageView('singleton')">
+						{{ t('mail', 'Show only the selected message') }}
+					</NcCheckboxRadioSwitch>
+				</div>
+
 				<h6>{{ t('mail', 'Sorting') }}</h6>
 				<div class="sorting">
 					<NcCheckboxRadioSwitch class="sorting__switch"
@@ -398,6 +416,9 @@ export default {
 		layoutMode() {
 			return this.mainStore.getPreference('layout-mode', 'vertical-split')
 		},
+		layoutMessageView() {
+			return this.mainStore.getPreference('layout-message-view')
+		},
 	},
 	watch: {
 		showSettings(value) {
@@ -439,6 +460,16 @@ export default {
 				Logger.error('Could not save preferences', { error })
 			}
 		},
+		async setLayoutMessageView(value) {
+			try {
+				await this.mainStore.savePreference({
+					key: 'layout-message-view',
+					value,
+				})
+			} catch (error) {
+				Logger.error('Could not save preferences', { error })
+			}
+		},
 		async onOpen() {
 			this.showSettings = true
 		},

Diff for: src/components/Thread.vue

@@ -126,6 +126,10 @@ export default {
 				return []
 			}
 
+			if (this.mainStore.getPreference('layout-message-view', 'threaded') === 'singleton') {
+				return [envelope]
+			}
+
 			const envelopes = this.mainStore.getEnvelopesByThreadRootId(envelope.accountId, envelope.threadRootId)
 			if (envelopes.length === 0) {
 				return []

Diff for: src/components/settings/AdminSettings.vue

@@ -253,6 +253,36 @@
 			</article>
 			<MicrosoftAdminOauthSettings :tenant-id="microsoftOauthTenantId" :client-id="microsoftOauthClientId" />
 		</div>
+		<div class="app-description">
+			<h3>{{ t('mail', 'User Interface Preference Defaults') }}</h3>
+			<article>
+				<p>
+					{{ t('mail', 'These settings are used to pre-configure the user interface preferences they can be overridden by the user in the mail settings') }}
+				</p>
+			</article>
+			<br>
+			<article>
+				<p>
+					{{ t('mail', 'Message View Mode') }}
+				</p>
+				<p>
+					<NcCheckboxRadioSwitch type="radio"
+						name="message_view_mode_radio"
+						value="threaded"
+						:checked.sync="layoutMessageView"
+						@update:checked="setLayoutMessageView('threaded')">
+						{{ t('mail', 'Show all messages in thread') }}
+					</NcCheckboxRadioSwitch>
+					<NcCheckboxRadioSwitch type="radio"
+						name="message_view_mode_radio"
+						value="singleton"
+						:checked.sync="layoutMessageView"
+						@update:checked="setLayoutMessageView('singleton')">
+						{{ t('mail', 'Show only the selected message') }}
+					</NcCheckboxRadioSwitch>
+				</p>
+			</article>
+		</div>
 	</SettingsSection>
 </template>
 
@@ -278,6 +308,7 @@ import {
 	updateLlmEnabled,
 	updateEnabledSmartReply,
 	setImportanceClassificationEnabledByDefault,
+	setLayoutMessageView,
 } from '../../service/SettingsService.js'
 
 const googleOauthClientId = loadState('mail', 'google_oauth_client_id', null) ?? undefined
@@ -342,6 +373,7 @@ export default {
 			isLlmFreePromptConfigured: loadState('mail', 'enabled_llm_free_prompt_backend'),
 			isClassificationEnabledByDefault: loadState('mail', 'llm_processing', true),
 			isImportanceClassificationEnabledByDefault: loadState('mail', 'importance_classification_default', true),
+			layoutMessageView: loadState('mail', 'layout_message_view'),
 		}
 	},
 	methods: {
@@ -410,6 +442,9 @@ export default {
 				logger.error('Could not save default classification setting', { error })
 			}
 		},
+		async setLayoutMessageView(value) {
+			await setLayoutMessageView(value)
+		},
 	},
 }
 </script>

Diff for: src/init.js

@@ -70,6 +70,10 @@ export default function initAfterAppCreation() {
 		key: 'layout-mode',
 		value: preferences['layout-mode'],
 	})
+	mainStore.savePreferenceMutation({
+		key: 'layout-message-view',
+		value: preferences['layout-message-view'],
+	})
 	mainStore.savePreferenceMutation({
 		key: 'follow-up-reminders',
 		value: preferences['follow-up-reminders'],

Diff for: src/service/SettingsService.js

@@ -89,3 +89,16 @@ export const setImportanceClassificationEnabledByDefault = async (enabledByDefau
 		enabledByDefault,
 	})
 }
+
+/**
+ * @param {boolean} value
+ * @return {Promise<void>}
+ */
+export const setLayoutMessageView = async (value) => {
+	const url = generateUrl('/apps/mail/api/settings/layout-message-view')
+	const data = {
+		value,
+	}
+	const resp = await axios.put(url, data)
+	return resp.data
+}

Diff for: tests/Unit/Controller/PageControllerTest.php

@@ -168,7 +168,7 @@ public function testIndex(): void {
 		$account1 = $this->createMock(Account::class);
 		$account2 = $this->createMock(Account::class);
 		$mailbox = $this->createMock(Mailbox::class);
-		$this->preferences->expects($this->exactly(10))
+		$this->preferences->expects($this->exactly(11))
 			->method('getPreference')
 			->willReturnMap([
 				[$this->userId, 'account-settings', '[]', json_encode([])],
@@ -179,6 +179,7 @@ public function testIndex(): void {
 				[$this->userId, 'search-priority-body', 'false', 'false'],
 				[$this->userId, 'start-mailbox-id', null, '123'],
 				[$this->userId, 'layout-mode', 'vertical-split', 'vertical-split'],
+				[$this->userId, 'layout-message-view', 'threaded', 'threaded'],
 				[$this->userId, 'follow-up-reminders', 'true', 'true'],
 				[$this->userId, 'internal-addresses', 'false', 'false'],
 			]);
@@ -257,17 +258,19 @@ public function testIndex(): void {
 				['version', '0.0.0', '26.0.0'],
 				['app.mail.attachment-size-limit', 0, 123],
 			]);
-		$this->config->expects($this->exactly(6))
+		$this->config->expects($this->exactly(7))
 			->method('getAppValue')
 			->withConsecutive(
 				[ 'mail', 'installed_version' ],
+				['mail', 'layout_message_view' ],
 				['mail', 'google_oauth_client_id' ],
 				['mail', 'microsoft_oauth_client_id' ],
 				['mail', 'microsoft_oauth_tenant_id' ],
 				['core', 'backgroundjobs_mode', 'ajax' ],
 				['mail', 'allow_new_mail_accounts', 'yes'],
 			)->willReturnOnConsecutiveCalls(
 				$this->returnValue('1.2.3'),
+				$this->returnValue('threaded'),
 				$this->returnValue(''),
 				$this->returnValue(''),
 				$this->returnValue(''),
@@ -321,6 +324,7 @@ public function testIndex(): void {
 					'tag-classified-messages' => 'false',
 					'search-priority-body' => 'false',
 					'layout-mode' => 'vertical-split',
+					'layout-message-view' => 'threaded',
 					'follow-up-reminders' => 'true',
 				]],
 				['prefill_displayName', 'Jane Doe'],