Skip to content

Commit 52d24d0

Browse files
committed
remove: fetch across entities, because users cannot be fetched anymore
1 parent 2a895f9 commit 52d24d0

File tree

3 files changed

+14
-46
lines changed

3 files changed

+14
-46
lines changed

src/components/Home/index.js

+8-34
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,21 @@
1-
import React, { Component } from 'react';
1+
import React from 'react';
22
import { compose } from 'recompose';
33

44
import { withAuthorization, withEmailVerification } from '../Session';
5-
import { withFirebase } from '../Firebase';
65
import Messages from '../Messages';
76

8-
class HomePage extends Component {
9-
constructor(props) {
10-
super(props);
7+
const HomePage = () => (
8+
<div>
9+
<h1>Home Page</h1>
10+
<p>The Home Page is accessible by every signed in user.</p>
1111

12-
this.state = {
13-
users: null,
14-
};
15-
}
16-
17-
componentDidMount() {
18-
this.props.firebase.users().on('value', snapshot => {
19-
this.setState({
20-
users: snapshot.val(),
21-
});
22-
});
23-
}
24-
25-
componentWillUnmount() {
26-
this.props.firebase.users().off();
27-
}
28-
29-
render() {
30-
return (
31-
<div>
32-
<h1>Home Page</h1>
33-
<p>The Home Page is accessible by every signed in user.</p>
34-
35-
<Messages users={this.state.users} />
36-
</div>
37-
);
38-
}
39-
}
12+
<Messages />
13+
</div>
14+
);
4015

4116
const condition = authUser => !!authUser;
4217

4318
export default compose(
44-
withFirebase,
4519
withEmailVerification,
4620
withAuthorization(condition),
4721
)(HomePage);

src/components/Messages/MessageItem.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,8 @@ class MessageItem extends Component {
4141
/>
4242
) : (
4343
<span>
44-
<strong>
45-
{message.user.username || message.user.userId}
46-
</strong>{' '}
47-
{message.text} {message.editedAt && <span>(Edited)</span>}
44+
<strong>{message.userId}</strong> {message.text}
45+
{message.editedAt && <span>(Edited)</span>}
4846
</span>
4947
)}
5048

src/components/Messages/Messages.js

+4-8
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,10 @@ class Messages extends Component {
6767
};
6868

6969
onEditMessage = (message, text) => {
70+
const { uid, ...messageSnapshot } = message;
71+
7072
this.props.firebase.message(message.uid).set({
71-
...message,
73+
...messageSnapshot,
7274
text,
7375
editedAt: this.props.firebase.serverValue.TIMESTAMP,
7476
});
@@ -86,7 +88,6 @@ class Messages extends Component {
8688
};
8789

8890
render() {
89-
const { users } = this.props;
9091
const { text, messages, loading } = this.state;
9192

9293
return (
@@ -103,12 +104,7 @@ class Messages extends Component {
103104

104105
{messages && (
105106
<MessageList
106-
messages={messages.map(message => ({
107-
...message,
108-
user: users
109-
? users[message.userId]
110-
: { userId: message.userId },
111-
}))}
107+
messages={messages}
112108
onEditMessage={this.onEditMessage}
113109
onRemoveMessage={this.onRemoveMessage}
114110
/>

0 commit comments

Comments
 (0)