fix(xo-web/user): fix custom filters in default filter select (#5298)
This commit is contained in:
parent
2291986e2c
commit
4f3d4b06b5
@ -16,6 +16,7 @@
|
|||||||
- [XOA/Notifications] Don't show expired notifications (PR [#5304](https://github.com/vatesfr/xen-orchestra/pull/5304))
|
- [XOA/Notifications] Don't show expired notifications (PR [#5304](https://github.com/vatesfr/xen-orchestra/pull/5304))
|
||||||
- [Backup/S3] Fix secret key edit form [#5233](https://github.com/vatesfr/xen-orchestra/issues/5233) (PR[#5305](https://github.com/vatesfr/xen-orchestra/pull/5305))
|
- [Backup/S3] Fix secret key edit form [#5233](https://github.com/vatesfr/xen-orchestra/issues/5233) (PR[#5305](https://github.com/vatesfr/xen-orchestra/pull/5305))
|
||||||
- [New network] Remove the possibility of creating a network on a bond member interface (PR [#5262](https://github.com/vatesfr/xen-orchestra/pull/5262))
|
- [New network] Remove the possibility of creating a network on a bond member interface (PR [#5262](https://github.com/vatesfr/xen-orchestra/pull/5262))
|
||||||
|
- [User] Fix custom filters not showing up when selecting a default filter for templates (PR [#5298](https://github.com/vatesfr/xen-orchestra/pull/5298))
|
||||||
|
|
||||||
### Packages to release
|
### Packages to release
|
||||||
|
|
||||||
|
@ -2,24 +2,32 @@ const common = {
|
|||||||
homeFilterNone: '',
|
homeFilterNone: '',
|
||||||
}
|
}
|
||||||
|
|
||||||
export const VM = {
|
const VM = {
|
||||||
...common,
|
...common,
|
||||||
homeFilterPendingVms: 'current_operations:"" ',
|
homeFilterPendingVms: 'current_operations:"" ',
|
||||||
homeFilterHvmGuests: 'virtualizationMode:hvm ',
|
homeFilterHvmGuests: 'virtualizationMode:hvm ',
|
||||||
}
|
}
|
||||||
|
|
||||||
export const host = {
|
const host = {
|
||||||
...common,
|
...common,
|
||||||
}
|
}
|
||||||
|
|
||||||
export const pool = {
|
const pool = {
|
||||||
...common,
|
...common,
|
||||||
}
|
}
|
||||||
|
|
||||||
export const vmTemplate = {
|
const vmTemplate = {
|
||||||
...common,
|
...common,
|
||||||
}
|
}
|
||||||
|
|
||||||
export const SR = {
|
const SR = {
|
||||||
...common,
|
...common,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default {
|
||||||
|
VM,
|
||||||
|
host,
|
||||||
|
pool,
|
||||||
|
'VM-template': vmTemplate,
|
||||||
|
SR,
|
||||||
|
}
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
import * as ComplexMatcher from 'complex-matcher'
|
import * as ComplexMatcher from 'complex-matcher'
|
||||||
import * as homeFilters from 'home-filters'
|
|
||||||
import _ from 'intl'
|
import _ from 'intl'
|
||||||
import ActionButton from 'action-button'
|
import ActionButton from 'action-button'
|
||||||
import Button from 'button'
|
import Button from 'button'
|
||||||
@ -8,6 +7,7 @@ import classNames from 'classnames'
|
|||||||
import Component from 'base-component'
|
import Component from 'base-component'
|
||||||
import cookies from 'js-cookie'
|
import cookies from 'js-cookie'
|
||||||
import defined, { get } from '@xen-orchestra/defined'
|
import defined, { get } from '@xen-orchestra/defined'
|
||||||
|
import homeFilters from 'home-filters'
|
||||||
import Icon from 'icon'
|
import Icon from 'icon'
|
||||||
import invoke from 'invoke'
|
import invoke from 'invoke'
|
||||||
import Link from 'link'
|
import Link from 'link'
|
||||||
@ -241,7 +241,7 @@ const OPTIONS = {
|
|||||||
},
|
},
|
||||||
'VM-template': {
|
'VM-template': {
|
||||||
defaultFilter: '',
|
defaultFilter: '',
|
||||||
filters: homeFilters.vmTemplate,
|
filters: homeFilters['VM-template'],
|
||||||
mainActions: [
|
mainActions: [
|
||||||
{
|
{
|
||||||
handler: vms => copyVms(vms, 'VM-template'),
|
handler: vms => copyVms(vms, 'VM-template'),
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
import * as FormGrid from 'form-grid'
|
import * as FormGrid from 'form-grid'
|
||||||
import * as homeFilters from 'home-filters'
|
|
||||||
import _, { messages } from 'intl'
|
import _, { messages } from 'intl'
|
||||||
import ActionButton from 'action-button'
|
import ActionButton from 'action-button'
|
||||||
import Component from 'base-component'
|
import Component from 'base-component'
|
||||||
|
import homeFilters from 'home-filters'
|
||||||
import Icon from 'icon'
|
import Icon from 'icon'
|
||||||
import PropTypes from 'prop-types'
|
import PropTypes from 'prop-types'
|
||||||
import React from 'react'
|
import React from 'react'
|
||||||
@ -52,7 +52,7 @@ const FILTER_TYPE_TO_LABEL_ID = {
|
|||||||
host: 'homeTypeHost',
|
host: 'homeTypeHost',
|
||||||
pool: 'homeTypePool',
|
pool: 'homeTypePool',
|
||||||
VM: 'homeTypeVm',
|
VM: 'homeTypeVm',
|
||||||
vmTemplate: 'homeTypeVmTemplate',
|
'VM-template': 'homeTypeVmTemplate',
|
||||||
}
|
}
|
||||||
|
|
||||||
const SSH_KEY_STYLE = { wordWrap: 'break-word' }
|
const SSH_KEY_STYLE = { wordWrap: 'break-word' }
|
||||||
|
Loading…
Reference in New Issue
Block a user