From 418e14d94b9bd1a93dbcf769af67c1f26534e251 Mon Sep 17 00:00:00 2001
From: Dennis Liu <dliuproduction@gmail.com>
Date: Wed, 21 Nov 2018 17:24:42 -0500
Subject: [PATCH] Rename props for open/close/show/hide states

---
 index.js                                      | 12 +++++------
 index_for_react_app.js                        | 20 +++++++++----------
 .../Widget/components/Launcher/index.js       | 12 +++++------
 src/store/actions/actionTypes.js              |  4 ++--
 src/store/actions/dispatcher.js               | 18 ++++++++---------
 src/store/actions/index.js                    |  8 ++++----
 src/store/reducers/behaviorReducer.js         | 18 ++++++++---------
 src/store/store.js                            |  4 ++--
 8 files changed, 47 insertions(+), 49 deletions(-)

diff --git a/index.js b/index.js
index d415dc28..d3190b59 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Widget, toggleWidget, openWidget, closeWidget, showWidget, hideWidget, isOpen, isVisible } from './index_for_react_app';
+import { Widget, toggleChat, openChat, closeChat, showChat, hideChat, isOpen, isVisible } from './index_for_react_app';
 
 const plugin = {
   init: (args) => {
@@ -29,11 +29,11 @@ const plugin = {
 export {
   plugin as default,
   Widget,
-  toggleWidget as toggle,
-  openWidget as open,
-  closeWidget as close,
-  showWidget as show,
-  hideWidget as hide,
+  toggleChat as toggle,
+  openChat as open,
+  closeChat as close,
+  showChat as show,
+  hideChat as hide,
   isOpen, 
   isVisible
 };
diff --git a/index_for_react_app.js b/index_for_react_app.js
index 02df0b06..b550a292 100644
--- a/index_for_react_app.js
+++ b/index_for_react_app.js
@@ -9,11 +9,11 @@ import {
   renderCustomComponent,
   isOpen,
   isVisible,
-  showWidget,
-  hideWidget,
-  toggleWidget,
-  openWidget,
-  closeWidget,
+  openChat,
+  closeChat,
+  toggleChat,
+  showChat,
+  hideChat,
   toggleInputDisabled,
   dropMessages
 } from './src/store/actions/dispatcher';
@@ -29,11 +29,11 @@ export {
   renderCustomComponent,
   isOpen,
   isVisible,
-  showWidget,
-  hideWidget,
-  toggleWidget,
-  openWidget,
-  closeWidget,
+  openChat,
+  closeChat,
+  toggleChat,
+  showChat,
+  hideChat,
   toggleInputDisabled,
   dropMessages
 };
diff --git a/src/components/Widget/components/Launcher/index.js b/src/components/Widget/components/Launcher/index.js
index 67ad8b81..293701b4 100644
--- a/src/components/Widget/components/Launcher/index.js
+++ b/src/components/Widget/components/Launcher/index.js
@@ -7,11 +7,11 @@ import openLauncher from 'assets/launcher_button.svg';
 import close from 'assets/clear-button.svg';
 import './style.scss';
 
-const Launcher = ({ toggle, chatOpened, badge }) =>
-  <button type="button" className={chatOpened ? 'launcher hide-sm' : 'launcher'} onClick={toggle}>
+const Launcher = ({ toggle, isChatOpen, badge }) =>
+  <button type="button" className={isChatOpen ? 'launcher hide-sm' : 'launcher'} onClick={toggle}>
     <Badge badge ={badge} />
     {
-      chatOpened ?
+      isChatOpen ?
         <img src={close} className="close-launcher" alt="" /> :
         <img src={openLauncher} className="open-launcher" alt="" />
     }
@@ -19,10 +19,8 @@ const Launcher = ({ toggle, chatOpened, badge }) =>
 
 Launcher.propTypes = {
   toggle: PropTypes.func,
-  chatOpened: PropTypes.bool,
+  isChatOpen: PropTypes.bool,
   badge: PropTypes.number
 };
 
-export default connect(store => ({
-  chatOpened: store.behavior.get('showChat')
-}))(Launcher);
+export default Launcher;
diff --git a/src/store/actions/actionTypes.js b/src/store/actions/actionTypes.js
index 7785087f..58115cae 100644
--- a/src/store/actions/actionTypes.js
+++ b/src/store/actions/actionTypes.js
@@ -3,8 +3,8 @@ export const CONNECT = 'CONNECT';
 export const DISCONNECT = 'DISCONNECT';
 export const GET_OPEN_STATE = 'GET_OPEN_STATE';
 export const GET_VISIBLE_STATE = 'GET_VISIBLE_STATE';
-export const SHOW_WIDGET = 'SHOW_WIDGET';
-export const HIDE_WIDGET = 'HIDE_WIDGET';
+export const SHOW_CHAT = 'SHOW_CHAT';
+export const HIDE_CHAT = 'HIDE_CHAT';
 export const TOGGLE_CHAT = 'TOGGLE_CHAT';
 export const OPEN_CHAT = 'OPEN_CHAT';
 export const CLOSE_CHAT = 'CLOSE_CHAT';
diff --git a/src/store/actions/dispatcher.js b/src/store/actions/dispatcher.js
index e0bbf09e..fa950975 100644
--- a/src/store/actions/dispatcher.js
+++ b/src/store/actions/dispatcher.js
@@ -61,24 +61,24 @@ export function renderCustomComponent(component, props, showAvatar = false) {
   store.dispatch(actions.renderCustomComponent(component, props, showAvatar));
 }
 
-export function showWidget() {
-  store.dispatch(actions.showWidget());
+export function openChat() {
+  store.dispatch(actions.openChat());
 }
 
-export function hideWidget() {
-  store.dispatch(actions.hideWidget());
+export function closeChat() {
+  store.dispatch(actions.closeChat());
 }
 
-export function toggleWidget() {
+export function toggleChat() {
   store.dispatch(actions.toggleChat());
 }
 
-export function openWidget() {
-  store.dispatch(actions.openChat());
+export function showChat() {
+  store.dispatch(actions.showChat());
 }
 
-export function closeWidget() {
-  store.dispatch(actions.closeChat());
+export function hideChat() {
+  store.dispatch(actions.hideChat());
 }
 
 export function toggleInputDisabled() {
diff --git a/src/store/actions/index.js b/src/store/actions/index.js
index 93577e5a..35d953b9 100644
--- a/src/store/actions/index.js
+++ b/src/store/actions/index.js
@@ -30,15 +30,15 @@ export function getVisibleState() {
   };
 }
 
-export function showWidget() {
+export function showChat() {
   return {
-    type: actions.SHOW_WIDGET
+    type: actions.SHOW_CHAT
   };
 }
 
-export function hideWidget() {
+export function hideChat() {
   return {
-    type: actions.HIDE_WIDGET
+    type: actions.HIDE_CHAT
   };
 }
 
diff --git a/src/store/reducers/behaviorReducer.js b/src/store/reducers/behaviorReducer.js
index 67fb5030..d5af178a 100644
--- a/src/store/reducers/behaviorReducer.js
+++ b/src/store/reducers/behaviorReducer.js
@@ -7,8 +7,8 @@ export default function (inputFieldTextHint, connectingText, storage) {
   const initialState = Map({ 
     connected: false, 
     initialized: false, 
-    showWidget: true, 
-    showChat: false, 
+    isChatVisible: true, 
+    isChatOpen: false, 
     disabledInput: true, 
     inputFieldTextHint, 
     connectingText 
@@ -18,20 +18,20 @@ export default function (inputFieldTextHint, connectingText, storage) {
     const storeParams = storeParamsTo(storage);
     switch (action.type) {
       // Each change to the redux store's behavior Map gets recorded to storage
-      case actionTypes.SHOW_WIDGET: {
-        return storeParams(state.update('showWidget', showWidget => true));
+      case actionTypes.SHOW_CHAT: {
+        return storeParams(state.update('isChatVisible', isChatVisible => true));
       }
-      case actionTypes.HIDE_WIDGET: {
-        return storeParams(state.update('showWidget', showWidget => false));
+      case actionTypes.HIDE_CHAT: {
+        return storeParams(state.update('isChatVisible', isChatVisible => false));
       }
       case actionTypes.TOGGLE_CHAT: {
-        return storeParams(state.update('showChat', showChat => !showChat));
+        return storeParams(state.update('isChatOpen', isChatOpen => !isChatOpen));
       }
       case actionTypes.OPEN_CHAT: {
-        return storeParams(state.update('showChat', showChat => true));
+        return storeParams(state.update('isChatOpen', isChatOpen => true));
       }
       case actionTypes.CLOSE_CHAT: {
-        return storeParams(state.update('showChat', showChat => false));
+        return storeParams(state.update('isChatOpen', isChatOpen => false));
       }
       case actionTypes.TOGGLE_INPUT_DISABLED: {
         return storeParams(state.update('disabledInput', disabledInput => !disabledInput));
diff --git a/src/store/store.js b/src/store/store.js
index 2bd0b9b5..5bacb2ec 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -18,10 +18,10 @@ function initStore(hintText, connectingText, socket, storage) {
         socket.emit("user_uttered", { message: action.text, customData: socket.customData, session_id });
       }
       case actionTypes.GET_OPEN_STATE: {
-        return store.getState().behavior.get("showChat");
+        return store.getState().behavior.get("isChatOpen");
       }
       case actionTypes.GET_VISIBLE_STATE: {
-        return store.getState().behavior.get("showWidget");
+        return store.getState().behavior.get("isChatVisible");
       }
     }