a4987060b7
* Add `Thread Activity centre` labs flag * Rename translation string * WIP Thread Activity Centre * Update supportedLevels * css lint * i18n lint * Fix labs subsection test * Update Threads Activity Centre label * Rename Thread Activity Centre to Threads Activity Centre * Use compound `MenuItem` instead of custom button * Color thread icon when hovered * Make the pop-up scrollable and add a max height * Remove Math.random in key * Remove unused class * Change add comments on `mx_ThreadsActivityRows` and `mx_ThreadsActivityRow` * Make threads activity centre labs flag split out unread counts Just shows notif & unread counts for main thread if the TAC is enabled. * Fix tests * Simpler fix * Open thread panel when thread clicke in Threads Activity Centre Hopefully this is a sensible enough way. The panel will stay open of course (ie. if you go to a different room & come back), but that's the nature of the right panel. * Dynamic state of room * Add doc * Use the StatelessNotificationBadge component in ThreadsActivityCentre and re-use the existing NotificationLevel * Remove unused style * Add room sorting * Fix `ThreadsActivityRow` props doc * Pass in & cache the status of the TAC labs flag * Pass includeThreads as setting to doesRoomHaveUnreadMessages too * Fix tests * Add analytics to the TAC (#12179) * Update TAC label (#12186) * Add `IndicatorIcon` to the TAC button (#12182) Add `IndicatorIcon` to the TAC button * Threads don't have activity if the room is muted This makes it match the computation in determineUnreadState. Ideally this logic should all be in one place. * Re-use doesRoomHaveUnreadThreads for useRoomThreadNotifications This incorporates the logic of not showing unread dots if the room is muted * Add TAC description in labs (#12197) * Fox position & size of dot on the tac button IndicatorIcon doesn't like having the size of its icon adjusted and we probably shouldn't do it anyway: better to specify to the component what size we want it. * TAC: Utils tests (#12200) * Add tests for `doesRoomHaveUnreadThreads` * Add tests for `getThreadNotificationLevel` * Add test for the ThreadsActivityCentre component * Add snapshot test * Fix narrow hover background on TAC button Make the button 32x32 (and the inner icon 24x24) * Add caption for empty TAC * s/tac/threads_activity_centre/ * Fix i18n & add tests * Add playwright tests for the TAC (#12227) * Fox comments --------- Co-authored-by: David Baker <dbkr@users.noreply.github.com>
262 lines
10 KiB
TypeScript
262 lines
10 KiB
TypeScript
/*
|
|
Copyright 2022 The Matrix.org Foundation C.I.C.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
import { MatrixEvent, NotificationCountType, Room, MatrixClient, ReceiptType } from "matrix-js-sdk/src/matrix";
|
|
import { Mocked, mocked } from "jest-mock";
|
|
|
|
import {
|
|
localNotificationsAreSilenced,
|
|
getLocalNotificationAccountDataEventType,
|
|
createLocalNotificationSettingsIfNeeded,
|
|
deviceNotificationSettingsKeys,
|
|
clearAllNotifications,
|
|
clearRoomNotification,
|
|
notificationLevelToIndicator,
|
|
getThreadNotificationLevel,
|
|
} from "../../src/utils/notifications";
|
|
import SettingsStore from "../../src/settings/SettingsStore";
|
|
import { getMockClientWithEventEmitter } from "../test-utils/client";
|
|
import { mkMessage, stubClient } from "../test-utils/test-utils";
|
|
import { MatrixClientPeg } from "../../src/MatrixClientPeg";
|
|
import { NotificationLevel } from "../../src/stores/notifications/NotificationLevel";
|
|
|
|
jest.mock("../../src/settings/SettingsStore");
|
|
|
|
describe("notifications", () => {
|
|
let accountDataStore: Record<string, MatrixEvent> = {};
|
|
let mockClient: Mocked<MatrixClient>;
|
|
let accountDataEventKey: string;
|
|
|
|
beforeEach(() => {
|
|
jest.clearAllMocks();
|
|
mockClient = getMockClientWithEventEmitter({
|
|
isGuest: jest.fn().mockReturnValue(false),
|
|
getAccountData: jest.fn().mockImplementation((eventType) => accountDataStore[eventType]),
|
|
setAccountData: jest.fn().mockImplementation((eventType, content) => {
|
|
accountDataStore[eventType] = new MatrixEvent({
|
|
type: eventType,
|
|
content,
|
|
});
|
|
}),
|
|
});
|
|
accountDataStore = {};
|
|
accountDataEventKey = getLocalNotificationAccountDataEventType(mockClient.deviceId!);
|
|
mocked(SettingsStore).getValue.mockReturnValue(false);
|
|
});
|
|
|
|
describe("createLocalNotification", () => {
|
|
it("creates account data event", async () => {
|
|
await createLocalNotificationSettingsIfNeeded(mockClient);
|
|
const event = mockClient.getAccountData(accountDataEventKey);
|
|
expect(event?.getContent().is_silenced).toBe(true);
|
|
});
|
|
|
|
it("does not do anything for guests", async () => {
|
|
mockClient.isGuest.mockReset().mockReturnValue(true);
|
|
await createLocalNotificationSettingsIfNeeded(mockClient);
|
|
const event = mockClient.getAccountData(accountDataEventKey);
|
|
expect(event).toBeFalsy();
|
|
});
|
|
|
|
it.each(deviceNotificationSettingsKeys)(
|
|
"unsilenced for existing sessions when %s setting is truthy",
|
|
async (settingKey) => {
|
|
mocked(SettingsStore).getValue.mockImplementation((key): any => {
|
|
return key === settingKey;
|
|
});
|
|
|
|
await createLocalNotificationSettingsIfNeeded(mockClient);
|
|
const event = mockClient.getAccountData(accountDataEventKey);
|
|
expect(event?.getContent().is_silenced).toBe(false);
|
|
},
|
|
);
|
|
|
|
it("does not override an existing account event data", async () => {
|
|
mockClient.setAccountData(accountDataEventKey, {
|
|
is_silenced: false,
|
|
});
|
|
|
|
await createLocalNotificationSettingsIfNeeded(mockClient);
|
|
const event = mockClient.getAccountData(accountDataEventKey);
|
|
expect(event?.getContent().is_silenced).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe("localNotificationsAreSilenced", () => {
|
|
it("defaults to false when no setting exists", () => {
|
|
expect(localNotificationsAreSilenced(mockClient)).toBeFalsy();
|
|
});
|
|
it("checks the persisted value", () => {
|
|
mockClient.setAccountData(accountDataEventKey, { is_silenced: true });
|
|
expect(localNotificationsAreSilenced(mockClient)).toBeTruthy();
|
|
|
|
mockClient.setAccountData(accountDataEventKey, { is_silenced: false });
|
|
expect(localNotificationsAreSilenced(mockClient)).toBeFalsy();
|
|
});
|
|
});
|
|
|
|
describe("clearRoomNotification", () => {
|
|
let client: MatrixClient;
|
|
let room: Room;
|
|
let sendReadReceiptSpy: jest.SpyInstance;
|
|
const ROOM_ID = "123";
|
|
const USER_ID = "@bob:example.org";
|
|
let message: MatrixEvent;
|
|
let sendReceiptsSetting = true;
|
|
|
|
beforeEach(() => {
|
|
stubClient();
|
|
client = mocked(MatrixClientPeg.safeGet());
|
|
room = new Room(ROOM_ID, client, USER_ID);
|
|
message = mkMessage({
|
|
event: true,
|
|
room: ROOM_ID,
|
|
user: USER_ID,
|
|
msg: "Hello",
|
|
});
|
|
room.addLiveEvents([message]);
|
|
sendReadReceiptSpy = jest.spyOn(client, "sendReadReceipt").mockResolvedValue({});
|
|
jest.spyOn(client, "getRooms").mockReturnValue([room]);
|
|
jest.spyOn(SettingsStore, "getValue").mockImplementation((name) => {
|
|
return name === "sendReadReceipts" && sendReceiptsSetting;
|
|
});
|
|
});
|
|
|
|
it("sends a request even if everything has been read", () => {
|
|
clearRoomNotification(room, client);
|
|
expect(sendReadReceiptSpy).toHaveBeenCalledWith(message, ReceiptType.Read, true);
|
|
});
|
|
|
|
it("marks the room as read even if the receipt failed", async () => {
|
|
room.setUnreadNotificationCount(NotificationCountType.Total, 5);
|
|
sendReadReceiptSpy = jest.spyOn(client, "sendReadReceipt").mockReset().mockRejectedValue({ error: 42 });
|
|
|
|
await expect(async () => {
|
|
await clearRoomNotification(room, client);
|
|
}).rejects.toEqual({ error: 42 });
|
|
expect(room.getUnreadNotificationCount(NotificationCountType.Total)).toBe(0);
|
|
});
|
|
|
|
describe("when sendReadReceipts setting is disabled", () => {
|
|
beforeEach(() => {
|
|
sendReceiptsSetting = false;
|
|
});
|
|
|
|
it("should send a private read receipt", () => {
|
|
clearRoomNotification(room, client);
|
|
expect(sendReadReceiptSpy).toHaveBeenCalledWith(message, ReceiptType.ReadPrivate, true);
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("clearAllNotifications", () => {
|
|
let client: MatrixClient;
|
|
let room: Room;
|
|
let sendReadReceiptSpy: jest.SpyInstance;
|
|
|
|
const ROOM_ID = "123";
|
|
const USER_ID = "@bob:example.org";
|
|
|
|
beforeEach(() => {
|
|
stubClient();
|
|
client = mocked(MatrixClientPeg.safeGet());
|
|
room = new Room(ROOM_ID, client, USER_ID);
|
|
sendReadReceiptSpy = jest.spyOn(client, "sendReadReceipt").mockResolvedValue({});
|
|
jest.spyOn(client, "getRooms").mockReturnValue([room]);
|
|
jest.spyOn(SettingsStore, "getValue").mockImplementation((name) => {
|
|
return name === "sendReadReceipts";
|
|
});
|
|
});
|
|
|
|
it("does not send any requests if everything has been read", () => {
|
|
clearAllNotifications(client);
|
|
expect(sendReadReceiptSpy).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("sends unthreaded receipt requests", () => {
|
|
const message = mkMessage({
|
|
event: true,
|
|
room: ROOM_ID,
|
|
user: USER_ID,
|
|
ts: 1,
|
|
});
|
|
room.addLiveEvents([message]);
|
|
room.setUnreadNotificationCount(NotificationCountType.Total, 1);
|
|
|
|
clearAllNotifications(client);
|
|
|
|
expect(sendReadReceiptSpy).toHaveBeenCalledWith(message, ReceiptType.Read, true);
|
|
});
|
|
|
|
it("sends private read receipts", () => {
|
|
const message = mkMessage({
|
|
event: true,
|
|
room: ROOM_ID,
|
|
user: USER_ID,
|
|
ts: 1,
|
|
});
|
|
room.addLiveEvents([message]);
|
|
room.setUnreadNotificationCount(NotificationCountType.Total, 1);
|
|
|
|
jest.spyOn(SettingsStore, "getValue").mockReset().mockReturnValue(false);
|
|
|
|
clearAllNotifications(client);
|
|
|
|
expect(sendReadReceiptSpy).toHaveBeenCalledWith(message, ReceiptType.ReadPrivate, true);
|
|
});
|
|
});
|
|
|
|
describe("notificationLevelToIndicator", () => {
|
|
it("returns undefined if notification level is None", () => {
|
|
expect(notificationLevelToIndicator(NotificationLevel.None)).toBeUndefined();
|
|
});
|
|
|
|
it("returns default if notification level is Activity", () => {
|
|
expect(notificationLevelToIndicator(NotificationLevel.Activity)).toEqual("default");
|
|
});
|
|
|
|
it("returns success if notification level is Notification", () => {
|
|
expect(notificationLevelToIndicator(NotificationLevel.Notification)).toEqual("success");
|
|
});
|
|
|
|
it("returns critical if notification level is Highlight", () => {
|
|
expect(notificationLevelToIndicator(NotificationLevel.Highlight)).toEqual("critical");
|
|
});
|
|
});
|
|
|
|
describe("getThreadNotificationLevel", () => {
|
|
let room: Room;
|
|
|
|
const ROOM_ID = "123";
|
|
const USER_ID = "@bob:example.org";
|
|
|
|
beforeEach(() => {
|
|
room = new Room(ROOM_ID, MatrixClientPeg.safeGet(), USER_ID);
|
|
});
|
|
|
|
it.each([
|
|
{ notificationCountType: NotificationCountType.Highlight, expected: NotificationLevel.Highlight },
|
|
{ notificationCountType: NotificationCountType.Total, expected: NotificationLevel.Notification },
|
|
{ notificationCountType: null, expected: NotificationLevel.Activity },
|
|
])(
|
|
"returns NotificationLevel $expected when notificationCountType is $expected",
|
|
({ notificationCountType, expected }) => {
|
|
jest.spyOn(room, "threadsAggregateNotificationType", "get").mockReturnValue(notificationCountType);
|
|
expect(getThreadNotificationLevel(room)).toEqual(expected);
|
|
},
|
|
);
|
|
});
|
|
});
|