From 4316028e41649681bb7168ad8c1e1fb8e61d1768 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Fri, 25 Sep 2020 21:47:47 +0300
Subject: [PATCH] Add filter by actor type to Users Filter Select
---
src/lang/en.js | 6 +++++-
src/views/users/components/UsersFilter.vue | 12 ++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/lang/en.js b/src/lang/en.js
index a6a26f27..7bc59811 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -345,13 +345,17 @@ export default {
usersFilter: {
inputPlaceholder: 'Select filter',
byAccountType: 'By account type',
+ byActorType: 'By actor type',
local: 'Local',
external: 'External',
byStatus: 'By status',
active: 'Active',
pending: 'Pending Approval',
deactivated: 'Deactivated',
- unconfirmed: 'Unconfirmed'
+ unconfirmed: 'Unconfirmed',
+ person: 'Person',
+ bot: 'Bot',
+ application: 'Application'
},
reports: {
reports: 'Reports',
diff --git a/src/views/users/components/UsersFilter.vue b/src/views/users/components/UsersFilter.vue
index a04cf971..b952f07c 100644
--- a/src/views/users/components/UsersFilter.vue
+++ b/src/views/users/components/UsersFilter.vue
@@ -16,6 +16,11 @@
<el-option value="need_approval">{{ $t('usersFilter.pending') }}</el-option>
<el-option value="unconfirmed">{{ $t('usersFilter.unconfirmed') }}</el-option>
</el-option-group>
+ <el-option-group :label="$t('usersFilter.byActorType')">
+ <el-option value="Person">{{ $t('usersFilter.person') }}</el-option>
+ <el-option value="Service">{{ $t('usersFilter.bot') }}</el-option>
+ <el-option value="Application">{{ $t('usersFilter.application') }}</el-option>
+ </el-option-group>
</el-select>
</template>
@@ -45,6 +50,9 @@ export default {
const indexOfDeactivated = this.$data.value.indexOf('deactivated')
const indexOfPending = this.$data.value.indexOf('need_approval')
const indexOfUnconfirmed = this.$data.value.indexOf('unconfirmed')
+ const indexOfPerson = this.$data.value.indexOf('Person')
+ const indexOfService = this.$data.value.indexOf('Service')
+ const indexOfApplication = this.$data.value.indexOf('Application')
if (this.$data.value.length === filtersQuantity) {
return []
@@ -58,6 +66,10 @@ export default {
? currentFilters.push(this.$data.value[Math.max(indexOfActive, indexOfDeactivated, indexOfPending, indexOfUnconfirmed)])
: currentFilters
+ Math.max(indexOfPerson, indexOfService, indexOfApplication) > -1
+ ? currentFilters.push(this.$data.value[Math.max(indexOfPerson, indexOfService, indexOfApplication)])
+ : currentFilters
+
return currentFilters
},
toggleFilters() {
--
GitLab