1
0
mirror of https://github.com/Unleash/unleash.git synced 2025-01-25 00:07:47 +01:00

make history-list-toggle use same store

This commit is contained in:
sveisvei 2016-12-05 18:11:51 +01:00
parent b35ad9a91b
commit e88e3aeb88
5 changed files with 33 additions and 17 deletions

View File

@ -150,7 +150,7 @@ function getHistoryFromToggle (state, toggleName) {
if (!toggleName) {
return [];
}
if (state.history.hasIn(['toggles', toggleName])) {
return state.history
.getIn(['toggles', toggleName])

View File

@ -1,5 +1,5 @@
import { connect } from 'react-redux';
import HistoryListComponent from './history-list-component';
import HistoryListToggleComponent from './history-list-component';
import { updateSettingForGroup } from '../../store/settings/actions';
const mapStateToProps = (state) => {
@ -12,6 +12,6 @@ const mapStateToProps = (state) => {
const HistoryListContainer = connect(mapStateToProps, {
updateSetting: updateSettingForGroup('history'),
})(HistoryListComponent);
})(HistoryListToggleComponent);
export default HistoryListContainer;

View File

@ -1,17 +1,8 @@
import React, { Component, PropTypes } from 'react';
import ListComponent from './history-list-container';
import { fetchHistoryForToggle } from '../../data/history-api';
class HistoryListToggle extends Component {
constructor (props) {
super(props);
this.state = {
fetching: true,
history: undefined,
};
}
static propTypes () {
return {
toggleName: PropTypes.string.isRequired,
@ -19,21 +10,21 @@ class HistoryListToggle extends Component {
}
componentDidMount () {
fetchHistoryForToggle(this.props.toggleName)
.then((res) => this.setState({ history: res.events, fetching: false }));
this.props.fetchHistoryForToggle(this.props.toggleName);
}
render () {
if (this.state.fetching) {
if (!this.props.history || this.props.history.length === 0) {
return <span>fetching..</span>;
}
return (
<div>
<h5>Showing history for toggle: <strong>{this.props.toggleName}</strong></h5>
<ListComponent history={this.state.history} />
<ListComponent history={this.props.history} />
</div>
);
}
}
export default HistoryListToggle;

View File

@ -0,0 +1,25 @@
import { connect } from 'react-redux';
import HistoryListToggleComponent from './history-list-toggle-component';
import { fetchHistoryForToggle } from '../../store/history-actions';
function getHistoryFromToggle (state, toggleName) {
if (!toggleName) {
return [];
}
if (state.history.hasIn(['toggles', toggleName])) {
return state.history.getIn(['toggles', toggleName]).toArray();
}
return [];
}
const mapStateToProps = (state, props) => ({
history: getHistoryFromToggle(state, props.toggleName),
});
const HistoryListToggleContainer = connect(mapStateToProps, {
fetchHistoryForToggle,
})(HistoryListToggleComponent);
export default HistoryListToggleContainer;

View File

@ -1,5 +1,5 @@
import React, { PropTypes } from 'react';
import HistoryListToggle from '../../component/history/history-list-toggle-component';
import HistoryListToggle from '../../component/history/history-list-toggle-container';
const render = ({ params }) => <HistoryListToggle toggleName={params.toggleName} />;