OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Rid ourselves of RightPanel.Phases completely

pull/21833/head
Travis Ralston 2019-12-05 23:35:12 -07:00
parent 756cf3a88b
commit 42898ec414
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/components/structures/RightPanel.js
View File

@ -45,8 +45,6 @@ export default class RightPanel extends React.Component {
}; };
} }
static Phase = RIGHT_PANEL_PHASES;
constructor(props, context) { constructor(props, context) {
super(props, context); super(props, context);
this.state = { this.state = {
@ -66,11 +64,11 @@ export default class RightPanel extends React.Component {
_getPhaseFromProps() { _getPhaseFromProps() {
if (this.props.groupId) { if (this.props.groupId) {
return RightPanel.Phase.GroupMemberList; return RIGHT_PANEL_PHASES.GroupMemberList;
} else if (this.props.user) { } else if (this.props.user) {
return RightPanel.Phase.RoomMemberInfo; return RIGHT_PANEL_PHASES.RoomMemberInfo;
} else { } else {
return RightPanel.Phase.RoomMemberList; return RIGHT_PANEL_PHASES.RoomMemberList;
} }
} }
@ -117,7 +115,7 @@ export default class RightPanel extends React.Component {
onInviteToGroupButtonClick() { onInviteToGroupButtonClick() {
showGroupInviteDialog(this.props.groupId).then(() => { showGroupInviteDialog(this.props.groupId).then(() => {
this.setState({ this.setState({
phase: RightPanel.Phase.GroupMemberList, phase: RIGHT_PANEL_PHASES.GroupMemberList,
}); });
}); });
} }
@ -133,9 +131,9 @@ export default class RightPanel extends React.Component {
return; return;
} }
// redraw the badge on the membership list // redraw the badge on the membership list
if (this.state.phase === RightPanel.Phase.RoomMemberList && member.roomId === this.props.roomId) { if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberList && member.roomId === this.props.roomId) {
this._delayedUpdate(); this._delayedUpdate();
} else if (this.state.phase === RightPanel.Phase.RoomMemberInfo && member.roomId === this.props.roomId && } else if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo && member.roomId === this.props.roomId &&
member.userId === this.state.member.userId) { member.userId === this.state.member.userId) {
// refresh the member info (e.g. new power level) // refresh the member info (e.g. new power level)
this._delayedUpdate(); this._delayedUpdate();
@ -169,13 +167,13 @@ export default class RightPanel extends React.Component {
let panel = <div />; let panel = <div />;
if (this.props.roomId && this.state.phase === RightPanel.Phase.RoomMemberList) { if (this.props.roomId && this.state.phase === RIGHT_PANEL_PHASES.RoomMemberList) {
panel = <MemberList roomId={this.props.roomId} key={this.props.roomId} />; panel = <MemberList roomId={this.props.roomId} key={this.props.roomId} />;
} else if (this.props.groupId && this.state.phase === RightPanel.Phase.GroupMemberList) { } else if (this.props.groupId && this.state.phase === RIGHT_PANEL_PHASES.GroupMemberList) {
panel = <GroupMemberList groupId={this.props.groupId} key={this.props.groupId} />; panel = <GroupMemberList groupId={this.props.groupId} key={this.props.groupId} />;
} else if (this.state.phase === RightPanel.Phase.GroupRoomList) { } else if (this.state.phase === RIGHT_PANEL_PHASES.GroupRoomList) {
panel = <GroupRoomList groupId={this.props.groupId} key={this.props.groupId} />; panel = <GroupRoomList groupId={this.props.groupId} key={this.props.groupId} />;
} else if (this.state.phase === RightPanel.Phase.RoomMemberInfo) { } else if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo) {
if (SettingsStore.isFeatureEnabled("feature_dm_verification")) { if (SettingsStore.isFeatureEnabled("feature_dm_verification")) {
const onClose = () => { const onClose = () => {
dis.dispatch({ dis.dispatch({
@ -192,9 +190,9 @@ export default class RightPanel extends React.Component {
} else { } else {
panel = <MemberInfo member={this.state.member} key={this.props.roomId || this.state.member.userId} />; panel = <MemberInfo member={this.state.member} key={this.props.roomId || this.state.member.userId} />;
} }
} else if (this.state.phase === RightPanel.Phase.Room3pidMemberInfo) { } else if (this.state.phase === RIGHT_PANEL_PHASES.Room3pidMemberInfo) {
panel = <ThirdPartyMemberInfo event={this.state.event} key={this.props.roomId} />; panel = <ThirdPartyMemberInfo event={this.state.event} key={this.props.roomId} />;
} else if (this.state.phase === RightPanel.Phase.GroupMemberInfo) { } else if (this.state.phase === RIGHT_PANEL_PHASES.GroupMemberInfo) {
if (SettingsStore.isFeatureEnabled("feature_dm_verification")) { if (SettingsStore.isFeatureEnabled("feature_dm_verification")) {
const onClose = () => { const onClose = () => {
dis.dispatch({ dis.dispatch({
@ -216,14 +214,14 @@ export default class RightPanel extends React.Component {
/> />
); );
} }
} else if (this.state.phase === RightPanel.Phase.GroupRoomInfo) { } else if (this.state.phase === RIGHT_PANEL_PHASES.GroupRoomInfo) {
panel = <GroupRoomInfo panel = <GroupRoomInfo
groupRoomId={this.state.groupRoomId} groupRoomId={this.state.groupRoomId}
groupId={this.props.groupId} groupId={this.props.groupId}
key={this.state.groupRoomId} />; key={this.state.groupRoomId} />;
} else if (this.state.phase === RightPanel.Phase.NotificationPanel) { } else if (this.state.phase === RIGHT_PANEL_PHASES.NotificationPanel) {
panel = <NotificationPanel />; panel = <NotificationPanel />;
} else if (this.state.phase === RightPanel.Phase.FilePanel) { } else if (this.state.phase === RIGHT_PANEL_PHASES.FilePanel) {
panel = <FilePanel roomId={this.props.roomId} resizeNotifier={this.props.resizeNotifier} />; panel = <FilePanel roomId={this.props.roomId} resizeNotifier={this.props.resizeNotifier} />;
} }