Feature/implement default quota for groups by hefftich · Pull Request #2858 · nextcloud/circles

hefftich · 2026-08-31T20:10:44Z

Resolves:
Implement a default quota per group. #2895

Summary

We need a way for admins to set default quotas for team folder creation, based on group membership. This needs a group -> quota mapping in the Teams admin settings.

Admin settings --> Teams

In the Team settings, admins can add entries to a table, defining default quotas for groups.
When a user creates a new team, the highest quota of the groups, this user is a member of, gets applied to the new Team folder.
At least a line for "all" is always present in the table, which is applied at team creation, when the user isn't a member of any other quota group.
The three-dot menu lets admins delete any mapping, despite "all".
The quotas only get applied at team creation. An admin can alway change the quota of existing teams later on.

group | default quota | options -- | -- | -- all | 100 MB | marketing | 2 GB | ... sales | 10 GB | ... engineering | 5 GB | ...

Examples

Bob is a member in the groups marketing and engineering. He creates a new team, which gets a quota of 5 GB.
Alice is not a member of any groups defined in this list. Her newly created team gets a quota of 100 MB.

TODO

...

Checklist

Code is properly formatted
Sign-off message is added to all commits
Tests (unit, integration, api and/or acceptance) are included
Screenshots before/after for front-end changes
Documentation (manuals or wiki) has been updated or is not required
[] Backports requested where applicable (ex: critical bugfixes)
Labels added where applicable (ex: bug/enhancement, 3. to review, feature component)
Milestone added for target branch/version (ex: 32.x for stable32)

AI (if applicable)

The content of this PR was partly or fully generated using AI

codecov · 2026-08-31T20:39:36Z

Codecov Report

❌ Patch coverage is 0% with 2 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
src/teams/api.ts	0.00%	2 Missing ⚠️

📢 Thoughts on this report? Let us know!

hefftich · 2026-09-04T08:28:02Z

/backport to stable35

artonge · 2026-09-09T09:23:25Z

/compile amend /

cristianscheid · 2026-09-09T14:31:33Z

/compile

artonge · 2026-09-10T14:51:53Z

Compile bot is failing because the PR comes from a fork.
Seems like I can compile something locally, but cannot push as you did not autorised repo admin to push to your branch.
So either you autorise me, or you try again compiling locally.

Co-authored-by: Copilot <copilot@github.com> GPT-5.6 Terra Signed-off-by: Stefan Lender <Stefan.Lender@dataport.de>

Signed-off-by: Stefan Lender <Stefan.Lender@dataport.de>

tomek2k1 · 2026-09-11T09:24:47Z

Compile bot is failing because the PR comes from a fork. Seems like I can compile something locally, but cannot push as you did not autorised repo admin to push to your branch. So either you autorise me, or you try again compiling locally.

I rebuilt it locally. It should be good now.

Signed-off-by: Louis Chmn <louis@chmn.me>

artonge · 2026-09-11T10:33:26Z

+		foreach ($this->membershipRequest->getMemberships($owner->getSingleId()) as $membership) {
+			try {
+				$membershipCircle = $this->circleRequest->getCircle($membership->getCircleId());
+			} catch (CircleNotFoundException) {
+				continue;
+			}
+
+			$quota = $this->getTeamFolderQuota($membershipCircle);
+			if ($quota !== null) {
+				$matches[] = $quota;
+			}
+		}


This means the quota for a unrelated team impacts the quota of the current team if the current user is part of both?
Is this really what we want?

@artonge, @jospoortvliet, @marcoambrosini
My understanding of the requirement is that both groups and teams can be used as quota mappings. I have already added the mapping to the admin UI. I am a bit confused:

Please look here

When a user creates a new team, we should collect the default, all matching group quotas, and all matching quotas from teams the user is a member of, then apply the highest value. 0 remains unlimited and therefore takes precedence.

Would you prefer a different priority model, where team membership quotas are only considered if no matching group quota exists? I think that would be a valid alternative, but it would make groups override teams rather than treating both mapping types equally.

What do you think about?

github-actions · 2026-09-15T06:35:04Z

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

Co-authored-by: Copilot <copilot@github.com> GPT-5.6 Terra Signed-off-by: Stefan Lender <Stefan.Lender@dataport.de>

hefftich added this to the Nextcloud 35 milestone Aug 31, 2026

hefftich requested review from ArtificialOwl and provokateurin as code owners August 31, 2026 20:10

hefftich added the 3. to review label Aug 31, 2026

hefftich added this to 👥 Teams Aug 31, 2026

github-project-automation Bot moved this to Backlog in 👥 Teams Aug 31, 2026

tomek2k1 moved this from Backlog to In progress in 👥 Teams Sep 2, 2026

tomek2k1 moved this from In progress to In review in 👥 Teams Sep 2, 2026

artonge reviewed Sep 2, 2026

View reviewed changes

Comment thread appinfo/info.xml

Comment thread lib/ConfigLexicon.php Outdated

hefftich enabled auto-merge September 2, 2026 14:08

artonge reviewed Sep 2, 2026

View reviewed changes

cristianscheid reviewed Sep 2, 2026

View reviewed changes

Comment thread lib/Service/TeamFolderPolicy.php Outdated

hefftich self-assigned this Sep 2, 2026

hefftich force-pushed the feature/implement_default_Quota_for_Groups branch 12 times, most recently from 761bc23 to 7d60718 Compare September 4, 2026 08:01

hefftich requested review from artonge and cristianscheid September 4, 2026 08:09

backportbot Bot added the backport-request label Sep 4, 2026

hefftich force-pushed the feature/implement_default_Quota_for_Groups branch 4 times, most recently from cb7a826 to ba69061 Compare September 9, 2026 08:42

hefftich added 4 commits September 11, 2026 11:23

feat(teams): add managing default quota for groups

48b9e47

Co-authored-by: Copilot <copilot@github.com> GPT-5.6 Terra Signed-off-by: Stefan Lender <Stefan.Lender@dataport.de>

feat(team-folders): add group-based default quota mappings

d05b058

Co-authored-by: Copilot <copilot@github.com> GPT-5.6 Terra Signed-off-by: Stefan Lender <Stefan.Lender@dataport.de>

build(teams): regenerate assets

468d9a9

Signed-off-by: Stefan Lender <Stefan.Lender@dataport.de>

fix(psalm): remove resolved quota warnings

b2e4d7a

Signed-off-by: Stefan Lender <Stefan.Lender@dataport.de>

tomek2k1 force-pushed the feature/implement_default_Quota_for_Groups branch from 81742c7 to 9a61ea4 Compare September 11, 2026 09:24

chore: Compile assets

467e24d

Signed-off-by: Louis Chmn <louis@chmn.me>

artonge force-pushed the feature/implement_default_Quota_for_Groups branch from 8a1f00d to 467e24d Compare September 11, 2026 10:16

artonge reviewed Sep 11, 2026

View reviewed changes

tomek2k1 modified the milestones: Nextcloud 35, Nextcloud 35.0.1 Sep 14, 2026

hefftich force-pushed the feature/implement_default_Quota_for_Groups branch 2 times, most recently from 4b12d53 to c9810e4 Compare September 14, 2026 21:43

hefftich requested a review from artonge September 14, 2026 21:58

github-actions Bot added the feedback-requested label Sep 15, 2026

fix(teams): implement review suggestions

eac2c64

Co-authored-by: Copilot <copilot@github.com> GPT-5.6 Terra Signed-off-by: Stefan Lender <Stefan.Lender@dataport.de>

hefftich force-pushed the feature/implement_default_Quota_for_Groups branch 3 times, most recently from 7d15270 to eac2c64 Compare September 15, 2026 08:54

Merge branch 'master' into feature/implement_default_Quota_for_Groups

ef1efdb

Uh oh!

Conversation

hefftich commented Aug 31, 2026

Summary

Admin settings --> Teams

Examples

TODO

Checklist

AI (if applicable)

Uh oh!

codecov Bot commented Aug 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hefftich commented Sep 4, 2026

Uh oh!

artonge commented Sep 9, 2026

Uh oh!

cristianscheid commented Sep 9, 2026

Uh oh!

artonge commented Sep 10, 2026

Uh oh!

tomek2k1 commented Sep 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

artonge Sep 11, 2026

Choose a reason for hiding this comment

Uh oh!

hefftich Sep 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Sep 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

codecov Bot commented Aug 31, 2026 •

edited

Loading

tomek2k1 commented Sep 11, 2026 •

edited

Loading

hefftich Sep 14, 2026 •

edited

Loading