diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 0072d4128..3630d29ab 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -16,6 +16,7 @@ - [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)) - [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 diff --git a/packages/xo-web/src/common/home-filters.js b/packages/xo-web/src/common/home-filters.js index 502b3b5d5..a4db9f391 100644 --- a/packages/xo-web/src/common/home-filters.js +++ b/packages/xo-web/src/common/home-filters.js @@ -2,24 +2,32 @@ const common = { homeFilterNone: '', } -export const VM = { +const VM = { ...common, homeFilterPendingVms: 'current_operations:"" ', homeFilterHvmGuests: 'virtualizationMode:hvm ', } -export const host = { +const host = { ...common, } -export const pool = { +const pool = { ...common, } -export const vmTemplate = { +const vmTemplate = { ...common, } -export const SR = { +const SR = { ...common, } + +export default { + VM, + host, + pool, + 'VM-template': vmTemplate, + SR, +} diff --git a/packages/xo-web/src/xo-app/home/index.js b/packages/xo-web/src/xo-app/home/index.js index 87ad93694..dec3bcd72 100644 --- a/packages/xo-web/src/xo-app/home/index.js +++ b/packages/xo-web/src/xo-app/home/index.js @@ -1,5 +1,4 @@ import * as ComplexMatcher from 'complex-matcher' -import * as homeFilters from 'home-filters' import _ from 'intl' import ActionButton from 'action-button' import Button from 'button' @@ -8,6 +7,7 @@ import classNames from 'classnames' import Component from 'base-component' import cookies from 'js-cookie' import defined, { get } from '@xen-orchestra/defined' +import homeFilters from 'home-filters' import Icon from 'icon' import invoke from 'invoke' import Link from 'link' @@ -241,7 +241,7 @@ const OPTIONS = { }, 'VM-template': { defaultFilter: '', - filters: homeFilters.vmTemplate, + filters: homeFilters['VM-template'], mainActions: [ { handler: vms => copyVms(vms, 'VM-template'), diff --git a/packages/xo-web/src/xo-app/user/index.js b/packages/xo-web/src/xo-app/user/index.js index 9ae220dda..fa8d9b4d0 100644 --- a/packages/xo-web/src/xo-app/user/index.js +++ b/packages/xo-web/src/xo-app/user/index.js @@ -1,8 +1,8 @@ import * as FormGrid from 'form-grid' -import * as homeFilters from 'home-filters' import _, { messages } from 'intl' import ActionButton from 'action-button' import Component from 'base-component' +import homeFilters from 'home-filters' import Icon from 'icon' import PropTypes from 'prop-types' import React from 'react' @@ -52,7 +52,7 @@ const FILTER_TYPE_TO_LABEL_ID = { host: 'homeTypeHost', pool: 'homeTypePool', VM: 'homeTypeVm', - vmTemplate: 'homeTypeVmTemplate', + 'VM-template': 'homeTypeVmTemplate', } const SSH_KEY_STYLE = { wordWrap: 'break-word' }