From eba577c0a96d5758abbc3d616656906956e57217 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Fri, 10 Sep 2021 17:32:36 +0530
Subject: [PATCH 1/5] ui: show nicAdapter selection for VMware non-readfromova
 template (#5429)

* ui: show nicAdapter selection for non-readfromova template

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

* show keyboardcontroller and ostype elements in different rows

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 .../views/image/RegisterOrUploadTemplate.vue  | 78 +++++++++++--------
 1 file changed, 45 insertions(+), 33 deletions(-)

diff --git a/ui/src/views/image/RegisterOrUploadTemplate.vue b/ui/src/views/image/RegisterOrUploadTemplate.vue
index 4e3ed435ab3..0dececc5dbe 100644
--- a/ui/src/views/image/RegisterOrUploadTemplate.vue
+++ b/ui/src/views/image/RegisterOrUploadTemplate.vue
@@ -220,7 +220,7 @@
         </a-form-item>
 
         <a-row :gutter="12" v-if="hyperKVMShow || hyperVMWShow">
-          <a-col :md="24" :lg="24" v-if="hyperKVMShow || (hyperVMWShow && !deployasis)">
+          <a-col :md="24" :lg="hyperKVMShow ? 24 : 12" v-if="hyperKVMShow || (hyperVMWShow && !deployasis)">
             <a-form-item :label="$t('label.rootdiskcontrollertype')">
               <a-select
                 v-decorator="['rootDiskControllerType', {
@@ -240,10 +240,10 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :md="24" :lg="24">
-            <a-form-item v-if="hyperVMWShow && !deployasis" :label="$t('label.keyboardtype')">
+          <a-col :md="24" :lg="12" v-if="hyperVMWShow && !deployasis">
+            <a-form-item :label="$t('label.nicadaptertype')">
               <a-select
-                v-decorator="['keyboardType', {
+                v-decorator="['nicAdapterType', {
                   rules: [
                     {
                       required: false,
@@ -251,41 +251,53 @@
                     }
                   ]
                 }]"
-                :placeholder="$t('label.keyboard')">
-                <a-select-option v-for="opt in keyboardType.opts" :key="opt.id">
-                  {{ opt.name || opt.description }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="12" v-if="!hyperVMWShow || (hyperVMWShow && !deployasis)">
-          <a-col :md="24" :lg="24">
-            <a-form-item :label="$t('label.ostypeid')">
-              <a-select
-                showSearch
-                optionFilterProp="children"
-                :filterOption="(input, option) => {
-                  return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                }"
-                v-decorator="['ostypeid', {
-                  initialValue: defaultOsId,
-                  rules: [
-                    {
-                      required: true,
-                      message: `${this.$t('message.error.select')}`
-                    }
-                  ]
-                }]"
-                :loading="osTypes.loading"
-                :placeholder="apiParams.ostypeid.description">
-                <a-select-option v-for="opt in osTypes.opts" :key="opt.id">
+                :placeholder="$t('label.nicadaptertype')">
+                <a-select-option v-for="opt in nicAdapterType.opts" :key="opt.id">
                   {{ opt.name || opt.description }}
                 </a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
         </a-row>
+        <a-form-item :label="$t('label.keyboardtype')" :lg="12" v-if="hyperVMWShow && !deployasis">
+          <a-select
+            v-decorator="['keyboardType', {
+              rules: [
+                {
+                  required: false,
+                  message: `${this.$t('message.error.select')}`
+                }
+              ]
+            }]"
+            :placeholder="$t('label.keyboard')">
+            <a-select-option v-for="opt in keyboardType.opts" :key="opt.id">
+              {{ opt.name || opt.description }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item :label="$t('label.ostypeid')" v-if="!hyperVMWShow || (hyperVMWShow && !deployasis)">
+          <a-select
+            showSearch
+            optionFilterProp="children"
+            :filterOption="(input, option) => {
+              return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            }"
+            v-decorator="['ostypeid', {
+              initialValue: defaultOsId,
+              rules: [
+                {
+                  required: true,
+                  message: `${this.$t('message.error.select')}`
+                }
+              ]
+            }]"
+            :loading="osTypes.loading"
+            :placeholder="apiParams.ostypeid.description">
+            <a-select-option v-for="opt in osTypes.opts" :key="opt.id">
+              {{ opt.name || opt.description }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
         <a-row :gutter="12">
           <a-col :md="24" :lg="24">
             <a-form-item>

From 35efdd18424b525091539c04faa6a3709b901be3 Mon Sep 17 00:00:00 2001
From: Nicolas Vazquez <nicovazquez90@gmail.com>
Date: Fri, 10 Sep 2021 09:53:49 -0300
Subject: [PATCH 2/5] ui: Hide settings button if not on development mode
 (#5431)

* Display colors Save settings only in dev mode

* Hide entirely the dic section if not on dev

* Hide the settings floating widget if not on development
---
 ui/src/components/page/GlobalLayout.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui/src/components/page/GlobalLayout.vue b/ui/src/components/page/GlobalLayout.vue
index ebfd4c4f1a4..a059ad22857 100644
--- a/ui/src/components/page/GlobalLayout.vue
+++ b/ui/src/components/page/GlobalLayout.vue
@@ -63,7 +63,7 @@
       </a-drawer>
     </template>
 
-    <template>
+    <template v-if="isDevelopmentMode">
       <drawer :visible="showSetting" placement="right">
         <div slot="handler">
           <a-button type="primary" size="large">
@@ -129,6 +129,9 @@ export default {
     ...mapState({
       mainMenu: state => state.permission.addRouters
     }),
+    isDevelopmentMode () {
+      return process.env.NODE_ENV === 'development'
+    },
     contentPaddingLeft () {
       if (!this.fixSidebar || this.isMobile()) {
         return '0'

From 8baf384359eb6ce39eaf450e6be667e268e68d73 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Fri, 10 Sep 2021 19:02:32 +0530
Subject: [PATCH 3/5] ui: fix add management ip range form (#5427)

Add management IP range form shows same pod multiple times when the pods has multiple IP ranges.
This PR fixes the behaviour.

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 ui/src/views/infra/network/IpRangesTabManagement.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui/src/views/infra/network/IpRangesTabManagement.vue b/ui/src/views/infra/network/IpRangesTabManagement.vue
index 2dc3beac670..4242d5d046b 100644
--- a/ui/src/views/infra/network/IpRangesTabManagement.vue
+++ b/ui/src/views/infra/network/IpRangesTabManagement.vue
@@ -84,7 +84,7 @@
               rules: [{ required: true, message: `${$t('label.required')}` }]
             }]"
           >
-            <a-select-option v-for="item in items" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
+            <a-select-option v-for="item in pods" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
           </a-select>
         </a-form-item>
         <a-form-item :label="$t('label.gateway')" class="form__item">
@@ -144,6 +144,7 @@ export default {
     return {
       componentLoading: false,
       items: [],
+      pods: [],
       total: 0,
       domains: [],
       domainsLoading: false,
@@ -215,8 +216,8 @@ export default {
       }).then(response => {
         this.items = []
         this.total = response.listpodsresponse.count || 0
-        const pods = response.listpodsresponse.pod ? response.listpodsresponse.pod : []
-        for (const pod of pods) {
+        this.pods = response.listpodsresponse.pod ? response.listpodsresponse.pod : []
+        for (const pod of this.pods) {
           if (pod && pod.startip && pod.startip.length > 0) {
             for (var idx = 0; idx < pod.startip.length; idx++) {
               this.items.push({

From c6055a23f374c4781947700ce9599dcf6e435073 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Fri, 10 Sep 2021 19:15:38 +0530
Subject: [PATCH 4/5] api, ui: return default ui pagesize as part of capability
 response (#5432)

listConfigurations is not available for all roles and therefore not fit to use in UI for a generic functionality.
This PR makes default ui pagesize a part for listCapabilities API response to make it available for UI across different role accounts.

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 .../api/command/user/config/ListCapabilitiesCmd.java   |  2 ++
 .../cloudstack/api/response/CapabilitiesResponse.java  |  8 ++++++++
 .../java/com/cloud/server/ManagementServerImpl.java    |  2 ++
 ui/src/store/modules/user.js                           | 10 +++-------
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
index 566be64cc94..05176f58a72 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
@@ -21,6 +21,7 @@ import java.util.Map;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.response.CapabilitiesResponse;
+import org.apache.cloudstack.config.ApiServiceConfiguration;
 import org.apache.log4j.Logger;
 
 import com.cloud.user.Account;
@@ -69,6 +70,7 @@ public class ListCapabilitiesCmd extends BaseCmd {
         if (capabilities.containsKey("apiLimitMax")) {
             response.setApiLimitMax((Integer)capabilities.get("apiLimitMax"));
         }
+        response.setDefaultUiPageSize((Long)capabilities.get(ApiServiceConfiguration.DefaultUIPageSize.key()));
         response.setObjectName("capability");
         response.setResponseName(getCommandName());
         this.setResponseObject(response);
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java
index 26b3fd53d54..e860baebe6d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java
@@ -100,6 +100,10 @@ public class CapabilitiesResponse extends BaseResponse {
     @Param(description = "true if experimental features for Kubernetes cluster such as Docker private registry are enabled, false otherwise")
     private boolean kubernetesClusterExperimentalFeaturesEnabled;
 
+    @SerializedName("defaultuipagesize")
+    @Param(description = "default page size in the UI for various views, value set in the configurations", since = "4.15.2")
+    private Long defaultUiPageSize;
+
     public void setSecurityGroupsEnabled(boolean securityGroupsEnabled) {
         this.securityGroupsEnabled = securityGroupsEnabled;
     }
@@ -175,4 +179,8 @@ public class CapabilitiesResponse extends BaseResponse {
     public void setKubernetesClusterExperimentalFeaturesEnabled(boolean kubernetesClusterExperimentalFeaturesEnabled) {
         this.kubernetesClusterExperimentalFeaturesEnabled = kubernetesClusterExperimentalFeaturesEnabled;
     }
+
+    public void setDefaultUiPageSize(Long defaultUiPageSize) {
+        this.defaultUiPageSize = defaultUiPageSize;
+    }
 }
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
index bec025f0685..93c1e9bf78c 100644
--- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -538,6 +538,7 @@ import org.apache.cloudstack.api.command.user.vpn.UpdateVpnConnectionCmd;
 import org.apache.cloudstack.api.command.user.vpn.UpdateVpnCustomerGatewayCmd;
 import org.apache.cloudstack.api.command.user.vpn.UpdateVpnGatewayCmd;
 import org.apache.cloudstack.api.command.user.zone.ListZonesCmd;
+import org.apache.cloudstack.config.ApiServiceConfiguration;
 import org.apache.cloudstack.config.Configuration;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
@@ -3858,6 +3859,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
         capabilities.put("allowUserViewAllDomainAccounts", allowUserViewAllDomainAccounts);
         capabilities.put("kubernetesServiceEnabled", kubernetesServiceEnabled);
         capabilities.put("kubernetesClusterExperimentalFeaturesEnabled", kubernetesClusterExperimentalFeaturesEnabled);
+        capabilities.put(ApiServiceConfiguration.DefaultUIPageSize.key(), ApiServiceConfiguration.DefaultUIPageSize.value());
         if (apiLimitEnabled) {
             capabilities.put("apiLimitInterval", apiLimitInterval);
             capabilities.put("apiLimitMax", apiLimitMax);
diff --git a/ui/src/store/modules/user.js b/ui/src/store/modules/user.js
index 9bd760ba1be..97bea865acc 100644
--- a/ui/src/store/modules/user.js
+++ b/ui/src/store/modules/user.js
@@ -255,13 +255,9 @@ const user = {
         api('listCapabilities').then(response => {
           const result = response.listcapabilitiesresponse.capability
           commit('SET_FEATURES', result)
-        }).catch(error => {
-          reject(error)
-        })
-
-        api('listConfigurations', { name: 'default.ui.page.size' }).then(response => {
-          const defaultListViewPageSize = parseInt(response.listconfigurationsresponse.configuration[0].value)
-          commit('SET_DEFAULT_LISTVIEW_PAGE_SIZE', defaultListViewPageSize)
+          if (result && result.defaultuipagesize) {
+            commit('SET_DEFAULT_LISTVIEW_PAGE_SIZE', result.defaultuipagesize)
+          }
         }).catch(error => {
           reject(error)
         })

From 4147d5a8883763a1dbea0e5ef530e867968783b9 Mon Sep 17 00:00:00 2001
From: Nicolas Vazquez <nicovazquez90@gmail.com>
Date: Fri, 10 Sep 2021 12:45:30 -0300
Subject: [PATCH 5/5] ui: Move eventBus listener to mounted (#5435)

This PR fixes the action buttons for IP addresses, needed a refresh before the fix
---
 ui/src/views/AutogenView.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index 8b61858d0cb..247ec0018c4 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -418,6 +418,11 @@ export default {
     eventBus.$off('async-job-complete')
     eventBus.$off('exec-action')
   },
+  mounted () {
+    eventBus.$on('exec-action', (action, isGroupAction) => {
+      this.execAction(action, isGroupAction)
+    })
+  },
   created () {
     eventBus.$on('vm-refresh-data', () => {
       if (this.$route.path === '/vm' || this.$route.path.includes('/vm/')) {
@@ -427,9 +432,6 @@ export default {
     eventBus.$on('async-job-complete', (action) => {
       this.fetchData()
     })
-    eventBus.$on('exec-action', (action, isGroupAction) => {
-      this.execAction(action, isGroupAction)
-    })
 
     this.currentPath = this.$route.fullPath
     this.fetchData()