Fix keyword and name search for backups

Author: abh1sar

api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupsCmd.java

@@ -76,6 +76,12 @@ public class ListBackupsCmd extends BaseListProjectAndAccountResourcesCmd {
             description = "list backups by zone id")
     private Long zoneId;
 
+    @Parameter(name = ApiConstants.NAME,
+            type = CommandType.STRING,
+            since = "4.21.0",
+            description = "list backups by name")
+    private String name;
+
     @Parameter(name = ApiConstants.BACKUP_OFFERING_ID,
             type = CommandType.UUID,
             entityType = BackupOfferingResponse.class,
@@ -101,6 +107,10 @@ public Long getVmId() {
         return vmId;
     }
 
+    public String getName() {
+        return name;
+    }
+
     public Long getBackupOfferingId() {
         return backupOfferingId;
     }

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

@@ -732,6 +732,7 @@ public boolean createBackup(CreateBackupCmd cmd) throws ResourceAllocationExcept
     public Pair<List<Backup>, Integer> listBackups(final ListBackupsCmd cmd) {
         final Long id = cmd.getId();
         final Long vmId = cmd.getVmId();
+        final String name = cmd.getName();
         final Long zoneId = cmd.getZoneId();
         final Long backupOfferingId = cmd.getBackupOfferingId();
         final Account caller = CallContext.current().getCallingAccount();
@@ -759,14 +760,16 @@ public Pair<List<Backup>, Integer> listBackups(final ListBackupsCmd cmd) {
         sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
         sb.and("idIN", sb.entity().getId(), SearchCriteria.Op.IN);
         sb.and("vmId", sb.entity().getVmId(), SearchCriteria.Op.EQ);
+        sb.and("name", sb.entity().getName(), SearchCriteria.Op.EQ);
         sb.and("zoneId", sb.entity().getZoneId(), SearchCriteria.Op.EQ);
         sb.and("backupOfferingId", sb.entity().getBackupOfferingId(), SearchCriteria.Op.EQ);
 
         if (keyword != null) {
+            sb.or().op("keywordName", sb.entity().getName(), SearchCriteria.Op.LIKE);
             SearchBuilder<VMInstanceVO> vmSearch = vmInstanceDao.createSearchBuilder();
-            vmSearch.and("name", vmSearch.entity().getHostName(), SearchCriteria.Op.LIKE);
-            sb.groupBy(sb.entity().getId());
             sb.join("vmSearch", vmSearch, sb.entity().getVmId(), vmSearch.entity().getId(), JoinBuilder.JoinType.INNER);
+            sb.or("vmSearch", "keywordVmName", vmSearch.entity().getHostName(), SearchCriteria.Op.LIKE);
+            sb.cp();
         }
 
         SearchCriteria<BackupVO> sc = sb.create();
@@ -780,6 +783,10 @@ public Pair<List<Backup>, Integer> listBackups(final ListBackupsCmd cmd) {
             sc.setParameters("vmId", vmId);
         }
 
+        if (name != null) {
+            sc.setParameters("name", name);
+        }
+
         if (zoneId != null) {
             sc.setParameters("zoneId", zoneId);
         }
@@ -789,7 +796,9 @@ public Pair<List<Backup>, Integer> listBackups(final ListBackupsCmd cmd) {
         }
 
         if (keyword != null) {
-            sc.setJoinParameters("vmSearch", "name", "%" + keyword + "%");
+            String keywordMatch = "%" + keyword + "%";
+            sc.setParameters("keywordName", keywordMatch);
+            sc.setParameters("keywordVmName", keywordMatch);
         }
 
         Pair<List<BackupVO>, Integer> result = backupDao.searchAndCount(sc, searchFilter);

ui/src/config/section/storage.js

@@ -421,7 +421,7 @@ export default {
       columns: ['name', 'status', 'size', 'virtualsize', 'virtualmachinename', 'backupofferingname', 'intervaltype', 'type', 'created', 'account', 'domain', 'zone'],
       details: ['name', 'description', 'virtualmachinename', 'id', 'intervaltype', 'type', 'externalid', 'size', 'virtualsize', 'volumes', 'backupofferingname', 'zone', 'account', 'domain', 'created'],
       searchFilters: () => {
-        var filters = ['keyword', 'zoneid', 'domainid', 'account', 'backupofferingid']
+        var filters = ['name', 'zoneid', 'domainid', 'account', 'backupofferingid']
         return filters
       },
       actions: [

ui/src/views/compute/StartBackup.vue

@@ -37,12 +37,12 @@
             <a-input v-model:value="form.name" v-focus="true" />
           </a-form-item>
           <a-form-item name="description" ref="description" :label="$t('label.description')">
-            <a-input v-model:value="form.description" v-focus="true" />
+            <a-input v-model:value="form.description"/>
           </a-form-item>
         </div>
       </a-form>
       <div :span="24" class="action-button">
-        <a-button @click="closeAction">{{ $t('label.cancel') }}</a-button>
+        <a-button @click="closeModal">{{ $t('label.cancel') }}</a-button>
         <a-button :loading="loading" type="primary" @click="handleSubmit" ref="submit">{{ $t('label.ok') }}</a-button>
       </div>
     </a-spin>