Basix/admin-fe
1
0
Fork 0
forked from AkkomaGang/admin-fe
Code Issues Pull requests Packages Projects Releases Wiki Activity

Refactoring and unification of function names

Browse source
This commit is contained in:
Angelina Filippova 2020-05-30 21:51:13 +03:00
parent 8fddbb69d2
commit f4d7ad9453
4 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/views/reports/components/Report.vue
View file

@ -24,7 +24,7 @@
<el-dropdown-item v-if="report.state !== 'closed'" @click.native="changeReportState('closed', report.id)">{{ $t('reports.close') }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<moderate-user-dropdown v-if="validAccount(report.account)" :account="report.account"/>
<moderate-user-dropdown v-if="isValid(report.account)" :account="report.account"/>
</div>
</div>
<div>
@ -174,14 +174,14 @@ export default {
handlePageChange(page) {
this.$store.dispatch('FetchReports', page)
},
isValid(account) {
return account.nickname && account.id
},
parseTimestamp(timestamp) {
return moment(timestamp).format('L HH:mm')
},
showStatuses(statuses = []) {
return statuses.length > 0
},
validAccount(account) {
return account.nickname && account.id
}
}
}

27
src/views/users/components/MultipleUsersMenu.vue
View file

@ -165,33 +165,33 @@ export default {
}
return {
grantRight: (right) => () => {
const filterUsersFn = user => user.nickname && user.id && user.local && !user.roles[right] && this.$store.state.user.id !== user.id
const filterUsersFn = user => this.isValid(user) && user.local && !user.roles[right] && this.$store.state.user.id !== user.id
const addRightFn = async(users) => await this.$store.dispatch('AddRight', { users, right })
const filtered = this.selectedUsers.filter(filterUsersFn)
applyAction(filtered, addRightFn)
},
revokeRight: (right) => () => {
const filterUsersFn = user => user.nickname && user.id && user.local && user.roles[right] && this.$store.state.user.id !== user.id
const filterUsersFn = user => this.isValid(user) && user.local && user.roles[right] && this.$store.state.user.id !== user.id
const deleteRightFn = async(users) => await this.$store.dispatch('DeleteRight', { users, right })
const filtered = this.selectedUsers.filter(filterUsersFn)
applyAction(filtered, deleteRightFn)
},
activate: () => {
const filtered = this.selectedUsers.filter(user => user.nickname && user.id && user.deactivated && this.$store.state.user.id !== user.id)
const filtered = this.selectedUsers.filter(user => this.isValid(user) && user.deactivated && this.$store.state.user.id !== user.id)
const activateUsersFn = async(users) => await this.$store.dispatch('ActivateUsers', { users })
applyAction(filtered, activateUsersFn)
},
deactivate: () => {
const filtered = this.selectedUsers.filter(user => user.nickname && user.id && !user.deactivated && this.$store.state.user.id !== user.id)
const filtered = this.selectedUsers.filter(user => this.isValid(user) && !user.deactivated && this.$store.state.user.id !== user.id)
const deactivateUsersFn = async(users) => await this.$store.dispatch('DeactivateUsers', { users })
applyAction(filtered, deactivateUsersFn)
},
remove: () => {
const filtered = this.selectedUsers.filter(user => user.nickname && user.id && this.$store.state.user.id !== user.id)
const filtered = this.selectedUsers.filter(user => this.isValid(user) && this.$store.state.user.id !== user.id)
const deleteAccountFn = async(users) => await this.$store.dispatch('DeleteUsers', { users })
applyAction(filtered, deleteAccountFn)
@ -199,40 +199,43 @@ export default {
addTag: (tag) => () => {
const filtered = this.selectedUsers.filter(user =>
tag === 'disable_remote_subscription' || tag === 'disable_any_subscription'
? user.nickname && user.id && user.local && !user.tags.includes(tag)
: user.nickname && user.id && !user.tags.includes(tag))
? this.isValid(user) && user.local && !user.tags.includes(tag)
: this.isValid(user) && !user.tags.includes(tag))
const addTagFn = async(users) => await this.$store.dispatch('AddTag', { users, tag })
applyAction(filtered, addTagFn)
},
removeTag: (tag) => async() => {
const filtered = this.selectedUsers.filter(user =>
tag === 'disable_remote_subscription' || tag === 'disable_any_subscription'
? user.nickname && user.id && user.local && user.tags.includes(tag)
: user.nickname && user.id && user.tags.includes(tag))
? this.isValid(user) && user.local && user.tags.includes(tag)
: this.isValid(user) && user.tags.includes(tag))
const removeTagFn = async(users) => await this.$store.dispatch('RemoveTag', { users, tag })
applyAction(filtered, removeTagFn)
},
requirePasswordReset: () => {
const filtered = this.selectedUsers.filter(user => user.nickname && user.id && user.local)
const filtered = this.selectedUsers.filter(user => this.isValid(user) && user.local)
const requirePasswordResetFn = async(users) => await this.$store.dispatch('RequirePasswordReset', users)
applyAction(filtered, requirePasswordResetFn)
},
confirmAccounts: () => {
const filtered = this.selectedUsers.filter(user => user.nickname && user.id && user.local && user.confirmation_pending)
const filtered = this.selectedUsers.filter(user => this.isValid(user) && user.local && user.confirmation_pending)
const confirmAccountFn = async(users) => await this.$store.dispatch('ConfirmUsersEmail', { users })
applyAction(filtered, confirmAccountFn)
},
resendConfirmation: () => {
const filtered = this.selectedUsers.filter(user => user.nickname && user.id && user.local && user.confirmation_pending)
const filtered = this.selectedUsers.filter(user => this.isValid(user) && user.local && user.confirmation_pending)
const resendConfirmationFn = async(users) => await this.$store.dispatch('ResendConfirmationEmail', users)
applyAction(filtered, resendConfirmationFn)
}
}
},
isValid(user) {
return user.nickname && user.id
},
grantRightToMultipleUsers(right) {
const { grantRight } = this.mappers()
this.confirmMessage(

8
src/views/users/index.vue
View file

@ -75,7 +75,7 @@
<el-table-column :label="$t('users.actions')" fixed="right">
<template slot-scope="scope">
<moderation-dropdown
v-if="validUser(scope.row)"
v-if="isValid(scope.row)"
:user="scope.row"
:page="'users'"
@open-reset-token-dialog="openResetPasswordDialog"/>
@ -211,14 +211,14 @@ export default {
handleSelectionChange(value) {
this.$data.selectedUsers = value
},
isValid(user) {
return user.nickname && user.id
},
openResetPasswordDialog() {
this.resetPasswordDialogOpen = true
},
showDeactivatedButton(id) {
return this.$store.state.user.id !== id
},
validUser(user) {
return user.nickname && user.id
}
}
}

10
src/views/users/show.vue
View file

@ -7,7 +7,7 @@
</div>
<div class="left-header-container">
<moderation-dropdown
v-if="validUser(user)"
v-if="isValid(user)"
:user="user"
:page="'userPage'"
@open-reset-token-dialog="openResetPasswordDialog"/>
@ -23,7 +23,7 @@
<reboot-button/>
</header>
<moderation-dropdown
v-if="validUser(user)"
v-if="isValid(user)"
:user="user"
:page="'userPage'"
@open-reset-token-dialog="openResetPasswordDialog"/>
@ -179,14 +179,14 @@ export default {
this.resetPasswordDialogOpen = false
this.$store.dispatch('RemovePasswordToken')
},
isValid(user) {
return user.nickname && user.id
},
onTogglePrivate() {
this.$store.dispatch('FetchUserProfile', { userId: this.$route.params.id, godmode: this.showPrivate })
},
openResetPasswordDialog() {
this.resetPasswordDialogOpen = true
},
validUser(user) {
return user.nickname && user.id
}
}
}