Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Don't restore MemberInfo from RightPanel history when viewing a room #8090

Merged
merged 8 commits into from
Mar 21, 2022
Merged

Don't restore MemberInfo from RightPanel history when viewing a room #8090

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f54f03b
don't restore MemberInfo from RightPanel history when viewing a room
ara4n Mar 20, 2022
dd911ed
switch to using isCardStateValid() to prune out the cards to be skipped
ara4n Mar 20, 2022
03045bd
switch to clearing out member cards on view_room
ara4n Mar 20, 2022
4d144ba
switch to clearing out member cards on view_room
ara4n Mar 20, 2022
bd41ee1
lint
ara4n Mar 20, 2022
6347b88
use optional chaining
ara4n Mar 21, 2022
6234d71
watch RVS rtaher than dispatcher for room changes
ara4n Mar 21, 2022
d23b994
fix import
ara4n Mar 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/stores/right-panel/RightPanelStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ export default class RightPanelStore extends ReadyWatchingStore {
if (!this.isPhaseValid(targetPhase)) return;

if ((targetPhase === this.currentCardForRoom(rId)?.phase && !!cardState)) {
// Update state: set right panel with a new state but keep the phase (dont know it this is ever needed...)
// Update state: set right panel with a new state but keep the phase (don't know it this is ever needed...)
const hist = this.byRoom[rId]?.history ?? [];
hist[hist.length - 1].state = cardState;
this.emitAndUpdateSettings();
Expand Down Expand Up @@ -367,6 +367,7 @@ export default class RightPanelStore extends ReadyWatchingStore {
}

private onVerificationRequestUpdate = () => {
if (!this.currentCard?.state) return;
const { member } = this.currentCard.state;
if (!member) return;
const pendingRequest = pendingVerificationRequestForUser(member);
Expand All @@ -378,9 +379,25 @@ export default class RightPanelStore extends ReadyWatchingStore {

private onRoomViewStoreUpdate = () => {
// TODO: only use this function instead of the onDispatch (the whole onDispatch can get removed!) as soon groups are removed
const oldRoomId = this.viewedRoomId;
this.viewedRoomId = RoomViewStore.getRoomId();
// load values from byRoomCache with the viewedRoomId.
this.loadCacheFromSettings();

// if we're switching to a room, clear out any stale MemberInfo cards
// in order to fix https://github.com/vector-im/element-web/issues/21487
if (oldRoomId !== this.viewedRoomId) {
if (this.currentCard?.phase !== RightPanelPhases.EncryptionPanel) {
const panel = this.byRoom[this.viewedRoomId];
if (panel?.history) {
panel.history = panel.history.filter(
(card) => card.phase != RightPanelPhases.RoomMemberInfo &&
card.phase != RightPanelPhases.Room3pidMemberInfo,
);
}
}
}

// If the right panel stays open mode is used, and the panel was either
// closed or never shown for that room, then force it open and display
// the room member list.
Expand Down