Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix User Counts updates on user add/remove #31484

Closed
wants to merge 1 commit into from
Closed

fix User Counts updates on user add/remove #31484

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 45 additions & 8 deletions apps/settings/src/store/users.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,22 +143,59 @@ const mutations = {
},
deleteUser(state, userid) {
const userIndex = state.users.findIndex(user => user.id === userid)
this.commit('updateUserCounts', { user: state.users[userIndex], actionType: 'remove' })
state.users.splice(userIndex, 1)
},
addUserData(state, response) {
state.users.push(response.data.ocs.data)
const user = response.data.ocs.data
state.users.push(user)
this.commit('updateUserCounts', { user, actionType: 'create' })
},
enableDisableUser(state, { userid, enabled }) {
const user = state.users.find(user => user.id === userid)
user.enabled = enabled
// increment or not
if (state.userCount > 0) {
state.groups.find(group => group.id === 'disabled').usercount += enabled ? -1 : 1
state.userCount += enabled ? 1 : -1
user.groups.forEach(group => {
// Increment disabled count
state.groups.find(groupSearch => groupSearch.id === group).disabled += enabled ? -1 : 1
// this.commit('updateUserCounts', { user, actionType: enabled ? 'enable' : 'disable' })
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer the enable/disable action type so the update one is not wrongly used in the future.

this.commit('updateUserCounts', { user, actionType: 'update' })
},
// update active/disabled counts, groups counts
updateUserCounts(state, { user, actionType }) {
const disabledGroup = state.groups.find(group => group.id === 'disabled')
switch (actionType) {
case 'update':
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To not duplicate the code you can handle both enable and disable like so:

		case 'enable':
		case 'disable':
			...

and keeping the current logic

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the review @artonge. I made the chenges and pushed here #31697
please review it again

disabledGroup.usercount += user.enabled ? -1 : 1 // update Disabled Users count
state.userCount += user.enabled ? 1 : -1 // update Active Users count
user.groups.forEach(userGroup => {
const group = state.groups.find(groupSearch => groupSearch.id === userGroup)
group.disabled += user.enabled ? -1 : 1 // update group disabled count
})
break
case 'create':
state.userCount++ // increment Active Users count

user.groups.forEach(userGroup => {
state.groups
.find(groupSearch => groupSearch.id === userGroup)
.usercount++ // increment group total count
})
break
case 'remove':
if (user.enabled) {
state.userCount-- // decrement Active Users count
user.groups.forEach(userGroup => {
const group = state.groups.find(groupSearch => groupSearch.id === userGroup)
group.usercount-- // decrement group total count
})
} else {
disabledGroup.usercount-- // decrement Disabled Users count
user.groups.forEach(userGroup => {
const group = state.groups.find(groupSearch => groupSearch.id === userGroup)
group.disabled-- // decrement group disabled count
})
}
break
default:
console.error(`Unknown action type in updateUserCounts: ${actionType}`)
// not throwing error to interupt execution as this is not fatal
}
},
setUserData(state, { userid, key, value }) {
Expand Down