Polish UI

Author: nvazquez

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

@@ -581,6 +581,7 @@ public class ApiConstants {
     public static final String SUITABLE_FOR_VM = "suitableforvirtualmachine";
     public static final String SUPPORTS_STORAGE_SNAPSHOT = "supportsstoragesnapshot";
     public static final String TARGET_IQN = "targetiqn";
+    public static final String TASKS_FILTER = "tasksfilter";
     public static final String TEMPLATE_FILTER = "templatefilter";
     public static final String TEMPLATE_ID = "templateid";
     public static final String TEMPLATE_IDS = "templateids";

api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListImportVMTasksCmd.java

@@ -35,7 +35,6 @@
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.vm.ImportVmTask;
 import org.apache.cloudstack.vm.ImportVmTasksManager;
 
 import javax.inject.Inject;
@@ -76,8 +75,8 @@ public class ListImportVMTasksCmd extends BaseListCmd {
             description = "Conversion host of the importing task")
     private Long convertHostId;
 
-    @Parameter(name = ApiConstants.STATE, type = CommandType.STRING, description = "List tasks by status, valid options are: Running, Completed, Failed")
-    private String state;
+    @Parameter(name = ApiConstants.TASKS_FILTER, type = CommandType.STRING, description = "Filter tasks by status, valid options are: All, Running, Completed, Failed")
+    private String tasksFilter;
 
     public Long getZoneId() {
         return zoneId;
@@ -95,8 +94,8 @@ public Long getConvertHostId() {
         return convertHostId;
     }
 
-    public String getState() {
-        return state == null ? ImportVmTask.TaskState.Running.name() : state;
+    public String getTasksFilter() {
+        return tasksFilter;
     }
 
     @Override

engine/schema/src/main/java/com/cloud/vm/dao/ImportVMTaskDaoImpl.java

@@ -65,7 +65,9 @@ public Pair<List<ImportVMTaskVO>, Integer> listImportVMTasks(Long zoneId, Long a
         if (convertHostId != null) {
             sc.setParameters("convertHostId", convertHostId);
         }
-        sc.setParameters("state", state);
+        if (state != null) {
+            sc.setParameters("state", state);
+        }
         Filter filter = new Filter(ImportVMTaskVO.class, "created", false, startIndex, pageSizeVal);
         return searchAndCount(sc, filter);
     }

server/src/main/java/org/apache/cloudstack/vm/ImportVmTasksManagerImpl.java

@@ -35,6 +35,7 @@
 import org.apache.cloudstack.api.command.admin.vm.ListImportVMTasksCmd;
 import org.apache.cloudstack.api.response.ImportVMTaskResponse;
 import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -78,13 +79,7 @@ public ListResponse<ImportVMTaskResponse> listImportVMTasks(ListImportVMTasksCmd
         Long startIndex = cmd.getStartIndex();
         Long pageSizeVal = cmd.getPageSizeVal();
 
-        ImportVmTask.TaskState state;
-        try {
-            state = ImportVmTask.TaskState.getValue(cmd.getState());
-        } catch (IllegalArgumentException e) {
-            throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Invalid value for task state: " + cmd.getState());
-        }
-
+        ImportVmTask.TaskState state = getStateFromFilter(cmd.getTasksFilter());
         Pair<List<ImportVMTaskVO>, Integer> result = importVMTaskDao.listImportVMTasks(zoneId, accountId, vcenter, convertHostId, state, startIndex, pageSizeVal);
         List<ImportVMTaskVO> tasks = result.first();
 
@@ -97,6 +92,17 @@ public ListResponse<ImportVMTaskResponse> listImportVMTasks(ListImportVMTasksCmd
         return listResponses;
     }
 
+    private ImportVmTask.TaskState getStateFromFilter(String tasksFilter) {
+        if (StringUtils.isBlank(tasksFilter) || tasksFilter.equalsIgnoreCase("all")) {
+            return null;
+        }
+        try {
+            return ImportVmTask.TaskState.getValue(tasksFilter);
+        } catch (IllegalArgumentException e) {
+            throw new ServerApiException(ApiErrorCode.PARAM_ERROR, String.format("Invalid value for task state: %s", tasksFilter));
+        }
+    }
+
     @Override
     public ImportVmTask createImportVMTaskRecord(DataCenter zone, Account owner, long userId, String displayName, String vcenter, String datacenterName, String sourceVMName, Host convertHost, Host importHost) {
         logger.debug("Creating import VM task entry for VM: {} for account {} on zone {} " +

ui/public/config.json

@@ -635,6 +635,7 @@
 "label.continue": "Continue",
 "label.continue.install": "Continue with installation",
 "label.controlnodes": "Control nodes",
+"label.conversionhost": "Conversion Host",
 "label.copied.clipboard": "Copied to clipboard",
 "label.copy": "Copy",
 "label.copy.clipboard": "Copy to clipboard",
@@ -699,6 +700,8 @@
 "label.crosszones": "Cross Zones",
 "label.currency": "Currency",
 "label.current": "Current",
+"label.currentstep": "Current step",
+"label.currentstep.duration": "Current step duration",
 "label.current.storage": "Current storage",
 "label.currentpassword": "Current password",
 "label.custom": "Custom",
@@ -2313,6 +2316,7 @@
 "label.sourcenattype": "Supported source NAT type",
 "label.sourceport": "Source port",
 "label.sourcetype": "Source type",
+"label.sourcevmname": "Source VM Name",
 "label.specifyasnumber": "Specify AS Number",
 "label.specifyipranges": "Specify IP ranges",
 "label.specifyvlan": "Specify VLAN",
@@ -2880,6 +2884,7 @@
 "label.leaseexpiryaction": "Lease expiry action",
 "label.remainingdays": "Lease",
 "label.leased": "Leased",
+"label.totalduration": "Total duration",
 "label.usestoragereplication": "Use primary storage replication",
 "message.acquire.ip.failed": "Failed to acquire IP.",
 "message.action.acquire.ip": "Please confirm that you want to acquire new IP.",

ui/public/locales/en.json

@@ -70,6 +70,9 @@
                 <router-link v-if="record.virtualmachineid" :to="{ path: '/vm/' + record.virtualmachineid }">{{ record.displayname }}</router-link>
                 <span v-else>{{ record.displayname }}</span>
               </template>
+              <template v-else-if="column.key === 'created'">
+                <span>{{ $toLocaleDate(record.created) }}</span>
+              </template>
             </template>
         </a-table>
         <div class="instances-card-footer">
@@ -125,55 +128,65 @@ export default {
   },
   data () {
     const columns = [
+      {
+        key: 'created',
+        title: this.$t('label.created'),
+        dataIndex: 'created'
+      },
       {
         key: 'displayname',
-        title: 'VM Display Name',
+        title: this.$t('label.displayname'),
         dataIndex: 'displayname'
       },
       {
         key: 'convertinstancehostid',
-        title: 'Conversion Host',
+        title: this.$t('label.conversionhost'),
         dataIndex: 'convertinstancehostid'
       },
       {
         key: 'step',
-        title: 'Current Step',
+        title: this.$t('label.currentstep'),
         dataIndex: 'step'
       },
       {
         key: 'stepduration',
-        title: 'Current Step Duration',
+        title: this.$t('label.currentstep.duration'),
         dataIndex: 'stepduration'
       },
       {
         key: 'description',
-        title: 'Description',
+        title: this.$t('label.description'),
         dataIndex: 'description'
       },
       {
         key: 'duration',
-        title: 'Total Duration',
+        title: this.$t('label.totalduration'),
         dataIndex: 'duration'
       },
       {
         key: 'sourcevmname',
-        title: 'Source VM Name',
+        title: this.$t('label.sourcevmname'),
         dataIndex: 'sourcevmname'
       },
       {
         key: 'vcenter',
-        title: 'vCenter',
+        title: this.$t('label.vcenter'),
         dataIndex: 'vcenter'
       },
       {
         key: 'datacentername',
-        title: 'Datacenter Name',
+        title: this.$t('label.vcenter.datacenter'),
         dataIndex: 'datacentername'
+      },
+      {
+        key: 'state',
+        title: this.$t('label.state'),
+        dataIndex: 'state'
       }
     ]
     return {
       columns,
-      filters: ['running', 'completed', 'failed'],
+      filters: ['all', 'running', 'completed', 'failed'],
       filterValue: 'running'
     }
   },

ui/src/views/tools/ImportVmTasks.vue

@@ -1204,7 +1204,7 @@ export default {
         zoneid: this.zoneId,
         page: this.page.tasks,
         pagesize: this.pageSize.tasks,
-        state: this.importVmTasksFilter
+        tasksfilter: this.importVmTasksFilter
       }
       getAPI('listImportVmTasks', params).then(response => {
         this.itemCount.tasks = response.listimportvmtasksresponse.count