Moved management of filtering options to own reducer

This commit is contained in:
Alejandro Celaya 2018-06-17 17:12:16 +02:00
parent 6587a08ed1
commit 1f157a015b
8 changed files with 100 additions and 21 deletions

View file

@ -25,30 +25,21 @@ export class ShlinkApiClient {
* @returns {Promise<Array>} * @returns {Promise<Array>}
*/ */
listShortUrls = (params = {}) => { listShortUrls = (params = {}) => {
const { page = 1 } = params; return this._performRequest('/rest/short-codes', 'GET', params)
return this._performRequest(`/rest/short-codes?page=${page}`)
.then(resp => resp.data.shortUrls.data) .then(resp => resp.data.shortUrls.data)
.catch(e => { .catch(e => this._handleAuthError(e, this.listShortUrls, [params]));
// If auth failed, reset token to force it to be regenerated, and perform a new request
if (e.response.status === 401) {
this._token = '';
return this.listShortUrls(params);
}
// Otherwise, let caller handle the rejection
return Promise.reject(e);
});
}; };
_performRequest = async (url, method = 'GET') => { _performRequest = async (url, method = 'GET', params = {}) => {
if (isEmpty(this._token)) { if (isEmpty(this._token)) {
this._token = await this._handleAuth(); this._token = await this._authenticate();
} }
return await this.axios({ return await this.axios({
method, method,
url: `${this._baseUrl}${url}`, url: `${this._baseUrl}${url}`,
headers: { 'Authorization': `Bearer ${this._token}` } headers: { 'Authorization': `Bearer ${this._token}` },
params
}).then(resp => { }).then(resp => {
// Save new token // Save new token
const { authorization = '' } = resp.headers; const { authorization = '' } = resp.headers;
@ -57,7 +48,7 @@ export class ShlinkApiClient {
}); });
}; };
_handleAuth = async () => { _authenticate = async () => {
const resp = await this.axios({ const resp = await this.axios({
method: 'POST', method: 'POST',
url: `${this._baseUrl}/rest/authenticate`, url: `${this._baseUrl}/rest/authenticate`,
@ -65,6 +56,17 @@ export class ShlinkApiClient {
}); });
return resp.data.token; return resp.data.token;
}; };
_handleAuthError = (e, method, args) => {
// If auth failed, reset token to force it to be regenerated, and perform a new request
if (e.response.status === 401) {
this._token = '';
return method(...args);
}
// Otherwise, let caller handle the rejection
return Promise.reject(e);
};
} }
export default new ShlinkApiClient(axios); export default new ShlinkApiClient(axios);

View file

@ -3,9 +3,11 @@ import { combineReducers } from 'redux';
import serversReducer from '../servers/reducers/server'; import serversReducer from '../servers/reducers/server';
import selectedServerReducer from '../servers/reducers/selectedServer'; import selectedServerReducer from '../servers/reducers/selectedServer';
import shortUrlsListReducer from '../short-urls/reducers/shortUrlsList'; import shortUrlsListReducer from '../short-urls/reducers/shortUrlsList';
import shortUrlsListParamsReducer from '../short-urls/reducers/shortUrlsListParams';
export default combineReducers({ export default combineReducers({
servers: serversReducer, servers: serversReducer,
selectedServer: selectedServerReducer, selectedServer: selectedServerReducer,
shortUrlsList: shortUrlsListReducer, shortUrlsList: shortUrlsListReducer,
shortUrlsListParams: shortUrlsListParamsReducer,
}); });

View file

@ -6,3 +6,4 @@ export const CREATE_SERVER = 'shlink/CREATE_SERVER';
// Short URLs // Short URLs
export const LIST_SHORT_URLS = 'shlink/LIST_SHORT_URLS'; export const LIST_SHORT_URLS = 'shlink/LIST_SHORT_URLS';
export const UPDATE_SHORT_URLS_LIST = 'shlink/UPDATE_SHORT_URLS_LIST';

View file

@ -1,15 +1,57 @@
import React from 'react';
import searchIcon from '@fortawesome/fontawesome-free-solid/faSearch'; import searchIcon from '@fortawesome/fontawesome-free-solid/faSearch';
import FontAwesomeIcon from '@fortawesome/react-fontawesome'; import FontAwesomeIcon from '@fortawesome/react-fontawesome';
import React from 'react';
import { connect } from 'react-redux';
import { updateShortUrlsList } from './reducers/shortUrlsList';
import './SearchBar.scss'; import './SearchBar.scss';
export default class SearchBar extends React.Component { export class SearchBar extends React.Component {
state = {
showClearBtn: false,
searchTerm: '',
};
timer = null;
render() { render() {
return ( return (
<div className="search-bar"> <div className="search-bar">
<input type="text" className="form-control form-control-lg search-bar__input" placeholder="Search..." /> <input type="text"
className="form-control form-control-lg search-bar__input"
placeholder="Search..."
onChange={e => this.searchTermChanged(e.target.value)}
value={this.state.searchTerm}
/>
<FontAwesomeIcon icon={searchIcon} className="search-bar__icon" /> <FontAwesomeIcon icon={searchIcon} className="search-bar__icon" />
<div className="close search-bar__close"
hidden={! this.state.showClearBtn}
onClick={() => this.searchTermChanged('')}
id="search-bar__close"
>
&times;
</div>
</div> </div>
); );
} }
searchTermChanged(searchTerm) {
this.setState({
showClearBtn: searchTerm !== '',
searchTerm: searchTerm,
});
const resetTimer = () => {
clearTimeout(this.timer);
this.timer = null;
};
resetTimer();
this.timer = setTimeout(() => {
this.props.updateShortUrlsList({ ...this.props.shortUrlsListParams, searchTerm });
resetTimer();
}, 500);
} }
}
export default connect(state => (
{ shortUrlsListParams: state.shortUrlsListParams }
), { updateShortUrlsList })(SearchBar);

View file

@ -6,6 +6,7 @@
.search-bar__input.search-bar__input { .search-bar__input.search-bar__input {
padding-left: 40px; padding-left: 40px;
padding-right: 40px;
} }
.search-bar__icon { .search-bar__icon {
@ -13,3 +14,8 @@
left: 15px; left: 15px;
color: #707581; color: #707581;
} }
.search-bar__close {
@include vertical-align();
right: 15px;
}

View file

@ -16,7 +16,14 @@ import './ShortUrlsList.scss';
export class ShortUrlsList extends React.Component { export class ShortUrlsList extends React.Component {
componentDidMount() { componentDidMount() {
const { match } = this.props; const { match } = this.props;
this.props.listShortUrls(match.params.serverId, { page: match.params.page }); console.log(this.props.shortUrlsListParams, match.params, {
...this.props.shortUrlsListParams,
page: match.params.page
});
this.props.listShortUrls(match.params.serverId, {
...this.props.shortUrlsListParams,
page: match.params.page
});
} }
render() { render() {
@ -129,4 +136,5 @@ class RowMenu extends React.Component {
export default connect(state => ({ export default connect(state => ({
shortUrlsList: state.shortUrlsList, shortUrlsList: state.shortUrlsList,
selectedServer: state.selectedServer, selectedServer: state.selectedServer,
shortUrlsListParams: state.shortUrlsListParams,
}), { listShortUrls })(ShortUrlsList); }), { listShortUrls })(ShortUrlsList);

View file

@ -1,10 +1,11 @@
import { LIST_SHORT_URLS } from '../../reducers/types'; import { LIST_SHORT_URLS, UPDATE_SHORT_URLS_LIST } from '../../reducers/types';
import ServersService from '../../servers/services'; import ServersService from '../../servers/services';
import ShlinkApiClient from '../../api/ShlinkApiClient'; import ShlinkApiClient from '../../api/ShlinkApiClient';
export default function shortUrlsListReducer(state = [], action) { export default function shortUrlsListReducer(state = [], action) {
switch (action.type) { switch (action.type) {
case LIST_SHORT_URLS: case LIST_SHORT_URLS:
case UPDATE_SHORT_URLS_LIST:
return action.shortUrls; return action.shortUrls;
default: default:
return state; return state;
@ -20,3 +21,10 @@ export const listShortUrls = (serverId, params = {}) => {
dispatch({ type: LIST_SHORT_URLS, shortUrls, selectedServer }); dispatch({ type: LIST_SHORT_URLS, shortUrls, selectedServer });
}; };
}; };
export const updateShortUrlsList = (params = {}) => {
return async dispatch => {
const shortUrls = await ShlinkApiClient.listShortUrls(params);
dispatch({ type: UPDATE_SHORT_URLS_LIST, shortUrls, params });
};
};

View file

@ -0,0 +1,10 @@
import { UPDATE_SHORT_URLS_LIST } from '../../reducers/types';
export default function shortUrlsListReducer(state = { page: 1 }, action) {
switch (action.type) {
case UPDATE_SHORT_URLS_LIST:
return { ...state, ...action.params };
default:
return state;
}
}