Cleanup
This commit is contained in:
parent
0963706266
commit
db30859a22
|
@ -118,8 +118,6 @@ const fetchRooms = function* fetchRooms() {
|
||||||
|
|
||||||
const handleLoginSuccess = function* handleLoginSuccess({ user }) {
|
const handleLoginSuccess = function* handleLoginSuccess({ user }) {
|
||||||
try {
|
try {
|
||||||
// const adding = yield select(state => state.server.adding);
|
|
||||||
|
|
||||||
RocketChat.getUserPresence(user.id);
|
RocketChat.getUserPresence(user.id);
|
||||||
|
|
||||||
const server = yield select(getServer);
|
const server = yield select(getServer);
|
||||||
|
@ -170,26 +168,11 @@ const handleLoginSuccess = function* handleLoginSuccess({ user }) {
|
||||||
yield put(setUser(user));
|
yield put(setUser(user));
|
||||||
EventEmitter.emit('connected');
|
EventEmitter.emit('connected');
|
||||||
|
|
||||||
// let currentRoot;
|
|
||||||
// const currentRoot = yield select(state => state.app.root);
|
|
||||||
// if (adding) {
|
|
||||||
// yield put(serverFinishAdd());
|
|
||||||
// yield put(appStart({ root: ROOT_INSIDE }));
|
|
||||||
// } else {
|
|
||||||
// currentRoot = yield select(state => state.app.root);
|
|
||||||
// if (currentRoot !== ROOT_INSIDE) {
|
|
||||||
yield put(appStart({ root: ROOT_INSIDE }));
|
yield put(appStart({ root: ROOT_INSIDE }));
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// after a successful login, check if it's been invited via invite link
|
|
||||||
// currentRoot = yield select(state => state.app.root);
|
|
||||||
// if (currentRoot === ROOT_INSIDE) {
|
|
||||||
const inviteLinkToken = yield select(state => state.inviteLinks.token);
|
const inviteLinkToken = yield select(state => state.inviteLinks.token);
|
||||||
if (inviteLinkToken) {
|
if (inviteLinkToken) {
|
||||||
yield put(inviteLinksRequest(inviteLinkToken));
|
yield put(inviteLinksRequest(inviteLinkToken));
|
||||||
}
|
}
|
||||||
// }
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
log(e);
|
log(e);
|
||||||
}
|
}
|
||||||
|
|
|
@ -136,12 +136,6 @@ const handleSelectServer = function* handleSelectServer({ server, version, fetch
|
||||||
// we'll set serverVersion as metadata for bugsnag
|
// we'll set serverVersion as metadata for bugsnag
|
||||||
logServerVersion(serverVersion);
|
logServerVersion(serverVersion);
|
||||||
yield put(selectServerSuccess(server, serverVersion));
|
yield put(selectServerSuccess(server, serverVersion));
|
||||||
|
|
||||||
// // if the adding state is true, finish add server
|
|
||||||
// const adding = yield select(state => state.server.adding);
|
|
||||||
// if (adding) {
|
|
||||||
// yield put(serverFinishAdd());
|
|
||||||
// }
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
yield put(selectServerFailure());
|
yield put(selectServerFailure());
|
||||||
log(e);
|
log(e);
|
||||||
|
|
|
@ -74,7 +74,6 @@ class NewServerView extends React.Component {
|
||||||
connecting: PropTypes.bool.isRequired,
|
connecting: PropTypes.bool.isRequired,
|
||||||
connectServer: PropTypes.func.isRequired,
|
connectServer: PropTypes.func.isRequired,
|
||||||
selectServer: PropTypes.func.isRequired,
|
selectServer: PropTypes.func.isRequired,
|
||||||
// adding: PropTypes.bool,
|
|
||||||
previousServer: PropTypes.string,
|
previousServer: PropTypes.string,
|
||||||
inviteLinksClear: PropTypes.func,
|
inviteLinksClear: PropTypes.func,
|
||||||
serverFinishAdd: PropTypes.func
|
serverFinishAdd: PropTypes.func
|
||||||
|
@ -101,13 +100,6 @@ class NewServerView extends React.Component {
|
||||||
this.queryServerHistory();
|
this.queryServerHistory();
|
||||||
}
|
}
|
||||||
|
|
||||||
// componentDidUpdate(prevProps) {
|
|
||||||
// const { adding } = this.props;
|
|
||||||
// if (prevProps.adding !== adding) {
|
|
||||||
// this.setHeader();
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
EventEmitter.removeListener('NewServer', this.handleNewServerEvent);
|
EventEmitter.removeListener('NewServer', this.handleNewServerEvent);
|
||||||
BackHandler.removeEventListener('hardwareBackPress', this.handleBackPress);
|
BackHandler.removeEventListener('hardwareBackPress', this.handleBackPress);
|
||||||
|
@ -407,7 +399,6 @@ class NewServerView extends React.Component {
|
||||||
|
|
||||||
const mapStateToProps = state => ({
|
const mapStateToProps = state => ({
|
||||||
connecting: state.server.connecting,
|
connecting: state.server.connecting,
|
||||||
// adding: state.server.adding,
|
|
||||||
previousServer: state.server.previousServer
|
previousServer: state.server.previousServer
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue