From db9f7e261f48fa5c27bf2a8599872db822473c40 Mon Sep 17 00:00:00 2001 From: John Dillick Date: Tue, 14 Jul 2020 19:34:21 -0400 Subject: [PATCH 1/3] Clear state.data when setting relation to column type mismatch. (#1564) --- src/dashboard/Data/Browser/Browser.react.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dashboard/Data/Browser/Browser.react.js b/src/dashboard/Data/Browser/Browser.react.js index 4bbafe93db..e86d03b356 100644 --- a/src/dashboard/Data/Browser/Browser.react.js +++ b/src/dashboard/Data/Browser/Browser.react.js @@ -499,6 +499,7 @@ class Browser extends DashboardView { setRelation(relation, filters) { this.setState({ relation: relation, + data: null, }, () => { let filterQueryString; if (filters && filters.size) { @@ -937,7 +938,7 @@ class Browser extends DashboardView { onDialogToggle(opened){ this.setState({showPermissionsDialog: opened}); } - + renderContent() { let browser = null; let className = this.props.params.className; From 162fdd9063e9e6936cecf2a612b2f4d1f154caaf Mon Sep 17 00:00:00 2001 From: mess-lelouch Date: Fri, 17 Jul 2020 13:07:05 -0400 Subject: [PATCH 2/3] Fix pointer CLPs (#1556) * Fix pointer CLPs * Restore removed new lines * Add checks Co-authored-by: Musa Yassin-Fort --- .../PermissionsDialog.react.js | 63 ++++++++++++------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/src/components/PermissionsDialog/PermissionsDialog.react.js b/src/components/PermissionsDialog/PermissionsDialog.react.js index 440c864e57..cd06a20bdb 100644 --- a/src/components/PermissionsDialog/PermissionsDialog.react.js +++ b/src/components/PermissionsDialog/PermissionsDialog.react.js @@ -534,7 +534,7 @@ export default class PermissionsDialog extends React.Component { // hide suggestions to avoid ugly footer overlap this.refEntry.current.setHidden(hidden); // also show indicator when input is not visible - this.refScrollHint.current.toggleActive(hidden); + // this.refScrollHint.current.toggleActive(hidden); }; this.observer = new IntersectionObserver(callback, { @@ -589,13 +589,15 @@ export default class PermissionsDialog extends React.Component { perms.delete = perms.delete || Map(); perms.addField = perms.addField || Map(); - (pointerPermsSubset.get = perms.get.pointerFields || []), - (pointerPermsSubset.find = perms.find.pointerFields || []), - (pointerPermsSubset.count = perms.count.pointerFields || []), - (pointerPermsSubset.create = perms.create.pointerFields || []), - (pointerPermsSubset.update = perms.update.pointerFields || []), - (pointerPermsSubset.delete = perms.delete.pointerFields || []), - (pointerPermsSubset.addField = perms.addField.pointerFields || []); + // The double check is necessary because the permissions object seems to be empty when accessing the CLP section + // if the class was recently created. + (pointerPermsSubset.get = permissions.get && permissions.get.pointerFields || []), + (pointerPermsSubset.find = permissions.find && permissions.find.pointerFields || []), + (pointerPermsSubset.count = permissions.count && permissions.count.pointerFields || []), + (pointerPermsSubset.create = permissions.create && permissions.create.pointerFields || []), + (pointerPermsSubset.update = permissions.update && permissions.update.pointerFields || []), + (pointerPermsSubset.delete = permissions.delete && permissions.delete.pointerFields || []), + (pointerPermsSubset.addField = permissions.addField && permissions.addField.pointerFields || []); } let pointerPerms = {}; @@ -764,6 +766,7 @@ export default class PermissionsDialog extends React.Component { let nextKeys; let nextEntryTypes; let nextPerms = this.state.perms; + let nextPointerPerms = this.state.pointerPerms; if (next.user || next.role) { id = next.user ? next.user.id : next.role.id; @@ -791,17 +794,32 @@ export default class PermissionsDialog extends React.Component { } // create new permissions - if (this.props.advanced) { - nextPerms = nextPerms.setIn(['get', key], true); - nextPerms = nextPerms.setIn(['find', key], true); - nextPerms = nextPerms.setIn(['count', key], true); - nextPerms = nextPerms.setIn(['create', key], true); - nextPerms = nextPerms.setIn(['update', key], true); - nextPerms = nextPerms.setIn(['delete', key], true); - nextPerms = nextPerms.setIn(['addField', key], true); + if (next.pointer) { + if (this.props.advanced) { + nextPointerPerms = nextPointerPerms.setIn([entry, 'get'], true) + nextPointerPerms = nextPointerPerms.setIn([entry, 'find'], true) + nextPointerPerms = nextPointerPerms.setIn([entry, 'count'], true) + nextPointerPerms = nextPointerPerms.setIn([entry, 'create'], true) + nextPointerPerms = nextPointerPerms.setIn([entry, 'update'], true) + nextPointerPerms = nextPointerPerms.setIn([entry, 'delete'], true) + nextPointerPerms = nextPointerPerms.setIn([entry, 'addField'], true) + } else { + nextPointerPerms = nextPointerPerms.setIn([entry, 'read'], true) + nextPointerPerms = nextPointerPerms.setIn([entry, 'write'], true) + } } else { - nextPerms = nextPerms.setIn(['read', key], true); - nextPerms = nextPerms.setIn(['write', key], true); + if (this.props.advanced) { + nextPerms = nextPerms.setIn(['get', key], true); + nextPerms = nextPerms.setIn(['find', key], true); + nextPerms = nextPerms.setIn(['count', key], true); + nextPerms = nextPerms.setIn(['create', key], true); + nextPerms = nextPerms.setIn(['update', key], true); + nextPerms = nextPerms.setIn(['delete', key], true); + nextPerms = nextPerms.setIn(['addField', key], true); + } else { + nextPerms = nextPerms.setIn(['read', key], true); + nextPerms = nextPerms.setIn(['write', key], true); + } } nextKeys = this.state.newKeys.concat([key]); @@ -810,6 +828,7 @@ export default class PermissionsDialog extends React.Component { return this.setState( { perms: nextPerms, + pointerPerms: nextPointerPerms, newKeys: nextKeys, entryTypes: nextEntryTypes, newEntry: '', @@ -911,7 +930,7 @@ export default class PermissionsDialog extends React.Component { return; } if (k === 'requiresAuthentication' && !v){ - // only acceppt requiresAuthentication with true + // only acceppt requiresAuthentication with true return } if (v) { @@ -964,7 +983,7 @@ export default class PermissionsDialog extends React.Component { // types is immutable.js Map const type = (types && types.get(key)) || {}; - let pointer; + let pointer = this.state.pointerPerms.has(key); let label = {key}; if (type.user) { @@ -996,7 +1015,7 @@ export default class PermissionsDialog extends React.Component {

); - } else if (type.pointer) { + } else if (pointer) { // get class info from schema let { type, targetClass } = columns[key]; @@ -1238,7 +1257,7 @@ export default class PermissionsDialog extends React.Component { )} {this.props.advanced ? this.state.pointers.map(pointer => - this.renderRow(pointer, true) + this.renderRow(pointer, this.state.columns) ) : null} {this.state.newKeys.map(key => From 57953df19ca7fd5f67c065727d32e3e5a4b841bc Mon Sep 17 00:00:00 2001 From: stevestencil Date: Mon, 3 Aug 2020 17:44:53 -0400 Subject: [PATCH 3/3] fixed master key not being passed in when saving file in global config (#1581) --- src/dashboard/Data/Config/ConfigDialog.react.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dashboard/Data/Config/ConfigDialog.react.js b/src/dashboard/Data/Config/ConfigDialog.react.js index bf33016e65..e2778e5fcb 100644 --- a/src/dashboard/Data/Config/ConfigDialog.react.js +++ b/src/dashboard/Data/Config/ConfigDialog.react.js @@ -42,7 +42,7 @@ function numberValidator(onChange) { function saveFile(onChange, file) { let value = new Parse.File(file.name, file); - value.save().then(() => onChange(value)); + value.save({ useMasterKey: true }).then(() => onChange(value)); } const EDITORS = {