Skip to content

fix: migrate preferences to initial state #10585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
st3iny merged 1 commit into from
Jan 20, 2025
Merged

fix: migrate preferences to initial state #10585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions lib/Controller/PageController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,19 +205,19 @@ public function index(): TemplateResponse {
);

$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),
Expand Down
28 changes: 11 additions & 17 deletions src/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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',
Expand All @@ -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',
Expand Down
12 changes: 0 additions & 12 deletions templates/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 14 additions & 13 deletions tests/Unit/Controller/PageControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ public function testIndex(): void {
->method('getLoginCredentials')
->willReturn($loginCredentials);

$this->initialState->expects($this->exactly(20))
$this->initialState->expects($this->exactly(21))
->method('provideInitialState')
->withConsecutive(
['debug', true],
Expand All @@ -311,6 +311,18 @@ public function testIndex(): void {
['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', '[email protected]'],
['outbox-messages', []],
Expand All @@ -324,18 +336,7 @@ public function testIndex(): void {
['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);
Expand Down
Loading