nextcloud
/
mail
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fix: migrate preferences to initial state 

Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
This commit is contained in:
Richard Steinmetz 2025-01-20 11:46:24 +01:00
Родитель bd0f2dcc14
Коммит 0cfce5ce99
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 27137D9E7D273FB2
4 изменённых файлов: 38 добавлений и 55 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

26
lib/Controller/PageController.php
Просмотреть файл

@ -205,19 +205,19 @@ class PageController extends Controller {
);
$user = $this->userSession->getUser();
$response = new TemplateResponse($this->appName, 'index',
[
'attachment-size-limit' => $this->config->getSystemValue('app.mail.attachment-size-limit', 0),
'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'),
'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'),
'start-mailbox-id' => $this->preferences->getPreference($this->currentUserId, 'start-mailbox-id'),
'tag-classified-messages' => $this->classificationSettingsService->isClassificationEnabled($this->currentUserId) ? 'true' : 'false',
'follow-up-reminders' => $this->preferences->getPreference($this->currentUserId, 'follow-up-reminders', 'true'),
]);
$response = new TemplateResponse($this->appName, 'index');
$this->initialStateService->provideInitialState('preferences', [
'attachment-size-limit' => $this->config->getSystemValue('app.mail.attachment-size-limit', 0),
'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'),
'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'),
'start-mailbox-id' => $this->preferences->getPreference($this->currentUserId, 'start-mailbox-id'),
'tag-classified-messages' => $this->classificationSettingsService->isClassificationEnabled($this->currentUserId) ? 'true' : 'false',
'follow-up-reminders' => $this->preferences->getPreference($this->currentUserId, 'follow-up-reminders', 'true'),
]);
$this->initialStateService->provideInitialState(
'prefill_displayName',
$this->userManager->getDisplayName($this->currentUserId),

28
src/init.js
Просмотреть файл

@ -9,18 +9,12 @@ import { fetchAvailableLanguages } from './service/translationService.js'
import useOutboxStore from './store/outboxStore.js'
import useMainStore from './store/mainStore.js'
const getPreferenceFromPage = (key) => {
const elem = document.getElementById(key)
if (!elem) {
return
}
return elem.value
}
export default function initAfterAppCreation() {
console.debug('Init after app creation')
const mainStore = useMainStore()
const preferences = loadState('mail', 'preferences', [])
mainStore.savePreferenceMutation({
key: 'debug',
value: loadState('mail', 'debug', false),
@ -37,32 +31,32 @@ export default function initAfterAppCreation() {
mainStore.savePreferenceMutation({
key: 'attachment-size-limit',
value: Number.parseInt(getPreferenceFromPage('attachment-size-limit'), 10),
value: Number.parseInt(preferences['attachment-size-limit'], 10),
})
mainStore.savePreferenceMutation({
key: 'version',
value: getPreferenceFromPage('config-installed-version'),
value: preferences['config-installed-version'],
})
mainStore.savePreferenceMutation({
key: 'external-avatars',
value: getPreferenceFromPage('external-avatars'),
value: preferences['external-avatars'],
})
mainStore.savePreferenceMutation({
key: 'collect-data',
value: getPreferenceFromPage('collect-data'),
value: preferences['collect-data'],
})
mainStore.savePreferenceMutation({
key: 'search-priority-body',
value: getPreferenceFromPage('search-priority-body'),
value: preferences['search-priority-body'],
})
const startMailboxId = getPreferenceFromPage('start-mailbox-id')
const startMailboxId = preferences['start-mailbox-id']
mainStore.savePreferenceMutation({
key: 'start-mailbox-id',
value: startMailboxId ? parseInt(startMailboxId, 10) : null,
})
mainStore.savePreferenceMutation({
key: 'tag-classified-messages',
value: getPreferenceFromPage('tag-classified-messages'),
value: preferences['tag-classified-messages'],
})
mainStore.savePreferenceMutation({
key: 'allow-new-accounts',
@ -74,11 +68,11 @@ export default function initAfterAppCreation() {
})
mainStore.savePreferenceMutation({
key: 'layout-mode',
value: getPreferenceFromPage('layout-mode'),
value: preferences['layout-mode'],
})
mainStore.savePreferenceMutation({
key: 'follow-up-reminders',
value: getPreferenceFromPage('follow-up-reminders'),
value: preferences['follow-up-reminders'],
})
mainStore.savePreferenceMutation({
key: 'internal-addresses',

12
templates/index.php
Просмотреть файл

@ -5,15 +5,3 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
script('mail', 'mail');
?>
<input type="hidden" id="attachment-size-limit" value="<?php p($_['attachment-size-limit']); ?>">
<input type="hidden" id="config-installed-version" value="<?php p($_['app-version']); ?>">
<input type="hidden" id="external-avatars" value="<?php p($_['external-avatars']); ?>">
<input type="hidden" id="collect-data" value="<?php p($_['collect-data']); ?>">
<input type="hidden" id="start-mailbox-id" value="<?php p($_['start-mailbox-id']); ?>">
<input type="hidden" id="tag-classified-messages" value="<?php p($_['tag-classified-messages']); ?>">
<input type="hidden" id="search-priority-body" value="<?php p($_['search-priority-body']); ?>">
<input type="hidden" id="layout-mode" value="<?php p($_['layout-mode']); ?>">
<input type="hidden" id="follow-up-reminders" value="<?php p($_['follow-up-reminders']); ?>">

27
tests/Unit/Controller/PageControllerTest.php
Просмотреть файл

@ -299,7 +299,7 @@ class PageControllerTest extends TestCase {
->method('getLoginCredentials')
->willReturn($loginCredentials);
$this->initialState->expects($this->exactly(20))
$this->initialState->expects($this->exactly(21))
->method('provideInitialState')
->withConsecutive(
['debug', true],
@ -311,6 +311,18 @@ class PageControllerTest extends TestCase {
['internal-addresses', false],
['sort-order', 'newest'],
['password-is-unavailable', true],
['preferences', [
'attachment-size-limit' => 123,
'external-avatars' => 'true',
'reply-mode' => 'bottom',
'app-version' => '1.2.3',
'collect-data' => 'true',
'start-mailbox-id' => '123',
'tag-classified-messages' => 'false',
'search-priority-body' => 'false',
'layout-mode' => 'vertical-split',
'follow-up-reminders' => 'true',
]],
['prefill_displayName', 'Jane Doe'],
['prefill_email', 'jane@doe.cz'],
['outbox-messages', []],
@ -324,18 +336,7 @@ class PageControllerTest extends TestCase {
['smime-certificates', []],
);
$expected = new TemplateResponse($this->appName, 'index', [
'attachment-size-limit' => 123,
'external-avatars' => 'true',
'reply-mode' => 'bottom',
'app-version' => '1.2.3',
'collect-data' => 'true',
'start-mailbox-id' => '123',
'tag-classified-messages' => 'false',
'search-priority-body' => 'false',
'layout-mode' => 'vertical-split',
'follow-up-reminders' => 'true',
]);
$expected = new TemplateResponse($this->appName, 'index');
$csp = new ContentSecurityPolicy();
$csp->addAllowedFrameDomain('\'self\'');
$expected->setContentSecurityPolicy($csp);