This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit f1c3d2c4beece042f39d13469bc99b7943b34b06 Merge: 28e8e2d0096 c970141e250 Author: Daan Hoogland <[email protected]> AuthorDate: Tue May 28 09:44:05 2024 +0200 Merge release branch 4.19 to main * 4.19: engine-schema: add removed columne for cloud.user_data, fix delete op (#9120) ui: fix create menu item access (#9104) server: honor listall param for listiso api (#9064) ui: add move to top/bottom for acl rules list (#9119) ui: fix columns for exportacls csv (#9118) ui: fix create network access in deploy vm wizard (#9117) UI: Add search filters (#9068) .../src/main/java/com/cloud/user/UserDataVO.java | 15 ++ .../resources/META-INF/db/schema-41900to41910.sql | 2 + .../java/com/cloud/api/query/QueryManagerImpl.java | 2 +- ui/public/locales/en.json | 9 +- ui/src/components/header/CreateMenu.vue | 12 +- ui/src/components/view/SearchView.vue | 287 ++++++++++++++++++++- ui/src/config/section/account.js | 1 + ui/src/config/section/compute.js | 6 +- ui/src/config/section/config.js | 2 + ui/src/config/section/image.js | 1 + ui/src/config/section/infra.js | 2 +- ui/src/config/section/infra/clusters.js | 1 + ui/src/config/section/infra/hosts.js | 1 + ui/src/config/section/infra/pods.js | 1 + ui/src/config/section/infra/primaryStorages.js | 1 + ui/src/config/section/infra/secondaryStorages.js | 1 + ui/src/config/section/infra/systemVms.js | 1 + ui/src/config/section/infra/zones.js | 1 + ui/src/config/section/network.js | 2 +- ui/src/config/section/offering.js | 6 + ui/src/config/section/role.js | 1 + ui/src/core/lazy_lib/icons_use.js | 4 + ui/src/views/compute/DeployVM.vue | 2 +- ui/src/views/compute/wizard/NetworkSelection.vue | 2 +- ui/src/views/network/AclListRulesTab.vue | 26 ++ 25 files changed, 374 insertions(+), 15 deletions(-) diff --cc ui/src/config/section/offering.js index 9250842ff4e,b97b1a0cb2c..8521512d6c0 --- a/ui/src/config/section/offering.js +++ b/ui/src/config/section/offering.js @@@ -367,8 -364,9 +371,9 @@@ export default icon: 'wifi-outlined', docHelp: 'adminguide/networking.html#network-offerings', permission: ['listNetworkOfferings'], + searchFilters: ['name', 'zoneid', 'domainid', 'tags'], columns: ['name', 'state', 'guestiptype', 'traffictype', 'networkrate', 'domain', 'zone', 'order'], - details: ['name', 'id', 'displaytext', 'guestiptype', 'traffictype', 'internetprotocol', 'networkrate', 'ispersistent', 'egressdefaultpolicy', 'availability', 'conservemode', 'specifyvlan', 'specifyipranges', 'supportspublicaccess', 'supportsstrechedl2subnet', 'service', 'tags', 'domain', 'zone'], + details: ['name', 'id', 'displaytext', 'guestiptype', 'traffictype', 'internetprotocol', 'networkrate', 'ispersistent', 'egressdefaultpolicy', 'availability', 'conservemode', 'specifyvlan', 'specifyipranges', 'supportspublicaccess', 'supportsstrechedl2subnet', 'forvpc', 'fornsx', 'nsxmode', 'service', 'tags', 'domain', 'zone'], resourceType: 'NetworkOffering', tabs: [ { @@@ -465,9 -463,10 +470,10 @@@ icon: 'deployment-unit-outlined', docHelp: 'plugins/nuage-plugin.html?#vpc-offerings', permission: ['listVPCOfferings'], + searchFilters: ['name', 'zoneid', 'domainid'], resourceType: 'VpcOffering', columns: ['name', 'state', 'displaytext', 'domain', 'zone', 'order'], - details: ['name', 'id', 'displaytext', 'internetprotocol', 'distributedvpcrouter', 'tags', 'service', 'domain', 'zone', 'created'], + details: ['name', 'id', 'displaytext', 'internetprotocol', 'distributedvpcrouter', 'tags', 'service', 'fornsx', 'nsxmode', 'domain', 'zone', 'created'], related: [{ name: 'vpc', title: 'label.vpc',
