diff --git a/src/components/Snapshot/Snapshot.js b/src/components/Snapshot/Snapshot.js index ac340cf9..571b7095 100644 --- a/src/components/Snapshot/Snapshot.js +++ b/src/components/Snapshot/Snapshot.js @@ -103,9 +103,17 @@ function SnapshotIcon(props, snapshotProps) { }>
Revert
} : '' } - { props.usercreated && !snapshotObject.removed ? - { !snapshotProps.disableBackup ?
Backup
:
Backup
} -
: '' + { props.usercreated && !snapshotObject.removed ? ( + + { !snapshotProps.disableBackup ? ( +
Back Up
+ ) : ( + +
Back up
+
+ )} +
+ ) : '' }
Clone Volume
diff --git a/src/models/backingImage.js b/src/models/backingImage.js index ebee14f3..c0261964 100644 --- a/src/models/backingImage.js +++ b/src/models/backingImage.js @@ -90,7 +90,7 @@ export default { if (url) { const resp = yield call(execAction, url) if (resp && resp.status === 200) { - message.success(`Successfully backup ${payload.name} backing image`) + message.success(`Successfully back up ${payload.name} backing image`) } yield delay(1000) yield put({ type: 'queryBackupBackingImage' }) diff --git a/src/routes/backingImage/BackingImageActions.js b/src/routes/backingImage/BackingImageActions.js index 894fc7b4..35d71bcc 100644 --- a/src/routes/backingImage/BackingImageActions.js +++ b/src/routes/backingImage/BackingImageActions.js @@ -45,7 +45,7 @@ function actions({ selected, backupProps, deleteBackingImage, downloadBackingIma const availableActions = [ { key: 'updateMinCopies', name: 'Update Minimum Copies Count', disabled: disableAction, tooltip: disableAction ? 'Missing disk with ready state' : '' }, - { key: 'backup', name: ' Backup', disabled: disableAction || backupTargetAvailable === false, tooltip: getBackupActionTooltip() }, + { key: 'backup', name: ' Back Up', disabled: disableAction || backupTargetAvailable === false, tooltip: getBackupActionTooltip() }, { key: 'download', name: 'Download', disabled: disableAction, tooltip: disableAction ? 'Missing disk with ready state' : '' }, { key: 'delete', name: 'Delete' }, ] diff --git a/src/routes/backingImage/BackingImageBulkActions.js b/src/routes/backingImage/BackingImageBulkActions.js index 1c2046ad..36fe0141 100644 --- a/src/routes/backingImage/BackingImageBulkActions.js +++ b/src/routes/backingImage/BackingImageBulkActions.js @@ -92,7 +92,7 @@ function bulkActions({ selectedRows, backupProps, deleteBackingImages, downloadS const allActions = [ { key: 'delete', name: 'Delete', disabled() { return selectedRows.length === 0 } }, { key: 'download', name: 'Download', disabled() { return (selectedRows.length === 0 || selectedRows.every(row => !hasReadyBackingDisk(row))) } }, - { key: 'backup', name: 'Backup', disabled() { return selectedRows.length === 0 || backupTargetAvailable === false || selectedRows.every(row => !hasReadyBackingDisk(row)) } }, + { key: 'backup', name: 'Back Up', disabled() { return selectedRows.length === 0 || backupTargetAvailable === false || selectedRows.every(row => !hasReadyBackingDisk(row)) } }, ] return ( diff --git a/src/routes/backingImage/RestoreBackupBackingImageModal.js b/src/routes/backingImage/RestoreBackupBackingImageModal.js index 1c231952..2f7e3dc3 100644 --- a/src/routes/backingImage/RestoreBackupBackingImageModal.js +++ b/src/routes/backingImage/RestoreBackupBackingImageModal.js @@ -39,7 +39,7 @@ const modal = ({ } const modalOpts = { - title: `Restore ${item.name} Backup Backing Image`, + title: 'Restore Backing Image', visible, onCancel, onOk: handleOk, @@ -50,16 +50,15 @@ const modal = ({ return (
- - {getFieldDecorator('secret', { - initialValue: '', - })()} - - - {getFieldDecorator('secretNamespace', { - initialValue: '', - })()} - + + {getFieldDecorator('backup', { initialValue: item?.name || '' })()} + + + {getFieldDecorator('secret', { initialValue: '' })()} + + + {getFieldDecorator('secretNamespace', { initialValue: '' })()} +
) diff --git a/src/routes/backingImage/index.js b/src/routes/backingImage/index.js index 6e6cfcb7..2dd3fffe 100644 --- a/src/routes/backingImage/index.js +++ b/src/routes/backingImage/index.js @@ -482,7 +482,7 @@ class BackingImage extends React.Component {
- Backup Backing Image + Backing Image Backup