From 5f23b30954ea1033fa85b06038e2d98f53461165 Mon Sep 17 00:00:00 2001
From: xavizalote <xavier.cazalot@gmail.com>
Date: Tue, 14 Jun 2016 23:03:36 +0200
Subject: [PATCH] explicit props/context types on ContextPasser component + fix
 use of ContextPasser

---
 .../lib/categories/CategoriesList.jsx             |  7 ++++---
 .../lib/categories/CategoriesNewForm.jsx          |  2 +-
 .../nova-base-components/lib/users/UsersMenu.jsx  |  2 +-
 .../nova-core/lib/components/ContextPasser.jsx    | 15 ++++++++++++---
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/packages/nova-base-components/lib/categories/CategoriesList.jsx b/packages/nova-base-components/lib/categories/CategoriesList.jsx
index 7b82f0c9f..221d47c6f 100644
--- a/packages/nova-base-components/lib/categories/CategoriesList.jsx
+++ b/packages/nova-base-components/lib/categories/CategoriesList.jsx
@@ -41,7 +41,7 @@ class CategoriesList extends Component {
           <Modal.Title><FormattedMessage id="categories.edit"/></Modal.Title>
         </Modal.Header>        
         <Modal.Body>
-          <ContextPasser currentUser={this.context.currentUser} closeCallback={this.closeModal}>
+          <ContextPasser currentUser={this.context.currentUser} messages={this.context.messages} closeCallback={this.closeModal}>
             <Telescope.components.CategoriesEditForm category={category}/>
           </ContextPasser>
         </Modal.Body>
@@ -57,7 +57,7 @@ class CategoriesList extends Component {
           <Modal.Title><FormattedMessage id="categories.new"/></Modal.Title>
         </Modal.Header>        
         <Modal.Body>
-          <ContextPasser currentUser={this.context.currentUser} closeCallback={this.closeModal}>
+          <ContextPasser currentUser={this.context.currentUser} messages={this.context.messages} closeCallback={this.closeModal}>
             <Telescope.components.CategoriesNewForm/>
           </ContextPasser>
         </Modal.Body>
@@ -116,7 +116,8 @@ CategoriesList.propTypes = {
 }
 
 CategoriesList.contextTypes = {
-  currentUser: React.PropTypes.object
+  currentUser: React.PropTypes.object,
+  messages: React.PropTypes.object,
 };
 
 module.exports = withRouter(CategoriesList);
diff --git a/packages/nova-base-components/lib/categories/CategoriesNewForm.jsx b/packages/nova-base-components/lib/categories/CategoriesNewForm.jsx
index e8f0345da..d3a8f62b8 100644
--- a/packages/nova-base-components/lib/categories/CategoriesNewForm.jsx
+++ b/packages/nova-base-components/lib/categories/CategoriesNewForm.jsx
@@ -11,7 +11,7 @@ const CategoriesNewForm = (props, context) => {
         currentUser={context.currentUser}
         methodName="categories.new"
         successCallback={(category)=>{
-          this.context.messages.flash("Category created.", "success");
+          context.messages.flash("Category created.", "success");
         }}
       />
     </div>
diff --git a/packages/nova-base-components/lib/users/UsersMenu.jsx b/packages/nova-base-components/lib/users/UsersMenu.jsx
index cc4011a19..a4a54914f 100644
--- a/packages/nova-base-components/lib/users/UsersMenu.jsx
+++ b/packages/nova-base-components/lib/users/UsersMenu.jsx
@@ -33,7 +33,7 @@ class UsersMenu extends Component {
           <Modal.Title><FormattedMessage id="settings.edit"/></Modal.Title>
         </Modal.Header>        
         <Modal.Body>
-          <ContextPasser currentUser={this.props.user} closeCallback={this.closeModal}>
+          <ContextPasser currentUser={this.props.user} messages={this.context.messages} closeCallback={this.closeModal}>
             <SettingsEditForm/>
           </ContextPasser>
         </Modal.Body>
diff --git a/packages/nova-core/lib/components/ContextPasser.jsx b/packages/nova-core/lib/components/ContextPasser.jsx
index ba87af0e2..be9793191 100644
--- a/packages/nova-core/lib/components/ContextPasser.jsx
+++ b/packages/nova-core/lib/components/ContextPasser.jsx
@@ -5,7 +5,10 @@ class ContextPasser extends Component {
   getChildContext() {
     return {
       closeCallback: this.props.closeCallback,
-      currentUser: this.props.currentUser // pass on currentUser
+      currentUser: this.props.currentUser, // pass on currentUser,
+      actions: this.props.actions,
+      events: this.props.events,
+      messages: this.props.messages,
     };
   }
 
@@ -16,12 +19,18 @@ class ContextPasser extends Component {
 
 ContextPasser.propTypes = {
   closeCallback: React.PropTypes.func,
-  currentUser: React.PropTypes.object
+  currentUser: React.PropTypes.object,
+  actions: React.PropTypes.object,
+  events: React.PropTypes.object,
+  messages: React.PropTypes.object,  
 };
 
 ContextPasser.childContextTypes = {
   closeCallback: React.PropTypes.func,
-  currentUser: React.PropTypes.object
+  currentUser: React.PropTypes.object,
+  actions: React.PropTypes.object,
+  events: React.PropTypes.object,
+  messages: React.PropTypes.object,
 };
 
 export default ContextPasser;