Merge branch 'develop' into fix-failing-nav-test

Author: catarak

client/components/Nav.jsx

@@ -679,6 +679,16 @@ class Nav extends React.PureComponent {
                 日本語
               </button>
             </li>
+            <li className="nav__dropdown-item">
+              <button
+                onFocus={this.handleFocusForLang}
+                onBlur={this.handleBlur}
+                value="hi"
+                onClick={(e) => this.handleLangSelection(e)}
+              >
+                हिन्दी
+              </button>
+            </li>
           </ul>
         </li>
       </React.Fragment>

client/i18n.js

@@ -1,16 +1,17 @@
 import i18n from 'i18next';
 import { initReactI18next } from 'react-i18next';
 import Backend from 'i18next-http-backend';
-import { enUS, es, ja } from 'date-fns/locale';
+import { enUS, es, ja, hi } from 'date-fns/locale';
 
 const fallbackLng = ['en-US'];
-const availableLanguages = ['en-US', 'es-419', 'ja'];
+const availableLanguages = ['en-US', 'es-419', 'ja', 'hi'];
 
 export function languageKeyToLabel(lang) {
   const languageMap = {
     'en-US': 'English',
     'es-419': 'Español',
-    ja: '日本語'
+    ja: '日本語',
+    hi: 'हिन्दी'
   };
   return languageMap[lang];
 }
@@ -19,7 +20,8 @@ export function languageKeyToDateLocale(lang) {
   const languageMap = {
     'en-US': enUS,
     'es-419': es,
-    ja
+    ja,
+    hi
   };
   return languageMap[lang];
 }

client/modules/IDE/actions/files.js

@@ -5,7 +5,8 @@ import * as ActionTypes from '../../../constants';
 import {
   setUnsavedChanges,
   closeNewFolderModal,
-  closeNewFileModal
+  closeNewFileModal,
+  setSelectedFile
 } from './ide';
 import { setProjectSavedTime } from './project';
 import { createError } from './ide';
@@ -82,7 +83,7 @@ export function submitFile(formProps, files, parentId, projectId) {
   });
 }
 
-export function handleCreateFile(formProps) {
+export function handleCreateFile(formProps, setSelected = true) {
   return (dispatch, getState) => {
     const state = getState();
     const { files } = state;
@@ -96,6 +97,9 @@ export function handleCreateFile(formProps) {
           if (updatedAt) dispatch(setProjectSavedTime(updatedAt));
           dispatch(closeNewFileModal());
           dispatch(setUnsavedChanges(true));
+          if (setSelected) {
+            dispatch(setSelectedFile(file.id));
+          }
           resolve();
         })
         .catch((error) => {

client/modules/IDE/actions/uploader.js

@@ -1,6 +1,6 @@
 import apiClient from '../../../utils/apiClient';
 import getConfig from '../../../utils/getConfig';
-import { createFile } from './files';
+import { handleCreateFile } from './files';
 import { TEXT_FILE_REGEX } from '../../../../server/utils/fileUtils';
 
 const s3BucketHttps =
@@ -48,7 +48,7 @@ export function dropzoneAcceptCallback(userId, file, done) {
     if (file.name.match(TEXT_FILE_REGEX) && file.size < MAX_LOCAL_FILE_SIZE) {
       localIntercept(file)
         .then((result) => {
-        file.content = result; // eslint-disable-line
+          file.content = result; // eslint-disable-line
           done('Uploading plaintext file locally.');
           file.previewElement.classList.remove('dz-error');
           file.previewElement.classList.add('dz-success');
@@ -103,7 +103,7 @@ export function dropzoneSendingCallback(file, xhr, formData) {
 }
 
 export function dropzoneCompleteCallback(file) {
-  return (dispatch, getState) => { // eslint-disable-line
+  return (dispatch) => { // eslint-disable-line
     if (
       (!file.name.match(TEXT_FILE_REGEX) || file.size >= MAX_LOCAL_FILE_SIZE) &&
       file.status !== 'error'
@@ -125,13 +125,13 @@ export function dropzoneCompleteCallback(file) {
         name: file.name,
         url: `${s3BucketHttps}${file.postData.key}`
       };
-      createFile(formParams)(dispatch, getState);
+      dispatch(handleCreateFile(formParams, false));
     } else if (file.content !== undefined) {
       const formParams = {
         name: file.name,
         content: file.content
       };
-      createFile(formParams)(dispatch, getState);
+      dispatch(handleCreateFile(formParams, false));
     }
   };
 }

client/modules/IDE/components/UploadFileModal.jsx

@@ -13,7 +13,7 @@ const limit = getConfig('UPLOAD_LIMIT') || 250000000;
 const limitText = prettyBytes(limit);
 
 class UploadFileModal extends React.Component {
-  propTypes = {
+  static propTypes = {
     reachedTotalSizeLimit: PropTypes.bool.isRequired,
     closeModal: PropTypes.func.isRequired,
     t: PropTypes.func.isRequired

client/modules/User/actions.js

@@ -141,6 +141,16 @@ export function validateSession() {
   };
 }
 
+export function resetProject(dispatch) {
+  dispatch({
+    type: ActionTypes.RESET_PROJECT
+  });
+  dispatch({
+    type: ActionTypes.CLEAR_CONSOLE
+  });
+  browserHistory.push('/');
+}
+
 export function logoutUser() {
   return (dispatch) => {
     apiClient
@@ -149,6 +159,7 @@ export function logoutUser() {
         dispatch({
           type: ActionTypes.UNAUTH_USER
         });
+        resetProject(dispatch);
       })
       .catch((error) => {
         const { response } = error;

developer_docs/development.md

@@ -91,6 +91,6 @@ Structure your commit message like this:
 
  - For reference to the JavaScript style guide, see the [Airbnb Style Guide](https://github.com/airbnb/javascript), [React ESLint Plugin](https://github.com/yannickcr/eslint-plugin-react).
 
- - The ESLint configuration is based on a few popular React/Redux boilerplates. Open to suggestions on this. If in development, you're getting annoyed with ESLint, you can temporarily remove the `eslint-loader` it from `webpack/config.dev.js` in the JavaScript loader, or disable any line from eslint by commenting at the end of the line `// eslint-disable-line`.
+ - The ESLint configuration is based on a few popular React/Redux boilerplates. Open to suggestions on this. If in development, you're getting annoyed with ESLint, you can disable any line from eslint by commenting at the end of the line `// eslint-disable-line`.
 
  - [Jest](https://jestjs.io/) for unit tests and snapshot testing along with [Enzyme](https://airbnb.io/enzyme/) for testing React.