Merge branch '4.18' into 4.19

Author: DaanHoogland

tools/docker/Dockerfile

@@ -20,7 +20,7 @@
 FROM ubuntu:22.04
 
 MAINTAINER "Apache CloudStack" <[email protected]>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.19.2.0-SNAPSHOT"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.18.3.0-SNAPSHOT"  Author="Apache CloudStack <[email protected]>"
 
 ARG DEBIAN_FRONTEND=noninteractive
 

tools/docker/Dockerfile.marvin

@@ -20,7 +20,7 @@
 FROM python:2
 
 MAINTAINER "Apache CloudStack" <[email protected]>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.19.2.0-SNAPSHOT"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.18.3.0-SNAPSHOT"  Author="Apache CloudStack <[email protected]>"
 
 ENV WORK_DIR=/marvin
 

tools/docker/Dockerfile.smokedev

@@ -19,8 +19,7 @@
 
 FROM ubuntu:16.04
 
-MAINTAINER "Apache CloudStack" <[email protected]>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.12.0-SNAPSHOT"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.12.0-SNAPSHOT" Author="Apache CloudStack <[email protected]>"
 
 RUN apt-get -y update && apt-get install -y \
     genisoimage \

ui/Dockerfile

@@ -19,11 +19,11 @@
 
 FROM node:14-bullseye AS build
 
-MAINTAINER "Apache CloudStack" <[email protected]>
 LABEL Description="Apache CloudStack UI; Modern role-base progressive UI for Apache CloudStack"
 LABEL Vendor="Apache.org"
 LABEL License=ApacheV2
 LABEL Version=0.5.0
+LABEL Author="Apache CloudStack <[email protected]>"
 
 WORKDIR /build
 

ui/src/config/section/compute.js

@@ -47,7 +47,7 @@ export default {
         return filters
       },
       columns: () => {
-        const fields = ['displayname', 'state', 'ipaddress']
+        const fields = ['name', 'state', 'ipaddress']
         const metricsFields = ['cpunumber', 'cputotal', 'cpuused', 'memorytotal',
           {
             memoryused: (record) => {
@@ -77,7 +77,7 @@ export default {
         fields.push('zonename')
         return fields
       },
-      searchFilters: ['displayname', 'zoneid', 'domainid', 'account', 'groupid', 'tags'],
+      searchFilters: ['name', 'zoneid', 'domainid', 'account', 'groupid', 'tags'],
       details: () => {
         var fields = ['name', 'displayname', 'id', 'state', 'ipaddress', 'ip6address', 'templatename', 'ostypename',
           'serviceofferingname', 'isdynamicallyscalable', 'haenable', 'hypervisor', 'boottype', 'bootmode', 'account',