Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-01 05:29:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve #1111

Browse source
This commit is contained in:
the-djmaze 2023-05-01 11:48:57 +02:00
parent 932b71f345
commit 88279c55e0
4 changed files with 18 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

44
dev/Sieve/View/Filter.js
View file

@ -17,31 +17,29 @@ const
// import { folderListOptionsBuilder } from 'Common/Folders';
/**
* @param {Array=} aDisabled
* @param {Array=} aHeaderLines
* @param {Function=} fRenameCallback
* @returns {Array}
*/
folderListOptionsBuilder = (
aDisabled,
aHeaderLines,
fRenameCallback
) => {
folderListOptionsBuilder = () => {
const
aResult = [],
aResult = [{
id: '',
name: '',
system: false,
disabled: false
}],
sDeepPrefix = '\u00A0\u00A0\u00A0',
showUnsubscribed = true/*!SettingsUserStore.hideUnsubscribed()*/,
disabled = rl.settings.get('sieveAllowFileintoInbox') ? '' : 'INBOX',
foldersWalk = folders => {
folders.forEach(oItem => {
if (showUnsubscribed || oItem.hasSubscriptions() || !oItem.exists) {
aResult.push({
id: oItem.fullName,
name:
sDeepPrefix.repeat(oItem.deep) +
fRenameCallback(oItem),
name: sDeepPrefix.repeat(oItem.deep) + oItem.detailedName(),
system: false,
disabled: !oItem.selectable() || aDisabled.includes(oItem.fullName)
disabled: !oItem.selectable() || disabled == oItem.fullName
});
}
@ -52,18 +50,6 @@ const
};
fRenameCallback = fRenameCallback || (oItem => oItem.name());
Array.isArray(aDisabled) || (aDisabled = []);
Array.isArray(aHeaderLines) && aHeaderLines.forEach(line =>
aResult.push({
id: line[0],
name: line[1],
system: false,
disabled: false
})
);
// FolderUserStore.folderList()
foldersWalk(window.Sieve.folderList() || []);
@ -82,13 +68,7 @@ export class FilterPopupView extends rl.pluginPopupView {
});
this.defaultOptionsAfterRender = defaultOptionsAfterRender;
this.folderSelectList = koComputable(() =>
folderListOptionsBuilder(
[rl.settings.get('sieveAllowFileintoInbox') ? '' : 'INBOX'],
[['', '']],
item => item?.localName() || ''
)
);
this.folderSelectList = koComputable(() => folderListOptionsBuilder());
this.selectedFolderValue.subscribe(() => this.filter().actionValueError(false));