Merge branch 'parse'

* parse: (159 commits) Release 2.1.0 (parse-community#1516) Update puppeteer to the latest version 🚀 (parse-community#1531) Update semver to the latest version 🚀 (parse-community#1527) Update semver to the latest version 🚀 (parse-community#1526) Update semver to the latest version 🚀 (parse-community#1525) Update semver to the latest version 🚀 (parse-community#1524) Update semver to the latest version 🚀 (parse-community#1521) Update css-loader to the latest version 🚀 (parse-community#1520) Update react-helmet to the latest version 🚀 (parse-community#1519) Update core-js to the latest version 🚀 (parse-community#1518) Update css-loader to the latest version 🚀 (parse-community#1514) Update semver to the latest version 🚀 (parse-community#1513) Update css-loader to the latest version 🚀 (parse-community#1512) Update js-beautify to the latest version 🚀 (parse-community#1510) Update prismjs to the latest version 🚀 (parse-community#1509) Update parse to the latest version 🚀 (parse-community#1507) Update webpack to the latest version 🚀 (parse-community#1504) Update marked to the latest version 🚀 (parse-community#1503) Update babel-loader to the latest version 🚀 (parse-community#1501) Update react to the latest version 🚀 (parse-community#1500) ... # Conflicts: # package-lock.json
beiguancyc · Apr 19, 2020 · 36674c7 · 36674c7
2 parents 004490c + f04d507
commit 36674c7
Show file tree

Hide file tree

Showing 100 changed files with 11,679 additions and 2,752 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,26 +1,25 @@
 {
-    "env": {
-        "es6": true,
-        "node": true,
-        "browser": true
+  "env": {
+    "es6": true,
+    "node": true,
+    "browser": true
+  },
+  "parser": "babel-eslint",
+  "extends": "eslint:recommended",
+  "parserOptions": {
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true,
+      "jsx": true
     },
-    "parser": "babel-eslint",
-    "extends": "eslint:recommended",
-    "parserOptions": {
-        "ecmaFeatures": {
-            "experimentalObjectRestSpread": true,
-            "jsx": true
-        },
-        "sourceType": "module"
-    },
-    "plugins": [
-        "react"
-    ],
-    "rules": {
-        "react/jsx-uses-vars": 1,
-        "react/jsx-uses-react": 1,
-        "react/react-in-jsx-scope": 1,
-        "no-console": 0,
-        "no-case-declarations": 0
-    }
+    "sourceType": "module"
+  },
+  "plugins": ["react"],
+  "rules": {
+    "react/jsx-uses-vars": 1,
+    "react/jsx-uses-react": 1,
+    "react/react-in-jsx-scope": 1,
+    "no-console": 0,
+    "no-case-declarations": 0,
+    "quotes": ["error", "single"]
+  }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,26 @@
 ## Parse Dashboard Changelog
 
 ### master
-[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/2.0.4...master)
+[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/2.1.0...master)
+
+### 2.1.0
+[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/2.0.5...2.1.0)
+
+__New features:__
+* Added JS Console to run custom queries ([#1464](https://github.com/parse-community/parse-dashboard/pull/1464)), thanks to [Pedro Mutter](https://github.com/MutterPedro).
+* View/Edit single row modal ([#1448](https://github.com/parse-community/parse-dashboard/pull/1448)), thanks to [NIno Črljenec](https://github.com/NinoZX).
+* Context menu with quick filters and links to related records in other Parse Objects ([#1431](https://github.com/parse-community/parse-dashboard/pull/1431)), thanks to [404-html](https://github.com/404-html).
+* Add ProtectedFields dialog and enhance Permissions dialogs ([#1478](https://github.com/parse-community/parse-dashboard/pull/1478)), thanks to [Old Grandpa](https://github.com/BufferUnderflower).
+
+__Improvements:__
+* Added config param delete confirmation dialog ([#1443](https://github.com/parse-community/parse-dashboard/pull/1443)), thanks to [Manuel Trezza](https://github.com/mtrezza).
+
+__Fixes:__
+* Inifite scroll not working ([#1432](https://github.com/parse-community/parse-dashboard/pull/1432)), thanks to [Douglas Muraoka](https://github.com/douglasmuraoka).
+* Fix crash in import semver re: npm/node-semver#305 ([#1441](https://github.com/parse-community/parse-dashboard/pull/1441)), thanks to [Ben Petty](https://github.com/benpetty).
+* Taking hidden columns into account when calculating Editor position ([#1438](https://github.com/parse-community/parse-dashboard/pull/1438)), thanks to [404-html](https://github.com/404-html).
+* Fix audience conditions when Installation class does not exist ([#1451](https://github.com/parse-community/parse-dashboard/pull/1451)), thanks to [Antonio Davi Macedo Coelho de Castro](https://github.com/davimacedo).
 
-* _Contributing to this repo? Add info about your change here to be included in next release_
 ### 2.0.5
  [Full Changelog](https://github.com/parse-community/parse-dashboard/compare/2.0.4...2.0.5)
  * Fix: delete and regenerate package-lock to fix broken build

diff --git a/Parse-Dashboard/Authentication.js b/Parse-Dashboard/Authentication.js
@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 var bcrypt = require('bcryptjs');
 var csrf = require('csurf');
 var passport = require('passport');

diff --git a/Parse-Dashboard/app.js b/Parse-Dashboard/app.js
@@ -29,12 +29,12 @@ function checkIfIconsExistForApps(apps, iconsFolder) {
   for (var i in apps) {
     var currentApp = apps[i];
     var iconName = currentApp.iconName;
-    var path = iconsFolder + "/" + iconName;
+    var path = iconsFolder + '/' + iconName;
 
     fs.stat(path, function(err) {
       if (err) {
           if ('ENOENT' == err.code) {// file does not exist
-              console.warn("Icon with file name: " + iconName +" couldn't be found in icons folder!");
+              console.warn('Icon with file name: ' + iconName +' couldn\'t be found in icons folder!');
           } else {
             console.log(
               'An error occurd while checking for icons, please check permission!');
@@ -162,8 +162,8 @@ module.exports = function(config, options) {
         }
       } catch (e) {
         // Directory doesn't exist or something.
-        console.warn("Iconsfolder at path: " + config.iconsFolder +
-          " not found!");
+        console.warn('Iconsfolder at path: ' + config.iconsFolder +
+          ' not found!');
       }
     }
 

diff --git a/Parse-Dashboard/index.js b/Parse-Dashboard/index.js
@@ -6,7 +6,7 @@
  * the root directory of this source tree.
  */
 // Command line tool for npm start
-"use strict"
+'use strict'
 const path = require('path');
 const jsonFile = require('json-file-plus');
 const express = require('express');
@@ -40,7 +40,7 @@ const trustProxy = program.trustProxy || process.env.PARSE_DASHBOARD_TRUST_PROXY
 const dev = program.dev;
 
 if (trustProxy && allowInsecureHTTP) {
-  console.log("Set only trustProxy *or* allowInsecureHTTP, not both.  Only one is needed to handle being behind a proxy.");
+  console.log('Set only trustProxy *or* allowInsecureHTTP, not both.  Only one is needed to handle being behind a proxy.');
   process.exit(-1);
 }
 

diff --git a/Parse-Dashboard/parse-dashboard-config.json b/Parse-Dashboard/parse-dashboard-config.json
@@ -1,12 +1,14 @@
 {
-  "apps": [{
-    "serverURL": "http://localhost:1338/parse",
-    "appId": "hello",
-    "masterKey": "world",
-    "appName": "",
-    "iconName": "",
-    "primaryBackgroundColor": "",
-    "secondaryBackgroundColor": ""
-  }],
+  "apps": [
+    {
+      "serverURL": "http://localhost:1338/parse",
+      "appId": "hello",
+      "masterKey": "world",
+      "appName": "",
+      "iconName": "",
+      "primaryBackgroundColor": "",
+      "secondaryBackgroundColor": ""
+    }
+  ],
   "iconsFolder": "icons"
-}
+}
diff --git a/README.md b/README.md
@@ -112,6 +112,8 @@ PARSE_DASHBOARD_USER_PASSWORD: "pass"
 PARSE_DASHBOARD_SSL_KEY: "sslKey"
 PARSE_DASHBOARD_SSL_CERT: "sslCert"
 PARSE_DASHBOARD_CONFIG: undefined // Only for reference, it must not exist
+PARSE_DASHBOARD_COOKIE_SESSION_SECRET: undefined // set the cookie session secret, defaults to a random string. Use this option if you want sessions to work across multiple servers, or across restarts
+
 ```
 
 ## Managing Multiple Apps