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

jospoortvliet · 2026-09-06T17:16:47Z

Hi,

I did some testing. The Team specific quota - that should be GROUP specific, so this can be managed from LDAP.

We should also add an explanation text. Maybe:

"Choose the default quote assigned to a Team folder created by users based on group membership. The default quota for a new Team folder is always the highest from the default quotas assigned to any of the groups a user is member of."

The current teas-based implementation does largely work, but there is one issue.

What I tested:

I created a 'Sales Team', then assigned 2 users to it. Then, in admin settings for Teams, assigned that team a higher default quota:

Then I let one of those users create a new team. This shows up correctly under Teamfolders in the Teamfolders (to be Groupfolders) app, with the higher default quota:

(it is Sales Team EMEA, which got 5GB of storage quota, as intended).

But in the Teams app, the folder created by this user does not show:

Choosing 'add' gives a error:

... but I guess perhaps a specific branch of the groupfolders app has to be checked out for all this to properly work.

If so, disregard the broken part. We should of course still fix the team vs group thing.

marcoambrosini · 2026-09-07T08:10:26Z

that should be GROUP specific, so this can be managed from LDAP

@jospoortvliet I think we should also allow teams here, more flexible for everyone. But agree that we need groups

for example: if you already have a "management" team, it's useful to be able to use that for trusting the members with a higher quota, instead to having to recreate that to a group. What do you think?

jospoortvliet · 2026-09-07T08:56:10Z

that should be GROUP specific, so this can be managed from LDAP

@jospoortvliet I think we should also allow teams here, more flexible for everyone. But agree that we need groups

for example: if you already have a "management" team, it's useful to be able to use that for trusting the members with a higher quota, instead to having to recreate that to a group. What do you think?

I don't think supporting teams is a problem - for small orgs it makes sense. Big orgs will likely want this in LDAP where other policies are handled, too, so groups would be the basis I think.

hefftich · 2026-09-07T10:10:42Z

@jospoortvliet The issue in the 3rd screenshot is a bug in the groupfolders project.
i created a pr: nextcloud/groupfolders#5086

Fin-c · 2026-09-07T12:28:34Z

@jospoortvliet I’ve fixed the bug relating to adding folders to existing teams that don’t yet have a team space #2890

hefftich · 2026-09-07T17:27:34Z

@jospoortvliet @marcoambrosini I implemented your suggestion. Teams and groups can now be selected.

jospoortvliet · 2026-09-08T11:40:43Z

@jospoortvliet @marcoambrosini I implemented your suggestion. Teams and groups can now be selected.

That works for me then. @alimmroth FYI

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:29:06Z

+		$matches = $override === null ? [] : [$override];
+		$owner = $circle->getOwner();
+		if (!$owner->isLocal()) {
+			return $matches === [] ? $fallback : ($matches[0] ?? $fallback);


Isn't this simpler and the same?

Suggested change

return $matches === [] ? $fallback : ($matches[0] ?? $fallback);

return $quota;

artonge · 2026-09-11T10:31:04Z

+		$override = $this->getTeamFolderQuota($circle);
+		$fallback = $this->getDefaultQuota();


Suggested change

$override = $this->getTeamFolderQuota($circle);

$fallback = $this->getDefaultQuota();

$quota = $this->getTeamFolderQuota($circle) ?? $this->getDefaultQuota();

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 · 2026-09-11T10:36:32Z

+	 * Resolve the highest configured team or group quota for the local team owner.
+	 * Unlimited (0) takes precedence over every finite quota.
+	 */
+	public function getQuotaForCircle(Circle $circle): int {


Probably a less complex version of it:

Suggested change

public function getQuotaForCircle(Circle $circle): int {

public function getQuotaForCircle(Circle $circle): int {

$quotas = [

$this->getTeamFolderQuota($circle) ?? $this->getDefaultQuota(),

...$this->getMatchingGroupQuotas($owner->getUserId()),

]);

if (in_array(0, $matches, true)) {

return 0;

}

return max(quotas);

}

artonge · 2026-09-11T10:37:12Z

+	}
+
+	/** @return list<int> */
+	private function getMatchingGroupQuotas(string $userId): array {


Suggested change

private function getMatchingGroupQuotas(string $userId): array {

private function getGroupQuotaForUser(string $userId): array {

artonge · 2026-09-11T10:39:14Z

This should either be properly addressed in another PR, or not be part of this PR.

artonge · 2026-09-11T10:42:11Z

 			$teamFolders = [];
 			foreach ($this->circleService->getAllCircles($probe) as $circle) {
-				$folder = $provider->getTeamFolder($circle->getSingleId());
+				$folder = $provider?->getTeamFolder($circle->getSingleId());


Should be ok at this point

Suggested change

$folder = $provider?->getTeamFolder($circle->getSingleId());

$folder = $provider->getTeamFolder($circle->getSingleId());

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 from 0f6c8e9 to 563e2bb Compare September 7, 2026 20:00

jospoortvliet mentioned this pull request Sep 8, 2026

Implement a default quota per group. #2895

Open

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

	return $matches === [] ? $fallback : ($matches[0] ?? $fallback);
	return $quota;

		$override = $this->getTeamFolderQuota($circle);
		$fallback = $this->getDefaultQuota();

	$override = $this->getTeamFolderQuota($circle);
	$fallback = $this->getDefaultQuota();
	$quota = $this->getTeamFolderQuota($circle) ?? $this->getDefaultQuota();

-	public function getQuotaForCircle(Circle $circle): int {
+	public function getQuotaForCircle(Circle $circle): int {
+		$quotas = [
+			$this->getTeamFolderQuota($circle) ?? $this->getDefaultQuota(),
+			...$this->getMatchingGroupQuotas($owner->getUserId()),
+		]);
+		if (in_array(0, $matches, true)) {
+			return 0;
+		}
+		return max(quotas);
+	}

	private function getMatchingGroupQuotas(string $userId): array {
	private function getGroupQuotaForUser(string $userId): array {

	$folder = $provider?->getTeamFolder($circle->getSingleId());
	$folder = $provider->getTeamFolder($circle->getSingleId());

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!

jospoortvliet commented Sep 6, 2026

Uh oh!

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

Uh oh!

Uh oh!

jospoortvliet commented Sep 7, 2026

Uh oh!

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

Uh oh!

Uh oh!

Fin-c commented Sep 7, 2026

Uh oh!

hefftich commented Sep 7, 2026

Uh oh!

jospoortvliet commented Sep 8, 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!

artonge Sep 11, 2026

Choose a reason for hiding this comment

Uh oh!

artonge Sep 11, 2026

Choose a reason for hiding this comment

Uh oh!

artonge Sep 11, 2026

Choose a reason for hiding this comment

Uh oh!

artonge Sep 11, 2026

Choose a reason for hiding this comment

Uh oh!

artonge Sep 11, 2026

Choose a reason for hiding this comment

Uh oh!

artonge Sep 11, 2026

Choose a reason for hiding this comment

Uh oh!

artonge Sep 11, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

codecov Bot commented Aug 31, 2026 •

edited

Loading

marcoambrosini commented Sep 7, 2026 •

edited

Loading

hefftich commented Sep 7, 2026 •

edited

Loading

tomek2k1 commented Sep 11, 2026 •

edited

Loading