Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion src/dashboard/Account/AccountOverview.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ export default class AccountOverview extends React.Component {
subtitle='If you delete this account key, anything that was using it will stop working.'
type={Modal.Types.DANGER}
open={this.state.showDeleteAccountKeyModal}
submitText='Yes, delete it'
submitText={'Yes, delete it'}
inProgressText={'Deleting\u2026'}
onSubmit={() => {
return AccountManager.deleteAccountKeyById(this.state.accountKeyIdToDelete);
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/Data/Browser/AddColumnDialog.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ export default class AddColumnDialog extends React.Component {
subtitle='Store another type of data in this class.'
disabled={!this.valid()}
confirmText='Add column'
cancelText={'Never mind, don\u2019t.'}
cancelText={'Cancel'}
onCancel={this.props.onCancel}
continueText={'Add column & continue'}
showContinue={true}
Expand Down
4 changes: 2 additions & 2 deletions src/dashboard/Data/Browser/CloneSelectedRowsDialog.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ export default class CloneSelectedRowsDialog extends React.Component {
title={this.props.selection['*'] ? 'Clone all rows?' : (selectionLength === 1 ? 'Clone this row?' : `Clone ${selectionLength} rows?`)}
subtitle={''}
disabled={!this.valid()}
confirmText={'Yes clone'}
cancelText={'Never mind, don\u2019t.'}
confirmText='Yes, clone'
cancelText='Cancel'
onCancel={this.props.onCancel}
onConfirm={this.props.onConfirm}>
{content}
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/Data/Browser/CreateClassDialog.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export default class CreateClassDialog extends React.Component {
subtitle='Create a new collection of objects.'
disabled={!this.valid()}
confirmText='Create class'
cancelText={'Cancel'}
cancelText='Cancel'
continueText={'Create class & add columns'}
onCancel={this.props.onCancel}
showContinue={true}
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/Data/Browser/DeleteRowsDialog.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export default class DeleteRowsDialog extends React.Component {
subtitle={this.props.relation ? 'You need to delete origin record. This is a reference.' : 'This action cannot be undone!'}
disabled={!this.valid()}
confirmText={`Yes, ${this.props.relation ? 'detach' : 'delete'}`}
cancelText={'Never mind, don\u2019t.'}
cancelText='Cancel'
onCancel={this.props.onCancel}
onConfirm={this.props.onConfirm}>
{content}
Expand Down
4 changes: 2 additions & 2 deletions src/dashboard/Data/Browser/DropClassDialog.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ export default class DropClassDialog extends React.Component {
title='Delete this class?'
subtitle='This action cannot be undone!'
disabled={!this.valid()}
confirmText='Yes, delete.'
cancelText={'Never mind, don\u2019t.'}
confirmText='Yes, delete it'
cancelText='Cancel'
onCancel={this.props.onCancel}
onConfirm={this.props.onConfirm}>
<Field
Expand Down
4 changes: 2 additions & 2 deletions src/dashboard/Data/Browser/ExportSelectedRowsDialog.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ export default class ExportSelectedRowsDialog extends React.Component {
title={this.props.selection['*'] ? 'Export all rows?' : (selectionLength === 1 ? 'Export 1 selected row?' : `Export ${selectionLength} selected rows?`)}
subtitle={this.props.selection['*'] ? 'Note: Exporting is limited to the first 10,000 rows.' : ''}
disabled={!this.valid()}
confirmText={'Yes export'}
cancelText={'Never mind, don\u2019t.'}
confirmText='Yes export'
cancelText='Cancel'
onCancel={this.props.onCancel}
onConfirm={this.props.onConfirm}>
{}
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/Data/Browser/PointerKeyDialog.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export default class PointerKeyDialog extends React.Component {
title={'Change pointer key'}
subtitle={hasColumns ? `The selected column will be used to represent a pointer for class "${this.props.className}"` : `There are no columns that can be set to represent a pointer for class "${this.props.className}"`}
confirmText='Set pointer key'
cancelText={'Never mind, don\u2019t.'}
cancelText='Cancel'
onCancel={this.props.onCancel}
disabled={!this.state.name}
onConfirm={() => {
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/Data/Browser/RemoveColumnDialog.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default class RemoveColumnDialog extends React.Component {
title='Remove a column'
subtitle={hasColumns ? 'Be careful, this action cannot be undone.' : 'There are no removable columns on this class.'}
confirmText='Remove column'
cancelText={'Never mind, don\u2019t.'}
cancelText='Cancel'
onCancel={this.props.onCancel}
disabled={!this.state.name}
onConfirm={() => {
Expand Down
6 changes: 3 additions & 3 deletions src/dashboard/Data/Browser/SecurityDialog.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,10 @@ export default class SecurityDialog extends React.Component {
details={<a target="_blank" href='http://docs.parseplatform.org/ios/guide/#security'>Learn more about CLPs and app security</a>}
permissions={this.props.perms}
userPointers={this.props.userPointers}
validateEntry={entry =>
validateEntry={entry =>
validateEntry(this.props.userPointers, entry, parseServerSupportsPointerPermissions)}
onCancel={this.handleClose}
onConfirm={perms =>
onConfirm={perms =>
this.props.onChangeCLP(perms).then(this.handleClose)}
/>
);
Expand All @@ -134,7 +134,7 @@ export default class SecurityDialog extends React.Component {
if (this.props.disabled) {
classes.push(styles.toolbarButtonDisabled);
}

return dialog;
}
}
8 changes: 4 additions & 4 deletions src/dashboard/Data/Config/ConfigDialog.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ export default class ConfigDialog extends React.Component {
subtitle={'Dynamically configure parts of your app'}
disabled={!this.valid()}
confirmText={newParam ? 'Create parameter' : 'Save parameter'}
cancelText={'Cancel'}
cancelText='Cancel'
onCancel={this.props.onCancel}
onConfirm={this.submit.bind(this)}>
<Field
Expand Down Expand Up @@ -233,13 +233,13 @@ export default class ConfigDialog extends React.Component {
description='Use this to configure your app. You can change it at any time.' />
}
input={EDITORS[this.state.type](this.state.value, (value) => { this.setState({ value }) })} />

{
/*
Add `Requires master key` field if parse-server version >= 3.9.0,
that is the minimum version that supports this feature.
*/
semver.valid(this.props.parseServerVersion) && semver.gte(this.props.parseServerVersion, '3.9.0')
semver.valid(this.props.parseServerVersion) && semver.gte(this.props.parseServerVersion, '3.9.0')
? <Field
label={
<Label
Expand All @@ -250,7 +250,7 @@ export default class ConfigDialog extends React.Component {
<Toggle
type={Toggle.Types.YES_NO}
value={this.state.masterKeyOnly}
onChange={(masterKeyOnly) => this.setState({ masterKeyOnly })}
onChange={(masterKeyOnly) => this.setState({ masterKeyOnly })}
additionalStyles={{ margin: '0px' }} />
}
className={styles.addColumnToggleWrapper}
Expand Down
4 changes: 2 additions & 2 deletions src/dashboard/Data/Config/DeleteParameterDialog.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ export default class DeleteParameterDialog extends React.Component {
title={'Delete parameter?'}
subtitle={'This action cannot be undone!'}
disabled={!this.valid()}
confirmText={'Yes, delete'}
cancelText={'Never mind, don\u2019t.'}
confirmText='Yes, delete it'
cancelText='Cancel'
onCancel={this.props.onCancel}
onConfirm={this.props.onConfirm}>
{content}
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/Data/Jobs/Jobs.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ class Jobs extends TableView {
title='Delete job schedule?'
subtitle='Careful, this action cannot be undone'
confirmText='Yes, delete it'
cancelText={'Never mind, don\'t'}
cancelText='Cancel'
onCancel={() => this.setState({ toDelete: null })}
onConfirm={() => {
this.setState({ toDelete: null });
Expand Down
4 changes: 2 additions & 2 deletions src/dashboard/Settings/AppleCerts.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ export default class AppleCerts extends React.Component {
type={Modal.Types.DANGER}
title='Delete this certificate'
subtitle='Notifications will no longer be sent to the associated app.'
cancelText={'Cancel'}
confirmText={'Delete it!'}
cancelText='Cancel'
confirmText='Yes, delete it'
onCancel={() => this.setState({ deletePending: null })}
onConfirm={() => {
let id = this.state.deletePending;
Expand Down