imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up editor drafts for unknown rooms (#12850)

Browse source 
* Clean up editor drafts for unknown rooms and add tests.

* lint

* Call cleanUpDraftsIfRequired when we know a live update has completed.

* Fix test for new call site of draft cleaning

* fix test
This commit is contained in:
David Langley 2024-08-07 09:35:57 +01:00 • committed by GitHub
parent 6e7ddbbae9
commit e6835fe9d2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 122 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

36
test/components/structures/MatrixChat-test.tsx
View file

@ -62,6 +62,7 @@ import { SettingLevel } from "../../../src/settings/SettingLevel";
import { MatrixClientPeg as peg } from "../../../src/MatrixClientPeg";
import DMRoomMap from "../../../src/utils/DMRoomMap";
import { ReleaseAnnouncementStore } from "../../../src/stores/ReleaseAnnouncementStore";
import { DRAFT_LAST_CLEANUP_KEY } from "../../../src/DraftCleaner";
jest.mock("matrix-js-sdk/src/oidc/authorize", () => ({
completeAuthorizationCodeGrant: jest.fn(),
@ -598,6 +599,41 @@ describe("<MatrixChat />", () => {
expect(screen.getByText(`Welcome ${userId}`)).toBeInTheDocument();
});
describe("clean up drafts", () => {
const roomId = "!room:server.org";
const unknownRoomId = "!room2:server.org";
const room = new Room(roomId, mockClient, userId);
const timestamp = 2345678901234;
beforeEach(() => {
localStorage.setItem(`mx_cider_state_${unknownRoomId}`, "fake_content");
localStorage.setItem(`mx_cider_state_${roomId}`, "fake_content");
mockClient.getRoom.mockImplementation((id) => [room].find((room) => room.roomId === id) || null);
});
afterEach(() => {
jest.restoreAllMocks();
});
it("should clean up drafts", async () => {
Date.now = jest.fn(() => timestamp);
localStorage.setItem(`mx_cider_state_${roomId}`, "fake_content");
localStorage.setItem(`mx_cider_state_${unknownRoomId}`, "fake_content");
await getComponentAndWaitForReady();
mockClient.emit(ClientEvent.Sync, SyncState.Syncing, SyncState.Syncing);
// let things settle
await flushPromises();
expect(localStorage.getItem(`mx_cider_state_${roomId}`)).not.toBeNull();
expect(localStorage.getItem(`mx_cider_state_${unknownRoomId}`)).toBeNull();
});
it("should not clean up drafts before expiry", async () => {
// Set the last cleanup to the recent past
localStorage.setItem(`mx_cider_state_${unknownRoomId}`, "fake_content");
localStorage.setItem(DRAFT_LAST_CLEANUP_KEY, String(timestamp - 100));
await getComponentAndWaitForReady();
mockClient.emit(ClientEvent.Sync, SyncState.Syncing, SyncState.Syncing);
expect(localStorage.getItem(`mx_cider_state_${unknownRoomId}`)).not.toBeNull();
});
});
describe("onAction()", () => {
beforeEach(() => {
jest.spyOn(defaultDispatcher, "dispatch").mockClear();