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
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Sean King
admin-fe
Commits
a66bb599
Commit
a66bb599
authored
5 years ago
by
Angelina Filippova
Browse files
Options
Downloads
Patches
Plain Diff
Add try/catch to actions that moderate users
parent
274ed16d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/store/modules/users.js
+62
-17
62 additions, 17 deletions
src/store/modules/users.js
src/views/users/index.vue
+2
-11
2 additions, 11 deletions
src/views/users/index.vue
with
64 additions
and
28 deletions
src/store/modules/users.js
+
62
−
17
View file @
a66bb599
import
{
Message
}
from
'
element-ui
'
import
i18n
from
'
@/lang
'
import
{
activateUsers
,
addRight
,
...
...
@@ -78,8 +80,13 @@ const users = {
commit
(
'
SWAP_USERS
'
,
updatedUsers
)
const
usersNicknames
=
users
.
map
(
user
=>
user
.
nickname
)
await
activateUsers
(
usersNicknames
,
getters
.
authHost
,
getters
.
token
)
dispatch
(
'
SearchUsers
'
,
{
query
:
state
.
searchQuery
,
page
:
state
.
currentPage
})
try
{
await
activateUsers
(
usersNicknames
,
getters
.
authHost
,
getters
.
token
)
}
catch
(
_e
)
{
return
}
finally
{
dispatch
(
'
SearchUsers
'
,
{
query
:
state
.
searchQuery
,
page
:
state
.
currentPage
})
}
},
async
AddRight
({
commit
,
dispatch
,
getters
,
state
},
{
users
,
right
})
{
const
updatedUsers
=
users
.
map
(
user
=>
{
...
...
@@ -88,8 +95,13 @@ const users = {
commit
(
'
SWAP_USERS
'
,
updatedUsers
)
const
usersNicknames
=
users
.
map
(
user
=>
user
.
nickname
)
await
addRight
(
usersNicknames
,
right
,
getters
.
authHost
,
getters
.
token
)
dispatch
(
'
SearchUsers
'
,
{
query
:
state
.
searchQuery
,
page
:
state
.
currentPage
})
try
{
await
addRight
(
usersNicknames
,
right
,
getters
.
authHost
,
getters
.
token
)
}
catch
(
_e
)
{
return
}
finally
{
dispatch
(
'
SearchUsers
'
,
{
query
:
state
.
searchQuery
,
page
:
state
.
currentPage
})
}
},
async
AddTag
({
commit
,
dispatch
,
getters
,
state
},
{
users
,
tag
})
{
const
updatedUsers
=
users
.
map
(
user
=>
{
...
...
@@ -98,16 +110,31 @@ const users = {
commit
(
'
SWAP_USERS
'
,
updatedUsers
)
const
nicknames
=
users
.
map
(
user
=>
user
.
nickname
)
await
tagUser
(
nicknames
,
[
tag
],
getters
.
authHost
,
getters
.
token
)
dispatch
(
'
SearchUsers
'
,
{
query
:
state
.
searchQuery
,
page
:
state
.
currentPage
})
try
{
await
tagUser
(
nicknames
,
[
tag
],
getters
.
authHost
,
getters
.
token
)
}
catch
(
_e
)
{
return
}
finally
{
dispatch
(
'
SearchUsers
'
,
{
query
:
state
.
searchQuery
,
page
:
state
.
currentPage
})
}
},
async
ClearFilters
({
commit
,
dispatch
,
state
})
{
commit
(
'
CLEAR_USERS_FILTERS
'
)
dispatch
(
'
SearchUsers
'
,
{
query
:
state
.
searchQuery
,
page
:
1
})
},
async
CreateNewAccount
({
dispatch
,
getters
,
state
},
{
nickname
,
email
,
password
})
{
await
createNewAccount
(
nickname
,
email
,
password
,
getters
.
authHost
,
getters
.
token
)
dispatch
(
'
SearchUsers
'
,
{
query
:
state
.
searchQuery
,
page
:
state
.
currentPage
})
try
{
await
createNewAccount
(
nickname
,
email
,
password
,
getters
.
authHost
,
getters
.
token
)
}
catch
(
_e
)
{
return
}
finally
{
dispatch
(
'
SearchUsers
'
,
{
query
:
state
.
searchQuery
,
page
:
state
.
currentPage
})
}
Message
({
message
:
i18n
.
t
(
'
users.accountCreated
'
),
type
:
'
success
'
,
duration
:
5
*
1000
})
},
async
DeactivateUsers
({
commit
,
dispatch
,
getters
,
state
},
users
)
{
const
updatedUsers
=
users
.
map
(
user
=>
{
...
...
@@ -116,8 +143,13 @@ const users = {
commit
(
'
SWAP_USERS
'
,
updatedUsers
)
const
usersNicknames
=
users
.
map
(
user
=>
user
.
nickname
)
await
deactivateUsers
(
usersNicknames
,
getters
.
authHost
,
getters
.
token
)
dispatch
(
'
SearchUsers
'
,
{
query
:
state
.
searchQuery
,
page
:
state
.
currentPage
})
try
{
await
deactivateUsers
(
usersNicknames
,
getters
.
authHost
,
getters
.
token
)
}
catch
(
_e
)
{
return
}
finally
{
dispatch
(
'
SearchUsers
'
,
{
query
:
state
.
searchQuery
,
page
:
state
.
currentPage
})
}
},
async
DeleteRight
({
commit
,
dispatch
,
getters
,
state
},
{
users
,
right
})
{
const
updatedUsers
=
users
.
map
(
user
=>
{
...
...
@@ -126,16 +158,24 @@ const users = {
commit
(
'
SWAP_USERS
'
,
updatedUsers
)
const
usersNicknames
=
users
.
map
(
user
=>
user
.
nickname
)
await
deleteRight
(
usersNicknames
,
right
,
getters
.
authHost
,
getters
.
token
)
dispatch
(
'
SearchUsers
'
,
{
query
:
state
.
searchQuery
,
page
:
state
.
currentPage
})
try
{
await
deleteRight
(
usersNicknames
,
right
,
getters
.
authHost
,
getters
.
token
)
}
catch
(
_e
)
{
return
}
finally
{
dispatch
(
'
SearchUsers
'
,
{
query
:
state
.
searchQuery
,
page
:
state
.
currentPage
})
}
},
async
DeleteUsers
({
commit
,
getters
,
state
},
users
)
{
const
usersNicknames
=
users
.
map
(
user
=>
user
.
nickname
)
try
{
await
deleteUsers
(
usersNicknames
,
getters
.
authHost
,
getters
.
token
)
}
catch
(
_e
)
{
return
}
const
deletedUsersIds
=
users
.
map
(
deletedUser
=>
deletedUser
.
id
)
const
updatedUsers
=
state
.
fetchedUsers
.
filter
(
user
=>
!
deletedUsersIds
.
includes
(
user
.
id
))
commit
(
'
SET_USERS
'
,
updatedUsers
)
const
usersNicknames
=
users
.
map
(
user
=>
user
.
nickname
)
await
deleteUsers
(
usersNicknames
,
getters
.
authHost
,
getters
.
token
)
},
async
RequirePasswordReset
({
getters
},
user
)
{
await
requirePasswordReset
(
user
.
nickname
,
getters
.
authHost
,
getters
.
token
)
...
...
@@ -161,8 +201,13 @@ const users = {
commit
(
'
SWAP_USERS
'
,
updatedUsers
)
const
nicknames
=
users
.
map
(
user
=>
user
.
nickname
)
await
untagUser
(
nicknames
,
[
tag
],
getters
.
authHost
,
getters
.
token
)
dispatch
(
'
SearchUsers
'
,
{
query
:
state
.
searchQuery
,
page
:
state
.
currentPage
})
try
{
await
untagUser
(
nicknames
,
[
tag
],
getters
.
authHost
,
getters
.
token
)
}
catch
(
_e
)
{
return
}
finally
{
dispatch
(
'
SearchUsers
'
,
{
query
:
state
.
searchQuery
,
page
:
state
.
currentPage
})
}
},
async
SearchUsers
({
commit
,
dispatch
,
state
,
getters
},
{
query
,
page
})
{
if
(
query
.
length
===
0
)
{
...
...
This diff is collapsed.
Click to expand it.
src/views/users/index.vue
+
2
−
11
View file @
a66bb599
...
...
@@ -245,17 +245,8 @@ export default {
this
.
$refs
.
usersTable
.
clearSelection
()
},
async
createNewAccount
(
accountData
)
{
try
{
await
this
.
$store
.
dispatch
(
'
CreateNewAccount
'
,
accountData
)
}
catch
(
_e
)
{
return
}
finally
{
this
.
createAccountDialogOpen
=
false
}
this
.
$message
({
type
:
'
success
'
,
message
:
this
.
$t
(
'
users.accountCreated
'
)
})
await
this
.
$store
.
dispatch
(
'
CreateNewAccount
'
,
accountData
)
this
.
createAccountDialogOpen
=
false
},
getFirstLetter
(
str
)
{
return
str
.
charAt
(
0
).
toUpperCase
()
...
...
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