Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
fix(bulk_actions): disable Apply until the new note count arrives
Elian Doran05e33c49853a
diff --git a/apps/client/src/widgets/dialogs/bulk_actions.spec.tsx b/apps/client/src/widgets/dialogs/bulk_actions.spec.tsxindex 5cd848a25f..61b7958355 100644--- a/apps/client/src/widgets/dialogs/bulk_actions.spec.tsx+++ b/apps/client/src/widgets/dialogs/bulk_actions.spec.tsx@@ -202,6 +202,30 @@ describe("BulkActionsDialog", () => {expect(executeButton().disabled).toBe(true);});+ it("keeps the execute button disabled until the count for a changed selection arrives", async () => {+ buildNote({ id: "_bulkAction", title: "Bulk action", "#action": JSON.stringify({ name: "deleteRevisions" }) });+ server.post.mockResolvedValue({ affectedNoteCount: 1 });+ await open([ "n1" ]);+ const button = container.querySelector<HTMLButtonElement>("button[name='execute-bulk-actions']");+ expect(button?.disabled).toBe(false);++ let respond = (_count: number) => {};+ server.post.mockImplementation(() => new Promise((resolve) => {+ respond = (affectedNoteCount) => resolve({ affectedNoteCount });+ }));+ const toggle = container.querySelector<HTMLInputElement>("input.switch-toggle");+ if (!toggle) throw new Error("No include-descendants toggle.");+ await act(async () => {+ toggle.dispatchEvent(new Event("input", { bubbles: true }));+ });+ expect(lastAffectedNotesRequest()).toStrictEqual({ noteIds: [ "n1" ], includeDescendants: true });+ expect(button?.disabled).toBe(true);++ await act(async () => respond(300));+ expect(button?.textContent).toContain("bulk_actions.execute_bulk_actions:300");+ expect(button?.disabled).toBe(false);+ });+it("runs the actions once, however often the execute button is pressed", async () => {buildNote({ id: "_bulkAction", title: "Bulk action", "#action": JSON.stringify({ name: "deleteRevisions" }) });server.post.mockResolvedValue({ affectedNoteCount: 1 });diff --git a/apps/client/src/widgets/dialogs/bulk_actions.tsx b/apps/client/src/widgets/dialogs/bulk_actions.tsxindex b8a1a048f5..8105a9652d 100644--- a/apps/client/src/widgets/dialogs/bulk_actions.tsx+++ b/apps/client/src/widgets/dialogs/bulk_actions.tsx@@ -33,12 +33,13 @@ export default function BulkActionsDialog() {useTriliumEvent("openBulkActionsDialog", async ({ selectedOrActiveNoteIds }) => {setSelectedOrActiveNoteIds(selectedOrActiveNoteIds);- setAffectedNoteCount(undefined);setBulkActionNote(await froca.getNote("_bulkAction"));setShown(true);});useEffect(() => {+ // Execution stays disabled until the count matches the notes it runs on.+ setAffectedNoteCount(undefined);if (!selectedOrActiveNoteIds || !bulkActionNote) return;let stale = false;