From 708eb7b6e76dcc27f36d1e6041ffe85c5f793983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Georget?= Date: Fri, 20 Jan 2017 11:47:39 +0100 Subject: [PATCH] Clean component by removing useless state logic --- .../public/app/containers/HomePage/actions.js | 25 ------------------- .../app/containers/HomePage/constants.js | 3 --- .../public/app/containers/HomePage/index.js | 25 +++---------------- .../public/app/containers/HomePage/reducer.js | 14 +---------- .../public/app/containers/HomePage/sagas.js | 4 +-- .../app/containers/HomePage/selectors.js | 12 +-------- .../public/app/routes.js | 2 -- 7 files changed, 6 insertions(+), 79 deletions(-) diff --git a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/actions.js b/packages/strapi-plugin-content-manager/public/app/containers/HomePage/actions.js index dbe6f36cc0..28b1279f31 100644 --- a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/actions.js +++ b/packages/strapi-plugin-content-manager/public/app/containers/HomePage/actions.js @@ -1,28 +1,3 @@ /* * Actions */ - -import { - LOAD, - LOAD_SUCCESS -} from './constants'; - -/** - * Load the generalSettings, this action starts the request saga - * - * @return {object} An action object with a type of LOAD_GENERAL_SETTINGS - */ -export function load_success(data) { - console.log('load_success() called'); - return { - type: LOAD_SUCCESS, - data - }; -} - -export function load() { - console.log('load() called'); - return { - type: LOAD - }; -} diff --git a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/constants.js b/packages/strapi-plugin-content-manager/public/app/containers/HomePage/constants.js index 8a0151bea5..f022a3bdbf 100644 --- a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/constants.js +++ b/packages/strapi-plugin-content-manager/public/app/containers/HomePage/constants.js @@ -8,6 +8,3 @@ * Follow this format: * export const YOUR_ACTION_CONSTANT = 'your-plugin/YourContainer/YOUR_ACTION_CONSTANT'; */ - -export const LOAD_SUCCESS = 'contentManager/HomePage/LOAD_SUCCESS'; -export const LOAD = 'contentManager/HomePage/LOAD'; diff --git a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/index.js b/packages/strapi-plugin-content-manager/public/app/containers/HomePage/index.js index 03678a55d5..7bf3a29e37 100644 --- a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/index.js +++ b/packages/strapi-plugin-content-manager/public/app/containers/HomePage/index.js @@ -10,20 +10,8 @@ import { injectIntl } from 'react-intl'; import styles from './styles.scss'; -import { - load, -} from './actions'; - -import { - selectName -} from './selectors'; - export class HomePage extends React.Component { - componentWillMount() { - this.props.load(); - } - render() { return (
@@ -40,18 +28,11 @@ export class HomePage extends React.Component { HomePage.propTypes = {}; -export function mapDispatchToProps(dispatch) { - return { - load: () => { - console.log('dispatch LOAD'); - dispatch(load()); - } - }; +export function mapDispatchToProps() { + return {}; } -const mapStateToProps = createStructuredSelector({ - name: selectName() -}); +const mapStateToProps = createStructuredSelector({}); // Wrap the component to inject dispatch and state into it export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(HomePage)); diff --git a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/reducer.js b/packages/strapi-plugin-content-manager/public/app/containers/HomePage/reducer.js index ff195ac094..eade591c4a 100644 --- a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/reducer.js +++ b/packages/strapi-plugin-content-manager/public/app/containers/HomePage/reducer.js @@ -12,23 +12,11 @@ import { fromJS } from 'immutable'; -import { LOAD, LOAD_SUCCESS } from './constants'; - // The initial state of the App -const initialState = fromJS({ - loading: false, - name: null -}); +const initialState = fromJS({}); function appReducer(state = initialState, action) { switch (action.type) { - case LOAD: - return state - .set('loading', true); - case LOAD_SUCCESS: - return state - .set('name', action.data.name) - .set('loading', false); default: return state; } diff --git a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/sagas.js b/packages/strapi-plugin-content-manager/public/app/containers/HomePage/sagas.js index 26064d077a..6a6809727b 100644 --- a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/sagas.js +++ b/packages/strapi-plugin-content-manager/public/app/containers/HomePage/sagas.js @@ -25,6 +25,4 @@ export function* mySaga() { } // Bootstrap sagas -export default [ - mySaga -]; +export default []; diff --git a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/selectors.js b/packages/strapi-plugin-content-manager/public/app/containers/HomePage/selectors.js index 0b2a0ea488..d1de233d89 100644 --- a/packages/strapi-plugin-content-manager/public/app/containers/HomePage/selectors.js +++ b/packages/strapi-plugin-content-manager/public/app/containers/HomePage/selectors.js @@ -2,18 +2,8 @@ * The home state selectors */ -import { createSelector } from 'reselect'; - const selectHome = (state) => state.get('home'); -const selectName = () => createSelector( - selectHome, - (state) => { - return state.get('name'); - } -); - export { - selectHome, - selectName, + selectHome }; diff --git a/packages/strapi-plugin-content-manager/public/app/routes.js b/packages/strapi-plugin-content-manager/public/app/routes.js index 185a9e3df2..eb6f0cece2 100644 --- a/packages/strapi-plugin-content-manager/public/app/routes.js +++ b/packages/strapi-plugin-content-manager/public/app/routes.js @@ -18,13 +18,11 @@ export default function createRoutes(store) { name: 'home', getComponent(nextState, cb) { const reducer = require('containers/HomePage/reducer'); // eslint-disable-line global-require - const sagas = require('containers/HomePage/sagas'); // eslint-disable-line global-require const component = require('containers/HomePage'); // eslint-disable-line global-require const renderRoute = loadModule(cb); injectReducer('home', reducer.default); - injectSagas(sagas.default); renderRoute(component); }, },