upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-20 22:00:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 39

fix(AppNavigationGroupList): restore navigation panel and search/filter functionality for sub-admin groups

Browse source 
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
This commit is contained in:
Maksim Sukharev 2025-05-12 18:38:53 +02:00
parent 875b8cf031
commit b52aae019a
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/settings/src/components/AppNavigationGroupList.vue
View file

@ -42,7 +42,7 @@
<NcAppNavigationList class="account-management__group-list"
aria-describedby="group-list-desc"
data-cy-users-settings-navigation-groups="custom">
<GroupListItem v-for="group in userGroups"
<GroupListItem v-for="group in filteredGroups"
:id="group.id"
ref="groupListItems"
:key="group.id"
@ -96,7 +96,11 @@ const selectedGroup = computed(() => route.params?.selectedGroup)
/** Current active group - URL decoded */
const selectedGroupDecoded = computed(() => selectedGroup.value ? decodeURIComponent(selectedGroup.value) : null)
/** All available groups */
const groups = computed(() => store.getters.getSortedGroups)
const groups = computed(() => {
return isAdminOrDelegatedAdmin.value
? store.getters.getSortedGroups
: store.getters.getSubAdminGroups
})
/** User groups */
const { userGroups } = useFormatGroups(groups)
/** Server settings for current user */
@ -119,6 +123,14 @@ const loadingGroups = ref(false)
const offset = ref(0)
/** Search query for groups */
const groupsSearchQuery = ref('')
const filteredGroups = computed(() => {
if (isAdminOrDelegatedAdmin.value) {
return userGroups.value
}
const substring = groupsSearchQuery.value.toLowerCase()
return userGroups.value.filter(group => group.id.toLowerCase().search(substring) !== -1 || group.title.toLowerCase().search(substring) !== -1)
})
const groupListItems = ref([])
const lastGroupListItem = computed(() => {

8
apps/settings/src/composables/useGroupsNavigation.ts
View file

@ -17,14 +17,12 @@ function formatGroupMenu(group?: IGroup) {
return null
}
const item = {
return {
id: group.id,
title: group.name,
usercount: group.usercount,
count: Math.max(0, group.usercount - group.disabled),
usercount: group.usercount ?? 0,
count: Math.max(0, (group.usercount ?? 0) - (group.disabled ?? 0)),
}
return item
}
export const useFormatGroups = (groups: Ref<IGroup[]>|ComputedRef<IGroup[]>) => {