Merge branch 'parse'

* parse: (21 commits) Reset credentials (parse-community#1135) 1.4.0 version bump + changelog (parse-community#1134) Fix: Master fails to install graphql-playground parse-community#1131 (parse-community#1133) Update eslint-plugin-react to the latest version 🚀 (parse-community#1122) Update babel7 to the latest version 🚀 (parse-community#1129) GraphQL API playground (parse-community#1123) Fix: Can't switch (dropdown list) between servers parse-community#1045 (parse-community#1125) Update puppeteer to the latest version 🚀 (parse-community#1124) Update eslint-plugin-react to the latest version 🚀 (parse-community#1120) Update webpack-cli to the latest version 🚀 (parse-community#1119) Update react-dnd to the latest version 🚀 (parse-community#1117) Update puppeteer to the latest version 🚀 (parse-community#1116) Update react-dnd to the latest version 🚀 (parse-community#1114) Update babel-eslint to the latest version 🚀 (parse-community#1113) Update react-dnd to the latest version 🚀 (parse-community#1111) Update react-dnd to the latest version 🚀 (parse-community#1110) Update package-json to the latest version 🚀 (parse-community#1108) Update webpack-cli to the latest version 🚀 (parse-community#1106) Update react-dnd to the latest version 🚀 (parse-community#1104) Update webpack-cli to the latest version 🚀 (parse-community#1103) ... # Conflicts: # package-lock.json
beiguancyc · Jul 13, 2019 · 1e24a5d · 1e24a5d
2 parents 9be7c14 + 9646557
commit 1e24a5d
Show file tree

Hide file tree

Showing 16 changed files with 1,944 additions and 602 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,6 +28,6 @@ deploy:
     condition: "$TRAVIS_JOB_NUMBER = $TRAVIS_BUILD_NUMBER.1"
     repo: parse-community/parse-dashboard
   email:
-    secure: NVlNLZh4bsCUaO1qYdXp6DpYnISQIXqz0xIaMfPI06CqFErkqlodWD7aOOYT2LyKos1f9QbQBbURl27drtJLudNqIXfMFbWMc0MwDJp4fJBa6vRFdn1jYNDcrqTbdAAoH5z6SU4r7YdiPz5pIJ7XjMajryaB7dAZLNiuZaTeTboF6QEQj+j+bw9IMcuiDIxQt3t+5f9Raah1HwZX5h5CBXS8voE97deCpf6jdVt3gaKvnZGvTvnDfYBsvmDE2ueqFK/xjt240PMArxqTbkEVFl/7Gti5jurLIKtX7StNsEZZZiGJS2+E9Px5nSFMM3JKnfD5Cj6IZxqobL9mQ4KueaL3tX5BOnbHfSpJs2t3Lp8TO0hnpmn8w/d7pekOjH3LihgC7AbZ3/ark9ZvPvP63XKhivKL4NuvNa+8yHeQNOLIzOjTPZl7ZS6XkibwxsOtgasMQWK4/Ttg6/jHHPjaXbnqn7ZoIM2GPZBv22xaReIWSRJdgW8G9ceSBEIIZFONkKsH0apDDq3eHg0vNEI4R3oEmV6t/R9yvpCzarfNLn5+l80ztMM+rX91eXT8B5V8Mpy+7urbQwIoFLUGRPDxbofEqEm8S6sLsjyYe7VnxBC4Lhir3DFxYL0+q5YLfhq64AejA4BM65+v5SyvXCUvyakzsRsydU230sJyaONHD5I=
+    secure: gVteu82NuKHKLBBySJJMwDgmli5j8MPiECz78uGhxxw6VCEhgG9LtHHHvJeXNcTYUgM0B4GKpk7f2QuqLnjkLJJJhmmb+uQlknhWXOsE43dNNZTjeNm8G8BLeMJofy07yx/J2kKQTbGbf2eHobt9f//FchzatwzfnUhqXFIQYRYnnod7vfB6xMQuRaiO2YDAqaoxunhdrjmoRHUDeD6F9L53CD+wqZfKMarB60rT+BFS2SEnyC+hvzqaBsTc5YMf3wdZ4A2U/NTYYANtvPybMIyi/M1GvCggsw0LcWJX7u9o87e1ctBQS8+OTsJd1evxE6SCyrXsOX1zVx8hiBvUqErTKwxc3cg6/hxnod7DrA0/hn9J/BTJXx4Kn0p9Lt+jv2NICzV0FsAMRrM+yhlt4UBKxP5Q4macYu1oiXIzfRrNpNJk55RTBBC47LbDNefdteglFw0tXHQUIr9iPAY80/2RvCVXx2tUyVmpfAU5+uo4QyMAlPkwt0/3L7ZwgS3uvTdH+d1KWscYt7phnqjBgnuMqE+1gIgESPZOkYF5nzmQ8GOdLVI02Pj/Dnoyq+RhrQ+rcZ/sZC5AJnbifEb5ul0AfxKDOmYKchFaRptzaZa9I2oQTK0nttBMBjgjRriFOKFHyV55qHGLO/UndDSzlWRNdRatGdbg10DvO24Vew4=
   api_key:
-    secure: k3c9OMqlY5fZ4E+G1IataTfChw+Qyd3b/VkoQiKri6AD795RKKB4lfV69PyfQJ2Mlw8nKp8CkQKYPRgf8as23xg4XSNkoaQOeL5kTRFuN+T5BEEoS/eJVx276csQ0edHfYGwW4rM4AbdPjlr+8CjmNqsYRmCXHYF5HiNIIaD+Y9fU4hMpx5JZvmVI0NePZzEe4wAFiCQ2doqeXdam808qNHInl2BayZLPZyU7dLAk+CBH+gTL4u9bn2Q4eWwICB8XI2heIm6i9oXJUReSCLY387FyowtGeepH/Q3g6JDxKmZ3qw+biYdyyk9TJdDfPUcjWHDlD+pQAHiBOUtxLh+5wVi9lIYaYHJDC74KRPmxgKyTvGf41z7q8IcK9dc3Eu5JIqtGmzpkCHYBHHkQ29W75sHOW8OuI/7VAZDr5pjZqU7LE9dHuk2Da8EccJQ1WHkBul3Tt36YWL1TtsgyE+PbpxOdq72+71Ji0Zh3O6udgVqBEZKFz6Fow7cMUUTWCy5oMSPdjqwW3C/jyB2tpliZfX1Lq+hysCwAjuKNhegyOwOGshf9xW0JcjBcHN+Q6fCaKlN8R/MRkMk1CRcbzxwt4SMKIskR/YgmbJ0ozaC5uI/HkKKpno+VTjPRKpzFBBA6L+ZWnt+0KLsjOjO6ITF1WjAfHK9lBBLjd87jWgsBBE=
+    secure: J9A9+tie/HmsVaDxiI3XEPGCK8SaR30JaMJldOEPwNJv3k+A5QifcgSPnVV3w+jdF1rMmYxdZLF8K9BDKLuPTl1Wh1V/y6S5qznnSv6IoCW2Zfud9m15zY7OCu8f8/Z0D4Lsb90pkgUGzChvy3XzH5JstkHaFlUyNI2WQWBRyRE9YoQ3IKUAsPL73O85gPD0qQAiX0smyk9zAM7anLCBptVXqJAwKHg10NwWExjWjVcmLOf+Ehu6DviV+QRvCMzoLWx+Q2w2cu3YkmJXq+FLMxgtRat6/PAM3zX9JSlLoQWPOK6LFO3VkOxgpk9V9F9B1pmsKAZ49GR8ltnjQcn3oSWJwShXP5Rl4xTOdZ64M6LBwtqnENqw8zF0f1QQyvRpPhXmZH0//84ikZEnWeENZoyqoqClQVJf2pCL1nlTzJDgVKL4bRx+ZGBaUMKxVbgdhY3GyJ2rOkZvB7VlUD/GzcnwokDvJ0OL2V68M+nw+BSe796U5GKZOLm7oNEOwzI0+Rosfl19jWRRIYfyLD0s6tHNi0liXXPJouNwWZIvBuHrMkYhCxP/Cdsze3j3HLgz5o9KEMlD4PhkyhArb/XF3yZBOlWdcK4zr6QBNf9+V7h6cHMmvOrMY0NjLm6x6rv3jMqEOEBpKUCR71NOEnbLDJ76OPVUDUbLlrJqAHBH3FU=
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,20 @@
 ## Parse Dashboard Changelog
 
 ### master
-[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/1.3.3...master)
+[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/1.4.1...master)
 
 * _Contributing to this repo? Add info about your change here to be included in next release_
 
+### 1.4.1
+[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/1.4.0...1.4.1)
+* Fix: 1.4.0 failed to deploy to npm.  Reset credentials and trying again.
+
+### 1.4.0
+[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/1.3.3...1.4.0)
+* Security Fix: see the [advisory](https://github.com/parse-community/parse-dashboard/network/alert/package-lock.json/lodash/open) for details. [22d748](https://github.com/parse-community/parse-dashboard/pull/1134/commits/22d748fdc1e95661dc39226f5f797dc8fb0e5c2f)
+* Feature: GraphQL API playground ([#1123](https://github.com/parse-community/parse-dashboard/pull/1123)), thanks to [Douglas Muraoka](https://github.com/douglasmuraoka)
+* Fix: Can't switch (dropdown list) between servers [#1045](https://github.com/parse-community/parse-dashboard/issues/1045) ([#1125](https://github.com/parse-community/parse-dashboard/pull/1125)), thanks to [Douglas Muraoka](https://github.com/douglasmuraoka)
+
 ### 1.3.3
 [Full Changelog](https://github.com/parse-community/parse-dashboard/compare/1.3.2...1.3.3)
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,7 +5,8 @@
     "Cloud Code Viewer",
     "Cloud Code Jobs Viewer and Runner",
     "Parse Config",
-    "API Console",
+    "REST API Console",
+    "GraphQL API Console",
     "Class Level Permissions Editor",
     "Pointer Permissions Editor",
     "Send Push Notifications",
@@ -20,7 +21,7 @@
   ],
   "homepage": "https://github.com/ParsePlatform/parse-dashboard",
   "bugs": "https://github.com/ParsePlatform/parse-dashboard/issues",
-  "version": "1.3.3",
+  "version": "1.4.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParsePlatform/parse-dashboard"
@@ -33,7 +34,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@babel/runtime": "7.4.5",
+    "@babel/runtime": "7.5.0",
     "bcryptjs": "2.3.0",
     "body-parser": "1.19.0",
     "commander": "2.20.0",
@@ -42,58 +43,61 @@
     "create-react-class": "15.6.3",
     "csurf": "1.10.0",
     "express": "4.17.1",
+    "graphql": "^14.3.1",
+    "graphql-playground-react": "^1.7.20",
     "history": "4.9.0",
-    "immutable": "3.8.1",
+    "immutable": "^4.0.0-rc.9",
     "immutable-devtools": "0.1.3",
     "js-beautify": "1.10.0",
     "json-file-plus": "3.2.0",
-    "package-json": "6.1.0",
+    "package-json": "6.4.0",
     "parse": "2.4.0",
     "passport": "0.4.0",
     "passport-local": "1.0.0",
     "prop-types": "15.7.2",
     "prismjs": "1.16.0",
     "query-string": "6.5.0",
     "react": "16.8.6",
-    "react-dnd": "7.4.5",
-    "react-dnd-html5-backend": "7.4.4",
+    "react-dnd": "8.0.3",
+    "react-dnd-html5-backend": "8.0.3",
     "react-dom": "16.8.6",
     "react-helmet": "5.2.1",
+    "react-redux": "^5.1.1",
     "react-router": "5.0.1",
     "react-router-dom": "5.0.1"
   },
   "devDependencies": {
-    "@babel/core": "7.4.5",
+    "@babel/core": "7.5.0",
     "@babel/plugin-proposal-decorators": "7.4.4",
     "@babel/plugin-transform-regenerator": "7.4.5",
-    "@babel/plugin-transform-runtime": "7.4.4",
+    "@babel/plugin-transform-runtime": "7.5.0",
     "@babel/polyfill": "7.4.4",
-    "@babel/preset-env": "7.4.5",
+    "@babel/preset-env": "7.5.0",
     "@babel/preset-react": "7.0.0",
-    "babel-eslint": "10.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",
     "eslint": "5.16.0",
     "eslint-plugin-jest": "22.5.1",
-    "eslint-plugin-react": "7.13.0",
+    "eslint-plugin-react": "7.14.1",
     "file-loader": "4.0.0",
     "http-server": "0.11.1",
     "jest": "24.8.0",
     "marked": "0.6.2",
     "node-sass": "4.12.0",
     "parse-server": "github:parseplatform/parse-server#master",
     "path-to-regexp": "3.0.0",
-    "puppeteer": "1.17.0",
+    "puppeteer": "1.18.1",
     "react-test-renderer": "16.8.6",
     "request": "2.87.0",
     "request-promise": "4.2.4",
     "sass-loader": "7.1.0",
     "style-loader": "0.23.0",
     "svg-prep": "1.0.4",
     "webpack": "4.33.0",
-    "webpack-cli": "3.3.2"
+    "webpack-cli": "3.3.5"
   },
   "scripts": {
     "dev": "node ./Parse-Dashboard/index.js & webpack --config webpack/build.config.js --devtool eval-source-map --progress --watch",

diff --git a/src/components/Sidebar/AppName.react.js b/src/components/Sidebar/AppName.react.js
@@ -0,0 +1,8 @@
+import React from 'react';
+import styles from 'components/Sidebar/Sidebar.scss';
+
+export default ({ name, onClick }) => (
+  <div className={styles.currentApp} onClick={onClick}>
+    {name}
+  </div>
+);
diff --git a/src/components/Sidebar/AppsMenu.react.js b/src/components/Sidebar/AppsMenu.react.js
@@ -6,6 +6,7 @@
  * the root directory of this source tree.
  */
 import AppBadge         from 'components/AppBadge/AppBadge.react';
+import AppName          from 'components/Sidebar/AppName.react';
 import html             from 'lib/htmlString';
 import { Link }         from 'react-router-dom';
 import React            from 'react';
@@ -14,21 +15,21 @@ import { unselectable } from 'stylesheets/base.scss';
 
 let AppsMenu = ({ apps, current, height, onSelect }) => (
   <div style={{ height }} className={[styles.appsMenu, unselectable].join(' ')}>
-    <div className={styles.currentApp} onClick={onSelect.bind(null, current.slug)}>
-      {current.name}
-    </div>
+    <AppName name={current.name} onClick={onSelect.bind(null, current.slug)} />
     <div className={styles.menuSection}>All Apps</div>
-    {apps.map((app) => {
-      if (app.slug === current.slug) {
-        return null;
-      }
-      return (
-        <Link to={{ pathname: html`/apps/${app.slug}/browser` }} key={app.slug} className={styles.menuRow}>
-          {app.name}
-          <AppBadge production={app.production} />
-        </Link>
-      );
-    })}
+    <div className={styles.appListContainer}>
+      {apps.map((app) => {
+        if (app.slug === current.slug) {
+          return null;
+        }
+        return (
+          <Link to={{ pathname: html`/apps/${app.slug}/browser` }} key={app.slug} className={styles.menuRow}>
+            {app.name}
+            <AppBadge production={app.production} />
+          </Link>
+        );
+      })}
+    </div>
   </div>
 );
 

diff --git a/src/components/Sidebar/AppsSelector.react.js b/src/components/Sidebar/AppsSelector.react.js
diff --git a/src/components/Sidebar/Sidebar.react.js b/src/components/Sidebar/Sidebar.react.js
@@ -7,9 +7,11 @@
  */
 import PropTypes   from 'lib/PropTypes';
 import AppsManager    from 'lib/AppsManager';
-import AppsSelector   from 'components/Sidebar/AppsSelector.react';
+import AppsMenu       from 'components/Sidebar/AppsMenu.react';
+import AppName        from 'components/Sidebar/AppName.react';
 import FooterMenu     from 'components/Sidebar/FooterMenu.react';
-import React          from 'react';
+import React, { useState } from 'react';
+import ParseApp       from 'lib/ParseApp';
 import SidebarHeader  from 'components/Sidebar/SidebarHeader.react';
 import SidebarSection from 'components/Sidebar/SidebarSection.react';
 import SidebarSubItem from 'components/Sidebar/SidebarSubItem.react';
@@ -26,7 +28,8 @@ const Sidebar = ({
   appSelector,
   primaryBackgroundColor,
   secondaryBackgroundColor
-}) => {
+}, { currentApp }) => {
+  const [ appsMenuOpen, setAppsMenuOpen ] = useState(false);
   const _subMenu = subsections => {
     if (!subsections) {
       return null;
@@ -53,35 +56,54 @@ const Sidebar = ({
 
   const apps = [].concat(AppsManager.apps()).sort((a, b) => (a.name < b.name ? -1 : (a.name > b.name ? 1 : 0)));
 
+  let sidebarContent;
+  if (appsMenuOpen) {
+    sidebarContent = (
+      <AppsMenu
+        apps={apps}
+        current={currentApp}
+        onSelect={() => setAppsMenuOpen(false)} />
+    );
+  } else {
+    sidebarContent = (
+      <>
+        {appSelector && (
+          <div className={styles.apps}>
+            <AppName name={currentApp.name} onClick={() => setAppsMenuOpen(true)} />
+          </div>
+        )}
+        <div className={styles.content}>
+          {sections.map(({
+            name,
+            icon,
+            style,
+            link,
+            subsections,
+          }) => {
+            const active = name === section;
+            return (
+              <SidebarSection
+                key={name}
+                name={name}
+                icon={icon}
+                style={style}
+                link={prefix + link}
+                active={active}
+                primaryBackgroundColor={primaryBackgroundColor}
+                secondaryBackgroundColor={secondaryBackgroundColor}
+                >
+                {active ? _subMenu(subsections) : null}
+              </SidebarSection>
+            );
+          })}
+        </div>
+      </>
+    )
+  }
+
   return <div className={styles.sidebar}>
     <SidebarHeader />
-    {appSelector ? <AppsSelector apps={apps} /> : null}
-
-    <div className={styles.content}>
-      {sections.map(({
-        name,
-        icon,
-        style,
-        link,
-        subsections,
-      }) => {
-        const active = name === section;
-        return (
-          <SidebarSection
-            key={name}
-            name={name}
-            icon={icon}
-            style={style}
-            link={prefix + link}
-            active={active}
-            primaryBackgroundColor={primaryBackgroundColor}
-            secondaryBackgroundColor={secondaryBackgroundColor}
-            >
-            {active ? _subMenu(subsections) : null}
-          </SidebarSection>
-        );
-      })}
-    </div>
+    {sidebarContent}
     <div className={styles.footer}>
       <a target='_blank' href='http://parseplatform.org/'>Open Source Hub</a>
       <a target='_blank' href='https://github.com/parse-community'>GitHub</a>
@@ -92,7 +114,7 @@ const Sidebar = ({
 }
 
 Sidebar.contextTypes = {
-  generatePath: PropTypes.func
+  currentApp: PropTypes.instanceOf(ParseApp)
 };
 
 export default Sidebar;