Merge branch 'rmhasan-fix_626'

signup-info-prompt
Eugen Rochko 2017-02-26 23:07:14 +01:00
commit 1b8d3375c8
7 changed files with 28 additions and 15 deletions

View File

@ -138,7 +138,8 @@ export function fetchAccountFail(id, error) {
return {
type: ACCOUNT_FETCH_FAIL,
id,
error
error,
skipAlert: true
};
};
@ -231,7 +232,8 @@ export function fetchAccountTimelineFail(id, error, skipLoading) {
type: ACCOUNT_TIMELINE_FETCH_FAIL,
id,
error,
skipLoading
skipLoading,
skipAlert: error.response.status === 404
};
};

View File

@ -46,6 +46,7 @@ export function fetchStatusCardFail(id, error) {
type: STATUS_CARD_FETCH_FAIL,
id,
error,
skipLoading: true
skipLoading: true,
skipAlert: true
};
};

View File

@ -57,7 +57,8 @@ export function fetchStatusFail(id, error, skipLoading) {
type: STATUS_FETCH_FAIL,
id,
error,
skipLoading
skipLoading,
skipAlert: true
};
};
@ -102,7 +103,12 @@ export function fetchContext(id) {
api(getState).get(`/api/v1/statuses/${id}/context`).then(response => {
dispatch(fetchContextSuccess(id, response.data.ancestors, response.data.descendants));
}).catch(error => {
if (error.response.status === 404) {
dispatch(deleteFromTimelines(id));
}
dispatch(fetchContextFail(id, error));
});
};
@ -129,6 +135,7 @@ export function fetchContextFail(id, error) {
return {
type: CONTEXT_FETCH_FAIL,
id,
error
error,
skipAlert: true
};
};

View File

@ -2,6 +2,7 @@ import PureRenderMixin from 'react-addons-pure-render-mixin';
import ImmutablePropTypes from 'react-immutable-proptypes';
import InnerHeader from '../../account/components/header';
import ActionBar from '../../account/components/action_bar';
import MissingIndicator from '../../../components/missing_indicator';
const Header = React.createClass({
contextTypes: {
@ -9,7 +10,7 @@ const Header = React.createClass({
},
propTypes: {
account: ImmutablePropTypes.map.isRequired,
account: ImmutablePropTypes.map,
me: React.PropTypes.number.isRequired,
onFollow: React.PropTypes.func.isRequired,
onBlock: React.PropTypes.func.isRequired,
@ -39,8 +40,8 @@ const Header = React.createClass({
render () {
const { account, me } = this.props;
if (!account) {
return null;
if (account === null) {
return <MissingIndicator />;
}
return (

View File

@ -4,7 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { fetchStatus } from '../../actions/statuses';
import Immutable from 'immutable';
import EmbeddedStatus from '../../components/status';
import LoadingIndicator from '../../components/loading_indicator';
import MissingIndicator from '../../components/missing_indicator';
import DetailedStatus from './components/detailed_status';
import ActionBar from './components/action_bar';
import Column from '../ui/components/column';
@ -117,7 +117,8 @@ const Status = React.createClass({
if (status === null) {
return (
<Column>
<LoadingIndicator />
<ColumnBackButton />
<MissingIndicator />
</Column>
);
}

View File

@ -5,7 +5,7 @@ const defaultFailSuffix = 'FAIL';
export default function errorsMiddleware() {
return ({ dispatch }) => next => action => {
if (action.type) {
if (action.type && !action.skipAlert) {
const isFail = new RegExp(`${defaultFailSuffix}$`, 'g');
const isSuccess = new RegExp(`${defaultSuccessSuffix}$`, 'g');

View File

@ -39,14 +39,15 @@ const normalizeStatus = (state, status) => {
return state;
}
status.account = status.account.id;
const normalStatus = { ...status };
normalStatus.account = status.account.id;
if (status.reblog && status.reblog.id) {
state = normalizeStatus(state, status.reblog);
status.reblog = status.reblog.id;
state = normalizeStatus(state, status.reblog);
normalStatus.reblog = status.reblog.id;
}
return state.update(status.id, Immutable.Map(), map => map.mergeDeep(Immutable.fromJS(status)));
return state.update(status.id, Immutable.Map(), map => map.mergeDeep(Immutable.fromJS(normalStatus)));
};
const normalizeStatuses = (state, statuses) => {