Skip to content

Commit

Permalink
Perf: Remove isPam item
Browse files Browse the repository at this point in the history
  • Loading branch information
@ZhaoJiSen
ZhaoJiSen committed Jan 20, 2025
1 parent 14c3b24 commit 58bb69c
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 47 deletions.
74 changes: 55 additions & 19 deletions src/components/Apps/AccountCreateUpdateForm/const.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import AutomationParamsForm from '@/views/assets/Platform/AutomationParamsSettin
export const accountFieldsMeta = (vm) => {
const defaultPrivilegedAccounts = ['root', 'administrator']

const isPam = vm.$route.query.flag === 'copy' || vm.$route.query.flag === 'move'

return {
assets: {
component: Select2,
Expand All @@ -30,7 +28,9 @@ export const accountFieldsMeta = (vm) => {
component: Select2,
rules: [Required],
el: {
disabled: isPam,
get disabled() {
return vm.isDisabled
},
multiple: false,
ajax: {
url: '/api/v1/accounts/account-templates/',
Expand All @@ -48,7 +48,9 @@ export const accountFieldsMeta = (vm) => {
label: vm.$t('AccountPolicy'),
helpTip: vm.$t('AccountPolicyHelpText'),
el: {
disabled: isPam
get disabled() {
return vm.isDisabled
}
},
hidden: () => {
return vm.platform || vm.asset
Expand All @@ -58,7 +60,9 @@ export const accountFieldsMeta = (vm) => {
label: vm.$t('Name'),
rules: [RequiredChange],
el: {
disabled: isPam
get disabled() {
return vm.isDisabled
}
},
on: {
input: ([value], updateForm) => {
Expand All @@ -79,7 +83,9 @@ export const accountFieldsMeta = (vm) => {
},
username: {
el: {
disabled: !!vm.account?.name || isPam
get disabled() {
return !!vm.account?.name || vm.isDisabled
}
},
on: {
input: ([value], updateForm) => {
Expand All @@ -99,7 +105,9 @@ export const accountFieldsMeta = (vm) => {
privileged: {
label: vm.$t('Privileged'),
el: {
disabled: isPam
get disabled() {
return vm.isDisabled
}
},
hidden: () => {
return vm.addTemplate
Expand All @@ -113,7 +121,11 @@ export const accountFieldsMeta = (vm) => {
el: {
multiple: false,
clearable: true,
disabled: isPam,
disabled: {
get disabled() {
return vm.isDisabled
}
},
ajax: {
url: `/api/v1/accounts/accounts/su-from-accounts/?account=${vm.account?.id || ''}&asset=${vm.asset?.id || ''}`,
transformOption: (item) => {
Expand All @@ -124,7 +136,11 @@ export const accountFieldsMeta = (vm) => {
},
su_from_username: {
label: vm.$t('UserSwitchFrom'),
disabled: isPam,
el: {
get disabled() {
return vm.isDisabled
}
},
hidden: (formValue) => {
return vm.platform || vm.asset || vm.addTemplate
}
Expand All @@ -133,7 +149,9 @@ export const accountFieldsMeta = (vm) => {
label: vm.$t('Password'),
component: UpdateToken,
el: {
disabled: isPam
get disabled() {
return vm.isDisabled
}
},
hidden: (formValue) => {
return formValue.secret_type !== 'password' || vm.addTemplate
Expand All @@ -143,23 +161,29 @@ export const accountFieldsMeta = (vm) => {
label: vm.$t('PrivateKey'),
component: UploadSecret,
el: {
disabled: isPam
get disabled() {
return vm.isDisabled
}
},
hidden: (formValue) => formValue.secret_type !== 'ssh_key' || vm.addTemplate
},
passphrase: {
label: vm.$t('Passphrase'),
component: UpdateToken,
el: {
disabled: isPam
get disabled() {
return vm.isDisabled
}
},
hidden: (formValue) => formValue.secret_type !== 'ssh_key' || vm.addTemplate
},
token: {
label: vm.$t('Token'),
component: UploadSecret,
el: {
disabled: isPam
get disabled() {
return vm.isDisabled
}
},
hidden: (formValue) => formValue.secret_type !== 'token' || vm.addTemplate
},
Expand All @@ -168,7 +192,9 @@ export const accountFieldsMeta = (vm) => {
label: vm.$t('AccessKey'),
component: UploadSecret,
el: {
disabled: isPam
get disabled() {
return vm.isDisabled
}
},
hidden: (formValue) => formValue.secret_type !== 'access_key' || vm.addTemplate
},
Expand All @@ -177,15 +203,19 @@ export const accountFieldsMeta = (vm) => {
label: vm.$t('ApiKey'),
component: UploadSecret,
el: {
disabled: isPam
get disabled() {
return vm.isDisabled
}
},
hidden: (formValue) => formValue.secret_type !== 'api_key' || vm.addTemplate
},
secret_type: {
type: 'radio-group',
options: [],
el: {
disabled: isPam
get disabled() {
return vm.isDisabled
}
},
hidden: () => {
return vm.addTemplate
Expand Down Expand Up @@ -223,19 +253,25 @@ export const accountFieldsMeta = (vm) => {
is_active: {
label: vm.$t('IsActive'),
el: {
disabled: isPam
get disabled() {
return vm.isDisabled
}
}
},
comment: {
label: vm.$t('Comment'),
el: {
disabled: isPam
get disabled() {
return vm.isDisabled
}
}
},
secret_reset: {
label: vm.$t('SecretReset'),
el: {
disabled: isPam
get disabled() {
return vm.isDisabled
}
}
}
}
Expand Down
11 changes: 11 additions & 0 deletions src/components/Apps/AccountCreateUpdateForm/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export default {
data() {
return {
loading: true,
isDisabled: false,
usernameChanged: false,
submitBtnText: this.$t('Confirm'),
iPlatform: {
Expand Down Expand Up @@ -74,6 +75,16 @@ export default {
hasSaveContinue: false
}
},
watch: {
'$route.query': {
handler(nv, ov) {
if (nv && (nv.flag === 'move' || nv.flag === 'copy')) {
this.isDisabled = true
}
},
immediate: true
}
},
async mounted() {
try {
await this.getPlatform()
Expand Down
4 changes: 0 additions & 4 deletions src/components/Apps/AccountListTable/UpdateSecretInfo.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,3 @@ export default {
}
}
</script>

<style scoped>
</style>
24 changes: 0 additions & 24 deletions src/components/Table/ListTable/TableAction/LeftSide.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ export default {
data() {
const vm = this
return {
showDrawer: false,
dynamicTemplateComponent: null,
defaultMoreActions: [
{
title: this.$t('DeleteSelected'),
Expand Down Expand Up @@ -226,20 +224,9 @@ export default {
const { href } = this.$router.resolve(route)
window.open(href, '_blank')
} else {
if (route.isPam) {
this.showDrawer = true
this.dynamicTemplateComponent = route.name
return
}
this.$router.push(route)
}
},
handleCloseDrawer() {
this.showDrawer = false
this.dynamicTemplateComponent = null
},
defaultBulkDeleteCallback({ selectedRows, reloadTable }) {
const msg = this.$t('DeleteWarningMsg') + ' ' + selectedRows.length + ' ' + this.$t('Rows') + ' ?'
const title = this.$tc('Info')
Expand Down Expand Up @@ -280,15 +267,4 @@ export default {
</script>
<style lang="scss" scoped>
::v-deep .ibox {
height: 100% !important;
margin: unset !important;
border: unset !important;
.el-card__body {
padding-top: unset !important;
padding-bottom: unset !important;
height: 100% !important;
}
}
</style>

0 comments on commit 58bb69c

Please sign in to comment.