+
: ''}
- {steps[current].content == 'month' ?
-
+ {steps[current].content == 'month'
+ ?
@@ -1082,16 +1084,16 @@ class ReactCron extends React.Component {
Every
- {let data = Object.assign({}, this.state.month, { incrementStart: val, monthText: this.state.month.cronEvery === '2' ? `${this.state.month.incrementIncrement}/${val}` : this.state.monthText }); this.setState({...this.state, monthText: data.monthText, month: data }, () => { this.prettyCronfun() })}} >
+ { let data = Object.assign({}, this.state.month, { incrementStart: val, monthText: this.state.month.cronEvery === '2' ? `${this.state.month.incrementIncrement}/${val}` : this.state.monthText }); this.setState({ ...this.state, monthText: data.monthText, month: data }, () => { this.prettyCronfun() }) }}>
month(s) starting at month
- {let data = Object.assign({}, this.state.month, { incrementIncrement: val, monthText: this.state.month.cronEvery === '2' ? `${val}/${this.state.month.incrementStart}` : this.state.monthText }); this.setState({...this.state, monthText: data.monthText, month: data }, () => { this.prettyCronfun() })}} >
+ { let data = Object.assign({}, this.state.month, { incrementIncrement: val, monthText: this.state.month.cronEvery === '2' ? `${val}/${this.state.month.incrementStart}` : this.state.monthText }); this.setState({ ...this.state, monthText: data.monthText, month: data }, () => { this.prettyCronfun() }) }}>
Specific month (choose one or many)
-
+
: ''}
+
{current > 0 && (
)}
{current === steps.length - 1 && (
-
- { this.state.cornFormat ?
-
+ { this.state.cornFormat
+ ?
Cron expression format error
-
:
-
+
+ :
{this.state.prettyCronText}
}
diff --git a/src/models/backup.js b/src/models/backup.js
index e8060faa..4117173c 100644
--- a/src/models/backup.js
+++ b/src/models/backup.js
@@ -16,10 +16,9 @@ export default {
selectedRows: [],
workloadDetailModalItem: {},
backupStatus: {},
- currentItem: {},
+ currentItem: [],
currentBackupVolume: {},
lastBackupUrl: '',
- baseImage: '',
volumeName: '',
backupTargetMessage: '',
previousChecked: false,
@@ -28,10 +27,8 @@ export default {
backupLabel: {},
nodeTags: [],
diskTags: [],
- bulkRestoreData: [],
backupVolumesForBulkCreate: [],
search: {},
- isBulkRestore: false,
restoreBackupModalVisible: false,
backupTargetAvailable: false,
workloadDetailModalVisible: false,
@@ -140,22 +137,21 @@ export default {
params.backupName = lastBackup.id
params.numberOfReplicas = payload.numberOfReplicas
params.volumeName = lastBackup.volumeName
- params.backingImage = payload.backingImage ? payload.backingImage : ''
+ params.backingImage = payload.backingImage || ''
- yield put({ type: 'showRestoreBackupModal', payload: { currentItem: params } })
- yield put({ type: 'queryDiskTagsAndgetNodeTags' })
+ yield put({ type: 'showRestoreBackupModal', payload: { currentItem: [params] } })
+ yield put({ type: 'queryDiskTagsAndGetNodeTags' })
}
},
*beforeShowRestoreBackupModal({
payload,
}, { put }) {
yield put({ type: 'showRestoreBackupModal', payload })
- yield put({ type: 'queryDiskTagsAndgetNodeTags' })
+ yield put({ type: 'queryDiskTagsAndGetNodeTags' })
},
*queryBackupDetailBulkData({
payload,
}, { call, put }) {
- // const data = yield call(execAction, payload.url)
if (payload && payload.selectedRows && payload.selectedRows.length > 0) {
let data = []
@@ -173,19 +169,19 @@ export default {
}
}
}
-
if (data && data.length > 0) {
yield put({ type: 'showRestoreBulkBackupModal',
payload: {
- currentItem: {
- name: '
',
+ currentItem: data.map(d => ({
+ backupName: d.name,
+ backingImage: d.volumeBackingImageName,
+ fromBackup: d.url,
+ volumeName: d.volumeName,
numberOfReplicas: payload.numberOfReplicas,
- },
- bulkRestoreData: data,
+ })),
},
})
-
- yield put({ type: 'queryDiskTagsAndgetNodeTags' })
+ yield put({ type: 'queryDiskTagsAndGetNodeTags' })
}
}
},
@@ -197,7 +193,7 @@ export default {
const search = yield select(store => { return store.backup.search })
yield put({ type: 'query', payload: { ...search } })
},
- *queryDiskTagsAndgetNodeTags({
+ *queryDiskTagsAndGetNodeTags({
payload,
}, { call, put }) {
const nodeTags = yield call(getNodeTags, payload)
@@ -212,20 +208,13 @@ export default {
*restoreBulkBackup({
payload,
}, { call, put, select }) {
- let restoreBulkBackup = []
yield put({ type: 'hideRestoreBackupModal' })
- if (payload.bulkRestoreData && payload.selectedBackup) {
- payload.bulkRestoreData.forEach((item) => {
- let params = {}
- Object.assign(params, payload.selectedBackup)
- params.name = item.volumeName
- params.fromBackup = item.url
- restoreBulkBackup.push(params)
- })
- }
- if (restoreBulkBackup.length > 0) {
- for (let i = 0; i < restoreBulkBackup.length; i++) {
- yield call(restore, restoreBulkBackup[i])
+ if (payload.length > 0) {
+ for (let i = 0; i < payload.length; i++) {
+ const resp = yield call(restore, payload[i])
+ if (resp && resp.status === 200) {
+ message.success(`Successfully restore backup volume ${payload[i].name}`, 3)
+ }
}
}
const search = yield select(store => { return store.backup.search })
@@ -267,7 +256,14 @@ export default {
payload,
}, { call, put, select }) {
yield put({ type: 'hideBulkCreateVolumeStandModalVisible' })
- yield payload.map((item) => call(createVolume, item))
+ if (payload.length > 0) {
+ for (let i = 0; i < payload.length; i++) {
+ const resp = yield call(createVolume, payload[i])
+ if (resp && resp.status === 200) {
+ message.success(`Successfully create DR volume ${payload[i].name}`, 3)
+ }
+ }
+ }
const search = yield select(store => { return store.backup.search })
yield put({ type: 'query', payload: { ...search } })
},
@@ -280,7 +276,7 @@ export default {
// For DR Volume
yield put({ type: 'initModalUrl', found, payload })
yield put({ type: 'showCreateVolumeStandModalVisible' })
- yield put({ type: 'queryDiskTagsAndgetNodeTags' })
+ yield put({ type: 'queryDiskTagsAndGetNodeTags' })
},
*BulkCreateStandVolume({
payload,
@@ -288,18 +284,18 @@ export default {
const data = yield payload.backupVolume.map((item) => call(execAction, item.actions.backupList))
const volumes = data.map((item, index) => {
const volume = payload.backupVolume[index]
- const found = item.data.find((backup) => backup.id === volume.lastBackupName)
+ const lastBackup = item.data.find((backup) => backup.id === volume.lastBackupName)
return {
- lastBackupUrl: found.url,
volumeName: volume.id,
- baseImage: volume.baseImage,
- size: found.volumeSize,
+ lastBackupUrl: lastBackup.url,
+ size: lastBackup.volumeSize,
+ backingImage: lastBackup.volumeBackingImageName,
}
})
// For DR Volume
yield put({ type: 'initBulkCreateModalUrl', volumes })
yield put({ type: 'showBulkCreateVolumeStandModalVisible' })
- yield put({ type: 'queryDiskTagsAndgetNodeTags' })
+ yield put({ type: 'queryDiskTagsAndGetNodeTags' })
},
*deleteAllBackups({
payload,
@@ -426,7 +422,7 @@ export default {
return { ...state, showBackuplabelsModalVisible: false, createVolumeStandModalKey: Math.random() }
},
initModalUrl(state, action) {
- return { ...state, lastBackupUrl: action.found.url, volumeName: action.payload.name, baseImage: action.payload.baseImage, size: action.found.volumeSize }
+ return { ...state, lastBackupUrl: action.found.url, volumeName: action.payload.name, size: action.found.volumeSize }
},
initBulkCreateModalUrl(state, action) {
return { ...state, backupVolumesForBulkCreate: action.volumes }
@@ -435,10 +431,10 @@ export default {
return { ...state, ...action.payload, restoreBackupModalVisible: true, restoreBackupModalKey: Math.random() }
},
showRestoreBulkBackupModal(state, action) {
- return { ...state, ...action.payload, isBulkRestore: true, restoreBackupModalVisible: true, restoreBackupModalKey: Math.random() }
+ return { ...state, ...action.payload, restoreBackupModalVisible: true, restoreBackupModalKey: Math.random() }
},
hideRestoreBackupModal(state) {
- return { ...state, previousChecked: false, tagsLoading: true, restoreBackupModalVisible: false, isBulkRestore: false }
+ return { ...state, previousChecked: false, tagsLoading: true, restoreBackupModalVisible: false }
},
updateSorter(state, action) {
saveSorter('backupList.sorter', action.payload)
diff --git a/src/routes/backup/BackupDetail.js b/src/routes/backup/BackupDetail.js
index 199e433e..fa62df06 100644
--- a/src/routes/backup/BackupDetail.js
+++ b/src/routes/backup/BackupDetail.js
@@ -3,19 +3,18 @@ import PropTypes from 'prop-types'
import { connect } from 'dva'
import queryString from 'query-string'
import { Modal } from 'antd'
-import RestoreBackup from './RestoreBackup'
+import RestoreBackupModal from './RestoreBackupModal'
import { DropOption } from '../../components'
import BackupList from './BackupList'
import { sortBackups } from '../../utils/sort'
import ShowBackupLabels from './ShowBackupLabels'
-import CreateStandbyVolume from './CreateStandbyVolume'
+import CreateStandbyVolumeModal from './CreateStandbyVolumeModal'
import WorkloadDetailModal from '../volume/WorkloadDetailModal'
const { confirm } = Modal
-function Backup({ host, backup, volume, setting, backingImage, loading, location, dispatch }) {
+function Backup({ backup, volume, setting, backingImage, loading, location, dispatch }) {
const { backupVolumes, backupData, restoreBackupModalVisible, restoreBackupModalKey, currentItem, sorter, showBackupLabelsModalKey, backupLabel, showBackuplabelsModalVisible, createVolumeStandModalKey, createVolumeStandModalVisible, baseImage, size, lastBackupUrl, workloadDetailModalVisible, workloadDetailModalItem, workloadDetailModalKey, previousChecked, tagsLoading, nodeTags, diskTags } = backup
- const hosts = host.data
const volumeList = volume.data
const settings = setting.data
const backingImages = backingImage.data
@@ -82,7 +81,6 @@ function Backup({ host, backup, volume, setting, backingImage, loading, location
const restoreBackupModalProps = {
item: currentItem,
- hosts,
previousChecked,
tagsLoading,
nodeTags,
@@ -207,9 +205,9 @@ function Backup({ host, backup, volume, setting, backingImage, loading, location
/>
- { restoreBackupModalVisible ?
: ''}
+ { restoreBackupModalVisible ?
: ''}
{ showBackuplabelsModalVisible ?
: ''}
- { createVolumeStandModalVisible ?
: ''}
+ { createVolumeStandModalVisible ?
: ''}
{ workloadDetailModalVisible ?
: ''}
+ If there is another volume with the same name ({getFieldsValue().name}), the create DR volume will fail.
+
+ const item = drVolumeConfigs[currentTab] || {}
+ const activeKey = items[currentTab].volumeName
+
return (
+
+ {items.map(i => )}
+
+ }>
+
+ {getFieldDecorator('name', {
+ initialValue: item.name,
+ rules: [
+ {
+ required: true,
+ message: 'Volume name is required',
+ },
+ ],
+ })()}
+
+
+
+ {getFieldDecorator('size', {
+ initialValue: item.size,
+ rules: [
+ {
+ required: true,
+ message: 'Please input volume size',
+ },
+ ],
+ })()}
{getFieldDecorator('numberOfReplicas', {
@@ -66,23 +225,8 @@ const modal = ({
required: true,
message: 'Please input the number of replicas',
},
- {
- validator: (rule, value, callback) => {
- if (value === '' || typeof value !== 'number') {
- callback()
- return
- }
- if (value < 1 || value > 10) {
- callback('The value should be between 1 and 10')
- } else if (!/^\d+$/.test(value)) {
- callback('The value must be a positive integer')
- } else {
- callback()
- }
- },
- },
],
- })()}
+ })()}
{getFieldDecorator('dataEngine', {
@@ -93,7 +237,7 @@ const modal = ({
message: 'Please select the data engine',
},
{
- validator: (rule, value, callback) => {
+ validator: (_rule, value, callback) => {
if (value === 'v1' && !v1DataEngineEnabled) {
callback('v1 data engine is not enabled')
} else if (value === 'v2' && !v2DataEngineEnabled) {
@@ -103,31 +247,37 @@ const modal = ({
},
},
],
- })(
{getFieldDecorator('accessMode', {
- initialValue: 'rwo',
- })(
{getFieldDecorator('backingImage', {
- initialValue: '',
- })(
+
+ {getFieldDecorator('encrypted', {
+ valuePropName: 'checked',
+ initialValue: item.encrypted || false,
+ })()}
+
{getFieldDecorator('nodeSelector', {
initialValue: [],
- })(
@@ -136,7 +286,7 @@ const modal = ({
{getFieldDecorator('diskSelector', {
initialValue: [],
- })(
@@ -155,6 +305,7 @@ modal.propTypes = {
numberOfReplicas: PropTypes.number,
nodeTags: PropTypes.array,
diskTags: PropTypes.array,
+ backupVolumes: PropTypes.array,
tagsLoading: PropTypes.bool,
backingImages: PropTypes.array,
v1DataEngineEnabled: PropTypes.bool,
diff --git a/src/routes/backup/BulkRestoreBackupModal.js b/src/routes/backup/BulkRestoreBackupModal.js
new file mode 100644
index 00000000..0646c9df
--- /dev/null
+++ b/src/routes/backup/BulkRestoreBackupModal.js
@@ -0,0 +1,316 @@
+import React, { useState } from 'react'
+import PropTypes from 'prop-types'
+import { Form, Input, InputNumber, Spin, Select, message, Popover, Alert, Tabs, Button, Checkbox, Tooltip } from 'antd'
+import { ModalBlur } from '../../components'
+
+const TabPane = Tabs.TabPane
+const FormItem = Form.Item
+const Option = Select.Option
+
+const formItemLayout = {
+ labelCol: {
+ span: 8,
+ },
+ wrapperCol: {
+ span: 14,
+ },
+}
+
+const modal = ({
+ items,
+ visible,
+ onCancel,
+ onOk,
+ nodeTags,
+ diskTags,
+ tagsLoading,
+ backingImages,
+ backupVolumes,
+ v1DataEngineEnabled,
+ v2DataEngineEnabled,
+ form: {
+ getFieldDecorator,
+ validateFields,
+ getFieldsError,
+ getFieldsValue,
+ getFieldValue,
+ setFieldsValue,
+ },
+}) => {
+ const initConfigs = items.map((i) => ({
+ name: i.volumeName,
+ numberOfReplicas: i.numberOfReplicas,
+ dataEngine: 'v1',
+ accessMode: i.accessMode || null,
+ latestBackup: i.backupName,
+ backingImage: i.backingImage,
+ encrypted: false,
+ restoreVolumeRecurringJob: 'ignored',
+ nodeSelector: i.nodeSelector || [],
+ diskSelector: i.diskSelector || [],
+ }))
+ const [currentTab, setCurrentTab] = useState(0)
+ const [restoreBackupConfigs, setRestoreBackupConfigs] = useState(initConfigs)
+
+ const handleOk = () => onOk(restoreBackupConfigs)
+
+ const updateRestoreBackupConfigs = (key, newValue) => {
+ setRestoreBackupConfigs(prev => {
+ const newConfigs = [...prev]
+ const data = {
+ ...getFieldsValue(),
+ [key]: newValue,
+ fromBackup: items[currentTab]?.fromBackup || '',
+ }
+ newConfigs.splice(currentTab, 1, data)
+ return newConfigs
+ })
+ }
+
+ const handleNameChange = (e) => updateRestoreBackupConfigs('name', e.target.value)
+ const handleReplicasNumberChange = (newNumber) => updateRestoreBackupConfigs('numberOfReplicas', newNumber)
+ const handleEncryptedCheck = (e) => updateRestoreBackupConfigs('encrypted', e.target.checked)
+ const handleDataEngineChange = (value) => updateRestoreBackupConfigs('dataEngine', value)
+ const handleAccessModeChange = (value) => updateRestoreBackupConfigs('accessMode', value)
+ const handleRecurringJobChange = (value) => updateRestoreBackupConfigs('restoreVolumeRecurringJob', value)
+ const handleNodeTagRemove = (value) => {
+ const oldNodeTags = restoreBackupConfigs[currentTab]?.nodeSelector
+ const newNodeSelector = oldNodeTags?.filter(tag => tag !== value) || []
+ updateRestoreBackupConfigs('nodeSelector', newNodeSelector)
+ }
+ const handleNodeTagAdd = (value) => {
+ const oldNodeTags = restoreBackupConfigs[currentTab]?.nodeSelector
+ updateRestoreBackupConfigs('nodeSelector', [...oldNodeTags, value])
+ }
+ const handleDiskTagRemove = (value) => {
+ const oldDiskTags = restoreBackupConfigs[currentTab]?.diskSelector
+ const newDiskSelector = oldDiskTags?.filter(tag => tag !== value) || []
+ updateRestoreBackupConfigs('diskSelector', newDiskSelector)
+ }
+ const handleDiskTagAdd = (value) => {
+ const oldDiskTags = restoreBackupConfigs[currentTab]?.diskSelector
+ updateRestoreBackupConfigs('diskSelector', [...oldDiskTags, value])
+ }
+
+ const handleApplyAll = () => {
+ // only apply below configs to other configs
+ const currentConfig = {
+ numberOfReplicas: getFieldValue('numberOfReplicas'),
+ dataEngine: getFieldValue('dataEngine'),
+ accessMode: getFieldValue('accessMode'),
+ encrypted: getFieldValue('encrypted') || false,
+ restoreVolumeRecurringJob: getFieldValue('restoreVolumeRecurringJob'),
+ nodeSelector: getFieldValue('nodeSelector'),
+ diskSelector: getFieldValue('diskSelector'),
+ }
+ setRestoreBackupConfigs(prev => {
+ const newConfigs = [...prev]
+ newConfigs.forEach((config, index) => {
+ if (index !== currentTab) {
+ newConfigs.splice(index, 1, { ...config, ...currentConfig })
+ }
+ })
+ return newConfigs
+ })
+ message.success(`Successfully apply ${getFieldValue('name')} config to all other restore volumes`, 5)
+ }
+
+ const allFieldsError = { ...getFieldsError() }
+ const hasFieldsError = Object.values(allFieldsError).some(fieldError => fieldError !== undefined) || false
+
+ const handleTabClick = (key) => {
+ if (hasFieldsError) {
+ message.error('Please correct the error fields before switching to another tab', 5)
+ return
+ }
+ validateFields((errors) => {
+ if (errors) return errors
+ })
+
+ const newIndex = items.findIndex(i => i.backupName === key)
+
+ if (newIndex !== -1) {
+ setCurrentTab(newIndex)
+ const nextConfig = restoreBackupConfigs[newIndex]
+ setFieldsValue({
+ name: nextConfig.name,
+ numberOfReplicas: nextConfig.numberOfReplicas,
+ dataEngine: nextConfig.dataEngine,
+ accessMode: nextConfig.accessMode,
+ latestBackup: nextConfig.latestBackup,
+ backingImage: nextConfig.backingImage,
+ encrypted: nextConfig.encrypted,
+ restoreVolumeRecurringJob: nextConfig.restoreVolumeRecurringJob,
+ nodeSelector: nextConfig.nodeSelector,
+ diskSelector: nextConfig.diskSelector,
+ })
+ }
+ }
+
+ const showWarning = backupVolumes?.some((backupVolume) => backupVolume.name === getFieldsValue().name)
+ const alertMessage =
+ 1. If there is another volume with the same name ({getFieldsValue().name}), the restore action will fail.
+
+ 2. The restore volume name ({getFieldsValue().name}) is the same as this backup volume, by which the backups created after restoration reside in this backup volume as well.
+
+
+ const tooltipTitle = `Apply this ${getFieldValue('name')} config to all the other restore volumes, this action will overwrite your previous filled in configs`
+ const modalOpts = {
+ title: 'Restore Multiple Latest Backups',
+ visible,
+ onOk: handleOk,
+ onCancel,
+ width: 700,
+ footer: [
+ ,
+
+
+ ,
+ ,
+ ],
+ }
+
+ const item = restoreBackupConfigs[currentTab] || {}
+ const activeKey = item.latestBackup
+
+ return (
+
+
+ {items.map(i => )}
+
+
+ }>
+
+ {getFieldDecorator('name', {
+ initialValue: item.name,
+ rules: [
+ {
+ required: true,
+ message: 'Volume name is required',
+ },
+ ],
+ })()}
+
+
+
+ {getFieldDecorator('numberOfReplicas', {
+ initialValue: item.numberOfReplicas,
+ rules: [
+ {
+ required: true,
+ message: 'Please input the number of replicas',
+ },
+ ],
+ })()
+ }
+
+
+ {getFieldDecorator('dataEngine', {
+ initialValue: item.dataEngine || 'v1',
+ rules: [
+ {
+ required: true,
+ message: 'Please select the data engine',
+ },
+ {
+ validator: (_rule, value, callback) => {
+ if (value === 'v1' && !v1DataEngineEnabled) {
+ callback('v1 data engine is not enabled')
+ } else if (value === 'v2' && !v2DataEngineEnabled) {
+ callback('v2 data engine is not enabled')
+ }
+ callback()
+ },
+ },
+ ],
+ })()}
+
+
+ {getFieldDecorator('accessMode', {
+ initialValue: item.accessMode,
+ })()}
+
+
+ {getFieldDecorator('latestBackup', {
+ initialValue: item.latestBackup,
+ })()}
+
+
+ {getFieldDecorator('backingImage', {
+ initialValue: item.backingImage,
+ })()}
+
+
+ {getFieldDecorator('encrypted', {
+ valuePropName: 'checked',
+ initialValue: item.encrypted || false,
+ })()}
+
+
+ {getFieldDecorator('restoreVolumeRecurringJob', {
+ initialValue: 'ignored',
+ })()}
+
+
+
+ {getFieldDecorator('nodeSelector', {
+ initialValue: [],
+ })()}
+
+
+
+
+ {getFieldDecorator('diskSelector', {
+ initialValue: [],
+ })()}
+
+
+
+
+ )
+}
+
+modal.propTypes = {
+ items: PropTypes.array.isRequired,
+ visible: PropTypes.bool,
+ onCancel: PropTypes.func,
+ onOk: PropTypes.func,
+ nodeTags: PropTypes.array,
+ diskTags: PropTypes.array,
+ backingImages: PropTypes.array,
+ backupVolumes: PropTypes.array,
+ v1DataEngineEnabled: PropTypes.bool,
+ v2DataEngineEnabled: PropTypes.bool,
+ tagsLoading: PropTypes.bool,
+ form: PropTypes.object.isRequired,
+}
+
+export default Form.create()(modal)
diff --git a/src/routes/backup/CreateStandbyVolume.js b/src/routes/backup/CreateStandbyVolumeModal.js
similarity index 94%
rename from src/routes/backup/CreateStandbyVolume.js
rename to src/routes/backup/CreateStandbyVolumeModal.js
index 05d30fbb..bd00123f 100644
--- a/src/routes/backup/CreateStandbyVolume.js
+++ b/src/routes/backup/CreateStandbyVolumeModal.js
@@ -50,6 +50,7 @@ const modal = ({
visible,
onCancel,
onOk: handleOk,
+ width: 700,
}
const showWarning = backupVolumes?.some((backupVolume) => backupVolume.name === getFieldsValue().name)
@@ -69,7 +70,7 @@ const modal = ({
rules: [
{
required: true,
- message: 'Please input volume name',
+ message: 'Volume name is required',
},
],
})(
)}
@@ -98,7 +99,7 @@ const modal = ({
},
},
],
- })(
)}
+ })(
)}
{getFieldDecorator('dataEngine', {
@@ -133,7 +134,7 @@ const modal = ({
message: 'Please input the number of replicas',
},
{
- validator: (rule, value, callback) => {
+ validator: (_rule, value, callback) => {
if (value === '' || typeof value !== 'number') {
callback()
return
@@ -161,15 +162,15 @@ const modal = ({
{getFieldDecorator('backingImage', {
initialValue: item.backingImage,
- })(
- {getFieldDecorator('encrypted', {
- valuePropName: 'encrypted',
- initialValue: false,
- })()}
+ {getFieldDecorator('encrypted', {
+ valuePropName: 'encrypted',
+ initialValue: false,
+ })()}
@@ -213,7 +214,6 @@ modal.propTypes = {
onCancel: PropTypes.func,
item: PropTypes.object,
onOk: PropTypes.func,
- hosts: PropTypes.array,
nodeTags: PropTypes.array,
diskTags: PropTypes.array,
backupVolumes: PropTypes.array,
diff --git a/src/routes/backup/RestoreBackup.js b/src/routes/backup/RestoreBackupModal.js
similarity index 77%
rename from src/routes/backup/RestoreBackup.js
rename to src/routes/backup/RestoreBackupModal.js
index 1abbc018..358de293 100644
--- a/src/routes/backup/RestoreBackup.js
+++ b/src/routes/backup/RestoreBackupModal.js
@@ -28,7 +28,6 @@ const modal = ({
setPreviousChange,
v1DataEngineEnabled,
v2DataEngineEnabled,
- isBulk = false,
form: {
getFieldDecorator,
validateFields,
@@ -51,8 +50,9 @@ const modal = ({
onOk(data)
})
}
+
const modalOpts = {
- title: isBulk ? 'Restore Backup' : `Restore Backup ${item.backupName}`,
+ title: `Restore Backup ${item.backupName}`,
visible,
onCancel,
onOk: handleOk,
@@ -74,7 +74,7 @@ const modal = ({