Merge branch 'develop' into fix/form-reinitialization-on-language-change

Author: raclim

client/modules/IDE/actions/files.js

@@ -11,15 +11,15 @@ import {
 import { setProjectSavedTime } from './project';
 import { createError } from './ide';
 
-function appendToFilename(filename, string) {
+export function appendToFilename(filename, string) {
   const dotIndex = filename.lastIndexOf('.');
   if (dotIndex === -1) return filename + string;
   return (
     filename.substring(0, dotIndex) + string + filename.substring(dotIndex)
   );
 }
 
-function createUniqueName(name, parentId, files) {
+export function createUniqueName(name, parentId, files) {
   const siblingFiles = files
     .find((file) => file.id === parentId)
     .children.map((childFileId) =>

client/modules/IDE/components/FileNode.jsx

@@ -2,8 +2,8 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import React, { useState, useRef } from 'react';
 import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
 import { useTranslation } from 'react-i18next';
+
 import * as IDEActions from '../actions/ide';
 import * as FileActions from '../actions/files';
 import DownArrowIcon from '../../../images/down-filled-triangle.svg';
@@ -353,7 +353,12 @@ const FileNode = ({
         <ul className="file-item__children">
           {children.map((childId) => (
             <li key={childId}>
-              <ConnectedFileNode id={childId} parentId={id} />
+              <ConnectedFileNode
+                id={childId}
+                parentId={id}
+                canEdit={canEdit}
+                onClickFile={onClickFile}
+              />
             </li>
           ))}
         </ul>
@@ -402,13 +407,12 @@ function mapStateToProps(state, ownProps) {
   });
 }
 
-function mapDispatchToProps(dispatch) {
-  return bindActionCreators(Object.assign(FileActions, IDEActions), dispatch);
-}
+const mapDispatchToProps = { ...FileActions, ...IDEActions };
 
 const ConnectedFileNode = connect(
   mapStateToProps,
   mapDispatchToProps
 )(FileNode);
 
-export { FileNode, ConnectedFileNode as default };
+export { FileNode };
+export default ConnectedFileNode;

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "p5.js-web-editor",
-  "version": "2.14.8",
+  "version": "2.15.0",
   "description": "The web editor for p5.js.",
   "scripts": {
     "clean": "rimraf dist",

package.json

@@ -14,10 +14,7 @@ const mongoConnectionString = process.env.MONGO_URL;
 const { ObjectId } = mongoose.Types;
 // Connect to MongoDB
 mongoose.Promise = global.Promise;
-mongoose.connect(mongoConnectionString, {
-  useNewUrlParser: true,
-  useUnifiedTopology: true
-});
+mongoose.connect(mongoConnectionString);
 mongoose.set('strictQuery', true);
 mongoose.connection.on('error', () => {
   console.error(

server/migrations/emailConsolidation.js

@@ -22,8 +22,6 @@ const connectToMongoDB = async () => {
     mongoose.set('strictQuery', true);
 
     await mongoose.connect(mongoConnectionString, {
-      useNewUrlParser: true,
-      useUnifiedTopology: true,
       serverSelectionTimeoutMS: 30000, // 30 seconds timeout
       socketTimeoutMS: 45000 // 45 seconds timeout
     });

server/previewServer.js

@@ -59,10 +59,7 @@ const headers = { 'User-Agent': 'p5js-web-editor/0.0.1' };
 
 const mongoConnectionString = process.env.MONGO_URL;
 
-mongoose.connect(mongoConnectionString, {
-  useNewUrlParser: true,
-  useUnifiedTopology: true
-});
+mongoose.connect(mongoConnectionString);
 mongoose.set('strictQuery', true);
 mongoose.connection.on('error', () => {
   console.error(

server/scripts/examples-gg-latest.js

@@ -14,10 +14,7 @@ const headers = { 'User-Agent': 'p5js-web-editor/0.0.1' };
 
 const mongoConnectionString = process.env.MONGO_URL;
 
-mongoose.connect(mongoConnectionString, {
-  useNewUrlParser: true,
-  useUnifiedTopology: true
-});
+mongoose.connect(mongoConnectionString);
 mongoose.set('strictQuery', true);
 mongoose.connection.on('error', () => {
   console.error(

server/scripts/examples.js

@@ -76,14 +76,19 @@ app.use(cookieParser());
 
 mongoose.set('strictQuery', true);
 
-const clientPromise = mongoose
-  .connect(mongoConnectionString, {
-    useNewUrlParser: true,
-    useUnifiedTopology: true,
-    serverSelectionTimeoutMS: 30000, // 30 seconds timeout
-    socketTimeoutMS: 45000 // 45 seconds timeout
-  })
-  .then((m) => m.connection.getClient());
+async function connectToMongoDB() {
+  try {
+    const mongooseConnection = await mongoose.connect(mongoConnectionString, {
+      serverSelectionTimeoutMS: 30000, // 30 seconds timeout
+      socketTimeoutMS: 45000 // 45 seconds timeout
+    });
+    return mongooseConnection.connection.getClient();
+  } catch (err) {
+    throw new Error('MongoDB connection failed', err);
+  }
+}
+
+const clientInstancePromise = connectToMongoDB();
 
 app.use(
   session({
@@ -97,8 +102,7 @@ app.use(
       secure: false
     },
     store: new MongoStore({
-      clientPromise,
-      autoReconnect: true
+      clientPromise: clientInstancePromise
     })
   })
 );