Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Sieve Circular dependency

Browse source
This commit is contained in:
the-djmaze 2022-03-11 13:01:46 +01:00
parent ea25d9bce4
commit 9bae77bfa1
2 changed files with 34 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

30
dev/Sieve/Utils.js
View file

@ -1,5 +1,3 @@
import { SieveScriptModel } from 'Sieve/Model/Script';
export const export const
// import { i18n } from 'Common/Translator'; // import { i18n } from 'Common/Translator';
i18n = rl.i18n, i18n = rl.i18n,
@ -58,32 +56,4 @@ export const
setError = text => { setError = text => {
serverError(true); serverError(true);
serverErrorDesc(text); serverErrorDesc(text);
},
updateList = () => {
if (!loading()) {
loading(true);
serverError(false);
Remote.request('Filters', (iError, data) => {
loading(false);
scripts([]);
if (iError) {
capa([]);
setError(getNotification(iError));
} else {
capa(data.Result.Capa);
/*
scripts(
data.Result.Scripts.map(aItem => SieveScriptModel.reviveFromJson(aItem)).filter(v => v)
);
*/
forEachObjectValue(data.Result.Scripts, value => {
value = SieveScriptModel.reviveFromJson(value);
value && scripts.push(value)
});
}
});
}
}; };

40
dev/sieve.js
View file

@ -1,15 +1,16 @@
import { import {
capa, capa,
scripts, forEachObjectValue,
getNotification,
loading, loading,
Remote,
scripts,
serverError, serverError,
serverErrorDesc, serverErrorDesc,
setError, setError
updateList,
getNotification,
Remote
} from 'Sieve/Utils'; } from 'Sieve/Utils';
import { SieveScriptModel } from 'Sieve/Model/Script';
import { SieveScriptPopupView } from 'Sieve/View/Script'; import { SieveScriptPopupView } from 'Sieve/View/Script';
// SieveUserStore // SieveUserStore
@ -17,7 +18,6 @@ window.Sieve = {
capa: capa, capa: capa,
scripts: scripts, scripts: scripts,
setError: setError, setError: setError,
updateList: updateList,
loading: loading, loading: loading,
serverError: serverError, serverError: serverError,
serverErrorDesc: serverErrorDesc, serverErrorDesc: serverErrorDesc,
@ -25,6 +25,34 @@ window.Sieve = {
folderList: null, folderList: null,
updateList: () => {
if (!loading()) {
loading(true);
serverError(false);
Remote.request('Filters', (iError, data) => {
loading(false);
scripts([]);
if (iError) {
capa([]);
setError(getNotification(iError));
} else {
capa(data.Result.Capa);
/*
scripts(
data.Result.Scripts.map(aItem => SieveScriptModel.reviveFromJson(aItem)).filter(v => v)
);
*/
forEachObjectValue(data.Result.Scripts, value => {
value = SieveScriptModel.reviveFromJson(value);
value && scripts.push(value)
});
}
});
}
},
deleteScript: script => { deleteScript: script => {
serverError(false); serverError(false);
Remote.request('FiltersScriptDelete', Remote.request('FiltersScriptDelete',