fix(xo-web/(file-)restore-legacy): ignore proxy remotes (#5124)
Legacy restore doesn't support proxy remotes
This commit is contained in:
parent
1c042778b6
commit
4636109081
@ -14,6 +14,8 @@
|
||||
|
||||
> Users must be able to say: “I had this issue, happy to know it's fixed”
|
||||
|
||||
- [Restore legacy, File restore legacy] Fix mount error in case of existing proxy remotes (PR [#5124](https://github.com/vatesfr/xen-orchestra/pull/5124))
|
||||
|
||||
### Packages to release
|
||||
|
||||
> Packages will be released in the order they are here, therefore, they should
|
||||
|
@ -2368,18 +2368,21 @@ export const editRemote = (remote, { name, options, proxy, url }) =>
|
||||
testRemote(remote).catch(noop)
|
||||
})
|
||||
|
||||
export const listRemote = remote =>
|
||||
_call(
|
||||
'remote.list',
|
||||
resolveIds({ id: remote })
|
||||
)::tap(subscribeRemotes.forceRefresh, err =>
|
||||
error(_('listRemote'), err.message || String(err))
|
||||
)
|
||||
export const listRemote = async remote =>
|
||||
remote.proxy === undefined
|
||||
? _call('remote.list', {
|
||||
id: remote.id,
|
||||
})::tap(subscribeRemotes.forceRefresh, err =>
|
||||
error(_('listRemote'), err.message || String(err))
|
||||
)
|
||||
: []
|
||||
|
||||
export const listRemoteBackups = remote =>
|
||||
_call('backup.list', resolveIds({ remote }))::tap(null, err =>
|
||||
error(_('listRemote'), err.message || String(err))
|
||||
)
|
||||
export const listRemoteBackups = async remote =>
|
||||
remote.proxy === undefined
|
||||
? _call('backup.list', { remote: remote.id })::tap(null, err =>
|
||||
error(_('listRemote'), err.message || String(err))
|
||||
)
|
||||
: []
|
||||
|
||||
export const testRemote = remote =>
|
||||
_call('remote.test', resolveIds({ id: remote }))
|
||||
|
@ -259,8 +259,8 @@ export default class Restore extends Component {
|
||||
const remotes = filter(rawRemotes, 'enabled')
|
||||
const remotesInfo = await Promise.all(
|
||||
map(remotes, async remote => ({
|
||||
files: await listRemote(remote.id),
|
||||
backupsInfo: await listRemoteBackups(remote.id),
|
||||
files: await listRemote(remote),
|
||||
backupsInfo: await listRemoteBackups(remote),
|
||||
}))
|
||||
)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user