verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

some fixes

This commit is contained in:
Guilherme Gazzo 2017-09-12 20:59:45 -03:00
parent bb35d0ff7e
commit 334705e42f
8 changed files with 69 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/containers/Banner.js
View File

@ -30,9 +30,29 @@ export default class Banner extends React.PureComponent {
authenticating: PropTypes.bool,
offline: PropTypes.bool
}
componentWillMount() {
this.state = {
slow: false
};
this.timer = setTimeout(() => this.setState({ slow: true }), 5000);
}
componentWillUnmount() {
clearTimeout(this.timer);
}
render() {
const { connecting, authenticating, offline } = this.props;
if (!this.state.slow) {
return null;
}
if (offline) {
return (
<View style={[styles.bannerContainer, { backgroundColor: 'red' }]}>
<Text style={[styles.bannerText, { color: '#a00' }]}>offline...</Text>
</View>
);
}
if (connecting) {
return (
<View style={[styles.bannerContainer, { backgroundColor: '#0d0' }]}>
@ -49,13 +69,6 @@ export default class Banner extends React.PureComponent {
);
}
if (offline) {
return (
<View style={[styles.bannerContainer, { backgroundColor: 'red' }]}>
<Text style={[styles.bannerText, { color: '#a00' }]}>offline...</Text>
</View>
);
}
return null;
}
}

3
app/containers/Message.js
View File

@ -10,7 +10,8 @@ import User from './message/User';
const styles = StyleSheet.create({
content: {
flexGrow: 1
flexGrow: 1,
flexShrink: 1
},
message: {
padding: 12,

59
app/lib/realm.js
View File

@ -1,5 +1,5 @@
import Realm from 'realm';
import { AsyncStorage } from 'react-native';
// import { AsyncStorage } from 'react-native';
const serversSchema = {
name: 'servers',
@ -95,63 +95,6 @@ const messagesSchema = {
_updatedAt: { type: 'date', optional: true },
temp: { type: 'bool', optional: true }
}
// a: {
// attachments: [
// {
// color: 'danger',
// fields: [
// {
// title: 'Bounce Type',
// value: 'Permanent'
// },
// {
// title: 'Bounce Sub Type',
// value: 'General'
// },
// {
// title: 'Reporting MTA',
// value: 'dsn; a8-82.smtp-out.amazonses.com'
// },
// {
// title: 'Timestamp',
// value: 'Tue Apr 19 2016 14:11:08 GMT-0400 (EDT)'
// }
// ]
// },
// {
// fields: [
// {
// title: 'Email Address',
// value: 'aaa@asd.at'
// },
// {
// title: 'Status',
// value: '5.1.1'
// },
// {
// title: 'Action',
// value: 'failed'
// },
// {
// title: 'Diagnostic Code',
// value: 'smtp; 550 5.1.1 <aaa@asd.at>: Recipient address rejected: User unknown in virtual mailbox table'
// }
// ]
// }
// ],
// bot: {
// i: 'EMQ3S3GGNJrrgJa4Z'
// },
// u: {
// _id: 'rocket.cat',
// username: 'rocket.cat'
// },
// roles: [
// 'bot',
// null
// ]
// }
};
//
// Realm.clearTestState();

33
app/sagas/createChannel.js
View File

@ -1,5 +1,5 @@
import { delay } from 'redux-saga';
import { select, put, call, fork, take } from 'redux-saga/effects';
import { select, put, call, take, takeEvery } from 'redux-saga/effects';
import { CREATE_CHANNEL, LOGIN } from '../actions/actionsTypes';
import { createChannelSuccess, createChannelFailure } from '../actions/createChannel';
import RocketChat from '../lib/rocketchat';
@ -9,26 +9,23 @@ const create = function* create(data) {
return yield RocketChat.createChannel(data);
};
const get = function* get() {
while (true) {
try {
const { data } = yield take(CREATE_CHANNEL.REQUEST);
const auth = yield select(state => state.login.isAuthenticated);
if (!auth) {
yield take(LOGIN.SUCCESS);
}
const result = yield call(create, data);
yield put(createChannelSuccess(result));
select(({ navigator }) => navigator).dismissModal({
animationType: 'slide-down'
});
} catch (err) {
yield delay(2000);
yield put(createChannelFailure(err));
const get = function* get({ data }) {
try {
const auth = yield select(state => state.login.isAuthenticated);
if (!auth) {
yield take(LOGIN.SUCCESS);
}
const result = yield call(create, data);
yield put(createChannelSuccess(result));
select(({ navigator }) => navigator).dismissModal({
animationType: 'slide-down'
});
} catch (err) {
yield delay(2000);
yield put(createChannelFailure(err));
}
};
const getData = function* getData() {
yield fork(get);
yield takeEvery(get, CREATE_CHANNEL.REQUEST);
};
export default getData;

2
app/sagas/login.js
View File

@ -1,5 +1,5 @@
import { AsyncStorage } from 'react-native';
import { take, put, call, takeEvery, fork, select, all, race } from 'redux-saga/effects';
import { take, put, call, takeEvery, select, all, race } from 'redux-saga/effects';
import * as types from '../actions/actionsTypes';
import { loginRequest, loginSuccess, loginFailure, setToken, logout } from '../actions/login';
import RocketChat from '../lib/rocketchat';

1
app/sagas/messages.js
View File

@ -5,7 +5,6 @@ import RocketChat from '../lib/rocketchat';
const get = function* get({ rid }) {
const auth = yield select(state => state.login.isAuthenticated);
console.log('hey now', yield select(state => state.login));
if (!auth) {
yield take(LOGIN.SUCCESS);
}

67
app/views/RoomView.js
View File

@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Text, View, StyleSheet, Button } from 'react-native';
import { Text, View, StyleSheet, Button, InteractionManager } from 'react-native';
import { ListView } from 'realm/react-native';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
@ -9,12 +9,11 @@ import * as actions from '../actions';
import { messagesRequest } from '../actions/messages';
import realm from '../lib/realm';
import RocketChat from '../lib/rocketchat';
import debounce from '../utils/throttle';
import Message from '../containers/Message';
import MessageBox from '../containers/MessageBox';
import KeyboardView from '../presentation/KeyboardView';
const ds = new ListView.DataSource({ rowHasChanged: (r1, r2) => r1 !== r2 });
const ds = new ListView.DataSource({ rowHasChanged: (r1, r2) => r1._id !== r2._id });
const styles = StyleSheet.create({
container: {
flex: 1,
@ -72,10 +71,10 @@ export default class RoomView extends React.Component {
this.sid = props.navigation.state.params.room.sid;
this.rid = props.rid || realm.objectForPrimaryKey('subscriptions', this.sid).rid;
// this.rid = 'GENERAL';
this.data = realm.objects('messages').filtered('_server.id = $0 AND rid = $1', this.props.server, this.rid).sorted('ts', true);
this.state = {
slow: false,
dataSource: [],
loaded: true,
joined: typeof props.rid === 'undefined'
@ -86,31 +85,20 @@ export default class RoomView extends React.Component {
this.props.navigation.setParams({
title: this.props.name || realm.objectForPrimaryKey('subscriptions', this.sid).name
});
this.timer = setTimeout(() => this.setState({ slow: true }), 5000);
this.props.getMessages(this.rid);
// const late = setTimeout(() => this.setState({
// loaded: false
// }), 1000);
// RocketChat.loadMessagesForRoom(this.rid, null, () => {
// clearTimeout(late);
// this.setState({
// loaded: true
// });
realm.addListener('change', this.updateState);
// });
// this.updateState();
this.state = {
...this.state,
dataSource: ds.cloneWithRows(this.getData())
};
this.data.addListener(this.updateState);
this.state.dataSource = ds.cloneWithRows(this.data);
}
componentDidMount() {
return RocketChat.readMessages(this.rid);
InteractionManager.runAfterInteractions(() => RocketChat.readMessages(this.rid));
}
componentDidUpdate() {
return !this.props.loading && clearTimeout(this.timer);
}
componentWillUnmount() {
realm.removeListener('change', this.updateState);
clearTimeout(this.timer);
this.data.removeAllListeners();
}
onEndReached = () => {
@ -132,35 +120,22 @@ export default class RoomView extends React.Component {
}
}
getData() {
return realm
.objects('messages')
.filtered('_server.id = $0 AND rid = $1', this.props.server, this.rid)
.sorted('ts', true);
}
updateState = debounce(() => {
updateState = () => {
this.setState({
dataSource: ds.cloneWithRows(this.getData())
dataSource: ds.cloneWithRows(this.data)
});
// RocketChat.readMessages(this.rid);
// this.setState({
// messages: this.messages
// });
}, 100);
};
sendMessage = message => RocketChat.sendMessage(this.rid, message);
joinRoom = () => {
RocketChat.joinRoom(this.props.rid)
.then(() => {
this.setState({
joined: true
});
});
joinRoom = async() => {
await RocketChat.joinRoom(this.props.rid);
this.setState({
joined: true
});
};
renderBanner = () => (this.props.loading ?
renderBanner = () => (this.state.slow && this.props.loading ?
(
<View style={styles.bannerContainer}>
<Text style={styles.bannerText}>Loading new messages...</Text>

18
app/views/RoomsListView.js
View File

@ -23,7 +23,8 @@ const styles = StyleSheet.create({
backgroundColor: '#E7E7E7'
},
list: {
width: '100%'
width: '100%',
backgroundColor: '#FFFFFF'
},
emptyView: {
flexGrow: 1,
@ -81,19 +82,20 @@ export default class RoomsListView extends React.Component {
searchText: '',
login: false
};
this.data = realm.objects('subscriptions').filtered('_server.id = $0', this.props.server).sorted('_updatedAt', true);
}
componentWillMount() {
realm.addListener('change', this.updateState);
this.data.addListener(this.updateState);
this.state = {
...this.state,
dataSource: ds.cloneWithRows(this.getData())
dataSource: ds.cloneWithRows(this.data)
};
}
componentWillUnmount() {
realm.removeListener('change', this.updateState);
this.data.removeAllListeners();
}
onSearchChangeText = (text) => {
@ -154,13 +156,9 @@ export default class RoomsListView extends React.Component {
});
}
getData() {
return realm.objects('subscriptions').filtered('_server.id = $0', this.props.server);
}
updateState = () => {
this.setState({
dataSource: ds.cloneWithRows(this.getData())
dataSource: ds.cloneWithRows(this.data)
});
};
@ -229,8 +227,8 @@ export default class RoomsListView extends React.Component {
renderItem = item => (
<RoomItem
{...item}
key={item._id}
name={item.name}
type={item.t}
baseUrl={this.props.Site_Url}
onPress={() => this._onPressItem(item._id, item)}