forked/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2026-03-12 18:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved logic to mark selected server to parent component in order to affect all children compo0nents on the same route

Browse Source
This commit is contained in:
Alejandro Celaya
2018-07-24 19:17:01 +02:00
parent 3eaa66435a
commit 78ba7c75ff
6 changed files with 72 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/short-urls/ShortUrls.js
View File

@@ -3,6 +3,7 @@ import { connect } from 'react-redux';
import Paginator from './Paginator';
import SearchBar from './SearchBar';
import ShortUrlsList from './ShortUrlsList';
import { assoc } from 'ramda';
export function ShortUrls(props) {
const { match: { params } } = props;
@@ -18,7 +19,4 @@ export function ShortUrls(props) {
);
}
export default connect(state => ({
shortUrlsList: state.shortUrlsList.shortUrls,
loading: state.shortUrlsList.loading,
}))(ShortUrls);
export default connect(state => assoc('shortUrlsList', state.shortUrlsList.shortUrls, state.shortUrlsList))(ShortUrls);

6
src/short-urls/ShortUrlsList.js
View File

@@ -102,7 +102,11 @@ export class ShortUrlsList extends React.Component {
}
renderShortUrls() {
const { shortUrlsList, selectedServer, loading } = this.props;
const { shortUrlsList, selectedServer, loading, error } = this.props;
if (error) {
return <tr><td colSpan="6" className="text-center table-danger">Something went wrong while loading short URLs :(</td></tr>;
}
if (loading) {
return <tr><td colSpan="6" className="text-center">Loading...</td></tr>;
}

35
src/short-urls/reducers/shortUrlsList.js
View File

@@ -1,9 +1,10 @@
import ServersService from '../../servers/services';
import ShlinkApiClient from '../../api/ShlinkApiClient';
import ServersService from '../../servers/services';
export const LIST_SHORT_URLS_START = 'shlink/shortUrlsList/LIST_SHORT_URLS_START';
export const LIST_SHORT_URLS_ERROR = 'shlink/shortUrlsList/LIST_SHORT_URLS_ERROR';
export const LIST_SHORT_URLS = 'shlink/shortUrlsList/LIST_SHORT_URLS';
export const UPDATE_SHORT_URLS_LIST = 'shlink/shortUrlsList/UPDATE_SHORT_URLS_LIST';
export const UPDATE_SHORT_URLS_LIST = LIST_SHORT_URLS;
const initialState = {
shortUrls: [],
@@ -13,34 +14,42 @@ const initialState = {
export default function reducer(state = initialState, action) {
switch (action.type) {
case LIST_SHORT_URLS_START:
return { ...state, loading: true };
return { ...state, loading: true, error: false };
case LIST_SHORT_URLS:
case UPDATE_SHORT_URLS_LIST:
return {
loading: false,
error: false,
shortUrls: action.shortUrls
};
case LIST_SHORT_URLS_ERROR:
return {
loading: false,
error: true,
shortUrls: []
};
default:
return state;
}
}
export const listShortUrls = (serverId, params = {}) => {
return async dispatch => {
dispatch({ type: LIST_SHORT_URLS_START });
const selectedServer = ServersService.findServerById(serverId);
// FIXME There should be a way to not need this, however, the active server is set when any route is loaded, in an
// FIXME outer component's componentDidMount, which makes it be invoked after this action
const selectedServer = ServersService.findServerById(serverId);
ShlinkApiClient.setConfig(selectedServer);
ShlinkApiClient.setConfig(selectedServer);
const shortUrls = await ShlinkApiClient.listShortUrls(params);
dispatch({ type: LIST_SHORT_URLS, shortUrls, selectedServer, params });
};
return updateShortUrlsList(params);
};
export const updateShortUrlsList = (params = {}) => {
return async dispatch => {
dispatch({ type: LIST_SHORT_URLS_START });
const shortUrls = await ShlinkApiClient.listShortUrls(params);
dispatch({ type: UPDATE_SHORT_URLS_LIST, shortUrls, params });
try {
const shortUrls = await ShlinkApiClient.listShortUrls(params);
dispatch({ type: LIST_SHORT_URLS, shortUrls, params });
} catch (e) {
dispatch({ type: LIST_SHORT_URLS_ERROR, params });
}
};
};