Skip to content

Commit 64dd72c

Browse files
Merge branch 'parse'
* parse: Release v2.0.3 (parse-community#1294) Update cross-env to the latest version 🚀 (parse-community#1295) Fix: Force pointer array items to always be pointers (parse-community#1291) Update webpack-cli to the latest version 🚀 (parse-community#1292) Update graphql to the latest version 🚀 (parse-community#1290) Update eslint to the latest version 🚀 (parse-community#1289) Update graphql to the latest version 🚀 (parse-community#1288) Update webpack to the latest version 🚀 (parse-community#1287) Fix CLP dialog for pointer fields (parse-community#1283) Update puppeteer to the latest version 🚀 (parse-community#1286) Update webpack to the latest version 🚀 (parse-community#1285) Update history to the latest version 🚀 (parse-community#1284) Fix: Feature "masterkey parameters" requires Parse Server >= 3.9.0 (parse-community#1281) Update webpack to the latest version 🚀 (parse-community#1282) Update history to the latest version 🚀 (parse-community#1279) # Conflicts: # package-lock.json
2 parents 0c3e013 + a6c2006 commit 64dd72c

File tree

8 files changed

+146
-134
lines changed

8 files changed

+146
-134
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
## Parse Dashboard Changelog
22

33
### master
4-
[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/2.0.2...master)
4+
[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/2.0.3...master)
55

66
* _Contributing to this repo? Add info about your change here to be included in next release_
77

8+
### 2.0.3
9+
[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/2.0.2...2.0.3)
10+
* Fix: Feature "masterkey parameters" requires Parse Server >= 3.9.0 ([#1281](https://github.com/parse-community/parse-dashboard/pull/1281)), thanks to [Manuel Trezza](https://github.com/mtrezza)
11+
* Fix: CLP dialog for pointer fields ([#1283](https://github.com/parse-community/parse-dashboard/pull/1283)), thanks to [Antonio Davi Macedo Coelho de Castro](https://github.com/davimacedo)
12+
* Fix: Force pointer array items to always be pointers ([#1291](https://github.com/parse-community/parse-dashboard/pull/1291)), thanks to [Antonio Davi Macedo Coelho de Castro](https://github.com/davimacedo)
13+
814
### 2.0.2
915
[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/2.0.1...2.0.2)
1016
* Fix: filter tab not working for _User, and ohter classes starting with _ ([#1275](https://github.com/parse-community/parse-dashboard/pull/1275)), thanks to [Antonio Davi Macedo Coelho de Castro](https://github.com/davimacedo)

package-lock.json

Lines changed: 121 additions & 118 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
],
2222
"homepage": "https://github.com/ParsePlatform/parse-dashboard",
2323
"bugs": "https://github.com/ParsePlatform/parse-dashboard/issues",
24-
"version": "2.0.2",
24+
"version": "2.0.3",
2525
"repository": {
2626
"type": "git",
2727
"url": "https://github.com/ParsePlatform/parse-dashboard"
@@ -45,9 +45,9 @@
4545
"create-react-class": "15.6.3",
4646
"csurf": "1.10.0",
4747
"express": "4.17.1",
48-
"graphql": "14.5.4",
48+
"graphql": "14.5.6",
4949
"graphql-playground-react": "1.7.20",
50-
"history": "4.9.0",
50+
"history": "4.10.1",
5151
"immutable": "4.0.0-rc.9",
5252
"immutable-devtools": "0.1.3",
5353
"js-beautify": "1.10.2",
@@ -81,9 +81,9 @@
8181
"babel-loader": "8.0.6",
8282
"babel-plugin-transform-object-rest-spread": "6.26.0",
8383
"core-js": "3.2.1",
84-
"cross-env": "5.2.1",
84+
"cross-env": "6.0.0",
8585
"css-loader": "3.2.0",
86-
"eslint": "6.3.0",
86+
"eslint": "6.4.0",
8787
"eslint-plugin-jest": "22.17.0",
8888
"eslint-plugin-react": "7.14.3",
8989
"file-loader": "4.2.0",
@@ -94,15 +94,15 @@
9494
"null-loader": "^3.0.0",
9595
"parse-server": "github:parseplatform/parse-server#master",
9696
"path-to-regexp": "3.1.0",
97-
"puppeteer": "1.19.0",
97+
"puppeteer": "1.20.0",
9898
"react-test-renderer": "16.9.0",
9999
"request": "2.87.0",
100100
"request-promise": "4.2.4",
101101
"sass-loader": "8.0.0",
102102
"style-loader": "1.0.0",
103103
"svg-prep": "1.0.4",
104-
"webpack": "4.39.3",
105-
"webpack-cli": "3.3.8"
104+
"webpack": "4.40.2",
105+
"webpack-cli": "3.3.9"
106106
},
107107
"scripts": {
108108
"dev": "node ./Parse-Dashboard/index.js & webpack --config webpack/build.config.js --devtool eval-source-map --progress --watch",

src/components/BrowserRow/BrowserRow.react.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import Parse from 'parse';
2+
import encode from 'parse/lib/browser/encode';
23
import React, { Component } from 'react';
34

45
import BrowserCell from 'components/BrowserCell/BrowserCell.react';
@@ -46,7 +47,7 @@ export default class BrowserRow extends Component {
4647
// "Parse._encoding" is responsible to convert Parse data into raw data.
4748
// Since array and object are generic types, we want to render them the way
4849
// they were stored in the database.
49-
attr = Parse._encode(obj.get(name));
50+
attr = encode(obj.get(name), undefined, true);
5051
}
5152
}
5253
let hidden = false;

src/dashboard/Data/Browser/BrowserTable.react.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import Editor from 'dashboard/Data/Browser/Editor.react';
1212
import EmptyState from 'components/EmptyState/EmptyState.react';
1313
import Icon from 'components/Icon/Icon.react';
1414
import Parse from 'parse';
15+
import encode from 'parse/lib/browser/encode';
1516
import React from 'react';
1617
import styles from 'dashboard/Data/Browser/Browser.scss';
1718
import Button from 'components/Button/Button.react';
@@ -198,7 +199,7 @@ export default class BrowserTable extends React.Component {
198199
// "Parse._encoding" is responsible to convert Parse data into raw data.
199200
// Since array and object are generic types, we want to edit them the way
200201
// they were stored in the database.
201-
value = Parse._encode(obj.get(name));
202+
value = encode(obj.get(name), undefined, true);
202203
} else {
203204
value = obj.get(name);
204205
}

src/dashboard/Data/Browser/BrowserToolbar.react.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,11 @@ let BrowserToolbar = ({
148148
const classSchema = schema.data.get('classes').get(classNameForEditors);
149149
if (classSchema) {
150150
classSchema.forEach(({ type, targetClass }, col) => {
151-
if (name === 'objectId' || isUnique && name !== uniqueField) {
151+
if (col === 'objectId' || isUnique && col !== uniqueField) {
152152
return;
153153
}
154154
if (targetClass === '_User') {
155-
userPointers.push(name);
155+
userPointers.push(col);
156156
}
157157
schemaSimplifiedData[col] = {
158158
type,

src/dashboard/Data/Browser/Editor.react.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import FileEditor from 'components/FileEditor/FileEditor.react';
1212
import GeoPointEditor from 'components/GeoPointEditor/GeoPointEditor.react';
1313
import NumberEditor from 'components/NumberEditor/NumberEditor.react';
1414
import Parse from 'parse';
15+
import decode from 'parse/lib/browser/decode';
1516
import React from 'react';
1617
import StringEditor from 'components/StringEditor/StringEditor.react';
1718

@@ -30,7 +31,7 @@ let Editor = ({ top, left, type, targetClass, value, readonly, width, onCommit }
3031
} else if (type === 'Array' || type === 'Object') {
3132
let encodeCommit = (json) => {
3233
try {
33-
let obj = JSON.parse(json);
34+
let obj = decode(JSON.parse(json));
3435
onCommit(obj);
3536
} catch (e) {
3637
onCommit(value);

src/dashboard/Data/Config/ConfigDialog.react.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,10 @@ export default class ConfigDialog extends React.Component {
236236

237237
{
238238
/*
239-
Add `Requires master key` field if parse-server version >= 3.8.0,
239+
Add `Requires master key` field if parse-server version >= 3.9.0,
240240
that is the minimum version that supports this feature.
241241
*/
242-
semver.valid(this.props.parseServerVersion) && semver.gte(this.props.parseServerVersion, '3.8.0')
242+
semver.valid(this.props.parseServerVersion) && semver.gte(this.props.parseServerVersion, '3.9.0')
243243
? <Field
244244
label={
245245
<Label

0 commit comments

Comments
 (0)