Skip to content

[FIX] Delete room error #485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegolmello merged 2 commits into from
Oct 16, 2018
Merged

[FIX] Delete room error #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a8b360
[FIX] Delete room error
diegolmello Oct 16, 2018
a3366b4
Merge branch 'develop' into delete-room
diegolmello Oct 16, 2018
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
15 changes: 6 additions & 9 deletions app/views/RoomActionsView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,8 @@ export default class RoomActionsView extends LoggedView {
super('RoomActionsView', props);
const { rid } = props;
this.rooms = database.objects('subscriptions').filtered('rid = $0', rid);
[this.room] = this.rooms;
this.state = {
room: this.room,
room: this.rooms[0] || {},
onlineMembers: [],
allMembers: [],
member: {}
Expand Down Expand Up @@ -90,11 +89,9 @@ export default class RoomActionsView extends LoggedView {
}

get canAddUser() {
const {
rid, t
} = this.room;
const { allMembers } = this.state;
const { allMembers, room } = this.state;
const { username } = this.props;
const { rid, t } = room;

// TODO: same test joined
const userInRoom = !!allMembers.find(m => m.username === username);
Expand Down Expand Up @@ -126,10 +123,10 @@ export default class RoomActionsView extends LoggedView {
}

get sections() {
const { onlineMembers, room } = this.state;
const {
rid, t, blocker, notifications
} = this.room;
const { onlineMembers } = this.state;
} = room;

const sections = [{
data: [{
Expand Down Expand Up @@ -325,7 +322,7 @@ export default class RoomActionsView extends LoggedView {
}

updateRoom = () => {
this.setState({ room: this.room });
this.setState({ room: this.rooms[0] || {} });
}

toggleBlockUser = async() => {
Expand Down
11 changes: 5 additions & 6 deletions app/views/RoomInfoEditView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default class RoomInfoEditView extends LoggedView {
this.rooms = database.objects('subscriptions').filtered('rid = $0', rid);
this.permissions = {};
this.state = {
room: {},
room: this.rooms[0] || {},
name: '',
description: '',
topic: '',
Expand All @@ -67,8 +67,8 @@ export default class RoomInfoEditView extends LoggedView {
}


async componentDidMount() {
await this.updateRoom();
componentDidMount() {
this.updateRoom();
this.init();
this.rooms.addListener(this.updateRoom);
const { room } = this.state;
Expand All @@ -79,9 +79,8 @@ export default class RoomInfoEditView extends LoggedView {
this.rooms.removeAllListeners();
}

updateRoom = async() => {
const [room] = this.rooms;
await this.setState({ room });
updateRoom = () => {
this.setState({ room: this.rooms[0] || {} });
}

init = () => {
Expand Down
2 changes: 1 addition & 1 deletion app/views/RoomView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ export default class RoomView extends LoggedView {

if (this.rooms.length > 0) {
const { room: prevRoom } = this.state;
const room = JSON.parse(JSON.stringify(this.rooms[0]));
const room = JSON.parse(JSON.stringify(this.rooms[0] || {}));
this.setState({ room });

if (!prevRoom.rid) {
Expand Down