Merge pull request #167 from rschamp/bugfix/GH-162

Fix GH-162: Show "user deletion canceled" modal

src/components/navigation/navigation.jsx

@@ -12,11 +12,14 @@ var Dropdown = require('./dropdown.jsx');
 var Input = require('../forms/input.jsx');
 var log = require('../../lib/log.js');
 var Login = require('../login/login.jsx');
+var Modal = require('../modal/modal.jsx');
 var Registration = require('../registration/registration.jsx');
 var Session = require('../../mixins/session.jsx');
 
 require('./navigation.scss');
 
+Modal.setAppElement(document.getElementById('view'));
+
 var defaultMessages = defineMessages({
     messages: {
         id: 'general.messages',
@@ -36,12 +39,13 @@ var Navigation = React.createClass({
     ],
     getInitialState: function () {
         return {
-            'accountNavOpen': false,
+            accountNavOpen: false,
-            'loginOpen': false,
+            canceledDeletionOpen: false,
-            'loginError': null,
+            loginOpen: false,
-            'registrationOpen': false,
+            loginError: null,
-            'unreadMessageCount': 0,
+            registrationOpen: false,
-            'messageCountIntervalId': -1
+            unreadMessageCount: 0,
+            messageCountIntervalId: -1
         };
     },
     componentDidMount: function () {
@@ -103,6 +107,7 @@ var Navigation = React.createClass({
     },
     handleLogIn: function (formData) {
         this.setState({'loginError': null});
+        formData['useMessages'] = true;
         this.api({
             method: 'post',
             host: '',
@@ -119,6 +124,11 @@ var Navigation = React.createClass({
                     this.setState({'loginError': body.msg});
                 } else {
                     this.closeLogin();
+                    body.messages.map(function (message) {
+                        if (message.message == 'canceled-deletion') {
+                            this.showCanceledDeletion();
+                        }
+                    }.bind(this));
                     window.refreshSession();
                 }
             }
@@ -145,6 +155,12 @@ var Navigation = React.createClass({
     closeAccountNav: function () {
         this.setState({'accountNavOpen': false});
     },
+    showCanceledDeletion: function () {
+        this.setState({'canceledDeletionOpen': true});
+    },
+    closeCanceledDeletion: function () {
+        this.setState({'canceledDeletionOpen': false});
+    },
     closeRegistration: function () {
         this.setState({'registrationOpen': false});
     },
@@ -299,6 +315,17 @@ var Navigation = React.createClass({
                         </li>
                     ]}
                 </ul>
+                <Modal isOpen={this.state.canceledDeletionOpen}
+                       onRequestClose={this.closeCanceledDeletion}
+                       frameSettings={{padding: 15}}>
+                    <h4>Your Account Will Not Be Deleted</h4>
+                    <p>
+                        Your account was scheduled for deletion but you logged in. Your account has been reactivated.
+                        If you didn’t request for your account to be deleted, you should
+                        {' '}<a href="/accounts/password_reset/">change your password</a>{' '}
+                        to make sure your account is secure.
+                    </p>
+                </Modal>
             </div>
         );
     }