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

AdminAPI: change from approval_pending to is_approved

Browse source
This commit is contained in:
Mark Felder 2021-01-18 12:24:35 -06:00
parent 30b14142c7
commit 3df5aebadf
6 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/api/__mocks__/users.js
View file

@ -1,12 +1,12 @@
import userChats from './chat' import userChats from './chat'
export let users = [ export let users = [
{ active: true, is_confirmed: true, approval_pending: false, deactivated: false, id: '2', nickname: 'allis', local: true, external: false, roles: { admin: true, moderator: false }, tags: [], actor_type: 'Person' }, { active: true, is_confirmed: true, is_approved: true, deactivated: false, id: '2', nickname: 'allis', local: true, external: false, roles: { admin: true, moderator: false }, tags: [], actor_type: 'Person' },
{ active: true, is_confirmed: true, approval_pending: false, deactivated: false, id: '10', nickname: 'bob', local: true, external: false, roles: { admin: false, moderator: false }, tags: ['mrf_tag:sandbox'], actor_type: 'Person' }, { active: true, is_confirmed: true, is_approved: true, deactivated: false, id: '10', nickname: 'bob', local: true, external: false, roles: { admin: false, moderator: false }, tags: ['mrf_tag:sandbox'], actor_type: 'Person' },
{ active: true, is_confirmed: true, approval_pending: true, deactivated: false, id: '567', nickname: 'ded', local: false, external: true, roles: { admin: false, moderator: false }, tags: [], actor_type: 'Person' }, { active: true, is_confirmed: true, is_approved: false, deactivated: false, id: '567', nickname: 'ded', local: false, external: true, roles: { admin: false, moderator: false }, tags: [], actor_type: 'Person' },
{ active: false, is_confirmed: true, approval_pending: false, deactivated: true, id: 'abc', nickname: 'john', local: true, external: false, roles: { admin: false, moderator: false }, tags: ['mrf_tag:media-strip'], actor_type: 'Person' }, { active: false, is_confirmed: true, is_approved: true, deactivated: true, id: 'abc', nickname: 'john', local: true, external: false, roles: { admin: false, moderator: false }, tags: ['mrf_tag:media-strip'], actor_type: 'Person' },
{ active: true, is_confirmed: true, approval_pending: true, deactivated: false, id: '100', nickname: 'sally', local: true, external: false, roles: { admin: false, moderator: false }, tags: [], actor_type: 'Service' }, { active: true, is_confirmed: true, is_approved: false, deactivated: false, id: '100', nickname: 'sally', local: true, external: false, roles: { admin: false, moderator: false }, tags: [], actor_type: 'Service' },
{ active: true, is_confirmed: true, approval_pending: true, deactivated: false, id: '123', nickname: 'bot', local: true, external: false, roles: { admin: false, moderator: false }, tags: [], actor_type: 'Application' } { active: true, is_confirmed: true, is_approved: false, deactivated: false, id: '123', nickname: 'bot', local: true, external: false, roles: { admin: false, moderator: false }, tags: [], actor_type: 'Application' }
] ]
const userProfile = { avatar: 'avatar.jpg', nickname: 'allis', id: '2', tags: [], roles: { admin: true, moderator: false }, local: true, external: false } const userProfile = { avatar: 'avatar.jpg', nickname: 'allis', id: '2', tags: [], roles: { admin: true, moderator: false }, local: true, external: false }
@ -104,7 +104,7 @@ export async function deactivateUsers(nicknames, authHost, token) {
export async function approveUserAccount(nicknames, authHost, token) { export async function approveUserAccount(nicknames, authHost, token) {
const response = nicknames.map(nickname => { const response = nicknames.map(nickname => {
const currentUser = users.find(user => user.nickname === nickname) const currentUser = users.find(user => user.nickname === nickname)
return { ...currentUser, approval_pending: false } return { ...currentUser, is_approved: true }
}) })
return Promise.resolve({ data: response }) return Promise.resolve({ data: response })
} }

2
src/store/modules/users.js
View file

@ -132,7 +132,7 @@ const users = {
}, },
async ApproveUsersAccount({ dispatch, getters }, { users, _userId, _statusId }) { async ApproveUsersAccount({ dispatch, getters }, { users, _userId, _statusId }) {
const updatedUsers = users.map(user => { const updatedUsers = users.map(user => {
return { ...user, approval_pending: false } return { ...user, is_approved: true }
}) })
const nicknames = users.map(user => user.nickname) const nicknames = users.map(user => user.nickname)
const callApiFn = async() => await approveUserAccount(nicknames, getters.authHost, getters.token) const callApiFn = async() => await approveUserAccount(nicknames, getters.authHost, getters.token)

4
src/views/users/components/ModerationDropdown.vue
View file

@ -46,13 +46,13 @@
{{ $t('users.deleteAccount') }} {{ $t('users.deleteAccount') }}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item <el-dropdown-item
v-if="user.local && user.approval_pending" v-if="user.local && !user.is_approved"
divided divided
@click.native="handleAccountApproval(user)"> @click.native="handleAccountApproval(user)">
{{ $t('users.approveAccount') }} {{ $t('users.approveAccount') }}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item <el-dropdown-item
v-if="user.local && user.approval_pending" v-if="user.local && !user.is_approved"
@click.native="handleAccountRejection(user)"> @click.native="handleAccountRejection(user)">
{{ $t('users.rejectAccount') }} {{ $t('users.rejectAccount') }}
</el-dropdown-item> </el-dropdown-item>

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

@ -238,7 +238,7 @@ export default {
applyAction(filtered, requirePasswordResetFn) applyAction(filtered, requirePasswordResetFn)
}, },
approveAccounts: () => { approveAccounts: () => {
const filtered = this.selectedUsers.filter(user => this.isLocalUser(user) && user.approval_pending) const filtered = this.selectedUsers.filter(user => this.isLocalUser(user) && !user.is_approved)
const approveAccountFn = async(users) => await this.$store.dispatch('ApproveUsersAccount', { users }) const approveAccountFn = async(users) => await this.$store.dispatch('ApproveUsersAccount', { users })
applyAction(filtered, approveAccountFn) applyAction(filtered, approveAccountFn)

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

@ -56,16 +56,16 @@
</el-table-column> </el-table-column>
<el-table-column :min-width="width" :label="$t('users.status')"> <el-table-column :min-width="width" :label="$t('users.status')">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="!scope.row.deactivated & !scope.row.approval_pending" type="success"> <el-tag v-if="!scope.row.deactivated & scope.row.is_approved" type="success">
<span v-if="isDesktop">{{ $t('users.active') }}</span> <span v-if="isDesktop">{{ $t('users.active') }}</span>
<i v-else class="el-icon-circle-check"/> <i v-else class="el-icon-circle-check"/>
</el-tag> </el-tag>
<el-tag v-if="scope.row.deactivated & !scope.row.approval_pending" type="danger"> <el-tag v-if="scope.row.deactivated & scope.row.is_approved" type="danger">
<span v-if="isDesktop">{{ $t('users.deactivated') }}</span> <span v-if="isDesktop">{{ $t('users.deactivated') }}</span>
<i v-else class="el-icon-circle-close"/> <i v-else class="el-icon-circle-close"/>
</el-tag> </el-tag>
<el-tooltip :content="$t('users.unapprovedAccount')" effect="dark"> <el-tooltip :content="$t('users.unapprovedAccount')" effect="dark">
<el-tag v-if="scope.row.approval_pending" type="info"> <el-tag v-if="!scope.row.is_approved" type="info">
<span v-if="isDesktop">{{ $t('users.unapproved') }}</span> <span v-if="isDesktop">{{ $t('users.unapproved') }}</span>
<i v-else class="el-icon-warning-outline"/> <i v-else class="el-icon-warning-outline"/>
</el-tag> </el-tag>

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

@ -89,8 +89,8 @@
<tr class="el-table__row"> <tr class="el-table__row">
<td>{{ $t('userProfile.status') }}</td> <td>{{ $t('userProfile.status') }}</td>
<td> <td>
<el-tag v-if="user.approval_pending" type="info">{{ $t('userProfile.pending') }}</el-tag> <el-tag v-if="!user.is_approved" type="info">{{ $t('userProfile.pending') }}</el-tag>
<el-tag v-if="!user.deactivated & !user.approval_pending" type="success">{{ $t('userProfile.active') }}</el-tag> <el-tag v-if="!user.deactivated & user.is_approved" type="success">{{ $t('userProfile.active') }}</el-tag>
<el-tag v-if="user.deactivated" type="danger">{{ $t('userProfile.deactivated') }}</el-tag> <el-tag v-if="user.deactivated" type="danger">{{ $t('userProfile.deactivated') }}</el-tag>
</td> </td>
</tr> </tr>