feat(xo-server,xo-web/smart backup): exclude XO Proxy VMs by default (#5128)
This commit is contained in:
parent
34b5962eac
commit
1c042778b6
@ -8,6 +8,7 @@
|
||||
> Users must be able to say: “Nice enhancement, I'm eager to test it”
|
||||
|
||||
- [Home] Remove 'tags' filter from the filter selector since tags have their own selector (PR [#5121](https://github.com/vatesfr/xen-orchestra/pull/5121))
|
||||
- [Backup/New] Add "XOA Proxy" to the excluded tags by default (PR [#5128](https://github.com/vatesfr/xen-orchestra/pull/5128))
|
||||
|
||||
### Bug fixes
|
||||
|
||||
@ -30,4 +31,5 @@
|
||||
>
|
||||
> In case of conflict, the highest (lowest in previous list) `$version` wins.
|
||||
|
||||
- xo-server minor
|
||||
- xo-web minor
|
||||
|
@ -48,6 +48,15 @@ createJob.params = {
|
||||
},
|
||||
}
|
||||
|
||||
export function getSuggestedExcludedTags() {
|
||||
return [
|
||||
'Continuous Replication',
|
||||
'Disaster Recovery',
|
||||
'XOSAN',
|
||||
this._config['xo-proxy'].vmTag,
|
||||
]
|
||||
}
|
||||
|
||||
export function migrateLegacyJob({ id }) {
|
||||
return this.migrateLegacyBackupJob(id)
|
||||
}
|
||||
|
@ -2101,6 +2101,9 @@ export const subscribeMetadataBackupJobs = createSubscription(() =>
|
||||
export const createBackupNgJob = props =>
|
||||
_call('backupNg.createJob', props)::tap(subscribeBackupNgJobs.forceRefresh)
|
||||
|
||||
export const getSuggestedExcludedTags = () =>
|
||||
_call('backupNg.getSuggestedExcludedTags')
|
||||
|
||||
export const deleteBackupJobs = async ({
|
||||
backupIds = [],
|
||||
metadataBackupIds = [],
|
||||
|
@ -36,6 +36,7 @@ import {
|
||||
deleteSchedule,
|
||||
editBackupNgJob,
|
||||
editSchedule,
|
||||
getSuggestedExcludedTags,
|
||||
isSrWritable,
|
||||
subscribeRemotes,
|
||||
} from 'xo'
|
||||
@ -235,9 +236,7 @@ const getInitialState = ({ preSelectedVmIds, setHomeVmIdsSelection }) => {
|
||||
smartMode: false,
|
||||
snapshotMode: false,
|
||||
srs: [],
|
||||
tags: {
|
||||
notValues: ['Continuous Replication', 'Disaster Recovery', 'XOSAN'],
|
||||
},
|
||||
tags: {},
|
||||
vms: preSelectedVmIds,
|
||||
}
|
||||
}
|
||||
@ -301,6 +300,9 @@ export default decorate([
|
||||
provideState({
|
||||
initialState: getInitialState,
|
||||
effects: {
|
||||
initialize: async function () {
|
||||
this.state.tags = { notValues: await getSuggestedExcludedTags() }
|
||||
},
|
||||
createJob: () => async state => {
|
||||
if (state.isJobInvalid) {
|
||||
return {
|
||||
|
Loading…
Reference in New Issue
Block a user