winterhazel commented on code in PR #13225: URL: https://github.com/apache/cloudstack/pull/13225#discussion_r3391055611
########## ui/public/locales/en.json: ########## @@ -2172,6 +2186,7 @@ "label.restore.volume.attach": "Restore volume and attach", "label.use.backup.ip.address": "Use IP Addresses from Backup", "label.use.backup.ip.address.tooltip": "Use the same IP/MAC addresses as stored in the backup metadata. The command will error out if the IP/MAC addresses are not available", +"label.userapikey": "API Key", Review Comment: `label.apikey` has the same content ########## ui/public/locales/pt_BR.json: ########## @@ -2462,10 +2475,13 @@ "label.usenewdiskoffering": "Substituir a oferta de disco?", "label.user": "Usu\u00e1rio", "label.user.conflict": "Conflito", +"label.userapikey": "Chave de API", +"label.usersecretkey": "Chave Secreta de API", "label.user.data": "Dados de usu\u00e1rio", "label.username": "Nome de usu\u00e1rio", "label.users": "Usu\u00e1rios", "label.usersource": "Tipo de usu\u00e1rio", +"label.user.api.key.rules": "Regras", Review Comment: ```suggestion "label.user.api.key.rules": "Regras do par de chaves de API", ``` ########## ui/src/views/iam/GenerateApiKeyPair.vue: ########## @@ -0,0 +1,226 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +<template> + <div class="form-layout" v-ctrl-enter="handleSubmit"> + <a-modal + v-if="showAddKeyPair" + :visible="showAddKeyPair" + :closable="true" + :maskClosable="false" + :okText="$t('label.ok')" + :cancelText="$t('label.cancel')" + style="top: 20px;" + width="50vw" + @cancel="closeModal" + @ok="handleSubmit" + :ok-button-props="{props: { type: 'default' } }" + :cancel-button-props="{props: { type: 'primary' } }" + centered> + <template #title> + {{ $t('label.action.create.api.key') }} + </template> + <a-spin :spinning="loading"> + <a-form + :ref="formRef" + :model="form" + layout="vertical" + @finish="handleSubmit"> + <a-alert + style="margin-bottom: 10px; " + :message="$t('message.note.about.keypair.permissions.title')" + :description="$t('message.note.about.keypair.permissions.body')" + type="info" + show-icon + /> + <a-form-item name="name" ref="name"> + <template #label> + <tooltip-label :title="$t('label.name')" :tooltip="apiParams.name.description"/> + </template> + <a-input + v-focus="true" + :placeholder="$t('label.apikeypair.name')" + v-model:value="form.name" /> + </a-form-item> + <a-form-item name="description" ref="description"> + <template #label> + <tooltip-label :title="$t('label.description')" :tooltip="apiParams.description.description"/> + </template> + <a-input + v-model:value="form.description" + :placeholder="$t('label.apikeypair.description')" /> + </a-form-item> + <a-row> + <a-form-item ref="startDate" name="startDate"> + <template #label> + <tooltip-label :title="$t('label.start.date')" :tooltip="apiParams.startdate.description"/> + </template> + <a-date-picker + v-model:value="form.startDate" + :disabled-date="disabledStartDate" + show-time + /> + </a-form-item> + <a-form-item ref="endDate" name="endDate" style="margin: 0 8px"> + <template #label> + <tooltip-label :title="$t('label.end.date')" :tooltip="apiParams.enddate.description"/> + </template> + <a-date-picker + :disabled-date="disabledEndDate" + v-model:value="form.endDate" + show-time /> + </a-form-item> + </a-row> + <a-form-item> + <template #label> + <tooltip-label :title="$t('label.rules')" :tooltip="apiParams.rules.description"/> + </template> + <api-key-pair-permission-table + :resource="resource" + @update-rules="updateRules"/> + </a-form-item> + </a-form> + </a-spin> + </a-modal> + </div> +</template> + +<script> +import { ref, reactive, toRaw } from 'vue' +import { postAPI } from '@/api' +import TooltipLabel from '@/components/widgets/TooltipLabel' +import ApiKeyPairPermissionTable from '@/views/iam/ApiKeyPairPermissionTable.vue' +import { dayjs, parseDayJsObject } from '@/utils/date' + +export default { + name: 'GenerateApiKeyPair', + components: { + TooltipLabel, + ApiKeyPairPermissionTable + }, + props: { + showAddKeyPair: { + type: Boolean, + default: false + }, + resource: { + type: Object, + required: true + } + }, + data () { + return { + rules: [], + loading: false + } + }, + beforeCreate () { + this.apiParams = this.$getApiParams('registerUserKeys') + }, + created () { + this.initForm() + }, + methods: { + initForm () { + this.formRef = ref() + this.form = reactive({}) + }, + buildRequestParams () { + const values = toRaw(this.form) + this.loading = true + const params = { + name: values.name, + 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 + } + for (const i in this.rules) { + const rule = this.rules[i] + params['rules[' + i + '].rule'] = rule.rule ? rule.rule : '' + params['rules[' + i + '].permission'] = rule.permission ? rule.permission : 'deny' + params['rules[' + i + '].description'] = rule.description ? rule.description : '' + } + return params + }, + handleSubmit (e) { + if (e && typeof e.preventDefault === 'function') { + e.preventDefault() + } + if (this.loading) return + this.formRef.value.validate().then(() => { + const params = this.buildRequestParams() + this.loading = true + postAPI('registerUserKeys', params).then(response => { + this.$pollJob({ + jobId: response.registeruserkeysresponse.jobid, + successMessage: `${this.$t('message.success.register.user.keypair')} ${this.$t('label.for')} user ${this.resource.id}`, Review Comment: You could use interpolation here to build the string instead. See `message.lock.user` for instance. ########## ui/src/views/iam/GenerateApiKeyPair.vue: ########## @@ -0,0 +1,226 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +<template> + <div class="form-layout" v-ctrl-enter="handleSubmit"> + <a-modal + v-if="showAddKeyPair" + :visible="showAddKeyPair" + :closable="true" + :maskClosable="false" + :okText="$t('label.ok')" + :cancelText="$t('label.cancel')" + style="top: 20px;" + width="50vw" + @cancel="closeModal" + @ok="handleSubmit" + :ok-button-props="{props: { type: 'default' } }" + :cancel-button-props="{props: { type: 'primary' } }" + centered> + <template #title> + {{ $t('label.action.create.api.key') }} + </template> + <a-spin :spinning="loading"> + <a-form + :ref="formRef" + :model="form" + layout="vertical" + @finish="handleSubmit"> + <a-alert + style="margin-bottom: 10px; " + :message="$t('message.note.about.keypair.permissions.title')" + :description="$t('message.note.about.keypair.permissions.body')" + type="info" + show-icon + /> + <a-form-item name="name" ref="name"> + <template #label> + <tooltip-label :title="$t('label.name')" :tooltip="apiParams.name.description"/> + </template> + <a-input + v-focus="true" + :placeholder="$t('label.apikeypair.name')" + v-model:value="form.name" /> + </a-form-item> + <a-form-item name="description" ref="description"> + <template #label> + <tooltip-label :title="$t('label.description')" :tooltip="apiParams.description.description"/> + </template> + <a-input + v-model:value="form.description" + :placeholder="$t('label.apikeypair.description')" /> + </a-form-item> + <a-row> + <a-form-item ref="startDate" name="startDate"> + <template #label> + <tooltip-label :title="$t('label.start.date')" :tooltip="apiParams.startdate.description"/> + </template> + <a-date-picker + v-model:value="form.startDate" + :disabled-date="disabledStartDate" + show-time + /> + </a-form-item> + <a-form-item ref="endDate" name="endDate" style="margin: 0 8px"> + <template #label> + <tooltip-label :title="$t('label.end.date')" :tooltip="apiParams.enddate.description"/> + </template> + <a-date-picker + :disabled-date="disabledEndDate" + v-model:value="form.endDate" + show-time /> + </a-form-item> + </a-row> + <a-form-item> + <template #label> + <tooltip-label :title="$t('label.rules')" :tooltip="apiParams.rules.description"/> + </template> + <api-key-pair-permission-table + :resource="resource" + @update-rules="updateRules"/> + </a-form-item> + </a-form> + </a-spin> + </a-modal> + </div> +</template> + +<script> +import { ref, reactive, toRaw } from 'vue' +import { postAPI } from '@/api' +import TooltipLabel from '@/components/widgets/TooltipLabel' +import ApiKeyPairPermissionTable from '@/views/iam/ApiKeyPairPermissionTable.vue' +import { dayjs, parseDayJsObject } from '@/utils/date' + +export default { + name: 'GenerateApiKeyPair', + components: { + TooltipLabel, + ApiKeyPairPermissionTable + }, + props: { + showAddKeyPair: { + type: Boolean, + default: false + }, + resource: { + type: Object, + required: true + } + }, + data () { + return { + rules: [], + loading: false + } + }, + beforeCreate () { + this.apiParams = this.$getApiParams('registerUserKeys') + }, + created () { + this.initForm() + }, + methods: { + initForm () { + this.formRef = ref() + this.form = reactive({}) + }, + buildRequestParams () { + const values = toRaw(this.form) + this.loading = true + const params = { + name: values.name, + 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 + } + for (const i in this.rules) { + const rule = this.rules[i] + params['rules[' + i + '].rule'] = rule.rule ? rule.rule : '' + params['rules[' + i + '].permission'] = rule.permission ? rule.permission : 'deny' + params['rules[' + i + '].description'] = rule.description ? rule.description : '' + } + return params + }, + handleSubmit (e) { + if (e && typeof e.preventDefault === 'function') { + e.preventDefault() + } + if (this.loading) return + this.formRef.value.validate().then(() => { + const params = this.buildRequestParams() + this.loading = true + postAPI('registerUserKeys', params).then(response => { + this.$pollJob({ + jobId: response.registeruserkeysresponse.jobid, + successMessage: `${this.$t('message.success.register.user.keypair')} ${this.$t('label.for')} user ${this.resource.id}`, + successMethod: () => { + this.fetchData() + }, + errorMessage: this.$t('message.register.keypair.failed'), + errorMethod: () => { + this.fetchData() + }, + loadingMessage: `${this.$t('label.registering.keypair')} ${this.$t('label.for')} user ${this.resource.id} ${this.$t('label.is.in.progress')}`, Review Comment: Same as above. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
