Merge release branch 4.19 to main

* 4.19:
  engine-schema: add removed columne for cloud.user_data, fix delete op (apache#9120)
  ui: fix create menu item access (apache#9104)
  server: honor listall param for listiso api (apache#9064)
  ui: add move to top/bottom for acl rules list (apache#9119)
  ui: fix columns for exportacls csv (apache#9118)
  ui: fix create network access in deploy vm wizard (apache#9117)
  UI: Add search filters (apache#9068)

Author: DaanHoogland

engine/schema/src/main/java/com/cloud/user/UserDataVO.java

@@ -24,8 +24,12 @@
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
+
+import java.util.Date;
 import java.util.UUID;
 
+import com.cloud.utils.db.GenericDao;
+
 @Entity
 @Table(name = "user_data")
 public class UserDataVO implements UserData {
@@ -58,6 +62,9 @@ public UserDataVO() {
     @Column(name = "params", length = 4096)
     private String params;
 
+    @Column(name = GenericDao.REMOVED_COLUMN)
+    private Date removed;
+
     @Override
     public long getDomainId() {
         return domainId;
@@ -117,4 +124,12 @@ public void setUserData(String userData) {
     public void setParams(String params) {
         this.params = params;
     }
+
+    public void setRemoved(Date removed) {
+        this.removed = removed;
+    }
+
+    public Date getRemoved() {
+        return removed;
+    }
 }

engine/schema/src/main/resources/META-INF/db/schema-41900to41910.sql

@@ -63,3 +63,5 @@ CREATE TABLE IF NOT EXISTS `cloud_usage`.`usage_vpc` (
 ) ENGINE=InnoDB CHARSET=utf8;
 
 CALL `cloud_usage`.`IDEMPOTENT_ADD_COLUMN`('cloud_usage.cloud_usage', 'state', 'VARCHAR(100) DEFAULT NULL');
+
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.user_data', 'removed', 'datetime COMMENT "date removed or null, if still present"');

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

@@ -4799,7 +4799,7 @@ private Pair<List<TemplateJoinVO>, Integer> searchForIsosInternal(ListIsosCmd cm
         boolean showRemovedISO = cmd.getShowRemoved();
         Account caller = CallContext.current().getCallingAccount();
 
-        boolean listAll = false;
+        boolean listAll = cmd.listAll();
         if (isoFilter != null && isoFilter == TemplateFilter.all) {
             if (caller.getType() == Account.Type.NORMAL) {
                 throw new InvalidParameterValueException("Filter " + TemplateFilter.all + " can be specified by admin only");

ui/public/locales/en.json

@@ -709,6 +709,7 @@
 "label.destnetworkuuid": "Network",
 "label.destport": "Destination Ports",
 "label.destroy": "Destroy",
+"label.destroying": "Destroying",
 "label.destroyed": "Destroyed",
 "label.destroy.router": "Destroy router",
 "label.deststartport": "Destination Start Port",
@@ -934,6 +935,7 @@
 "label.fwdeviceid": "ID",
 "label.fwdevicestate": "Status",
 "label.gateway": "Gateway",
+"label.global": "Global",
 "label.global.settings": "Global Settings",
 "label.globo.dns": "GloboDNS",
 "label.globo.dns.configuration": "GloboDNS configuration",
@@ -1347,6 +1349,7 @@
 "label.min_balance": "Min balance",
 "label.mincpunumber": "Min CPU cores",
 "label.minimum": "Minimum",
+"label.minimumsemanticversion": "Minimum semantic version",
 "label.miniops": "Min IOPS",
 "label.minmaxiops": "Min IOPS / Max IOPS",
 "label.minmembers": "Min members",
@@ -1701,6 +1704,7 @@
 "label.reboot": "Reboot",
 "label.receivedbytes": "Bytes received",
 "label.recover.vm": "Recover Instance",
+"label.recovering": "Recovering",
 "label.redirect": "Redirect to:",
 "label.redirecturi": "Redirect URI",
 "label.redundantrouter": "Redundant router",
@@ -1843,6 +1847,7 @@
 "label.scaledown.policy": "ScaleDown policy",
 "label.scaleup.policies": "ScaleUp policies",
 "label.scaleup.policy": "ScaleUp policy",
+"label.scaling": "Scaling",
 "label.schedule": "Schedule",
 "label.schedule.add": "Add schedule",
 "label.scheduled.backups": "Scheduled backups",
@@ -2211,6 +2216,7 @@
 "label.update.vmware.datacenter": "Update VMWare datacenter",
 "label.updating": "Updating",
 "label.upgrade.router.newer.template": "Upgrade router to use newer Template",
+"label.upgrading": "Upgrading",
 "label.upload": "Upload",
 "label.upload.description": "Path to upload objects at",
 "label.upload.path": "Upload path",
@@ -3058,7 +3064,8 @@
 "message.network.offering.promiscuous.mode": "Applicable for guest Networks on VMware hypervisor only.\nReject - The switch drops any outbound frame from a virtual machine adapter with a source MAC address that is different from the one in the .vmx configuration file.\nAccept - The switch does not perform filtering, and permits all outbound frames.\nNone - Default to value from global setting.",
 "message.network.removenic": "Please confirm that want to remove this NIC, which will also remove the associated Network from the Instance.",
 "message.network.secondaryip": "Please confirm that you would like to acquire a new secondary IP for this NIC. \n NOTE: You need to manually configure the newly-acquired secondary IP inside the virtual machine.",
-"message.network.selection": "Choose one or more Networks to attach the Instance to. A new Network can also be created here.",
+"message.network.selection": "Choose one or more Networks to attach the Instance to.",
+"message.network.selection.new.network": "A new Network can also be created here.",
 "message.network.updateip": "Please confirm that you would like to change the IP address for this NIC on the Instance.",
 "message.network.usage.info.data.points": "Each data point represents the difference in data traffic since the last data point.",
 "message.network.usage.info.sum.of.vnics": "The Network usage shown is made up of the sum of data traffic from all the vNICs in the Instance.",

ui/src/components/header/CreateMenu.vue

@@ -19,7 +19,7 @@
   <a-dropdown>
     <template #overlay>
       <a-menu>
-        <a-menu-item style="width: 100%; padding: 12px">
+        <a-menu-item style="width: 100%; padding: 12px" v-if="'deployVirtualMachine' in $store.getters.apis">
           <router-link :to="{ path: '/action/deployVirtualMachine'}">
             <a-row>
               <a-col style="margin-right: 12px">
@@ -38,7 +38,7 @@
             </a-row>
           </router-link>
         </a-menu-item>
-        <a-menu-item style="width: 100%; padding: 12px" v-if="'listKubernetesClusters' in $store.getters.apis">
+        <a-menu-item style="width: 100%; padding: 12px" v-if="'createKubernetesCluster' in $store.getters.apis">
           <router-link :to="{ path: '/kubernetes', query: { action: 'createKubernetesCluster' } }">
             <a-row>
               <a-col style="margin-right: 12px">
@@ -57,7 +57,7 @@
             </a-row>
           </router-link>
         </a-menu-item>
-        <a-menu-item style="width: 100%; padding: 12px">
+        <a-menu-item style="width: 100%; padding: 12px" v-if="'createVolume' in $store.getters.apis">
           <router-link :to="{ path: '/volume', query: { action: 'createVolume' } }">
             <a-row>
               <a-col style="margin-right: 12px">
@@ -76,7 +76,7 @@
             </a-row>
           </router-link>
         </a-menu-item>
-        <a-menu-item style="width: 100%; padding: 12px">
+        <a-menu-item style="width: 100%; padding: 12px" v-if="'createNetwork' in $store.getters.apis">
           <router-link :to="{ path: '/guestnetwork', query: { action: 'createNetwork' } }">
             <a-row>
               <a-col style="margin-right: 12px">
@@ -95,7 +95,7 @@
             </a-row>
           </router-link>
         </a-menu-item>
-        <a-menu-item style="width: 100%; padding: 12px">
+        <a-menu-item style="width: 100%; padding: 12px" v-if="'createVPC' in $store.getters.apis">
           <router-link :to="{ path: '/vpc', query: { action: 'createVPC' } }">
             <a-row>
               <a-col style="margin-right: 12px">
@@ -114,7 +114,7 @@
             </a-row>
           </router-link>
         </a-menu-item>
-        <a-menu-item style="width: 100%; padding: 12px">
+        <a-menu-item style="width: 100%; padding: 12px" v-if="'registerTemplate' in $store.getters.apis">
           <router-link :to="{ path: '/template', query: { action: 'registerTemplate' } }">
             <a-row>
               <a-col style="margin-right: 12px">