nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Don't allow pin or edit of messages with a send status (#31158)

Browse Source 
* Don't allow pin or edit of messages with a send status

* lint and improve comments.
This commit is contained in:
David Langley
2025-11-03 17:33:18 +00:00
committed by GitHub
parent 18a5565b70
commit dcf3e536ab
4 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/unit-tests/components/views/context_menus/MessageContextMenu-test.tsx
View File

@@ -748,7 +748,8 @@ function createMenu(
// @ts-ignore illegally set private prop
room.currentState.beacons = beacons;
mxEvent.setStatus(EventStatus.SENT);
// The base case is that we have received the remote echo and have an eventId. No sending status.
mxEvent.setStatus(null);
client.getUserId = jest.fn().mockReturnValue("@user:example.com");
client.getRoom = jest.fn().mockReturnValue(room);

22
test/unit-tests/components/views/messages/MessageActionBar-test.tsx
View File

@@ -125,7 +125,8 @@ describe("<MessageActionBar />", () => {
beforeEach(() => {
jest.clearAllMocks();
alicesMessageEvent.setStatus(EventStatus.SENT);
// The base case is that we have received the remote echo and have an eventId. No sending status.
alicesMessageEvent.setStatus(null);
jest.spyOn(SettingsStore, "getValue").mockReturnValue(false);
jest.spyOn(SettingsStore, "setValue").mockResolvedValue(undefined);
});
@@ -376,6 +377,25 @@ describe("<MessageActionBar />", () => {
expect(queryByLabelText("Delete")).toBeTruthy();
});
it("only shows retry and delete buttons when event could not be sent", () => {
// Enable pin and other features
jest.spyOn(SettingsStore, "getValue").mockReturnValue(true);
alicesMessageEvent.setStatus(EventStatus.NOT_SENT);
const { queryByLabelText } = getComponent({ mxEvent: alicesMessageEvent });
// Should show retry and cancel buttons
expect(queryByLabelText("Retry")).toBeTruthy();
expect(queryByLabelText("Delete")).toBeTruthy();
// Should NOT show edit, pin, react, reply buttons
expect(queryByLabelText("Edit")).toBeFalsy();
expect(queryByLabelText("Pin")).toBeFalsy();
expect(queryByLabelText("React")).toBeFalsy();
expect(queryByLabelText("Reply")).toBeFalsy();
expect(queryByLabelText("Reply in thread")).toBeFalsy();
});
it.todo("unsends event on cancel click");
it.todo("retrys event on retry click");
});