starred/native
1
0
Fork 0
mirror of https://github.com/bulwarkmail/native.git synced 2026-11-02 16:07:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: delete a filter rule at once with an undo in the filter store

Browse Source
This commit is contained in:
Linus Rath
2026-10-31 04:11:36 +01:00
parent 6c3046c8dc
commit b95f2c296d
3 changed files with 119 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/__tests__/live-stalwart-mail.test.ts
+43 -1
View File
@@ -45,8 +45,9 @@ import { pruneEmailSubmissions } from '../submissions';
import { listPrincipals } from '../files';
import { createContact, deleteContacts, getAddressBooks, getContact } from '../contacts';
import {
createSieveScript, deleteSieveScript, getSieveScriptContent, getSieveScripts, validateSieveScript,
createSieveScript, deleteSieveScript, getSieveScriptContent, getSieveScripts, updateSieveScript, validateSieveScript,
} from '../sieve';
import { useFilterStore } from '../../stores/filter-store';
import { inlineContactMediaForExport, writeContactWithNewPhoto } from '../../lib/contact-media';
import { getBulwarkMetadata, resetBulwarkMetadata, supportsBulwarkMetadata } from '../bulwark-metadata';
import { parseSharedTags, SHARED_TAGS_KEY } from '../../lib/shared-tags';
@@ -405,6 +406,47 @@ live('live Stalwart: mail, contacts, search (0.16 and 1.0)', () => {
}
}, 60_000);
it('deletes a filter rule at once and puts it back on Undo, in the script on the server', async () => {
// The account's filters as they are, to put back afterwards.
const before = await getSieveScripts();
const active = before.find((s) => s.isActive && s.name !== 'vacation');
const original = active ? await getSieveScriptContent(active.blobId) : null;
const activeContent = async () => {
const now = (await getSieveScripts()).find((s) => s.isActive && s.name !== 'vacation');
return now ? getSieveScriptContent(now.blobId) : '';
};
try {
await useFilterStore.getState().selectAccount(null);
expect(useFilterStore.getState().isOpaque, 'the test account has no hand-written filters').toBe(false);
const rule = (id: string) => ({
id, name: `live ${id} ${RUN}`, enabled: true, matchType: 'all' as const,
conditions: [{ field: 'subject' as const, comparator: 'contains' as const, value: `${id}-${RUN}` }],
actions: [{ type: 'mark_read' as const, value: '' }], stopProcessing: false,
});
useFilterStore.getState().addRule(rule('one'));
useFilterStore.getState().addRule(rule('two'));
await useFilterStore.getState().saveFilters();
expect(await activeContent()).toContain(`one-${RUN}`);
const undo = await useFilterStore.getState().deleteRuleNow('one');
let content = await activeContent();
expect(content).not.toContain(`one-${RUN}`);
expect(content).toContain(`two-${RUN}`);
expect(await undo!()).toBe(true);
content = await activeContent();
expect(content.indexOf(`one-${RUN}`)).toBeGreaterThan(-1);
expect(content.indexOf(`one-${RUN}`)).toBeLessThan(content.indexOf(`two-${RUN}`));
} finally {
const after = await getSieveScripts();
if (active && original !== null) await updateSieveScript(active.id, original, true);
for (const script of after) {
if (!before.some((b) => b.id === script.id)) await deleteSieveScript(script.id).catch(() => undefined);
}
useFilterStore.getState().clearState();
}
}, 60_000);
it('changes and restores an identity\'s name and signature', async () => {
const [identity] = await getIdentities();
const before = { name: identity.name, textSignature: identity.textSignature ?? '' };