From ec44b17344ad43d39b5b23daf87ec34909d5603e Mon Sep 17 00:00:00 2001 From: Manuel <5673677+mtrezza@users.noreply.github.com> Date: Sat, 18 Jun 2022 15:04:22 +0200 Subject: [PATCH 01/15] ci: fix insecure git protocol (#2177) --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ddb58a780..64c8eaed87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -129,6 +129,8 @@ jobs: run: | node_major=$(echo "${{ matrix.NODE_VERSION }}" | cut -d'.' -f1) echo "::set-output name=node_major::$(echo $node_major)" + - name: Fix usage of insecure GitHub protocol + run: sudo git config --system url."https://github".insteadOf "git://github" - uses: actions/checkout@v2 - name: Use Node.js ${{ matrix.NODE_VERSION }} uses: actions/setup-node@v1 From e4bd5a2ff664a6f686c3c3f40e0ea3365180fd66 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 18 Jun 2022 13:07:47 +0000 Subject: [PATCH 02/15] chore(release): 4.1.3-alpha.1 [skip ci] ## [4.1.3-alpha.1](https://github.com/ParsePlatform/parse-dashboard/compare/4.1.2...4.1.3-alpha.1) (2022-06-18) ### Bug Fixes * security upgrade semver-regex from 3.1.3 to 3.1.4 ([#2154](https://github.com/ParsePlatform/parse-dashboard/issues/2154)) ([4f9090a](https://github.com/ParsePlatform/parse-dashboard/commit/4f9090ad22460913f7987964ee54f26d348ca254)) --- changelogs/CHANGELOG_alpha.md | 7 +++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changelogs/CHANGELOG_alpha.md b/changelogs/CHANGELOG_alpha.md index 31f3d1f539..b730cf648f 100644 --- a/changelogs/CHANGELOG_alpha.md +++ b/changelogs/CHANGELOG_alpha.md @@ -1,3 +1,10 @@ +## [4.1.3-alpha.1](https://github.com/ParsePlatform/parse-dashboard/compare/4.1.2...4.1.3-alpha.1) (2022-06-18) + + +### Bug Fixes + +* security upgrade semver-regex from 3.1.3 to 3.1.4 ([#2154](https://github.com/ParsePlatform/parse-dashboard/issues/2154)) ([4f9090a](https://github.com/ParsePlatform/parse-dashboard/commit/4f9090ad22460913f7987964ee54f26d348ca254)) + ## [4.1.2-alpha.3](https://github.com/ParsePlatform/parse-dashboard/compare/4.1.2-alpha.2...4.1.2-alpha.3) (2022-06-04) diff --git a/package-lock.json b/package-lock.json index 8b32b7020b..cdcffdfca0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "parse-dashboard", - "version": "4.1.3-beta.1", + "version": "4.1.3-alpha.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9f16a019ba..466ebfac1e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "parse-dashboard", - "version": "4.1.3-beta.1", + "version": "4.1.3-alpha.1", "repository": { "type": "git", "url": "https://github.com/ParsePlatform/parse-dashboard" From e3b11db8fc632e1d0f2cfa8329b33891fa4c8a40 Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Thu, 23 Jun 2022 21:40:17 +0100 Subject: [PATCH 03/15] refactor: upgrade core-js from 3.22.7 to 3.22.8 (#2180) --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index cdcffdfca0..cdb771b526 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5476,9 +5476,9 @@ } }, "core-js": { - "version": "3.22.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.7.tgz", - "integrity": "sha512-Jt8SReuDKVNZnZEzyEQT5eK6T2RRCXkfTq7Lo09kpm+fHjgGewSbNjV+Wt4yZMhPDdzz2x1ulI5z/w4nxpBseg==" + "version": "3.22.8", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.8.tgz", + "integrity": "sha512-UoGQ/cfzGYIuiq6Z7vWL1HfkE9U9IZ4Ub+0XSiJTCzvbZzgPA69oDF2f+lgJ6dFFLEdjW5O6svvoKzXX23xFkA==" }, "core-js-compat": { "version": "3.19.2", diff --git a/package.json b/package.json index 466ebfac1e..b12fe3fcc6 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "connect-flash": "0.1.1", "cookie-session": "2.0.0", "copy-to-clipboard": "3.3.1", - "core-js": "3.22.7", + "core-js": "3.22.8", "csurf": "1.11.0", "express": "4.18.1", "graphiql": "1.8.9", From ec5cd0391724f956aecffa054603f6ab9d29340c Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Sat, 25 Jun 2022 19:10:57 +0100 Subject: [PATCH 04/15] refactor: upgrade typescript from 4.7.2 to 4.7.3 (#2181) --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index cdb771b526..5382f37f54 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17831,9 +17831,9 @@ } }, "typescript": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.2.tgz", - "integrity": "sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==" + "version": "4.7.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.3.tgz", + "integrity": "sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==" }, "ua-parser-js": { "version": "0.7.28", diff --git a/package.json b/package.json index b12fe3fcc6..b625c4a610 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "react-router-dom": "5.3.0", "regenerator-runtime": "0.13.9", "semver": "7.3.7", - "typescript": "4.7.2" + "typescript": "4.7.3" }, "devDependencies": { "@actions/core": "1.2.6", From f7774445d35218eb7868d93dad60ed4a2cb7b7f1 Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Mon, 27 Jun 2022 12:53:30 +0100 Subject: [PATCH 05/15] refactor: upgrade react-popper-tooltip from 4.3.1 to 4.4.0 (#2183) --- package-lock.json | 55 ++++++++++++++++++++++++++++++----------------- package.json | 2 +- 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5382f37f54..e40608eace 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3040,9 +3040,9 @@ } }, "@popperjs/core": { - "version": "2.10.2", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.10.2.tgz", - "integrity": "sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ==" + "version": "2.11.5", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz", + "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==" }, "@react-dnd/asap": { "version": "4.0.0", @@ -3568,6 +3568,14 @@ "csstype": "^3.0.2" } }, + "@types/react-dom": { + "version": "18.0.5", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.5.tgz", + "integrity": "sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==", + "requires": { + "@types/react": "*" + } + }, "@types/responselike": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz", @@ -15389,29 +15397,36 @@ "integrity": "sha512-FNbLuG/HAdapQoybeZSoes1PWdOj0w242gb+e1R0hicf3Gyj/Mf8M9NaED2AnXVOX01b2FXomwUiw1xP1K+8sA==" }, "react-popper": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz", - "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz", + "integrity": "sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==", "requires": { "react-fast-compare": "^3.0.1", "warning": "^4.0.2" - }, - "dependencies": { - "react-fast-compare": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz", - "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==" - } } }, "react-popper-tooltip": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/react-popper-tooltip/-/react-popper-tooltip-4.3.1.tgz", - "integrity": "sha512-/Lj1vjAEFEFxKKWnxupeS9pRrXYQlJd++OAAj/Ht3uOSqjWLtYWDXKV99e+YO6b5hV3SgXbtkHFzHH4eqlMWJA==", - "requires": { - "@babel/runtime": "^7.15.4", - "@popperjs/core": "^2.10.2", - "react-popper": "^2.2.5" + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/react-popper-tooltip/-/react-popper-tooltip-4.4.0.tgz", + "integrity": "sha512-i6x9DDGI88kO/pltGF20unkpfCi1KwyT+g3naDILX3v5aQVvBoPZjEyMejBG3lcoN0IJwEjyrKkjGonRAuXK9g==", + "requires": { + "@babel/runtime": "^7.18.3", + "@popperjs/core": "^2.11.5", + "@types/react": "^18.0.11", + "@types/react-dom": "^18.0.5", + "react-popper": "^2.3.0" + }, + "dependencies": { + "@types/react": { + "version": "18.0.14", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.14.tgz", + "integrity": "sha512-x4gGuASSiWmo0xjDLpm5mPb52syZHJx02VKbqUKdLmKtAwIh63XClGsiTI1K6DO5q7ox4xAsQrU+Gl3+gGXF9Q==", + "requires": { + "@types/prop-types": "*", + "@types/scheduler": "*", + "csstype": "^3.0.2" + } + } } }, "react-redux": { diff --git a/package.json b/package.json index b625c4a610..f00dd8e6a5 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "react-dom": "16.14.0", "react-helmet": "6.1.0", "react-json-view": "1.21.3", - "react-popper-tooltip": "4.3.1", + "react-popper-tooltip": "4.4.0", "react-redux": "8.0.2", "react-router": "5.2.1", "react-router-dom": "5.3.0", From d1d3efb7a6312950ecbe05dc34eac4da4818862f Mon Sep 17 00:00:00 2001 From: Flow Date: Mon, 27 Jun 2022 16:10:40 +0100 Subject: [PATCH 06/15] =?UTF-8?q?=F0=9F=92=84=20Remove=20Support=20Links?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Sidebar/FooterMenu.react.js | 69 ---------------------- src/components/Sidebar/Sidebar.react.js | 12 +--- 2 files changed, 1 insertion(+), 80 deletions(-) delete mode 100644 src/components/Sidebar/FooterMenu.react.js diff --git a/src/components/Sidebar/FooterMenu.react.js b/src/components/Sidebar/FooterMenu.react.js deleted file mode 100644 index af09f3abf0..0000000000 --- a/src/components/Sidebar/FooterMenu.react.js +++ /dev/null @@ -1,69 +0,0 @@ -/* - * 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. - */ -import Icon from 'components/Icon/Icon.react'; -import Popover from 'components/Popover/Popover.react'; -import Position from 'lib/Position'; -import React from 'react'; -import styles from 'components/Sidebar/Sidebar.scss'; - -let mountPath = window.PARSE_DASHBOARD_PATH; - -export default class FooterMenu extends React.Component { - constructor() { - super(); - - this.state = { - show: false, - position: null, - }; - this.moreRef = React.createRef(); - } - - toggle() { - let pos = Position.inWindow(this.moreRef.current); - pos.x += 24; - this.setState({ - show: true, - position: pos - }); - } - - render() { - if (this.props.isCollapsed) { - return ( -
- -
- ); - } - - let content = null; - if (this.state.show) { - content = ( - this.setState({ show: false })}> - - - ); - } - return ( - - - {content} - - ); - } -} diff --git a/src/components/Sidebar/Sidebar.react.js b/src/components/Sidebar/Sidebar.react.js index c3c2c6c806..f62b6676bd 100644 --- a/src/components/Sidebar/Sidebar.react.js +++ b/src/components/Sidebar/Sidebar.react.js @@ -8,7 +8,6 @@ import AppsManager from 'lib/AppsManager'; import AppsMenu from 'components/Sidebar/AppsMenu.react'; import AppName from 'components/Sidebar/AppName.react'; -import FooterMenu from 'components/Sidebar/FooterMenu.react'; import isInsidePopover from 'lib/isInsidePopover'; import Pin from 'components/Sidebar/Pin.react'; import React, { useEffect, useState, useContext } from 'react'; @@ -178,16 +177,7 @@ const Sidebar = ({ > {sidebarContent} -
- {!collapsed && ( - <> - Open Source Hub - GitHub - Docs - - )} - -
+ ); } From 231fbb29b985c303a893336f8d10719a355bc3d2 Mon Sep 17 00:00:00 2001 From: Antonio Davi Macedo Coelho de Castro Date: Tue, 28 Jun 2022 00:53:12 -0700 Subject: [PATCH 07/15] refactor: upgrade react-popper-tooltip from 4.4.0 to 4.4.1 (#2189) --- package-lock.json | 28 +++------------------------- package.json | 2 +- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index e40608eace..f17f3678a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3568,14 +3568,6 @@ "csstype": "^3.0.2" } }, - "@types/react-dom": { - "version": "18.0.5", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.5.tgz", - "integrity": "sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==", - "requires": { - "@types/react": "*" - } - }, "@types/responselike": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz", @@ -15406,27 +15398,13 @@ } }, "react-popper-tooltip": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/react-popper-tooltip/-/react-popper-tooltip-4.4.0.tgz", - "integrity": "sha512-i6x9DDGI88kO/pltGF20unkpfCi1KwyT+g3naDILX3v5aQVvBoPZjEyMejBG3lcoN0IJwEjyrKkjGonRAuXK9g==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/react-popper-tooltip/-/react-popper-tooltip-4.4.1.tgz", + "integrity": "sha512-Qe4KH/CAdUYKWzCiV5g7XQGAHxqw9HIbZJpCUmvS+9s0d4qXk+ViCBp/lcTjUr1EG9FeNRt5LCy52tYBh2kO1Q==", "requires": { "@babel/runtime": "^7.18.3", "@popperjs/core": "^2.11.5", - "@types/react": "^18.0.11", - "@types/react-dom": "^18.0.5", "react-popper": "^2.3.0" - }, - "dependencies": { - "@types/react": { - "version": "18.0.14", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.14.tgz", - "integrity": "sha512-x4gGuASSiWmo0xjDLpm5mPb52syZHJx02VKbqUKdLmKtAwIh63XClGsiTI1K6DO5q7ox4xAsQrU+Gl3+gGXF9Q==", - "requires": { - "@types/prop-types": "*", - "@types/scheduler": "*", - "csstype": "^3.0.2" - } - } } }, "react-redux": { diff --git a/package.json b/package.json index f00dd8e6a5..761b8a16d3 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "react-dom": "16.14.0", "react-helmet": "6.1.0", "react-json-view": "1.21.3", - "react-popper-tooltip": "4.4.0", + "react-popper-tooltip": "4.4.1", "react-redux": "8.0.2", "react-router": "5.2.1", "react-router-dom": "5.3.0", From 31a2b7813531e370e11b1a050ea28b575a058816 Mon Sep 17 00:00:00 2001 From: Manuel <5673677+mtrezza@users.noreply.github.com> Date: Sun, 3 Jul 2022 11:07:31 +0200 Subject: [PATCH 08/15] fix: login fails with error `req.session.regenerate is not a function` (#2195) [skip release] --- package-lock.json | 9 ++++----- package.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index f17f3678a3..8ed7b7f56c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14529,13 +14529,12 @@ "dev": true }, "passport": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/passport/-/passport-0.6.0.tgz", - "integrity": "sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/passport/-/passport-0.5.3.tgz", + "integrity": "sha512-gGc+70h4gGdBWNsR3FuV3byLDY6KBTJAIExGFXTpQaYfbbcHCBlRRKx7RBQSpqEqc5Hh2qVzRs7ssvSfOpkUEA==", "requires": { "passport-strategy": "1.x.x", - "pause": "0.0.1", - "utils-merge": "^1.0.1" + "pause": "0.0.1" } }, "passport-local": { diff --git a/package.json b/package.json index 761b8a16d3..a8d2495b36 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "otpauth": "7.1.3", "package-json": "7.0.0", "parse": "3.4.2", - "passport": "0.6.0", + "passport": "0.5.3", "passport-local": "1.0.0", "prismjs": "1.28.0", "prop-types": "15.8.1", From 1e4f754b947ed91e8119145c5f43d74d56e54ac4 Mon Sep 17 00:00:00 2001 From: Flow Date: Sun, 3 Jul 2022 15:04:43 +0100 Subject: [PATCH 09/15] feat: remove support links keep Log Out --- src/components/Sidebar/Sidebar.react.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/components/Sidebar/Sidebar.react.js b/src/components/Sidebar/Sidebar.react.js index f62b6676bd..005b12e23f 100644 --- a/src/components/Sidebar/Sidebar.react.js +++ b/src/components/Sidebar/Sidebar.react.js @@ -17,6 +17,8 @@ import SidebarSubItem from 'components/Sidebar/SidebarSubItem.react'; import styles from 'components/Sidebar/Sidebar.scss'; import { CurrentApp } from 'context/currentApp'; +let mountPath = window.PARSE_DASHBOARD_PATH; + const Sidebar = ({ prefix, action, @@ -177,7 +179,13 @@ const Sidebar = ({ > {sidebarContent} - +
+ {!collapsed && ( + <> + Log Out 👋 + + )} +
); } From daf8138437cdd703320a7521f71033369d4fd021 Mon Sep 17 00:00:00 2001 From: Flow Date: Mon, 4 Jul 2022 01:15:34 +0100 Subject: [PATCH 10/15] feat: Log Out as sub-menu inside 3-dots --- src/components/Sidebar/FooterMenu.react.js | 65 ++++++++++++++++++++++ src/components/Sidebar/Sidebar.react.js | 8 +-- src/components/Sidebar/Sidebar.scss | 22 ++++---- 3 files changed, 79 insertions(+), 16 deletions(-) create mode 100644 src/components/Sidebar/FooterMenu.react.js diff --git a/src/components/Sidebar/FooterMenu.react.js b/src/components/Sidebar/FooterMenu.react.js new file mode 100644 index 0000000000..721829c352 --- /dev/null +++ b/src/components/Sidebar/FooterMenu.react.js @@ -0,0 +1,65 @@ +/* + * 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. + */ +import Icon from 'components/Icon/Icon.react'; +import Popover from 'components/Popover/Popover.react'; +import Position from 'lib/Position'; +import React from 'react'; +import styles from 'components/Sidebar/Sidebar.scss'; + +let mountPath = window.PARSE_DASHBOARD_PATH; + +export default class FooterMenu extends React.Component { + constructor() { + super(); + + this.state = { + show: false, + position: null, + }; + this.moreRef = React.createRef(); + } + + toggle() { + let pos = Position.inWindow(this.moreRef.current); + pos.x += 24; + this.setState({ + show: true, + position: pos + }); + } + + render() { + if (this.props.isCollapsed) { + return ( +
+ +
+ ); + } + + let content = null; + if (this.state.show) { + content = ( + this.setState({ show: false })}> +
+ Log Out +
+ + ); + } + return ( + + + {content} + + ); + } +} diff --git a/src/components/Sidebar/Sidebar.react.js b/src/components/Sidebar/Sidebar.react.js index 005b12e23f..1a1efac877 100644 --- a/src/components/Sidebar/Sidebar.react.js +++ b/src/components/Sidebar/Sidebar.react.js @@ -8,6 +8,7 @@ import AppsManager from 'lib/AppsManager'; import AppsMenu from 'components/Sidebar/AppsMenu.react'; import AppName from 'components/Sidebar/AppName.react'; +import FooterMenu from 'components/Sidebar/FooterMenu.react'; import isInsidePopover from 'lib/isInsidePopover'; import Pin from 'components/Sidebar/Pin.react'; import React, { useEffect, useState, useContext } from 'react'; @@ -17,7 +18,6 @@ import SidebarSubItem from 'components/Sidebar/SidebarSubItem.react'; import styles from 'components/Sidebar/Sidebar.scss'; import { CurrentApp } from 'context/currentApp'; -let mountPath = window.PARSE_DASHBOARD_PATH; const Sidebar = ({ prefix, @@ -180,11 +180,7 @@ const Sidebar = ({ {sidebarContent}
- {!collapsed && ( - <> - Log Out 👋 - - )} +
); diff --git a/src/components/Sidebar/Sidebar.scss b/src/components/Sidebar/Sidebar.scss index 65e9bfe414..c4635f0528 100644 --- a/src/components/Sidebar/Sidebar.scss +++ b/src/components/Sidebar/Sidebar.scss @@ -352,10 +352,10 @@ a.subitem { .popup { position: absolute; - bottom: 4px; - left: -183px; + bottom: 12px; + left: -64px; background: white; - width: 200px; + width: 100px; border-radius: 5px; &:after { @@ -363,7 +363,7 @@ a.subitem { content: ''; position: absolute; bottom: -6px; - right: 11px; + right: 42px; } a { @@ -372,21 +372,23 @@ a.subitem { height: 30px; line-height: 31px; font-size: 13px; - text-align: right; + text-align: center; border-bottom: 1px solid #e0e0ea; color: $mainTextColor; - padding-right: 8px; &:hover{ background-color: darken(white,4%) } + &:first-child { - border-radius: 5px 5px 0 0; + border-radius: 5px; + // border-radius: 5px 5px 0 0; } &:last-child { - border-bottom: 0; - border-radius: 0 0 5px 5px; + border-radius: 5px; + // border-bottom: 0; + // border-radius: 0 0 5px 5px; } .emoji{ @@ -414,4 +416,4 @@ a.subitem { fill: white; } } -} \ No newline at end of file +} From 8e28b2a4f4db4ae9da31cb104986933e3295c02d Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Sun, 3 Jul 2022 23:59:50 -0500 Subject: [PATCH 11/15] refactor: upgrade graphiql from 1.8.9 to 1.9.7 (#2202) --- package-lock.json | 97 ++++++++++++++++++++++++++--------------------- package.json | 2 +- 2 files changed, 55 insertions(+), 44 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8ed7b7f56c..5e08adab43 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2220,10 +2220,44 @@ "integrity": "sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==", "dev": true }, + "@graphiql/react": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@graphiql/react/-/react-0.4.3.tgz", + "integrity": "sha512-MnH+7LqRqFnwo8YBDtgDfJOdeS5QqNTzH2gTvTbEYYWaNQW1+Vhbsyu2RKHnPSgKVQlfLzdjw6SAMtSb3q1Qog==", + "requires": { + "@graphiql/toolkit": "^0.6.0", + "codemirror": "^5.65.3", + "codemirror-graphql": "^1.3.2", + "copy-to-clipboard": "^3.2.0", + "escape-html": "^1.0.3", + "graphql-language-service": "^5.0.6", + "markdown-it": "^12.2.0", + "set-value": "^4.1.0" + }, + "dependencies": { + "is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "requires": { + "isobject": "^3.0.1" + } + }, + "set-value": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-4.1.0.tgz", + "integrity": "sha512-zTEg4HL0RwVrqcWs3ztF+x1vkxfm0lP+MQQFPiMJTKVceBwEV0A569Ou8l9IYQG8jOZdMVI1hGsc0tmeD2o/Lw==", + "requires": { + "is-plain-object": "^2.0.4", + "is-primitive": "^3.0.1" + } + } + } + }, "@graphiql/toolkit": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/@graphiql/toolkit/-/toolkit-0.4.5.tgz", - "integrity": "sha512-QXuuMSSK/0GfBS7tltrGZdyhIvm6oe9TK4VW9pfa8dALYttpzyJ64Q4Sx9I1Ng++yOMJWziM/ksa043zkNHsjQ==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@graphiql/toolkit/-/toolkit-0.6.0.tgz", + "integrity": "sha512-mbAwbt4lw2bFp9QW3NLVmh/r/ymczlcqvXk1HfvuC7Ma4h0yzrJiQauJyh1/gF5kjqevcRSquvP/YQJSvh1u6w==", "requires": { "@n1ru4l/push-pull-async-iterable-iterator": "^3.1.0", "meros": "^1.1.4" @@ -5197,16 +5231,16 @@ "dev": true }, "codemirror": { - "version": "5.65.5", - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.5.tgz", - "integrity": "sha512-HNyhvGLnYz5c+kIsB9QKVitiZUevha3ovbIYaQiGzKo7ECSL/elWD9RXt3JgNr0NdnyqE9/Rc/7uLfkJQL638w==" + "version": "5.65.6", + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.6.tgz", + "integrity": "sha512-zNihMSMoDxK9Gqv9oEyDT8oM51rcRrQ+IEo2zyS48gJByBq5Fj8XuNEguMra+MuIOuh6lkpnLUJeL70DoTt6yw==" }, "codemirror-graphql": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/codemirror-graphql/-/codemirror-graphql-1.3.0.tgz", - "integrity": "sha512-Inqecp/PpUsNFz6+V6jpgQD1m7jjGg3yby60baw2t5yb2stBH8Z/6cHm/IYp9eN0Aq2EWqomd0GkGmiISPi4jQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/codemirror-graphql/-/codemirror-graphql-1.3.2.tgz", + "integrity": "sha512-glwFsEVlH5TvxjSKGymZ1sNy37f3Mes58CB4fXOd0zy9+JzDL08Wti1b5ycy4vFZYghMDK1/Or/zRSjMAGtC2w==", "requires": { - "graphql-language-service": "^5.0.4" + "graphql-language-service": "^5.0.6" } }, "collection-visit": { @@ -8046,38 +8080,15 @@ "dev": true }, "graphiql": { - "version": "1.8.9", - "resolved": "https://registry.npmjs.org/graphiql/-/graphiql-1.8.9.tgz", - "integrity": "sha512-X+olqol3VfOrFrsAfYzgNbvHoEE0lDUtg52+f3yLeNY4Ens+rAH4RSdH4wVtoRdh3CafmhVsfLQvn04hHkgftQ==", + "version": "1.9.7", + "resolved": "https://registry.npmjs.org/graphiql/-/graphiql-1.9.7.tgz", + "integrity": "sha512-rn0njwDkCpFn5GwDbSuzt7GwjiFLhYCdgiscYm4n8Oq9EeOyGrIxQK/PjUz1YaR/+T7lg1raIBuRAX/Nei9KcQ==", "requires": { - "@graphiql/toolkit": "^0.4.4", - "codemirror": "^5.65.3", - "codemirror-graphql": "^1.3.0", - "copy-to-clipboard": "^3.2.0", + "@graphiql/react": "^0.4.1", + "@graphiql/toolkit": "^0.6.0", "entities": "^2.0.0", - "escape-html": "^1.0.3", - "graphql-language-service": "^5.0.4", - "markdown-it": "^12.2.0", - "set-value": "^4.1.0" - }, - "dependencies": { - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "requires": { - "isobject": "^3.0.1" - } - }, - "set-value": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-4.1.0.tgz", - "integrity": "sha512-zTEg4HL0RwVrqcWs3ztF+x1vkxfm0lP+MQQFPiMJTKVceBwEV0A569Ou8l9IYQG8jOZdMVI1hGsc0tmeD2o/Lw==", - "requires": { - "is-plain-object": "^2.0.4", - "is-primitive": "^3.0.1" - } - } + "graphql-language-service": "^5.0.5", + "markdown-it": "^12.2.0" } }, "graphql": { @@ -8086,9 +8097,9 @@ "integrity": "sha512-qbHgh8Ix+j/qY+a/ZcJnFQ+j8ezakqPiHwPiZhV/3PgGlgf96QMBB5/f2rkiC9sgLoy/xvT6TSiaf2nTHJh5iA==" }, "graphql-language-service": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-5.0.4.tgz", - "integrity": "sha512-lX+ahYBwvTHJe1N7JqA08moNwbr0RWaFILxVnbciaaeb469TTIhQi87ZgVJ/y9Szre4d0r3vjIt2EstwafzcDA==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-5.0.6.tgz", + "integrity": "sha512-FjE23aTy45Lr5metxCv3ZgSKEZOzN7ERR+OFC1isV5mHxI0Ob8XxayLTYjQKrs8b3kOpvgTYmSmu6AyXOzYslg==", "requires": { "nullthrows": "^1.0.0", "vscode-languageserver-types": "^3.15.1" diff --git a/package.json b/package.json index a8d2495b36..966e8a0d6a 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "core-js": "3.22.8", "csurf": "1.11.0", "express": "4.18.1", - "graphiql": "1.8.9", + "graphiql": "1.9.7", "graphql": "16.5.0", "history": "4.10.1", "immutable": "4.1.0", From 35e44768f65c64a228cb6ea8314aa534c5342f08 Mon Sep 17 00:00:00 2001 From: Manuel <5673677+mtrezza@users.noreply.github.com> Date: Mon, 4 Jul 2022 11:40:52 +0200 Subject: [PATCH 12/15] feat: remove support and documentation links (#2203) --- src/components/Sidebar/FooterMenu.react.js | 8 ++------ src/components/Sidebar/Sidebar.react.js | 7 ------- src/components/Sidebar/Sidebar.scss | 12 ++++++------ 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/src/components/Sidebar/FooterMenu.react.js b/src/components/Sidebar/FooterMenu.react.js index af09f3abf0..de471f5ce7 100644 --- a/src/components/Sidebar/FooterMenu.react.js +++ b/src/components/Sidebar/FooterMenu.react.js @@ -26,7 +26,7 @@ export default class FooterMenu extends React.Component { toggle() { let pos = Position.inWindow(this.moreRef.current); - pos.x += 24; + pos.x += 95; this.setState({ show: true, position: pos @@ -50,11 +50,7 @@ export default class FooterMenu extends React.Component { position={this.state.position} onExternalClick={() => this.setState({ show: false })}> ); diff --git a/src/components/Sidebar/Sidebar.react.js b/src/components/Sidebar/Sidebar.react.js index c3c2c6c806..cc51068214 100644 --- a/src/components/Sidebar/Sidebar.react.js +++ b/src/components/Sidebar/Sidebar.react.js @@ -179,13 +179,6 @@ const Sidebar = ({ {sidebarContent}
- {!collapsed && ( - <> - Open Source Hub - GitHub - Docs - - )}
diff --git a/src/components/Sidebar/Sidebar.scss b/src/components/Sidebar/Sidebar.scss index 65e9bfe414..6281bcaaf2 100644 --- a/src/components/Sidebar/Sidebar.scss +++ b/src/components/Sidebar/Sidebar.scss @@ -363,16 +363,16 @@ a.subitem { content: ''; position: absolute; bottom: -6px; - right: 11px; + right: 94px; } a { @include NotoSansFont; display: block; - height: 30px; - line-height: 31px; + height: 40px; + line-height: 41px; font-size: 13px; - text-align: right; + text-align: center; border-bottom: 1px solid #e0e0ea; color: $mainTextColor; padding-right: 8px; @@ -381,12 +381,12 @@ a.subitem { } &:first-child { - border-radius: 5px 5px 0 0; + border-radius: 5px 5px 5px 5px; } &:last-child { border-bottom: 0; - border-radius: 0 0 5px 5px; + border-radius: 5px 5px 5px 5px; } .emoji{ From 062002e0ef4a19b92fd260c69ba5e76acc16a089 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 4 Jul 2022 09:42:59 +0000 Subject: [PATCH 13/15] chore(release): 4.2.0-alpha.1 [skip ci] # [4.2.0-alpha.1](https://github.com/ParsePlatform/parse-dashboard/compare/4.1.3-alpha.1...4.2.0-alpha.1) (2022-07-04) ### Bug Fixes * login fails with error `req.session.regenerate is not a function` ([#2195](https://github.com/ParsePlatform/parse-dashboard/issues/2195)) [skip release] ([31a2b78](https://github.com/ParsePlatform/parse-dashboard/commit/31a2b7813531e370e11b1a050ea28b575a058816)) ### Features * remove support and documentation links ([#2203](https://github.com/ParsePlatform/parse-dashboard/issues/2203)) ([35e4476](https://github.com/ParsePlatform/parse-dashboard/commit/35e44768f65c64a228cb6ea8314aa534c5342f08)) --- changelogs/CHANGELOG_alpha.md | 11 +++++++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changelogs/CHANGELOG_alpha.md b/changelogs/CHANGELOG_alpha.md index b730cf648f..a333b73176 100644 --- a/changelogs/CHANGELOG_alpha.md +++ b/changelogs/CHANGELOG_alpha.md @@ -1,3 +1,14 @@ +# [4.2.0-alpha.1](https://github.com/ParsePlatform/parse-dashboard/compare/4.1.3-alpha.1...4.2.0-alpha.1) (2022-07-04) + + +### Bug Fixes + +* login fails with error `req.session.regenerate is not a function` ([#2195](https://github.com/ParsePlatform/parse-dashboard/issues/2195)) [skip release] ([31a2b78](https://github.com/ParsePlatform/parse-dashboard/commit/31a2b7813531e370e11b1a050ea28b575a058816)) + +### Features + +* remove support and documentation links ([#2203](https://github.com/ParsePlatform/parse-dashboard/issues/2203)) ([35e4476](https://github.com/ParsePlatform/parse-dashboard/commit/35e44768f65c64a228cb6ea8314aa534c5342f08)) + ## [4.1.3-alpha.1](https://github.com/ParsePlatform/parse-dashboard/compare/4.1.2...4.1.3-alpha.1) (2022-06-18) diff --git a/package-lock.json b/package-lock.json index 5e08adab43..9ea8aba68b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "parse-dashboard", - "version": "4.1.3-alpha.1", + "version": "4.2.0-alpha.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 966e8a0d6a..0caaf502d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "parse-dashboard", - "version": "4.1.3-alpha.1", + "version": "4.2.0-alpha.1", "repository": { "type": "git", "url": "https://github.com/ParsePlatform/parse-dashboard" From a8ad924e9f8f6ab995e03b41f85ee68a4e27e01a Mon Sep 17 00:00:00 2001 From: Flow Date: Mon, 4 Jul 2022 11:55:40 +0100 Subject: [PATCH 14/15] Revert "Merge branch 'alpha' of https://github.com/MrMartinR/parse-dashboard into alpha" This reverts commit f5e2012d96922f960a22d964683c26f939e9f97f, reversing changes made to 062002e0ef4a19b92fd260c69ba5e76acc16a089. --- src/components/Sidebar/FooterMenu.react.js | 4 ++-- src/components/Sidebar/Sidebar.react.js | 3 +-- src/components/Sidebar/Sidebar.scss | 24 ++++++++++------------ 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/components/Sidebar/FooterMenu.react.js b/src/components/Sidebar/FooterMenu.react.js index 721829c352..de471f5ce7 100644 --- a/src/components/Sidebar/FooterMenu.react.js +++ b/src/components/Sidebar/FooterMenu.react.js @@ -26,7 +26,7 @@ export default class FooterMenu extends React.Component { toggle() { let pos = Position.inWindow(this.moreRef.current); - pos.x += 24; + pos.x += 95; this.setState({ show: true, position: pos @@ -50,7 +50,7 @@ export default class FooterMenu extends React.Component { position={this.state.position} onExternalClick={() => this.setState({ show: false })}> ); diff --git a/src/components/Sidebar/Sidebar.react.js b/src/components/Sidebar/Sidebar.react.js index 1a1efac877..cc51068214 100644 --- a/src/components/Sidebar/Sidebar.react.js +++ b/src/components/Sidebar/Sidebar.react.js @@ -18,7 +18,6 @@ import SidebarSubItem from 'components/Sidebar/SidebarSubItem.react'; import styles from 'components/Sidebar/Sidebar.scss'; import { CurrentApp } from 'context/currentApp'; - const Sidebar = ({ prefix, action, @@ -180,7 +179,7 @@ const Sidebar = ({ {sidebarContent}
- +
); diff --git a/src/components/Sidebar/Sidebar.scss b/src/components/Sidebar/Sidebar.scss index c4635f0528..6281bcaaf2 100644 --- a/src/components/Sidebar/Sidebar.scss +++ b/src/components/Sidebar/Sidebar.scss @@ -352,10 +352,10 @@ a.subitem { .popup { position: absolute; - bottom: 12px; - left: -64px; + bottom: 4px; + left: -183px; background: white; - width: 100px; + width: 200px; border-radius: 5px; &:after { @@ -363,32 +363,30 @@ a.subitem { content: ''; position: absolute; bottom: -6px; - right: 42px; + right: 94px; } a { @include NotoSansFont; display: block; - height: 30px; - line-height: 31px; + height: 40px; + line-height: 41px; font-size: 13px; text-align: center; border-bottom: 1px solid #e0e0ea; color: $mainTextColor; + padding-right: 8px; &:hover{ background-color: darken(white,4%) } - &:first-child { - border-radius: 5px; - // border-radius: 5px 5px 0 0; + border-radius: 5px 5px 5px 5px; } &:last-child { - border-radius: 5px; - // border-bottom: 0; - // border-radius: 0 0 5px 5px; + border-bottom: 0; + border-radius: 5px 5px 5px 5px; } .emoji{ @@ -416,4 +414,4 @@ a.subitem { fill: white; } } -} +} \ No newline at end of file From 18e4b1d99d37121618039c27dc0f03373f005c66 Mon Sep 17 00:00:00 2001 From: MrMartinR Date: Thu, 1 Jun 2023 00:27:54 +0000 Subject: [PATCH 15/15] ci: release commit