Skip to content

[stable30] fix(settings): Fix infinitely loading account management page with pagination of groups - #51782

Merged
susnux merged 28 commits into
stable30from
backport/51336/stable30
Apr 3, 2025
Merged

[stable30] fix(settings): Fix infinitely loading account management page with pagination of groups#51782
susnux merged 28 commits into
stable30from
backport/51336/stable30

Conversation

@backportbot

@backportbotbackportbotBot commented Mar 28, 2025•
edited by Pytal
Loading

Copy link
Copy Markdown

Backport of #51336

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Remove all the empty commits

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot
backportbotBot requested review from Pytal, artonge and susnuxMarch 28, 2025 21:57
@backportbotbackportbotBot added this to the Nextcloud 30.0.9 milestone Mar 28, 2025
github-advanced-security[bot]
github-advanced-securityAI found potential problems Mar 28, 2025
View reviewed changes
Comment threadapps/provisioning_api/lib/Controller/UsersController.php
function (string $gid) {
$group = $this->groupManager->get($gid);
return [
'id' => $group->getGID(),

Check notice

Code scanning / Psalm

PossiblyNullReference

Cannot call method getGID on possibly null value
Comment threadapps/settings/lib/Controller/UsersController.php Fixed
Comment threadapps/settings/lib/Controller/UsersController.php Fixed
@Pytal
Pytalforce-pushed the backport/51336/stable30 branch 2 times, most recently from 249f525 to 43f3693CompareMarch 28, 2025 22:23
@Pytal

Pytal commented Mar 28, 2025

Copy link
Copy Markdown
Member

Psalm failure here as well from missing #51375, cc @come-nc

github-advanced-security[bot]
github-advanced-securityAI found potential problems Mar 28, 2025
View reviewed changes
Comment threadapps/settings/lib/Controller/UsersController.php Fixed
Pytal added 12 commits April 1, 2025 10:17
@Pytal@backportbot
perf(settings): Remove computation of all groups
ff76f4a
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
fix(settings): Fix infinitely loading account management page with pa…
8f10477
…gination of groups
- Includes searching
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
feat(provisioning_api): Add endpoint for fetching user groups with de…
5167b56
…tails
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
perf(settings): Cancel request on new search
f664eb8
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
fix(settings): Allow searching for groups in user row
86e521d
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
fix(settings): Allow searching for groups in new account dialog
328bb10
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
perf(settings): Make scrolling smooth when a large number of groups a…
c3dba3b
…re rendered
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
refactor(settings): Consolidate group formatting
1fbf26a
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
chore(settings): Add note on groups sorting
537d68d
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
fix(settings): Fix loaded groups being undefined
82cd9a2
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
fix(settings): Prevent selection of invalid groups that are not fully…
74b26f7
… loaded
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
fix(settings): Fix erroneous hiding of group admin column with pagina…
ae390d2
…ted groups
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Pytaland others added 11 commits April 1, 2025 10:17
@Pytal@backportbot
fix(settings): Fix group creation in new account dialog
c022d2f
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
fix(settings): Fix duplicated group options when editing account
42b7fda
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
fix(settings): Fix duplicated group options in new account dialog
a5e2c7d
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
fix(settings): Natural order groups
75708f5
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
fix(settings): Preserve system groups on reset
368fcc3
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
fix(settings): Fix initialization of store
f1ed995
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
fix(settings): Separate subadmin options
3402b7c
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
test(settings): Wait until groups list has loaded
06af6de
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
test(settings): Correctly find group in select
85dc4b4
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal@backportbot
test(settings): Fix group items not being found
58fc803
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@nextcloud-command@backportbot
chore(assets): Recompile assets
9cac821
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@backportbot
backportbotBotforce-pushed the backport/51336/stable30 branch from 43f3693 to 9cac821CompareApril 1, 2025 10:17
@come-nc

come-nc commented Apr 1, 2025

Copy link
Copy Markdown
Contributor

This still does not backport cleanly despite having merged #51375

There are conflicts in frontend file and I do not know enough to solve them.
Would @artonge or @susnux be up for redoing the backport and fixing the conflicts?

@artonge

artonge commented Apr 1, 2025

Copy link
Copy Markdown
Collaborator

Looking into it

@artonge
artongeforce-pushed the backport/51336/stable30 branch 5 times, most recently from cf5a729 to 5f95423CompareApril 1, 2025 12:19
@artonge
artonge marked this pull request as ready for review April 1, 2025 12:20
@artonge
artongeforce-pushed the backport/51336/stable30 branch from 5f95423 to e1c56c2CompareApril 1, 2025 12:21
@artonge
chore: Backport fixes
fcd5da1
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
artongeforce-pushed the backport/51336/stable30 branch from e1c56c2 to fcd5da1CompareApril 1, 2025 13:19
@artonge
artonge requested a review from nfebeApril 2, 2025 13:33
@susnux
susnux merged commit a61d561 into stable30Apr 3, 2025
@susnux
susnux deleted the backport/51336/stable30 branch April 3, 2025 06:46
@AltahrimAltahrim mentioned this pull request Apr 3, 2025
Merged
5 tasks
@bruecknerbrueckner mentioned this pull request Apr 11, 2025
Closed
8 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@susnuxsusnuxsusnux approved these changes
@artongeartongeartonge approved these changes
@PytalPytalAwaiting requested review from Pytal
@provokateurinprovokateurinAwaiting requested review from provokateurinprovokateurin is a code owner
@nfebenfebeAwaiting requested review from nfebe

Assignees

@PytalPytal

@come-nccome-nc

Labels

3. to reviewWaiting for reviewsbugenhancementfeature: settingsfeature: users and groupsperformance 🚀

Projects

None yet

Milestone

Nextcloud 30.0.9

Development

Successfully merging this pull request may close these issues.

6 participants

@Pytal@come-nc@artonge@susnux@github-advanced-security@nextcloud-command