From 77103fb474c7517e494fdca8104c71c5ecc701d1 Mon Sep 17 00:00:00 2001 From: Flow Date: Mon, 4 Jul 2022 12:10:40 +0100 Subject: [PATCH 1/5] feat: rename button nevermind to Cancel --- src/dashboard/Account/AccountOverview.react.js | 2 +- src/dashboard/Data/Browser/AddColumnDialog.react.js | 2 +- .../Data/Browser/CloneSelectedRowsDialog.react.js | 4 ++-- src/dashboard/Data/Browser/CreateClassDialog.react.js | 2 +- src/dashboard/Data/Browser/DeleteRowsDialog.react.js | 2 +- src/dashboard/Data/Browser/DropClassDialog.react.js | 4 ++-- .../Data/Browser/ExportSelectedRowsDialog.react.js | 4 ++-- src/dashboard/Data/Browser/PointerKeyDialog.react.js | 2 +- src/dashboard/Data/Browser/RemoveColumnDialog.react.js | 2 +- src/dashboard/Data/Browser/SecurityDialog.react.js | 6 +++--- src/dashboard/Data/Config/ConfigDialog.react.js | 8 ++++---- src/dashboard/Data/Config/DeleteParameterDialog.react.js | 4 ++-- src/dashboard/Data/Jobs/Jobs.react.js | 2 +- src/dashboard/Settings/AppleCerts.react.js | 4 ++-- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/dashboard/Account/AccountOverview.react.js b/src/dashboard/Account/AccountOverview.react.js index c6966ad5f7..5915308755 100644 --- a/src/dashboard/Account/AccountOverview.react.js +++ b/src/dashboard/Account/AccountOverview.react.js @@ -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); diff --git a/src/dashboard/Data/Browser/AddColumnDialog.react.js b/src/dashboard/Data/Browser/AddColumnDialog.react.js index 6b11c174b3..a950175df2 100644 --- a/src/dashboard/Data/Browser/AddColumnDialog.react.js +++ b/src/dashboard/Data/Browser/AddColumnDialog.react.js @@ -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} diff --git a/src/dashboard/Data/Browser/CloneSelectedRowsDialog.react.js b/src/dashboard/Data/Browser/CloneSelectedRowsDialog.react.js index 14e7221f6e..41dc6123be 100644 --- a/src/dashboard/Data/Browser/CloneSelectedRowsDialog.react.js +++ b/src/dashboard/Data/Browser/CloneSelectedRowsDialog.react.js @@ -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} diff --git a/src/dashboard/Data/Browser/CreateClassDialog.react.js b/src/dashboard/Data/Browser/CreateClassDialog.react.js index 6f17b7c178..36fa0dee4d 100644 --- a/src/dashboard/Data/Browser/CreateClassDialog.react.js +++ b/src/dashboard/Data/Browser/CreateClassDialog.react.js @@ -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} diff --git a/src/dashboard/Data/Browser/DeleteRowsDialog.react.js b/src/dashboard/Data/Browser/DeleteRowsDialog.react.js index 66e16e3e4e..0a60ecc742 100644 --- a/src/dashboard/Data/Browser/DeleteRowsDialog.react.js +++ b/src/dashboard/Data/Browser/DeleteRowsDialog.react.js @@ -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} diff --git a/src/dashboard/Data/Browser/DropClassDialog.react.js b/src/dashboard/Data/Browser/DropClassDialog.react.js index 56623b2ebf..fc29103d0a 100644 --- a/src/dashboard/Data/Browser/DropClassDialog.react.js +++ b/src/dashboard/Data/Browser/DropClassDialog.react.js @@ -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}> {} diff --git a/src/dashboard/Data/Browser/PointerKeyDialog.react.js b/src/dashboard/Data/Browser/PointerKeyDialog.react.js index 74ea430745..8f36134975 100644 --- a/src/dashboard/Data/Browser/PointerKeyDialog.react.js +++ b/src/dashboard/Data/Browser/PointerKeyDialog.react.js @@ -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={() => { diff --git a/src/dashboard/Data/Browser/RemoveColumnDialog.react.js b/src/dashboard/Data/Browser/RemoveColumnDialog.react.js index bcf0a119cc..304574aa9d 100644 --- a/src/dashboard/Data/Browser/RemoveColumnDialog.react.js +++ b/src/dashboard/Data/Browser/RemoveColumnDialog.react.js @@ -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={() => { diff --git a/src/dashboard/Data/Browser/SecurityDialog.react.js b/src/dashboard/Data/Browser/SecurityDialog.react.js index cc817006d2..6e138b3b91 100644 --- a/src/dashboard/Data/Browser/SecurityDialog.react.js +++ b/src/dashboard/Data/Browser/SecurityDialog.react.js @@ -122,10 +122,10 @@ export default class SecurityDialog extends React.Component { details={Learn more about CLPs and app security} 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)} /> ); @@ -134,7 +134,7 @@ export default class SecurityDialog extends React.Component { if (this.props.disabled) { classes.push(styles.toolbarButtonDisabled); } - + return dialog; } } diff --git a/src/dashboard/Data/Config/ConfigDialog.react.js b/src/dashboard/Data/Config/ConfigDialog.react.js index e2778e5fcb..6163ad0630 100644 --- a/src/dashboard/Data/Config/ConfigDialog.react.js +++ b/src/dashboard/Data/Config/ConfigDialog.react.js @@ -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)}> } 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') ? this.setState({ masterKeyOnly })} + onChange={(masterKeyOnly) => this.setState({ masterKeyOnly })} additionalStyles={{ margin: '0px' }} /> } className={styles.addColumnToggleWrapper} diff --git a/src/dashboard/Data/Config/DeleteParameterDialog.react.js b/src/dashboard/Data/Config/DeleteParameterDialog.react.js index c3c4ed252e..e90dd03878 100644 --- a/src/dashboard/Data/Config/DeleteParameterDialog.react.js +++ b/src/dashboard/Data/Config/DeleteParameterDialog.react.js @@ -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} diff --git a/src/dashboard/Data/Jobs/Jobs.react.js b/src/dashboard/Data/Jobs/Jobs.react.js index 98ef7574fa..178808a5c8 100644 --- a/src/dashboard/Data/Jobs/Jobs.react.js +++ b/src/dashboard/Data/Jobs/Jobs.react.js @@ -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 }); diff --git a/src/dashboard/Settings/AppleCerts.react.js b/src/dashboard/Settings/AppleCerts.react.js index 1de385a640..428460cdad 100644 --- a/src/dashboard/Settings/AppleCerts.react.js +++ b/src/dashboard/Settings/AppleCerts.react.js @@ -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; From 63df507e6973405e6b557846a82af7fe0bbdb375 Mon Sep 17 00:00:00 2001 From: Flow Date: Thu, 7 Jul 2022 13:15:36 +0100 Subject: [PATCH 2/5] feat: rename label Yes to Yes --- src/dashboard/Account/AccountOverview.react.js | 2 +- src/dashboard/Data/Browser/CloneSelectedRowsDialog.react.js | 2 +- src/dashboard/Data/Browser/DeleteRowsDialog.react.js | 2 +- src/dashboard/Data/Browser/DropClassDialog.react.js | 2 +- src/dashboard/Data/Browser/ExportSelectedRowsDialog.react.js | 2 +- src/dashboard/Data/Config/DeleteParameterDialog.react.js | 2 +- src/dashboard/Data/Jobs/Jobs.react.js | 2 +- src/dashboard/Settings/AppleCerts.react.js | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/dashboard/Account/AccountOverview.react.js b/src/dashboard/Account/AccountOverview.react.js index 5915308755..891cf7764f 100644 --- a/src/dashboard/Account/AccountOverview.react.js +++ b/src/dashboard/Account/AccountOverview.react.js @@ -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' inProgressText={'Deleting\u2026'} onSubmit={() => { return AccountManager.deleteAccountKeyById(this.state.accountKeyIdToDelete); diff --git a/src/dashboard/Data/Browser/CloneSelectedRowsDialog.react.js b/src/dashboard/Data/Browser/CloneSelectedRowsDialog.react.js index 41dc6123be..cbfcd24b77 100644 --- a/src/dashboard/Data/Browser/CloneSelectedRowsDialog.react.js +++ b/src/dashboard/Data/Browser/CloneSelectedRowsDialog.react.js @@ -56,7 +56,7 @@ 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' + confirmText='Yes' cancelText='Cancel' onCancel={this.props.onCancel} onConfirm={this.props.onConfirm}> diff --git a/src/dashboard/Data/Browser/DeleteRowsDialog.react.js b/src/dashboard/Data/Browser/DeleteRowsDialog.react.js index 0a60ecc742..2904acfa5d 100644 --- a/src/dashboard/Data/Browser/DeleteRowsDialog.react.js +++ b/src/dashboard/Data/Browser/DeleteRowsDialog.react.js @@ -57,7 +57,7 @@ export default class DeleteRowsDialog extends React.Component { title={this.props.selection['*'] ? `${deleteText} all rows?` : (selectionLength === 1 ? `${deleteText} this row?` : `${deleteText} ${selectionLength} rows?`)} 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'}`} + confirmText='Yes' cancelText='Cancel' onCancel={this.props.onCancel} onConfirm={this.props.onConfirm}> diff --git a/src/dashboard/Data/Browser/DropClassDialog.react.js b/src/dashboard/Data/Browser/DropClassDialog.react.js index fc29103d0a..736f59603e 100644 --- a/src/dashboard/Data/Browser/DropClassDialog.react.js +++ b/src/dashboard/Data/Browser/DropClassDialog.react.js @@ -35,7 +35,7 @@ export default class DropClassDialog extends React.Component { title='Delete this class?' subtitle='This action cannot be undone!' disabled={!this.valid()} - confirmText='Yes, delete it' + confirmText='Yes' cancelText='Cancel' onCancel={this.props.onCancel} onConfirm={this.props.onConfirm}> diff --git a/src/dashboard/Data/Browser/ExportSelectedRowsDialog.react.js b/src/dashboard/Data/Browser/ExportSelectedRowsDialog.react.js index 307803b078..f325f1a88d 100644 --- a/src/dashboard/Data/Browser/ExportSelectedRowsDialog.react.js +++ b/src/dashboard/Data/Browser/ExportSelectedRowsDialog.react.js @@ -30,7 +30,7 @@ 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' + confirmText='Yes' cancelText='Cancel' onCancel={this.props.onCancel} onConfirm={this.props.onConfirm}> diff --git a/src/dashboard/Data/Config/DeleteParameterDialog.react.js b/src/dashboard/Data/Config/DeleteParameterDialog.react.js index e90dd03878..94d69a11c2 100644 --- a/src/dashboard/Data/Config/DeleteParameterDialog.react.js +++ b/src/dashboard/Data/Config/DeleteParameterDialog.react.js @@ -49,7 +49,7 @@ export default class DeleteParameterDialog extends React.Component { title={'Delete parameter?'} subtitle={'This action cannot be undone!'} disabled={!this.valid()} - confirmText='Yes, delete it' + confirmText='Yes' cancelText='Cancel' onCancel={this.props.onCancel} onConfirm={this.props.onConfirm}> diff --git a/src/dashboard/Data/Jobs/Jobs.react.js b/src/dashboard/Data/Jobs/Jobs.react.js index 178808a5c8..4ba36eb87b 100644 --- a/src/dashboard/Data/Jobs/Jobs.react.js +++ b/src/dashboard/Data/Jobs/Jobs.react.js @@ -230,7 +230,7 @@ class Jobs extends TableView { type={Modal.Types.DANGER} title='Delete job schedule?' subtitle='Careful, this action cannot be undone' - confirmText='Yes, delete it' + confirmText='Yes' cancelText='Cancel' onCancel={() => this.setState({ toDelete: null })} onConfirm={() => { diff --git a/src/dashboard/Settings/AppleCerts.react.js b/src/dashboard/Settings/AppleCerts.react.js index 428460cdad..bb642d9cf8 100644 --- a/src/dashboard/Settings/AppleCerts.react.js +++ b/src/dashboard/Settings/AppleCerts.react.js @@ -64,7 +64,7 @@ export default class AppleCerts extends React.Component { title='Delete this certificate' subtitle='Notifications will no longer be sent to the associated app.' cancelText='Cancel' - confirmText='Yes, delete it' + confirmText='Yes' onCancel={() => this.setState({ deletePending: null })} onConfirm={() => { let id = this.state.deletePending; From dc436208ce9f93ba0017d8c91d8e1ce94bba7dc1 Mon Sep 17 00:00:00 2001 From: Flow Date: Fri, 8 Jul 2022 11:55:07 +0100 Subject: [PATCH 3/5] fix questions and labels on dialogs --- src/dashboard/Data/Browser/RemoveColumnDialog.react.js | 4 ++-- src/dashboard/Settings/AppleCerts.react.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dashboard/Data/Browser/RemoveColumnDialog.react.js b/src/dashboard/Data/Browser/RemoveColumnDialog.react.js index 304574aa9d..53aff2d4a5 100644 --- a/src/dashboard/Data/Browser/RemoveColumnDialog.react.js +++ b/src/dashboard/Data/Browser/RemoveColumnDialog.react.js @@ -46,9 +46,9 @@ export default class RemoveColumnDialog extends React.Component { Date: Sat, 9 Jul 2022 13:13:00 +0100 Subject: [PATCH 4/5] replace label Yes for --- src/dashboard/Account/AccountOverview.react.js | 4 ++-- src/dashboard/Data/Browser/AddColumnDialog.react.js | 6 +++--- src/dashboard/Data/Browser/AttachRowsDialog.react.js | 2 +- .../Data/Browser/AttachSelectedRowsDialog.react.js | 2 +- .../Data/Browser/CloneSelectedRowsDialog.react.js | 2 +- src/dashboard/Data/Browser/CreateClassDialog.react.js | 4 ++-- src/dashboard/Data/Browser/DeleteRowsDialog.react.js | 2 +- src/dashboard/Data/Browser/DropClassDialog.react.js | 2 +- src/dashboard/Data/Browser/ExportDialog.react.js | 2 +- .../Data/Browser/ExportSelectedRowsDialog.react.js | 2 +- src/dashboard/Data/Browser/PointerKeyDialog.react.js | 4 ++-- src/dashboard/Data/Browser/RemoveColumnDialog.react.js | 2 +- src/dashboard/Data/Browser/SecureFieldsDialog.react.js | 2 +- src/dashboard/Data/Config/ConfigDialog.react.js | 2 +- .../Data/Config/DeleteParameterDialog.react.js | 6 +++--- src/dashboard/Data/Jobs/Jobs.react.js | 2 +- src/dashboard/Data/Webhooks/Webhooks.react.js | 6 +++--- src/dashboard/Settings/AppleCerts.react.js | 2 +- src/dashboard/Settings/GeneralSettings.react.js | 10 +++++----- src/dashboard/Settings/SecuritySettings.react.js | 2 +- 20 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/dashboard/Account/AccountOverview.react.js b/src/dashboard/Account/AccountOverview.react.js index 891cf7764f..2fce5c9ca8 100644 --- a/src/dashboard/Account/AccountOverview.react.js +++ b/src/dashboard/Account/AccountOverview.react.js @@ -291,7 +291,7 @@ export default class AccountOverview extends React.Component { onClose={() => { this.setState({showAccountKeyModal: false}); }} - submitText='Create Key' + submitText='Create' inProgressText={'Creating\u2026'} clearFields={() => { this.setState({accountKeyName: ''}); @@ -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' + submitText='Delete' inProgressText={'Deleting\u2026'} onSubmit={() => { return AccountManager.deleteAccountKeyById(this.state.accountKeyIdToDelete); diff --git a/src/dashboard/Data/Browser/AddColumnDialog.react.js b/src/dashboard/Data/Browser/AddColumnDialog.react.js index a950175df2..fd244551b4 100644 --- a/src/dashboard/Data/Browser/AddColumnDialog.react.js +++ b/src/dashboard/Data/Browser/AddColumnDialog.react.js @@ -200,10 +200,10 @@ export default class AddColumnDialog extends React.Component { title='Add a new column' subtitle='Store another type of data in this class.' disabled={!this.valid()} - confirmText='Add column' - cancelText={'Cancel'} + confirmText='Add' + cancelText='Cancel' onCancel={this.props.onCancel} - continueText={'Add column & continue'} + continueText={'Add & continue'} showContinue={true} onContinue={() => { this.props.onContinue(this.state); diff --git a/src/dashboard/Data/Browser/AttachRowsDialog.react.js b/src/dashboard/Data/Browser/AttachRowsDialog.react.js index 3bd27b54f1..79a850c520 100644 --- a/src/dashboard/Data/Browser/AttachRowsDialog.react.js +++ b/src/dashboard/Data/Browser/AttachRowsDialog.react.js @@ -43,7 +43,7 @@ export default class AttachRowsDialog extends React.Component { onClose={this.props.onCancel} onSubmit={this.handleConfirm} submitText="Attach" - inProgressText="Attaching ..." + inProgressText={'Attaching\u2026'} > diff --git a/src/dashboard/Data/Browser/CloneSelectedRowsDialog.react.js b/src/dashboard/Data/Browser/CloneSelectedRowsDialog.react.js index cbfcd24b77..3a387f4a21 100644 --- a/src/dashboard/Data/Browser/CloneSelectedRowsDialog.react.js +++ b/src/dashboard/Data/Browser/CloneSelectedRowsDialog.react.js @@ -56,7 +56,7 @@ 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' + confirmText='Clone' cancelText='Cancel' onCancel={this.props.onCancel} onConfirm={this.props.onConfirm}> diff --git a/src/dashboard/Data/Browser/CreateClassDialog.react.js b/src/dashboard/Data/Browser/CreateClassDialog.react.js index 36fa0dee4d..fe4962e74b 100644 --- a/src/dashboard/Data/Browser/CreateClassDialog.react.js +++ b/src/dashboard/Data/Browser/CreateClassDialog.react.js @@ -67,9 +67,9 @@ export default class CreateClassDialog extends React.Component { title='Add a new class' subtitle='Create a new collection of objects.' disabled={!this.valid()} - confirmText='Create class' + confirmText='Add' cancelText='Cancel' - continueText={'Create class & add columns'} + continueText={'Add & add columns'} onCancel={this.props.onCancel} showContinue={true} onContinue={async () => { diff --git a/src/dashboard/Data/Browser/DeleteRowsDialog.react.js b/src/dashboard/Data/Browser/DeleteRowsDialog.react.js index 2904acfa5d..93fc24a994 100644 --- a/src/dashboard/Data/Browser/DeleteRowsDialog.react.js +++ b/src/dashboard/Data/Browser/DeleteRowsDialog.react.js @@ -57,7 +57,7 @@ export default class DeleteRowsDialog extends React.Component { title={this.props.selection['*'] ? `${deleteText} all rows?` : (selectionLength === 1 ? `${deleteText} this row?` : `${deleteText} ${selectionLength} rows?`)} subtitle={this.props.relation ? 'You need to delete origin record. This is a reference.' : 'This action cannot be undone!'} disabled={!this.valid()} - confirmText='Yes' + confirmText='Delete' cancelText='Cancel' onCancel={this.props.onCancel} onConfirm={this.props.onConfirm}> diff --git a/src/dashboard/Data/Browser/DropClassDialog.react.js b/src/dashboard/Data/Browser/DropClassDialog.react.js index 736f59603e..b007ab559e 100644 --- a/src/dashboard/Data/Browser/DropClassDialog.react.js +++ b/src/dashboard/Data/Browser/DropClassDialog.react.js @@ -35,7 +35,7 @@ export default class DropClassDialog extends React.Component { title='Delete this class?' subtitle='This action cannot be undone!' disabled={!this.valid()} - confirmText='Yes' + confirmText='Delete' cancelText='Cancel' onCancel={this.props.onCancel} onConfirm={this.props.onConfirm}> diff --git a/src/dashboard/Data/Browser/ExportDialog.react.js b/src/dashboard/Data/Browser/ExportDialog.react.js index d26db0494e..fec7e64bfd 100644 --- a/src/dashboard/Data/Browser/ExportDialog.react.js +++ b/src/dashboard/Data/Browser/ExportDialog.react.js @@ -46,7 +46,7 @@ export default class ExportDialog extends React.Component { type={Modal.Types.INFO} icon='down-outline' iconSize={40} - title='Export this class' + title='Export this class?' subtitle={'We\'ll send you an email when your data is ready.'} confirmText='Export' cancelText='Cancel' diff --git a/src/dashboard/Data/Browser/ExportSelectedRowsDialog.react.js b/src/dashboard/Data/Browser/ExportSelectedRowsDialog.react.js index f325f1a88d..92f2ce50bf 100644 --- a/src/dashboard/Data/Browser/ExportSelectedRowsDialog.react.js +++ b/src/dashboard/Data/Browser/ExportSelectedRowsDialog.react.js @@ -30,7 +30,7 @@ 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' + confirmText='Export' cancelText='Cancel' onCancel={this.props.onCancel} onConfirm={this.props.onConfirm}> diff --git a/src/dashboard/Data/Browser/PointerKeyDialog.react.js b/src/dashboard/Data/Browser/PointerKeyDialog.react.js index 8f36134975..f102a514cb 100644 --- a/src/dashboard/Data/Browser/PointerKeyDialog.react.js +++ b/src/dashboard/Data/Browser/PointerKeyDialog.react.js @@ -52,9 +52,9 @@ export default class PointerKeyDialog extends React.Component { return ( diff --git a/src/dashboard/Data/Config/DeleteParameterDialog.react.js b/src/dashboard/Data/Config/DeleteParameterDialog.react.js index 94d69a11c2..d545b0c777 100644 --- a/src/dashboard/Data/Config/DeleteParameterDialog.react.js +++ b/src/dashboard/Data/Config/DeleteParameterDialog.react.js @@ -46,10 +46,10 @@ export default class DeleteParameterDialog extends React.Component { diff --git a/src/dashboard/Data/Jobs/Jobs.react.js b/src/dashboard/Data/Jobs/Jobs.react.js index 4ba36eb87b..5d1521f9fd 100644 --- a/src/dashboard/Data/Jobs/Jobs.react.js +++ b/src/dashboard/Data/Jobs/Jobs.react.js @@ -230,7 +230,7 @@ class Jobs extends TableView { type={Modal.Types.DANGER} title='Delete job schedule?' subtitle='Careful, this action cannot be undone' - confirmText='Yes' + confirmText='Delete' cancelText='Cancel' onCancel={() => this.setState({ toDelete: null })} onConfirm={() => { diff --git a/src/dashboard/Data/Webhooks/Webhooks.react.js b/src/dashboard/Data/Webhooks/Webhooks.react.js index 99e797db67..b200fb5d29 100644 --- a/src/dashboard/Data/Webhooks/Webhooks.react.js +++ b/src/dashboard/Data/Webhooks/Webhooks.react.js @@ -166,7 +166,7 @@ class Webhooks extends TableView { onClose={() => { this.setState({showNewWebhookModal: false}); }} - submitText='Create Webhook' + submitText='Create' inProgressText={'Creating\u2026'} clearFields={this.clearFields.bind(this)} enabled={true /* TODO: do some validation here */}> @@ -184,7 +184,7 @@ class Webhooks extends TableView { onClose={() => { this.setState({showEditWebhookModal: false}); }} - submitText='Save Webhook' + submitText='Save' inProgressText={'Saving\u2026'} clearFields={this.clearFields.bind(this)} enabled={true /* TODO: do some validation here */}> @@ -212,7 +212,7 @@ class Webhooks extends TableView { onClose={() => { this.setState({showDeleteWebhookModal: false}); }} - submitText='Delete Webhook' + submitText='Delete' inProgressText={'Deleting\u2026'} clearFields={() => { this.setState({ diff --git a/src/dashboard/Settings/AppleCerts.react.js b/src/dashboard/Settings/AppleCerts.react.js index 21dd93c25a..b083758de6 100644 --- a/src/dashboard/Settings/AppleCerts.react.js +++ b/src/dashboard/Settings/AppleCerts.react.js @@ -64,7 +64,7 @@ export default class AppleCerts extends React.Component { title='Delete this certificate?' subtitle='Notifications will no longer be sent to the associated app.' cancelText='Cancel' - confirmText='Yes' + confirmText='Delete' onCancel={() => this.setState({ deletePending: null })} onConfirm={() => { let id = this.state.deletePending; diff --git a/src/dashboard/Settings/GeneralSettings.react.js b/src/dashboard/Settings/GeneralSettings.react.js index 31de3b49b2..8cff83780a 100644 --- a/src/dashboard/Settings/GeneralSettings.react.js +++ b/src/dashboard/Settings/GeneralSettings.react.js @@ -409,8 +409,8 @@ export default class GeneralSettings extends DashboardView { iconSize={30} type={Modal.Types.DANGER} open={this.state.showMigrateAppModal} - submitText={this.state.migrationWarnings && this.state.migrationWarnings.length > 0 ? 'Migrate anyway' : 'Begin the migration'} - inProgressText={'Beginning the migration\u2026'} + submitText={this.state.migrationWarnings && this.state.migrationWarnings.length > 0 ? 'Migrate anyway' : 'Migrate'} + inProgressText={'Migrating\u2026'} showErrors={this.state.showMongoConnectionValidationErrors} width={900} onSubmit={() => { @@ -463,7 +463,7 @@ export default class GeneralSettings extends DashboardView { }} onClose={closeModalWithConnectionString} type={Modal.Types.DANGER} - submitText={this.state.migrationWarnings && this.state.migrationWarnings.length > 0 ? 'Change anyway' : 'Change connection string'} + submitText={this.state.migrationWarnings && this.state.migrationWarnings.length > 0 ? 'Change anyway' : 'Change'} inProgressText={'Changing\u2026'} showErrors={this.state.showMongoConnectionValidationErrors} width={900} @@ -494,7 +494,7 @@ export default class GeneralSettings extends DashboardView { iconSize={30} type={Modal.Types.DANGER} open={this.state.showTransferAppModal} - submitText='Transfer ownership' + submitText='Transfer' inProgressText={'Transferring\u2026'} enabled={ (this.state.password.length > 0 || !AccountManager.currentUser().has_password) @@ -531,7 +531,7 @@ export default class GeneralSettings extends DashboardView { subtitle='This is an irreversible action!' type={Modal.Types.DANGER} open={this.state.showDeleteAppModal} - submitText='Permanently delete this app' + submitText='Delete' inProgressText={'Deleting\u2026'} enabled={this.state.password.length > 0} onSubmit={() => AppsManager.deleteApp(this.context.slug, this.state.password)} diff --git a/src/dashboard/Settings/SecuritySettings.react.js b/src/dashboard/Settings/SecuritySettings.react.js index 5930cd3556..059f61947d 100644 --- a/src/dashboard/Settings/SecuritySettings.react.js +++ b/src/dashboard/Settings/SecuritySettings.react.js @@ -48,7 +48,7 @@ export default class SecuritySettings extends DashboardView { } open={this.state.showResetDialog} type={Modal.Types.DANGER} - submitText='Reset it' + submitText='Reset' inProgressText={'Resetting\u2026'} enabled={this.state.passwordInput.length > 0 || !AccountManager.currentUser().has_password} onSubmit={() => currentApp.resetMasterKey(this.state.passwordInput)} From 4c064750f42dea955c4b233299f88628f0dd629c Mon Sep 17 00:00:00 2001 From: Flow Date: Sun, 10 Jul 2022 11:18:19 +0100 Subject: [PATCH 5/5] refactor question and button labels --- src/dashboard/Data/Browser/CreateClassDialog.react.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dashboard/Data/Browser/CreateClassDialog.react.js b/src/dashboard/Data/Browser/CreateClassDialog.react.js index fe4962e74b..e54f345157 100644 --- a/src/dashboard/Data/Browser/CreateClassDialog.react.js +++ b/src/dashboard/Data/Browser/CreateClassDialog.react.js @@ -64,12 +64,12 @@ export default class CreateClassDialog extends React.Component { type={Modal.Types.INFO} icon='plus' iconSize={40} - title='Add a new class' - subtitle='Create a new collection of objects.' + title='Create a new class?' + subtitle='This creates a new class to hold objects.' disabled={!this.valid()} - confirmText='Add' + confirmText='Create' cancelText='Cancel' - continueText={'Add & add columns'} + continueText={'Create & add columns'} onCancel={this.props.onCancel} showContinue={true} onContinue={async () => {