bf3cb42da7
Cherry-picked d2528b26b6
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream changed stuff, we had extra attributes.
Applied upstream changes while keeping our extra attributes.
- `app/serializers/rest/instance_serializer.rb`:
Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`,
so updated that file by keeping our extra attributes, and took upstream's
version of `app/serializers/rest/instance_serializer.rb`.
- `spec/views/about/show.html.haml_spec.rb`:
Took upstream's version.
30 lines
833 B
JavaScript
30 lines
833 B
JavaScript
import api from '../api';
|
|
import { importFetchedAccount } from './importer';
|
|
|
|
export const SERVER_FETCH_REQUEST = 'Server_FETCH_REQUEST';
|
|
export const SERVER_FETCH_SUCCESS = 'Server_FETCH_SUCCESS';
|
|
export const SERVER_FETCH_FAIL = 'Server_FETCH_FAIL';
|
|
|
|
export const fetchServer = () => (dispatch, getState) => {
|
|
dispatch(fetchServerRequest());
|
|
|
|
api(getState)
|
|
.get('/api/v2/instance').then(({ data }) => {
|
|
if (data.contact.account) dispatch(importFetchedAccount(data.contact.account));
|
|
dispatch(fetchServerSuccess(data));
|
|
}).catch(err => dispatch(fetchServerFail(err)));
|
|
};
|
|
|
|
const fetchServerRequest = () => ({
|
|
type: SERVER_FETCH_REQUEST,
|
|
});
|
|
|
|
const fetchServerSuccess = server => ({
|
|
type: SERVER_FETCH_SUCCESS,
|
|
server,
|
|
});
|
|
|
|
const fetchServerFail = error => ({
|
|
type: SERVER_FETCH_FAIL,
|
|
error,
|
|
});
|