Skip to content

Commit d59787a

Browse files
Merge pull request #803 from back4app/bac-1418/fix-config-crash
fix Config page bugs with Date types
2 parents 6c222d7 + a77a5f8 commit d59787a

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,14 @@ class Config extends TableView {
235235
params.forEach((value, param) => {
236236
const masterKeyOnly = masterKeyOnlyParams.get(param) || false;
237237
const type = typeof value;
238-
if (type === 'object' && value.__type == 'File') {
239-
value = Parse.File.fromJSON(value);
240-
} else if (type === 'object' && value.__type == 'GeoPoint') {
241-
value = new Parse.GeoPoint(value);
238+
if (type === 'object' && value !== null) {
239+
if (value.__type == 'File') {
240+
value = Parse.File.fromJSON(value);
241+
} else if (value.__type == 'GeoPoint') {
242+
value = new Parse.GeoPoint(value);
243+
} else if (value.__type == 'Date') {
244+
value = new Date(value.iso)
245+
}
242246
}
243247
data.push({
244248
param: param,

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ export default class ConfigDialog extends React.Component {
120120
case 'Number':
121121
return !isNaN(parseFloat(this.state.value));
122122
case 'Date':
123+
if (this.state.value === null || this.state.value === undefined || this.state.value === '') {
124+
return false;
125+
}
123126
return !isNaN(new Date(this.state.value));
124127
case 'Object':
125128
try {

0 commit comments

Comments
 (0)