minor UI fixes

Author: abh1sar

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

@@ -60,6 +60,7 @@ public class ApiConstants {
     public static final String BACKUP_STORAGE_AVAILABLE = "backupstorageavailable";
     public static final String BACKUP_STORAGE_LIMIT = "backupstoragelimit";
     public static final String BACKUP_STORAGE_TOTAL = "backupstoragetotal";
+    public static final String BACKUP_VM_OFFERING_REMOVED = "vmbackupofferingremoved";
     public static final String BACKUP_TOTAL = "backuptotal";
     public static final String BASE64_IMAGE = "base64image";
     public static final String BGP_PEERS = "bgppeers";

api/src/main/java/org/apache/cloudstack/api/response/BackupResponse.java

@@ -119,6 +119,10 @@ public class BackupResponse extends BaseResponse {
     @Param(description = "the interval type of the backup schedule", since = "4.21.0")
     private String intervalType;
 
+    @SerializedName(ApiConstants.BACKUP_VM_OFFERING_REMOVED)
+    @Param(description = "The backup offering corresponding to this backup was removed from the VM", since = "4.21.0")
+    private Boolean vmOfferingRemoved;
+
     public String getId() {
         return id;
     }
@@ -294,4 +298,8 @@ public String getIntervalType() {
     public void setIntervalType(String intervalType) {
         this.intervalType = intervalType;
     }
+
+    public void setVmOfferingRemoved(boolean vmOfferingRemoved) {
+        this.vmOfferingRemoved = vmOfferingRemoved;
+    }
 }

engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupDaoImpl.java

@@ -47,6 +47,7 @@
 import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionCallback;
 import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.google.gson.Gson;
 
@@ -281,10 +282,7 @@ public List<Long> listVmIdsWithBackupsInZone(Long zoneId) {
 
     @Override
     public BackupResponse newBackupResponse(Backup backup, Boolean listVmDetails) {
-        VMInstanceVO vm = null;
-        if (backup.getVmId() != null) {
-            vm = vmInstanceDao.findByIdIncludingRemoved(backup.getVmId());
-        }
+        VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(backup.getVmId());
         AccountVO account = accountDao.findByIdIncludingRemoved(backup.getAccountId());
         DomainVO domain = domainDao.findByIdIncludingRemoved(backup.getDomainId());
         DataCenterVO zone = dataCenterDao.findByIdIncludingRemoved(backup.getZoneId());
@@ -295,9 +293,12 @@ public BackupResponse newBackupResponse(Backup backup, Boolean listVmDetails) {
         response.setId(backup.getUuid());
         response.setName(backup.getName());
         response.setDescription(backup.getDescription());
-        if (vm != null) {
+        response.setVmName(vm.getHostName());
+        if (vm.getState() != VirtualMachine.State.Expunging) {
             response.setVmId(vm.getUuid());
-            response.setVmName(vm.getHostName());
+        }
+        if (vm.getBackupOfferingId() != backup.getBackupOfferingId()) {
+            response.setVmOfferingRemoved(true);
         }
         response.setExternalId(backup.getExternalId());
         response.setType(backup.getType());
@@ -310,7 +311,7 @@ public BackupResponse newBackupResponse(Backup backup, Boolean listVmDetails) {
         }
         // ACS 4.20: For backups taken prior this release the backup.backed_volumes column would be empty hence use vm_instance.backup_volumes
         String backedUpVolumes;
-        if (Objects.isNull(backup.getBackedUpVolumes()) && vm != null) {
+        if (Objects.isNull(backup.getBackedUpVolumes())) {
             backedUpVolumes = new Gson().toJson(vm.getBackupVolumeList().toArray(), Backup.VolumeInfo[].class);
         } else {
             backedUpVolumes = new Gson().toJson(backup.getBackedUpVolumes().toArray(), Backup.VolumeInfo[].class);

ui/src/config/section/storage.js

@@ -457,7 +457,7 @@ export default {
           label: 'label.backup.offering.remove',
           message: 'message.backup.offering.remove',
           dataView: true,
-          show: (record) => { return record.state !== 'Destroyed' },
+          show: (record) => { return record.state !== 'Destroyed' && record.vmbackupofferingremoved !== true },
           args: ['forced', 'virtualmachineid'],
           mapping: {
             forced: {