coffey-labs/ihasmail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Take the filing action, not the whole rule

Browse Source 
Deleting a folder removed every rule that filed into it, along with
whatever else those rules did. A rule that filed into Work, marked read
and stopped processing lost the marking and the stopping too, and
deleting a folder says nothing about whether those were still wanted.

Only the fileinto action goes now. A rule left with nothing to do is
still removed, because it has nothing to do; a rule filing into two
folders keeps the one that still exists. The toast says which happened.

Verified against the running app with two rules aimed at the same
folder, one filing only and one filing and marking read: the first was
removed, the second kept its markread, and the script stored on the
server agrees.
This commit is contained in:
jcoffey-dev
2026-08-25 12:23:29 -07:00
parent 1f14b818ef
commit 7f382565e8
3 changed files with 71 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/lib/__tests__/sieveFolders.test.ts
+34 -11
View File
@@ -1,5 +1,5 @@
import { describe, expect, it } from "vitest";
import { retargetRules, dropRulesForFolders } from "../sieveFolders";
import { retargetRules, detachFolders } from "../sieveFolders";
import { newRule, type SieveRule } from "../sieve";
/**
@@ -56,30 +56,53 @@ describe("retargetRules", () => {
});
});
describe("dropRulesForFolders", () => {
it("removes a rule whose destination is gone", () => {
describe("detachFolders", () => {
it("removes only the filing action, leaving the rest of the rule doing its job", () => {
const rules = [rule("news", fileinto("Newsletters", "mb1", [{ type: "markread" }, { type: "stop" }]))];
const out = detachFolders(rules, [{ id: "mb1", path: "Newsletters" }]);
expect(out.removed).toEqual([]);
expect(out.edited).toHaveLength(1);
expect(out.rules[0]!.actions.map((a) => a.type)).toEqual(["markread", "stop"]);
});
it("removes the rule when filing was all it did", () => {
const rules = [rule("news", fileinto("Newsletters", "mb1")), rule("keep", fileinto("Archive", "mb9"))];
const out = dropRulesForFolders(rules, [{ id: "mb1", path: "Newsletters" }]);
const out = detachFolders(rules, [{ id: "mb1", path: "Newsletters" }]);
expect(out.removed.map((r) => r.name)).toEqual(["news"]);
expect(out.rules.map((r) => r.name)).toEqual(["keep"]);
});
it("removes rules for a deleted folder's children too", () => {
const rules = [rule("a", fileinto("Work", "mb1")), rule("b", fileinto("Work/Invoices", "mb2"))];
const out = dropRulesForFolders(rules, [{ id: "mb1", path: "Work" }, { id: "mb2", path: "Work/Invoices" }]);
expect(out.rules).toEqual([]);
expect(out.removed).toHaveLength(2);
it("handles a deleted folder's children too", () => {
const rules = [
rule("a", fileinto("Work", "mb1")),
rule("b", fileinto("Work/Invoices", "mb2", [{ type: "flag" }])),
];
const out = detachFolders(rules, [{ id: "mb1", path: "Work" }, { id: "mb2", path: "Work/Invoices" }]);
expect(out.removed.map((r) => r.name)).toEqual(["a"]);
expect(out.rules.map((r) => r.name)).toEqual(["b"]);
expect(out.rules[0]!.actions.map((a) => a.type)).toEqual(["flag"]);
});
it("still finds the rule when only the path matches", () => {
const rules = [rule("news", fileinto("Newsletters"))];
expect(dropRulesForFolders(rules, [{ id: "mb1", path: "NEWSLETTERS" }]).removed).toHaveLength(1);
expect(detachFolders(rules, [{ id: "mb1", path: "NEWSLETTERS" }]).removed).toHaveLength(1);
});
it("keeps a second filing action aimed somewhere that still exists", () => {
const rules = [rule("both", [
{ type: "fileinto", mailbox: "Newsletters", mailboxId: "mb1" },
{ type: "fileinto", mailbox: "Archive", mailboxId: "mb9", copy: true },
])];
const out = detachFolders(rules, [{ id: "mb1", path: "Newsletters" }]);
expect(out.removed).toEqual([]);
expect(out.rules[0]!.actions).toEqual([{ type: "fileinto", mailbox: "Archive", mailboxId: "mb9", copy: true }]);
});
it("leaves the list untouched when nothing matches", () => {
const rules = [rule("keep", fileinto("Archive", "mb9"))];
const out = dropRulesForFolders(rules, [{ id: "mb1", path: "Newsletters" }]);
const out = detachFolders(rules, [{ id: "mb1", path: "Newsletters" }]);
expect(out.rules).toBe(rules);
expect(out.edited).toEqual([]);
expect(out.removed).toEqual([]);
});
});