Skip to content

fix(Database Browser): Avoid Parse transformations on array and object fields #1223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dplewis merged 2 commits into from
Aug 15, 2019
Merged

fix(Database Browser): Avoid Parse transformations on array and object fields #1223

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc6058c
fix(Database Browser): Avoid Parse transformations on array and objec…
douglasmuraoka Aug 14, 2019
c30dcc1
Merge branch 'master' into fix_avoid_generic_array_objects_transforma…
douglasmuraoka Aug 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/components/BrowserCell/BrowserCell.react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,7 @@ let BrowserCell = ({ type, value, hidden, width, current, onSelect, onEditChange
content = dateStringUTC(value);
} else if (type === 'Boolean') {
content = value ? 'True' : 'False';
} else if (type === 'Array') {
content = JSON.stringify(value.map(val => val instanceof Parse.Object ? val.toPointer() : val))
} else if (type === 'Object' || type === 'Bytes') {
} else if (type === 'Object' || type === 'Bytes' || type === 'Array') {
content = JSON.stringify(value);
} else if (type === 'File') {
if (value.url()) {
Expand Down
38 changes: 22 additions & 16 deletions src/dashboard/Data/Browser/BrowserTable.react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export default class BrowserTable extends React.Component {
});
}

renderRow({ row, obj, rowWidth }) {
renderRow({ row, obj, json, rowWidth }) {
let attributes = obj.attributes;
let index = row - this.state.offset;
return (
Expand All @@ -106,6 +106,12 @@ export default class BrowserTable extends React.Component {
} else if (type === 'Relation' && !attr && obj.id) {
attr = new Parse.Relation(obj, name);
attr.targetClassName = this.props.columns[name].targetClass;
} else if (type === 'Array' || type === 'Object') {
// This is needed to avoid unwanted conversions of objects to Parse.Objects.
// When retrieving data from JSON, Parse-SDK will not try to convert any data.
// Since array and object are generic types, we want to render them the way
// they were stored in the database.
attr = json[name];
}
}
let current = this.props.current && this.props.current.row === row && this.props.current.col === j;
Expand Down Expand Up @@ -166,7 +172,7 @@ export default class BrowserTable extends React.Component {
if (this.props.newObject && this.state.offset <= 0) {
newRow = (
<div style={{ marginBottom: 30, borderBottom: '1px solid #169CEE' }}>
{this.renderRow({ row: -1, obj: this.props.newObject, rowWidth: rowWidth })}
{this.renderRow({ row: -1, obj: this.props.newObject, json: {}, rowWidth: rowWidth })}
</div>
);
}
Expand All @@ -175,7 +181,7 @@ export default class BrowserTable extends React.Component {
for (let i = this.state.offset; i < end; i++) {
let index = i - this.state.offset;
let obj = this.props.data[i];
rows[index] = this.renderRow({ row: i, obj: obj, rowWidth: rowWidth });
rows[index] = this.renderRow({ row: i, obj, json: obj.toJSON(), rowWidth: rowWidth });
}

if (this.props.editing) {
Expand All @@ -198,8 +204,20 @@ export default class BrowserTable extends React.Component {
}
let obj = this.props.current.row < 0 ? this.props.newObject : this.props.data[this.props.current.row];
let value = obj;
let json = obj.toJSON();
if (!this.props.isUnique) {
value = obj.get(name);
if (type === 'Array' || type === 'Object') {
if (!json) {
json = obj.toJSON();
}
// This is needed to avoid unwanted conversions of objects to Parse.Objects.
// When retrieving data from JSON, Parse-SDK will not try to convert any data.
// Since array and object are generic types, we want to edit them the way
// they were stored in the database.
value = json[name];
} else {
value = obj.get(name);
}
}
if (name === 'objectId') {
if (!this.props.isUnique) {
Expand All @@ -209,18 +227,6 @@ export default class BrowserTable extends React.Component {
value = new Parse.ACL({ '*': { read: true }, [obj.id]: { read: true, write: true }});
} else if (name === 'password' && this.props.className === '_User') {
value = '';
} else if (type === 'Array') {
if (value) {
value = value.map(val => {
if (val instanceof Parse.Object) {
return val.toPointer();
} else if (val && typeof val.getMonth === 'function') {
return { __type: "Date", iso: val.toISOString() };
}

return val;
});
}
}
let wrapTop = Math.max(0, this.props.current.row * ROW_HEIGHT);
if (this.props.current.row > -1 && this.props.newObject) {
Expand Down