Live location sharing - refresh beacon expiry in room (#8116)
* add duration dropdown to live location picker Signed-off-by: Kerry Archibald <kerrya@element.io> * tidy comments Signed-off-by: Kerry Archibald <kerrya@element.io> * setup component Signed-off-by: Kerry Archibald <kerrya@element.io> * replace references to beaconInfoId with beacon.identifier Signed-off-by: Kerry Archibald <kerrya@element.io> * icon Signed-off-by: Kerry Archibald <kerrya@element.io> * component for styled live beacon icon Signed-off-by: Kerry Archibald <kerrya@element.io> * emit liveness change whenever livebeaconIds changes Signed-off-by: Kerry Archibald <kerrya@element.io> * Handle multiple live beacons in room share warning, test Signed-off-by: Kerry Archibald <kerrya@element.io> * un xdescribe beaconstore tests Signed-off-by: Kerry Archibald <kerrya@element.io> * missed copyrights Signed-off-by: Kerry Archibald <kerrya@element.io> * i18n Signed-off-by: Kerry Archibald <kerrya@element.io> * refresh beacon time remaining Signed-off-by: Kerry Archibald <kerrya@element.io> * kill timeout Signed-off-by: Kerry Archibald <kerrya@element.io> * use useInterval Signed-off-by: Kerry Archibald <kerrya@element.io> * beacon not optional in useMsRemaining Signed-off-by: Kerry Archibald <kerrya@element.io> * just use single "you are sharing" message Signed-off-by: Kerry Archibald <kerrya@element.io> * trigger Signed-off-by: Kerry Archibald <kerrya@element.io> * i18n Signed-off-by: Kerry Archibald <kerrya@element.io> * i18n again Signed-off-by: Kerry Archibald <kerrya@element.io>
This commit is contained in:
Kerry
GitHub
parent
9b2944294c
commit
752ad6a9f9
4 changed files with 201 additions and 43 deletions
|
|
@ -44,13 +44,17 @@ describe('<RoomLiveShareWarning />', () => {
|
|||
|
||||
// 14.03.2022 16:15
|
||||
const now = 1647270879403;
|
||||
const MINUTE_MS = 60000;
|
||||
const HOUR_MS = 3600000;
|
||||
// mock the date so events are stable for snapshots etc
|
||||
jest.spyOn(global.Date, 'now').mockReturnValue(now);
|
||||
const room1Beacon1 = makeBeaconInfoEvent(aliceId, room1Id, { isLive: true, timeout: HOUR_MS });
|
||||
const room2Beacon1 = makeBeaconInfoEvent(aliceId, room2Id, { isLive: true, timeout: HOUR_MS });
|
||||
const room2Beacon2 = makeBeaconInfoEvent(aliceId, room2Id, { isLive: true, timeout: HOUR_MS * 12 });
|
||||
const room3Beacon1 = makeBeaconInfoEvent(aliceId, room3Id, { isLive: true, timeout: HOUR_MS });
|
||||
const room1Beacon1 = makeBeaconInfoEvent(aliceId, room1Id, {
|
||||
isLive: true,
|
||||
timeout: HOUR_MS,
|
||||
}, '$0');
|
||||
const room2Beacon1 = makeBeaconInfoEvent(aliceId, room2Id, { isLive: true, timeout: HOUR_MS }, '$1');
|
||||
const room2Beacon2 = makeBeaconInfoEvent(aliceId, room2Id, { isLive: true, timeout: HOUR_MS * 12 }, '$2');
|
||||
const room3Beacon1 = makeBeaconInfoEvent(aliceId, room3Id, { isLive: true, timeout: HOUR_MS }, '$3');
|
||||
|
||||
// make fresh rooms every time
|
||||
// as we update room state
|
||||
|
|
@ -67,7 +71,8 @@ describe('<RoomLiveShareWarning />', () => {
|
|||
|
||||
const advanceDateAndTime = (ms: number) => {
|
||||
// bc liveness check uses Date.now we have to advance this mock
|
||||
jest.spyOn(global.Date, 'now').mockReturnValue(now + ms);
|
||||
jest.spyOn(global.Date, 'now').mockReturnValue(Date.now() + ms);
|
||||
|
||||
// then advance time for the interval by the same amount
|
||||
jest.advanceTimersByTime(ms);
|
||||
};
|
||||
|
|
@ -105,6 +110,8 @@ describe('<RoomLiveShareWarning />', () => {
|
|||
jest.spyOn(global.Date, 'now').mockRestore();
|
||||
});
|
||||
|
||||
const getExpiryText = wrapper => findByTestId(wrapper, 'room-live-share-expiry').text();
|
||||
|
||||
it('renders nothing when user has no live beacons at all', async () => {
|
||||
await makeOwnBeaconStore();
|
||||
const component = getComponent();
|
||||
|
|
@ -137,7 +144,7 @@ describe('<RoomLiveShareWarning />', () => {
|
|||
const component = getComponent({ roomId: room2Id });
|
||||
expect(component).toMatchSnapshot();
|
||||
// later expiry displayed
|
||||
expect(findByTestId(component, 'room-live-share-expiry').text()).toEqual('12h left');
|
||||
expect(getExpiryText(component)).toEqual('12h left');
|
||||
});
|
||||
|
||||
it('removes itself when user stops having live beacons', async () => {
|
||||
|
|
@ -146,7 +153,9 @@ describe('<RoomLiveShareWarning />', () => {
|
|||
expect(component.html()).toBeTruthy();
|
||||
|
||||
// time travel until room1Beacon1 is expired
|
||||
advanceDateAndTime(HOUR_MS + 1);
|
||||
act(() => {
|
||||
advanceDateAndTime(HOUR_MS + 1);
|
||||
});
|
||||
act(() => {
|
||||
mockClient.emit(BeaconEvent.LivenessChange, false, new Beacon(room1Beacon1));
|
||||
component.setProps({});
|
||||
|
|
@ -168,6 +177,29 @@ describe('<RoomLiveShareWarning />', () => {
|
|||
expect(component.html()).toBeTruthy();
|
||||
});
|
||||
|
||||
it('updates beacon time left periodically', () => {
|
||||
const component = getComponent({ roomId: room1Id });
|
||||
expect(getExpiryText(component)).toEqual('1h left');
|
||||
|
||||
act(() => {
|
||||
advanceDateAndTime(MINUTE_MS * 25);
|
||||
});
|
||||
|
||||
expect(getExpiryText(component)).toEqual('35m left');
|
||||
});
|
||||
|
||||
it('clears expiry time interval on unmount', () => {
|
||||
const clearIntervalSpy = jest.spyOn(global, 'clearInterval');
|
||||
const component = getComponent({ roomId: room1Id });
|
||||
expect(getExpiryText(component)).toEqual('1h left');
|
||||
|
||||
act(() => {
|
||||
component.unmount();
|
||||
});
|
||||
|
||||
expect(clearIntervalSpy).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
describe('stopping beacons', () => {
|
||||
it('stops beacon on stop sharing click', () => {
|
||||
const component = getComponent({ roomId: room2Id });
|
||||
|
|
@ -184,25 +216,28 @@ describe('<RoomLiveShareWarning />', () => {
|
|||
|
||||
it('displays again with correct state after stopping a beacon', () => {
|
||||
// make sure the loading state is reset correctly after removing a beacon
|
||||
const component = getComponent({ roomId: room2Id });
|
||||
const component = getComponent({ roomId: room1Id });
|
||||
|
||||
// stop the beacon
|
||||
act(() => {
|
||||
findByTestId(component, 'room-live-share-stop-sharing').at(0).simulate('click');
|
||||
});
|
||||
// time travel until room1Beacon1 is expired
|
||||
advanceDateAndTime(HOUR_MS + 1);
|
||||
act(() => {
|
||||
advanceDateAndTime(HOUR_MS + 1);
|
||||
});
|
||||
act(() => {
|
||||
mockClient.emit(BeaconEvent.LivenessChange, false, new Beacon(room1Beacon1));
|
||||
});
|
||||
|
||||
const newLiveBeacon = makeBeaconInfoEvent(aliceId, room2Id, { isLive: true });
|
||||
const newLiveBeacon = makeBeaconInfoEvent(aliceId, room1Id, { isLive: true });
|
||||
act(() => {
|
||||
mockClient.emit(BeaconEvent.New, newLiveBeacon, new Beacon(newLiveBeacon));
|
||||
});
|
||||
|
||||
// button not disabled and expiry time shown
|
||||
expect(findByTestId(component, 'room-live-share-stop-sharing').at(0).props().disabled).toBeFalsy();
|
||||
expect(findByTestId(component, 'room-live-share-expiry').text()).toEqual('11h left');
|
||||
expect(findByTestId(component, 'room-live-share-expiry').text()).toEqual('1h left');
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -19,12 +19,57 @@ exports[`<RoomLiveShareWarning /> when user has live beacons renders correctly w
|
|||
>
|
||||
You are sharing your live location
|
||||
</span>
|
||||
<span
|
||||
className="mx_RoomLiveShareWarning_expiry"
|
||||
data-test-id="room-live-share-expiry"
|
||||
<LiveTimeRemaining
|
||||
beacon={
|
||||
Beacon {
|
||||
"_beaconInfo": Object {
|
||||
"assetType": "m.self",
|
||||
"description": undefined,
|
||||
"live": true,
|
||||
"timeout": 3600000,
|
||||
"timestamp": 1647270879403,
|
||||
},
|
||||
"_events": Object {
|
||||
"Beacon.LivenessChange": Array [
|
||||
[Function],
|
||||
[Function],
|
||||
],
|
||||
"Beacon.new": [Function],
|
||||
"Beacon.update": [Function],
|
||||
},
|
||||
"_eventsCount": 3,
|
||||
"_isLive": true,
|
||||
"_maxListeners": undefined,
|
||||
"livenessWatchInterval": 1000000000002,
|
||||
"roomId": "$room1:server.org",
|
||||
"rootEvent": Object {
|
||||
"content": Object {
|
||||
"org.matrix.msc3488.asset": Object {
|
||||
"type": "m.self",
|
||||
},
|
||||
"org.matrix.msc3488.ts": 1647270879403,
|
||||
"org.matrix.msc3489.beacon_info": Object {
|
||||
"description": undefined,
|
||||
"live": true,
|
||||
"timeout": 3600000,
|
||||
},
|
||||
},
|
||||
"event_id": "$0",
|
||||
"room_id": "$room1:server.org",
|
||||
"state_key": "@alice:server.org",
|
||||
"type": "org.matrix.msc3489.beacon_info.@alice:server.org.2",
|
||||
},
|
||||
Symbol(kCapture): false,
|
||||
}
|
||||
}
|
||||
>
|
||||
1h left
|
||||
</span>
|
||||
<span
|
||||
className="mx_RoomLiveShareWarning_expiry"
|
||||
data-test-id="room-live-share-expiry"
|
||||
>
|
||||
1h left
|
||||
</span>
|
||||
</LiveTimeRemaining>
|
||||
<AccessibleButton
|
||||
data-test-id="room-live-share-stop-sharing"
|
||||
disabled={false}
|
||||
|
|
@ -67,14 +112,59 @@ exports[`<RoomLiveShareWarning /> when user has live beacons renders correctly w
|
|||
<span
|
||||
className="mx_RoomLiveShareWarning_label"
|
||||
>
|
||||
You are sharing 2 live locations
|
||||
You are sharing your live location
|
||||
</span>
|
||||
<span
|
||||
className="mx_RoomLiveShareWarning_expiry"
|
||||
data-test-id="room-live-share-expiry"
|
||||
<LiveTimeRemaining
|
||||
beacon={
|
||||
Beacon {
|
||||
"_beaconInfo": Object {
|
||||
"assetType": "m.self",
|
||||
"description": undefined,
|
||||
"live": true,
|
||||
"timeout": 43200000,
|
||||
"timestamp": 1647270879403,
|
||||
},
|
||||
"_events": Object {
|
||||
"Beacon.LivenessChange": Array [
|
||||
[Function],
|
||||
[Function],
|
||||
],
|
||||
"Beacon.new": [Function],
|
||||
"Beacon.update": [Function],
|
||||
},
|
||||
"_eventsCount": 3,
|
||||
"_isLive": true,
|
||||
"_maxListeners": undefined,
|
||||
"livenessWatchInterval": 1000000000010,
|
||||
"roomId": "$room2:server.org",
|
||||
"rootEvent": Object {
|
||||
"content": Object {
|
||||
"org.matrix.msc3488.asset": Object {
|
||||
"type": "m.self",
|
||||
},
|
||||
"org.matrix.msc3488.ts": 1647270879403,
|
||||
"org.matrix.msc3489.beacon_info": Object {
|
||||
"description": undefined,
|
||||
"live": true,
|
||||
"timeout": 43200000,
|
||||
},
|
||||
},
|
||||
"event_id": "$2",
|
||||
"room_id": "$room2:server.org",
|
||||
"state_key": "@alice:server.org",
|
||||
"type": "org.matrix.msc3489.beacon_info.@alice:server.org.4",
|
||||
},
|
||||
Symbol(kCapture): false,
|
||||
}
|
||||
}
|
||||
>
|
||||
12h left
|
||||
</span>
|
||||
<span
|
||||
className="mx_RoomLiveShareWarning_expiry"
|
||||
data-test-id="room-live-share-expiry"
|
||||
>
|
||||
12h left
|
||||
</span>
|
||||
</LiveTimeRemaining>
|
||||
<AccessibleButton
|
||||
data-test-id="room-live-share-stop-sharing"
|
||||
disabled={false}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue