Merge branch 'master' into greenkeeper/eslint-plugin-jest-22.10.0

Author: davimacedo

package-lock.json

@@ -34,7 +34,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@babel/runtime": "7.5.0",
+    "@babel/runtime": "7.5.5",
     "bcryptjs": "2.3.0",
     "body-parser": "1.19.0",
     "codemirror-graphql": "github:timsuchanek/codemirror-graphql#details-fix",
@@ -49,7 +49,7 @@
     "history": "4.9.0",
     "immutable": "4.0.0-rc.9",
     "immutable-devtools": "0.1.3",
-    "js-beautify": "1.10.0",
+    "js-beautify": "1.10.1",
     "json-file-plus": "3.2.0",
     "package-json": "6.4.0",
     "parse": "2.4.0",
@@ -68,22 +68,22 @@
     "react-router-dom": "5.0.1"
   },
   "devDependencies": {
-    "@babel/core": "7.5.0",
+    "@babel/core": "7.5.5",
     "@babel/plugin-proposal-decorators": "7.4.4",
     "@babel/plugin-transform-regenerator": "7.4.5",
-    "@babel/plugin-transform-runtime": "7.5.0",
+    "@babel/plugin-transform-runtime": "7.5.5",
     "@babel/polyfill": "7.4.4",
-    "@babel/preset-env": "7.5.0",
+    "@babel/preset-env": "7.5.5",
     "@babel/preset-react": "7.0.0",
     "babel-eslint": "10.0.2",
     "babel-loader": "8.0.6",
     "babel-plugin-transform-object-rest-spread": "6.26.0",
     "core-js": "2.6.5",
-    "css-loader": "2.1.1",
+    "css-loader": "3.1.0",
     "eslint": "5.16.0",
     "eslint-plugin-jest": "22.10.0",
     "eslint-plugin-react": "7.14.1",
-    "file-loader": "4.0.0",
+    "file-loader": "4.1.0",
     "http-server": "0.11.1",
     "jest": "24.8.0",
     "marked": "0.6.2",

package.json

@@ -8,6 +8,8 @@
 .content {
   margin-left: 300px;
   transition: margin-left 0.5s ease-in;
+  overflow: auto;
+  max-height: 100vh;
 }
 
 @media (max-width: 980px) {

src/dashboard/Dashboard.scss

@@ -25,10 +25,11 @@
   position: relative;
   height: calc(100vh - 96px);
   margin-top: 96px;
+  overflow: hidden;
 
   // Workaround to override graphql-playground-react
   // animations and query editor height
-  & > div > div {
+  & > div:not(.empty) > div {
     opacity: 1;
     transform: unset;
     animation: unset;

src/dashboard/Data/ApiConsole/ApiConsole.scss

@@ -11,9 +11,6 @@ export default function getFileName(name) {
   if (name instanceof Parse.File) {
     return getFileName(name.name());
   }
-  let offset = 37;
-  if (name.indexOf('tfss-') === 0) {
-    offset += 5;
-  }
+  const offset = name.indexOf('_') + 1;
   return name.substr(offset);
 }

src/lib/getFileName.js

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2016-present, Parse, LLC
+ * All rights reserved.
+ *
+ * This source code is licensed under the license found in the LICENSE file in
+ * the root directory of this source tree.
+ */
+jest.dontMock('../getFileName');
+const getFileName = require('../getFileName').default;
+const Parse = require('parse');
+
+describe('getFileName', () => {
+  it('get filename prefixed with hex', () => {
+    const actualFilename = 'profile.jpg';
+    expect(getFileName(`7b16230f584b360f667665fcb7d7a98b_${actualFilename}`)).toBe(actualFilename);
+
+    const parseFile = new Parse.File(`7b16230f584b360f667665fcb7d7a98b_${actualFilename}`);
+    expect(getFileName(parseFile)).toBe(actualFilename);
+  });
+
+  it('get filename containing underscore and prefixed with hex', () => {
+    const actualFilename = 'bg_img.png';
+    expect(getFileName(`7b16230f584b360f667665fcb7d7a98b_${actualFilename}`)).toBe(actualFilename);
+
+    const parseFile = new Parse.File(`7b16230f584b360f667665fcb7d7a98b_${actualFilename}`);
+    expect(getFileName(parseFile)).toBe(actualFilename);
+  });
+});

src/lib/tests/getFileName.test.js

@@ -33,17 +33,28 @@ module.exports = {
       {
         test: /\.js$/,
         exclude: /node_modules/,
-        use: { 
-          loader: 'babel-loader', 
+        use: {
+          loader: 'babel-loader',
           query: {
             plugins: [["@babel/plugin-proposal-decorators", { "legacy": true }], '@babel/transform-regenerator', '@babel/transform-runtime'],
             presets: ['@babel/preset-react', '@babel/preset-env']
           },
         },
       }, {
         test: /\.scss$/,
-        use: [ "style-loader", "css-loader?modules&localIdentName=[local]__[hash:base64:5]!sass-loader?includePaths[]=" +
-          encodeURIComponent(path.resolve(__dirname, '../src')) ]
+        use: [
+          'style-loader',
+          {
+            loader: 'css-loader',
+            options: {
+              modules: {
+                localIdentName: '[local]__[hash:base64:5]'
+              },
+              importLoaders: 2
+            },
+          },
+          "sass-loader?includePaths[]=" + encodeURIComponent(path.resolve(__dirname, '../src'))
+        ]
       }, {
         test: /\.css$/,
         use: [ 'style-loader', 'css-loader' ]