Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
admin-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pleroma
admin-fe
Commits
05b6992d
Commit
05b6992d
authored
4 years ago
by
Angelina Filippova
Browse files
Options
Downloads
Patches
Plain Diff
Add actor_type filter
parent
6b58b4f5
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/api/users.js
+4
-4
4 additions, 4 deletions
src/api/users.js
src/store/modules/users.js
+10
-2
10 additions, 2 deletions
src/store/modules/users.js
with
14 additions
and
6 deletions
src/api/users.js
+
4
−
4
View file @
05b6992d
...
...
@@ -110,10 +110,10 @@ export async function fetchUser(id, authHost, token) {
})
}
export
async
function
fetchUsers
(
filters
,
authHost
,
token
,
page
=
1
)
{
export
async
function
fetchUsers
(
filters
,
actorTypeFilters
,
authHost
,
token
,
page
=
1
)
{
return
await
request
({
baseURL
:
baseName
(
authHost
),
url
:
`/api/pleroma/admin/users?page=
${
page
}
&filters=
${
filters
}
`
,
url
:
`/api/pleroma/admin/users?page=
${
page
}
&filters=
${
filters
}
&actor_types=
${
actorTypeFilters
}
`
,
method
:
'
get
'
,
headers
:
authHeaders
(
token
)
})
...
...
@@ -175,10 +175,10 @@ export async function resendConfirmationEmail(nicknames, authHost, token) {
})
}
export
async
function
searchUsers
(
query
,
filters
,
authHost
,
token
,
page
=
1
)
{
export
async
function
searchUsers
(
query
,
filters
,
actorTypeFilters
,
authHost
,
token
,
page
=
1
)
{
return
await
request
({
baseURL
:
baseName
(
authHost
),
url
:
`/api/pleroma/admin/users?query=
${
query
}
&page=
${
page
}
&filters=
${
filters
}
`
,
url
:
`/api/pleroma/admin/users?query=
${
query
}
&page=
${
page
}
&filters=
${
filters
}
&actor_types=
${
actorTypeFilters
}
`
,
method
:
'
get
'
,
headers
:
authHeaders
(
token
)
})
...
...
This diff is collapsed.
Click to expand it.
src/store/modules/users.js
+
10
−
2
View file @
05b6992d
...
...
@@ -31,6 +31,7 @@ const users = {
totalUsersCount
:
0
,
currentPage
:
1
,
pageSize
:
50
,
actorTypeFilters
:
[],
filters
:
{
local
:
false
,
external
:
false
,
...
...
@@ -46,6 +47,9 @@ const users = {
tags
:
[]
},
mutations
:
{
SET_ACTOR_TYPE_FILTERS
:
(
state
,
actorTypeFilters
)
=>
{
state
.
actorTypeFilters
=
actorTypeFilters
},
SET_USERS
:
(
state
,
users
)
=>
{
state
.
fetchedUsers
=
users
},
...
...
@@ -248,7 +252,7 @@ const users = {
async
FetchUsers
({
commit
,
dispatch
,
getters
,
state
},
{
page
})
{
commit
(
'
SET_LOADING
'
,
true
)
const
filters
=
Object
.
keys
(
state
.
filters
).
filter
(
filter
=>
state
.
filters
[
filter
]).
join
()
const
response
=
await
fetchUsers
(
filters
,
getters
.
authHost
,
getters
.
token
,
page
)
const
response
=
await
fetchUsers
(
filters
,
state
.
actorTypeFilters
,
getters
.
authHost
,
getters
.
token
,
page
)
await
dispatch
(
'
GetNodeInfo
'
)
loadUsers
(
commit
,
page
,
response
.
data
)
},
...
...
@@ -299,7 +303,7 @@ const users = {
commit
(
'
SET_SEARCH_QUERY
'
,
query
)
const
filters
=
Object
.
keys
(
state
.
filters
).
filter
(
filter
=>
state
.
filters
[
filter
]).
join
()
const
response
=
await
searchUsers
(
query
,
filters
,
getters
.
authHost
,
getters
.
token
,
page
)
const
response
=
await
searchUsers
(
query
,
filters
,
state
.
actorTypeFilters
,
getters
.
authHost
,
getters
.
token
,
page
)
loadUsers
(
commit
,
page
,
response
.
data
)
}
...
...
@@ -310,6 +314,10 @@ const users = {
duration
:
5
*
1000
})
},
async
ToggleActorTypeFilter
({
commit
,
dispatch
,
state
},
actorTypeFilters
)
{
commit
(
'
SET_ACTOR_TYPE_FILTERS
'
,
actorTypeFilters
)
dispatch
(
'
SearchUsers
'
,
{
query
:
state
.
searchQuery
,
page
:
1
})
},
async
ToggleUsersFilter
({
commit
,
dispatch
,
state
},
filters
)
{
const
defaultFilters
=
{
local
:
false
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment