apply suggestions and fix bugs

Author: bernardodemarco

api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterUserKeysCmd.java

@@ -138,7 +138,7 @@ public List<Map<String, Object>> getRules() {
 
             String description = detail.get(ApiConstants.DESCRIPTION);
             if (StringUtils.isNotEmpty(description)) {
-                if (permission.length() > 255) {
+                if (description.length() > 255) {
                     throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Description cannot be longer than 255 characters.");
                 }
                 ruleDetails.put(ApiConstants.DESCRIPTION, description);

ui/public/locales/pt_BR.json

@@ -2058,7 +2058,7 @@
 "label.secondarystoragelimit": "Limites do armazenamento secund\u00e1rio (GiB)",
 "label.secretkey": "Chave secreta",
 "label.secret.key": "Chave secreta",
-"label.apikeyaccess": "Accesso a pares de chaves de API",
+"label.apikeyaccess": "Acesso a pares de chaves de API",
 "label.secured": "Protegido",
 "label.security.groups": "Grupos de seguran\u00e7a",
 "label.securitygroup": "Grupo de seguran\u00e7a",

ui/src/components/view/ApiKeyPairsTab.vue

@@ -41,7 +41,6 @@
         :columns="columns"
         :dataSource="keypairs"
         :rowKey="item => item.id"
-        :key="item => item.id"
         :rowSelection="rowSelection()"
         :pagination="false" >
         <template #name="{ record }">
@@ -132,7 +131,6 @@
       :showAddKeyPair="showAddKeyPair"
       :resource="resource"
       @fetch-data="fetchData"
-      @handle-cancel="handleCancelAddKeyPair"
       @refresh-data="handleRefreshData"
       @close-modal="closeModalAddKeyPair" />
   </div>
@@ -145,7 +143,6 @@ import BulkActionView from '@/components/view/BulkActionView.vue'
 import eventBus from '@/config/eventBus'
 import OwnershipSelection from '@/views/compute/wizard/OwnershipSelection.vue'
 import GenerateApiKeyPair from '@/views/iam/GenerateApiKeyPair.vue'
-import store from '@/store'
 
 export default {
   name: 'ApiKeyPairsTab',
@@ -154,8 +151,7 @@ export default {
     Status,
     TooltipButton,
     BulkActionView,
-    GenerateApiKeyPair,
-    store
+    GenerateApiKeyPair
   },
   props: {
     resource: {
@@ -286,31 +282,39 @@ export default {
       }
       this.deleteKeypairs(this.selectedItems)
     },
-    deleteKeypairs (keypairs) {
+    async deleteKeypairs (keypairs) {
+      if (!keypairs || keypairs.length === 0) {
+        this.fetchLoading = false
+        return
+      }
+
       this.fetchLoading = true
-      keypairs.forEach(async keypair => {
-        try {
-          const jobId = await this.deleteKeyPair({
-            keypairid: keypair.id
-          })
-          await this.$pollJob({
-            jobId,
-            action: {
-              isFetchData: false
-            },
-            successMethod: () => {
-              eventBus.emit('update-resource-state', { selectedItems: this.selectedItems, resource: keypair.id, state: 'success' })
-            },
-            catchMethod: () => {
-              eventBus.emit('update-resource-state', { selectedItems: this.selectedItems, resource: keypair.id, state: 'failed' })
-            }
-          })
-        } catch (e) {
-          eventBus.emit('update-resource-state', { selectedItems: this.selectedItems, resource: keypair.id, state: 'failed' })
-        } finally {
-          this.fetchLoading = false
-        }
-      })
+      try {
+        await Promise.all(keypairs.map(async keypair => {
+          try {
+            const jobId = await this.deleteKeyPair({
+              keypairid: keypair.id
+            })
+            await this.$pollJob({
+              jobId,
+              action: {
+                isFetchData: false
+              },
+              successMethod: () => {
+                console.log('success method')
+                eventBus.emit('update-resource-state', { selectedItems: this.selectedItems, resource: keypair.id, state: 'success' })
+              },
+              catchMethod: () => {
+                eventBus.emit('update-resource-state', { selectedItems: this.selectedItems, resource: keypair.id, state: 'failed' })
+              }
+            })
+          } catch (e) {
+            eventBus.emit('update-resource-state', { selectedItems: this.selectedItems, resource: keypair.id, state: 'failed' })
+          }
+        }))
+      } finally {
+        this.fetchLoading = false
+      }
     },
     async deleteKeyPair (args) {
       const response = await postAPI('deleteUserKeys', args)
@@ -337,14 +341,11 @@ export default {
     closeModalAddKeyPair () {
       this.showAddKeyPair = false
     },
-    handleCancelAddKeyPair () {
-      this.showAddKeyPair = false
-    },
     handleRefreshData () {
       this.$emit('refresh-data')
     },
     rowSelection () {
-      if ('deleteUserKeys' in store.getters.apis) {
+      if ('deleteUserKeys' in this.$store.getters.apis) {
         return {
           selectedRowKeys: this.selectedRowKeys,
           onChange: this.setSelection

ui/src/views/iam/ApiKeyPairPermissionTable.vue

@@ -33,7 +33,7 @@
         </div>
         <div class="rules-table__col rules-table__col--permission">
           <permission-editable
-            :defaultValue="newRulePermission"
+            :default-value="newRulePermission"
             :value="newRulePermission"
             @onChange="updateNewPermission()" />
         </div>
@@ -173,14 +173,12 @@
 import { getAPI } from '@/api'
 import draggable from 'vuedraggable'
 import PermissionEditable from './PermissionEditable'
-import RuleDelete from './RuleDelete'
 import TooltipButton from '@/components/widgets/TooltipButton'
 import { genericCompare } from '@/utils/sort'
 
 export default {
   name: 'ApiKeyPairPermissionTable',
   components: {
-    RuleDelete,
     PermissionEditable,
     draggable,
     TooltipButton

ui/src/views/iam/GenerateApiKeyPair.vue

@@ -150,7 +150,7 @@ export default {
         id: this.resource.id,
         description: values.description ? values.description : null,
         startdate: values.startDate ? parseDayJsObject({ value: values.startDate }) : null,
-        endDate: values.endDate ? parseDayJsObject({ value: values.endDate }) : null
+        enddate: values.endDate ? parseDayJsObject({ value: values.endDate }) : null
       }
       for (const i in this.rules) {
         const rule = this.rules[i]
@@ -161,7 +161,9 @@ export default {
       return params
     },
     handleSubmit (e) {
-      e.preventDefault()
+      if (e && typeof e.preventDefault === 'function') {
+        e.preventDefault()
+      }
       if (this.loading) return
       this.formRef.value.validate().then(() => {
         const params = this.buildRequestParams()
@@ -193,15 +195,13 @@ export default {
       })
     },
     closeModal () {
-      this.form.name = ''
-      this.form.description = ''
+      this.form.name = null
+      this.form.description = null
       this.form.startDate = null
       this.form.endDate = null
+      this.rules = []
       this.$emit('close-modal')
     },
-    handleCancel () {
-      this.$emit('handle-cancel')
-    },
     fetchData () {
       this.$emit('fetch-data')
     },