From 84a20042f208ea336439215f03d33ffb9bff1958 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Tue, 25 Jul 2017 22:53:26 +0700 Subject: [PATCH 1/2] Prefix redux constants in plugins --- plugins/coral-plugin-viewing-options/client/actions.js | 6 +++--- plugins/coral-plugin-viewing-options/client/constants.js | 7 +++++-- plugins/coral-plugin-viewing-options/client/reducer.js | 8 ++++---- plugins/talk-plugin-featured-comments/client/constants.js | 6 ++++-- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/plugins/coral-plugin-viewing-options/client/actions.js b/plugins/coral-plugin-viewing-options/client/actions.js index 8a6473e3c..48ea73bdd 100644 --- a/plugins/coral-plugin-viewing-options/client/actions.js +++ b/plugins/coral-plugin-viewing-options/client/actions.js @@ -1,9 +1,9 @@ -import {VIEWING_OPTIONS_OPEN, VIEWING_OPTIONS_CLOSE} from './constants'; +import {OPEN_MENU, CLOSE_MENU} from './constants'; export const openViewingOptions = () => ({ - type: VIEWING_OPTIONS_OPEN + type: OPEN_MENU, }); export const closeViewingOptions = () => ({ - type: VIEWING_OPTIONS_CLOSE + type: CLOSE_MENU, }); diff --git a/plugins/coral-plugin-viewing-options/client/constants.js b/plugins/coral-plugin-viewing-options/client/constants.js index 586fe7a28..857a76e1b 100644 --- a/plugins/coral-plugin-viewing-options/client/constants.js +++ b/plugins/coral-plugin-viewing-options/client/constants.js @@ -1,2 +1,5 @@ -export const VIEWING_OPTIONS_OPEN = 'VIEWING_OPTIONS_OPEN'; -export const VIEWING_OPTIONS_CLOSE = 'VIEWING_OPTIONS_CLOSE'; +const prefix = 'TALK_VIEWING_OPTIONS'; + +export const OPEN_MENU = `${prefix}_OPEN_MENU`; +export const CLOSE_MENU = `${prefix}_CLOSE_MENU`; + diff --git a/plugins/coral-plugin-viewing-options/client/reducer.js b/plugins/coral-plugin-viewing-options/client/reducer.js index ab9f077df..687de803a 100644 --- a/plugins/coral-plugin-viewing-options/client/reducer.js +++ b/plugins/coral-plugin-viewing-options/client/reducer.js @@ -1,17 +1,17 @@ -import {VIEWING_OPTIONS_OPEN, VIEWING_OPTIONS_CLOSE} from './constants'; +import {OPEN_MENU, CLOSE_MENU} from './constants'; const initialState = { open: false }; -export default function offTopic (state = initialState, action) { +export default function reducer(state = initialState, action) { switch (action.type) { - case VIEWING_OPTIONS_OPEN: + case OPEN_MENU: return { ...state, open: true }; - case VIEWING_OPTIONS_CLOSE: + case CLOSE_MENU: return { ...state, open: false diff --git a/plugins/talk-plugin-featured-comments/client/constants.js b/plugins/talk-plugin-featured-comments/client/constants.js index 7aad99014..c03bf4839 100644 --- a/plugins/talk-plugin-featured-comments/client/constants.js +++ b/plugins/talk-plugin-featured-comments/client/constants.js @@ -1,2 +1,4 @@ -export const SHOW_TOOLTIP = 'SHOW_TOOLTIP'; -export const HIDE_TOOLTIP = 'HIDE_TOOLTIP'; +const prefix = 'TALK_FEATURED_COMMENTS'; + +export const SHOW_TOOLTIP = `${prefix}_SHOW_TOOLTIP`; +export const HIDE_TOOLTIP = `${prefix}_HIDE_TOOLTIP`; From b8c5e564045277845f99ac0b58521d2d572ec810 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Tue, 25 Jul 2017 23:04:32 +0700 Subject: [PATCH 2/2] Rename action names to match the new constant names :-D --- plugins/coral-plugin-viewing-options/client/actions.js | 4 ++-- .../client/components/ViewingOptions.js | 6 +++--- .../client/containers/ViewingOptions.js | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/coral-plugin-viewing-options/client/actions.js b/plugins/coral-plugin-viewing-options/client/actions.js index 48ea73bdd..fbac224bf 100644 --- a/plugins/coral-plugin-viewing-options/client/actions.js +++ b/plugins/coral-plugin-viewing-options/client/actions.js @@ -1,9 +1,9 @@ import {OPEN_MENU, CLOSE_MENU} from './constants'; -export const openViewingOptions = () => ({ +export const openMenu = () => ({ type: OPEN_MENU, }); -export const closeViewingOptions = () => ({ +export const closeMenu = () => ({ type: CLOSE_MENU, }); diff --git a/plugins/coral-plugin-viewing-options/client/components/ViewingOptions.js b/plugins/coral-plugin-viewing-options/client/components/ViewingOptions.js index 87680b370..a7b4be755 100644 --- a/plugins/coral-plugin-viewing-options/client/components/ViewingOptions.js +++ b/plugins/coral-plugin-viewing-options/client/components/ViewingOptions.js @@ -7,15 +7,15 @@ import {Icon} from 'plugin-api/beta/client/components/ui'; const ViewingOptions = (props) => { const toggleOpen = () => { if (!props.open) { - props.openViewingOptions(); + props.openMenu(); } else { - props.closeViewingOptions(); + props.closeMenu(); } }; const handleClickOutside = () => { if (props.open) { - props.closeViewingOptions(); + props.closeMenu(); } }; diff --git a/plugins/coral-plugin-viewing-options/client/containers/ViewingOptions.js b/plugins/coral-plugin-viewing-options/client/containers/ViewingOptions.js index cbe1e7fa3..84900b9c6 100644 --- a/plugins/coral-plugin-viewing-options/client/containers/ViewingOptions.js +++ b/plugins/coral-plugin-viewing-options/client/containers/ViewingOptions.js @@ -1,13 +1,13 @@ import {connect} from 'plugin-api/beta/client/hocs'; import {bindActionCreators} from 'redux'; import ViewingOptions from '../components/ViewingOptions'; -import {openViewingOptions, closeViewingOptions} from '../actions'; +import {openMenu, closeMenu} from '../actions'; const mapStateToProps = ({coralPluginViewingOptions: state}) => ({ open: state.open }); const mapDispatchToProps = (dispatch) => - bindActionCreators({openViewingOptions, closeViewingOptions}, dispatch); + bindActionCreators({openMenu, closeMenu}, dispatch); export default connect(mapStateToProps, mapDispatchToProps)(ViewingOptions);