From 13e151e83b681da969a6c5d046f626c70b6340f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Thu, 16 Jul 2015 19:12:18 +0200
Subject: [PATCH] add logging and responsive user navigation

---
 index.html                                               | 2 +-
 js/actions/user_actions.js                               | 1 +
 js/app.js                                                | 5 ++---
 js/components/ascribe_buttons/acl_button.js              | 6 ++++--
 js/components/ascribe_uploader/react_s3_fine_uploader.js | 1 +
 js/components/header.js                                  | 4 ++++
 js/utils/fetch_api_utils.js                              | 1 -
 js/utils/requests.js                                     | 2 ++
 8 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/index.html b/index.html
index 869aff9f..39ebca26 100644
--- a/index.html
+++ b/index.html
@@ -52,7 +52,7 @@
         </script>
 
         <!-- Logging for sentry -->
-        <!-- <script src="//cdn.ravenjs.com/1.1.19/raven.min.js"></script> -->
+        <script src="//cdn.ravenjs.com/1.1.19/raven.min.js"></script>
 
         <!-- Intercom library -->
         <script>
diff --git a/js/actions/user_actions.js b/js/actions/user_actions.js
index c5095391..65f51d35 100644
--- a/js/actions/user_actions.js
+++ b/js/actions/user_actions.js
@@ -19,6 +19,7 @@ class UserActions {
             })
             .catch((err) => {
                 console.log(err);
+                this.actions.updateCurrentUser({});
             });
     }
     logoutCurrentUser() {
diff --git a/js/app.js b/js/app.js
index 7bec7027..0fc0c191 100644
--- a/js/app.js
+++ b/js/app.js
@@ -28,17 +28,16 @@ requests.defaults({
     },
     fatalErrorHandler: (err) => {
         console.log(err);
-        //alert('Something went wrong, please reload the page');
     }
 });
 
-/* Raven.config('https://0955da3388c64ab29bd32c2a429f9ef4@app.getsentry.com/48351', {
+Raven.config('https://0955da3388c64ab29bd32c2a429f9ef4@app.getsentry.com/48351', {
     // pass along the version of your application
     release: '1.0.0'
 }).install();
 
 window.onerror = Raven.process;
- */
+
 class AppGateway {
 
     start() {
diff --git a/js/components/ascribe_buttons/acl_button.js b/js/components/ascribe_buttons/acl_button.js
index c4826f86..d9423889 100644
--- a/js/components/ascribe_buttons/acl_button.js
+++ b/js/components/ascribe_buttons/acl_button.js
@@ -103,8 +103,10 @@ let AclButton = React.createClass({
 
     showNotification(response){
         this.props.handleSuccess();
-        let notification = new GlobalNotificationModel(response.notification, 'success');
-        GlobalNotificationActions.appendGlobalNotification(notification);
+        if(response.notification) {
+            let notification = new GlobalNotificationModel(response.notification, 'success');
+            GlobalNotificationActions.appendGlobalNotification(notification);
+        }
     },
 
     // plz move to share form
diff --git a/js/components/ascribe_uploader/react_s3_fine_uploader.js b/js/components/ascribe_uploader/react_s3_fine_uploader.js
index 2620e945..5e86d043 100644
--- a/js/components/ascribe_uploader/react_s3_fine_uploader.js
+++ b/js/components/ascribe_uploader/react_s3_fine_uploader.js
@@ -312,6 +312,7 @@ var ReactS3FineUploader = React.createClass({
     },
 
     onError() {
+        Raven.captureException('react-fineuploader-error');
         let notification = new GlobalNotificationModel(this.props.defaultErrorMessage, 'danger', 5000);
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
diff --git a/js/components/header.js b/js/components/header.js
index 1098fdb8..3cf05309 100644
--- a/js/components/header.js
+++ b/js/components/header.js
@@ -102,6 +102,10 @@ let Header = React.createClass({
                   activator: '#IntercomDefaultWidget'
                }  
             });
+
+            Raven.setUserContext({
+                email: this.state.currentUser.email
+            });
         }
     },
 
diff --git a/js/utils/fetch_api_utils.js b/js/utils/fetch_api_utils.js
index 8cbb6a9d..db3f93fb 100644
--- a/js/utils/fetch_api_utils.js
+++ b/js/utils/fetch_api_utils.js
@@ -72,7 +72,6 @@ export function getCookie(name) {
             return parts[i].split('=').pop();
         }
     }
-    console.warn('There wasn\'t a cookie with name: ' + name + ' found.');
 }
 
 /*
diff --git a/js/utils/requests.js b/js/utils/requests.js
index 2137394a..e66c8ad5 100644
--- a/js/utils/requests.js
+++ b/js/utils/requests.js
@@ -23,6 +23,8 @@ class Requests {
     unpackResponse(response) {
         if (response.status >= 500) {
             throw new ServerError();
+        } else if(response.status === 403) {
+            Raven.captureException('csrftoken error');
         }
         return response.text();
     }