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

Display an error message if room not found #325

Merged
merged 3 commits into from
Jun 28, 2016
Merged

Display an error message if room not found #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98c0386
Display an error message if room not found
dbkr Jun 24, 2016
548c392
PR feedback
dbkr Jun 28, 2016
e8337b2
More PR feedback
dbkr Jun 28, 2016
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
14 changes: 11 additions & 3 deletions src/components/structures/RoomView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ module.exports = React.createClass({
guestsCanJoin: false,
canPeek: false,

// error object, as from the matrix client/server API
// If we failed to load information about the room,
// store the error here.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

string? something else?

roomLoadError: null,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please can we include comments which document wtf these mean?


// this is true if we are fully scrolled-down, and are looking at
// the end of the live timeline. It has the effect of hiding the
// 'scroll to bottom' knob, among a couple of other things.
Expand Down Expand Up @@ -163,6 +168,7 @@ module.exports = React.createClass({
}, (err) => {
this.setState({
roomLoading: false,
roomLoadError: err,
});
});
} else {
Expand Down Expand Up @@ -1282,6 +1288,7 @@ module.exports = React.createClass({

// We have no room object for this room, only the ID.
// We've got to this room by following a link, possibly a third party invite.
var room_alias = this.props.roomAddress[0] == '#' ? this.props.roomAddress : null;
return (
<div className="mx_RoomView">
<RoomHeader ref="header"
Expand All @@ -1292,7 +1299,8 @@ module.exports = React.createClass({
<div className="mx_RoomView_auxPanel">
<RoomPreviewBar onJoinClick={ this.onJoinButtonClicked }
onRejectClick={ this.onRejectThreepidInviteButtonClicked }
canJoin={ true } canPreview={ false }
canPreview={ false } error={ this.state.roomLoadError }
roomAlias={room_alias}
spinner={this.state.joining}
inviterName={inviterName}
invitedEmail={invitedEmail}
Expand Down Expand Up @@ -1330,7 +1338,7 @@ module.exports = React.createClass({
<RoomPreviewBar onJoinClick={ this.onJoinButtonClicked }
onRejectClick={ this.onRejectButtonClicked }
inviterName={ inviterName }
canJoin={ true } canPreview={ false }
canPreview={ false }
spinner={this.state.joining}
room={this.state.room}
/>
Expand Down Expand Up @@ -1400,7 +1408,7 @@ module.exports = React.createClass({
invitedEmail = this.props.thirdPartyInvite.invitedEmail;
}
aux = (
<RoomPreviewBar onJoinClick={this.onJoinButtonClicked} canJoin={true}
<RoomPreviewBar onJoinClick={this.onJoinButtonClicked}
onRejectClick={this.onRejectThreepidInviteButtonClicked}
spinner={this.state.joining}
inviterName={inviterName}
Expand Down
32 changes: 28 additions & 4 deletions src/components/views/rooms/RoomPreviewBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,24 @@ module.exports = React.createClass({

// If invited by 3rd party invite, the email address the invite was sent to
invitedEmail: React.PropTypes.string,
canJoin: React.PropTypes.bool,

// A standard client/server API error object. If supplied, indicates that the
// caller was unable to fetch details about the room for the given reason.
error: React.PropTypes.object,

canPreview: React.PropTypes.bool,
spinner: React.PropTypes.bool,
room: React.PropTypes.object,

// The alias that was used to access this room, if appropriate
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might also be worth recording what it is used for (ie, sticking into error messages).

I wondered if it might actually be better called roomName (since, from the POV of RoomPreviewBar it's just a name for the room), but that is probably going too far and is too confusing with the actual room name.

// If given, this will be how the room is referred to (eg.
// in error messages).
roomAlias: React.PropTypes.object,
},

getDefaultProps: function() {
return {
onJoinClick: function() {},
canJoin: false,
canPreview: true,
};
},
Expand Down Expand Up @@ -115,8 +123,24 @@ module.exports = React.createClass({
);

}
else if (this.props.canJoin) {
var name = this.props.room ? this.props.room.name : "";
else if (this.props.error) {
var name = this.props.roomAlias || "This room";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

roomAlias needs adding to propTypes

var error;
if (this.props.error.errcode == 'M_NOT_FOUND') {
error = name + " does not exist";
} else {
error = name + " is not accessible at this time";
}
joinBlock = (
<div>
<div className="mx_RoomPreviewBar_join_text">
{ error }
</div>
</div>
);
}
else {
var name = this.props.room ? this.props.room.name : (this.props.room_alias || "");
name = name ? <b>{ name }</b> : "a room";
joinBlock = (
<div>
Expand Down