Drop AbstractAppStore and

put the properties/observables where they belong
This commit is contained in:
djmaze 2020-10-12 19:46:41 +02:00
parent 917dfa732e
commit 0eba94f671
12 changed files with 145 additions and 191 deletions

View file

@ -39,9 +39,9 @@ class GeneralAdminSettings {
this.capaAttachmentThumbnails = CapaAdminStore.attachmentThumbnails;
this.capaTemplates = CapaAdminStore.templates;
this.allowLanguagesOnSettings = AppAdminStore.allowLanguagesOnSettings;
this.allowLanguagesOnSettings = ko.observable(!!settingsGet('AllowLanguagesOnSettings'));
this.weakPassword = AppAdminStore.weakPassword;
this.newMoveToFolder = AppAdminStore.newMoveToFolder;
this.newMoveToFolder = ko.observable(!!settingsGet('NewMoveToFolder'));
this.dataFolderAccess = AppAdminStore.dataFolderAccess;
@ -83,19 +83,19 @@ class GeneralAdminSettings {
setTimeout(() => this.languageAdminTrigger(SaveSettingsStep.Idle), 1000);
};
this.mainAttachmentLimit.subscribe((value) => {
this.mainAttachmentLimit.subscribe(value => {
Remote.saveAdminConfig(f1, {
'AttachmentLimit': pInt(value)
});
});
this.language.subscribe((value) => {
this.language.subscribe(value => {
Remote.saveAdminConfig(f2, {
'Language': value.trim()
});
});
this.languageAdmin.subscribe((value) => {
this.languageAdmin.subscribe(value => {
this.languageAdminTrigger(SaveSettingsStep.Animate);
translatorReload(true, value)
.then(fReloadLanguageHelper(SaveSettingsStep.TrueResult), fReloadLanguageHelper(SaveSettingsStep.FalseResult))
@ -106,56 +106,56 @@ class GeneralAdminSettings {
});
});
this.theme.subscribe((value) => {
this.theme.subscribe(value => {
changeTheme(value, this.themeTrigger);
Remote.saveAdminConfig(f3, {
'Theme': value.trim()
});
});
this.capaAdditionalAccounts.subscribe((value) => {
this.capaAdditionalAccounts.subscribe(value => {
Remote.saveAdminConfig(null, {
'CapaAdditionalAccounts': value ? '1' : '0'
});
});
this.capaIdentities.subscribe((value) => {
this.capaIdentities.subscribe(value => {
Remote.saveAdminConfig(null, {
'CapaIdentities': value ? '1' : '0'
});
});
this.capaTemplates.subscribe((value) => {
this.capaTemplates.subscribe(value => {
Remote.saveAdminConfig(null, {
'CapaTemplates': value ? '1' : '0'
});
});
this.capaAttachmentThumbnails.subscribe((value) => {
this.capaAttachmentThumbnails.subscribe(value => {
Remote.saveAdminConfig(null, {
'CapaAttachmentThumbnails': value ? '1' : '0'
});
});
this.capaThemes.subscribe((value) => {
this.capaThemes.subscribe(value => {
Remote.saveAdminConfig(null, {
'CapaThemes': value ? '1' : '0'
});
});
this.capaUserBackground.subscribe((value) => {
this.capaUserBackground.subscribe(value => {
Remote.saveAdminConfig(null, {
'CapaUserBackground': value ? '1' : '0'
});
});
this.allowLanguagesOnSettings.subscribe((value) => {
this.allowLanguagesOnSettings.subscribe(value => {
Remote.saveAdminConfig(null, {
'AllowLanguagesOnSettings': value ? '1' : '0'
});
});
this.newMoveToFolder.subscribe((value) => {
this.newMoveToFolder.subscribe(value => {
Remote.saveAdminConfig(null, {
'NewMoveToFolder': value ? '1' : '0'
});

View file

@ -2,17 +2,16 @@ import ko from 'ko';
import { settingsSaveHelperSimpleFunction } from 'Common/Utils';
import AppStore from 'Stores/Admin/App';
import Remote from 'Remote/Admin/Fetch';
class LoginAdminSettings {
constructor() {
this.determineUserLanguage = AppStore.determineUserLanguage;
this.determineUserDomain = AppStore.determineUserDomain;
const settingsGet = rl.settings.get;
this.determineUserLanguage = ko.observable(!!settingsGet('DetermineUserLanguage'));
this.determineUserDomain = ko.observable(!!settingsGet('DetermineUserDomain'));
this.defaultDomain = ko.observable(rl.settings.get('LoginDefaultDomain')).idleTrigger();
this.allowLanguagesOnLogin = AppStore.allowLanguagesOnLogin;
this.defaultDomain = ko.observable(settingsGet('LoginDefaultDomain')).idleTrigger();
this.allowLanguagesOnLogin = ko.observable(!!settingsGet('AllowLanguagesOnLogin'));
this.dummy = ko.observable(false);
}
@ -21,25 +20,25 @@ class LoginAdminSettings {
setTimeout(() => {
const f1 = settingsSaveHelperSimpleFunction(this.defaultDomain.trigger, this);
this.determineUserLanguage.subscribe((value) => {
this.determineUserLanguage.subscribe(value => {
Remote.saveAdminConfig(null, {
'DetermineUserLanguage': value ? '1' : '0'
});
});
this.determineUserDomain.subscribe((value) => {
this.determineUserDomain.subscribe(value => {
Remote.saveAdminConfig(null, {
'DetermineUserDomain': value ? '1' : '0'
});
});
this.allowLanguagesOnLogin.subscribe((value) => {
this.allowLanguagesOnLogin.subscribe(value => {
Remote.saveAdminConfig(null, {
'AllowLanguagesOnLogin': value ? '1' : '0'
});
});
this.defaultDomain.subscribe((value) => {
this.defaultDomain.subscribe(value => {
Remote.saveAdminConfig(f1, {
'LoginDefaultDomain': value.trim()
});

View file

@ -13,7 +13,7 @@ const settingsGet = rl.settings.get;
class SecurityAdminSettings {
constructor() {
this.useLocalProxyForExternalImages = AppAdminStore.useLocalProxyForExternalImages;
this.useLocalProxyForExternalImages = ko.observable(!!rl.settings.get('UseLocalProxyForExternalImages'));
this.weakPassword = AppAdminStore.weakPassword;
@ -22,7 +22,7 @@ class SecurityAdminSettings {
this.capaTwoFactorAuth = CapaAdminStore.twoFactorAuth;
this.capaTwoFactorAuthForce = CapaAdminStore.twoFactorAuthForce;
this.capaTwoFactorAuth.subscribe((value) => {
this.capaTwoFactorAuth.subscribe(value => {
if (!value) {
this.capaTwoFactorAuthForce(false);
}
@ -31,7 +31,7 @@ class SecurityAdminSettings {
this.verifySslCertificate = ko.observable(!!settingsGet('VerifySslCertificate'));
this.allowSelfSigned = ko.observable(!!settingsGet('AllowSelfSigned'));
this.verifySslCertificate.subscribe((value) => {
this.verifySslCertificate.subscribe(value => {
if (!value) {
this.allowSelfSigned(true);
}
@ -123,37 +123,37 @@ class SecurityAdminSettings {
}
onBuild() {
this.capaOpenPGP.subscribe((value) => {
this.capaOpenPGP.subscribe(value => {
Remote.saveAdminConfig(null, {
'CapaOpenPGP': value ? '1' : '0'
});
});
this.capaTwoFactorAuth.subscribe((value) => {
this.capaTwoFactorAuth.subscribe(value => {
Remote.saveAdminConfig(null, {
'CapaTwoFactorAuth': value ? '1' : '0'
});
});
this.capaTwoFactorAuthForce.subscribe((value) => {
this.capaTwoFactorAuthForce.subscribe(value => {
Remote.saveAdminConfig(null, {
'CapaTwoFactorAuthForce': value ? '1' : '0'
});
});
this.useLocalProxyForExternalImages.subscribe((value) => {
this.useLocalProxyForExternalImages.subscribe(value => {
Remote.saveAdminConfig(null, {
'UseLocalProxyForExternalImages': value ? '1' : '0'
});
});
this.verifySslCertificate.subscribe((value) => {
this.verifySslCertificate.subscribe(value => {
Remote.saveAdminConfig(null, {
'VerifySslCertificate': value ? '1' : '0'
});
});
this.allowSelfSigned.subscribe((value) => {
this.allowSelfSigned.subscribe(value => {
Remote.saveAdminConfig(null, {
'AllowSelfSigned': value ? '1' : '0'
});

View file

@ -42,7 +42,7 @@ class GeneralUserSettings {
this.threadsAllowed = AppStore.threadsAllowed;
this.useThreads = SettingsStore.useThreads;
this.replySameFolder = SettingsStore.replySameFolder;
this.allowLanguagesOnSettings = AppStore.allowLanguagesOnSettings;
this.allowLanguagesOnSettings = !!rl.settings.get('AllowLanguagesOnSettings');
this.languageFullName = ko.computed(() => convertLangName(this.language()));
this.languageTrigger = ko.observable(SaveSettingsStep.Idle).extend({ throttle: 100 });