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. groupfolders#5029

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

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

Co-authored-by: Copilot <copilot@github.com> Signed-off-by: Fin Clausen <Fin.Clausen@dataport.de>

…/implement_default_Quota_for_Groups # Conflicts: # src/components/AdminTeamFolders.vue

Co-authored-by: Copilot <copilot@github.com> Signed-off-by: Fin Clausen <Fin.Clausen@dataport.de>

…bled Co-authored-by: Copilot <copilot@github.com> Signed-off-by: Stefan Lender <Stefan.Lender@dataport.de>

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

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

…efault_Quota_for_Groups

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

artonge · 2026-09-02T15:25:54Z

 			new Entry(key: self::TEAM_FOLDER_AUTO_CREATE, type: ValueType::BOOL, defaultRaw: true, definition: 'whether Circles auto-creates team folders and allows UI/API upgrade (not exposed in admin UI)', lazy: true),
-			new Entry(key: self::TEAM_FOLDER_DEFAULT_QUOTA, type: ValueType::INT, defaultRaw: 0, definition: 'default quota in bytes for auto-created team folders (0 means unlimited)', lazy: true),
+			new Entry(key: self::TEAM_FOLDER_DEFAULT_QUOTA, type: ValueType::INT, defaultRaw: 104857600, definition: 'default quota in bytes for all team folders (0 means unlimited)', lazy: true),
+			new Entry(key: self::TEAM_FOLDER_QUOTAS, type: ValueType::ARRAY, defaultRaw: [], definition: 'team folder quota overrides in bytes by team ID (0 means unlimited)', lazy: true),


Don't we have team settings or properties or metadata to store such data? cc @cristianscheid who might know

team settings can be set/updated like here

// lib/Service/MembershipService::calculateAndSavePopulation() $settings = $circle->getSettings(); $settings['population'] = $population; $settings['populationInherited'] = $populationInherited; $this->circleRequest->updateSettings($circle->setSettings($settings));

those get stored in oc_circles_circle.settings

artonge · 2026-09-02T15:26:55Z

+export async function getLinkableTeamFolders(teamId: string): Promise<TeamFolder[]> {
+	const { data } = await axios.get<OcsResponse<TeamFolder[]>>(generateOcsUrl('apps/circles/teams/{circleId}/folder/linkable', { circleId: teamId }))
+	return data.ocs.data
+}
+
+/**
+ * Link a team to a team folder.
+ *
+ * @param teamId - The team single id
+ * @param folderId - The id of the existing team folder
+ */
+export async function linkTeamFolder(teamId: string, folderId: number): Promise<TeamFolder> {
+	const { data } = await axios.post<OcsResponse<{ folderId: number, folder: TeamFolder }>>(
+		generateOcsUrl('apps/circles/teams/{circleId}/folder/link', { circleId: teamId }),
+		{ folderId },
+	)
+	return data.ocs.data.folder
+}
+


This already existe, no?

artonge · 2026-09-02T15:31:30Z

+	public function removeTeam(string $teamId): void {
+		$quotas = $this->getQuotas();
+		if (array_key_exists($teamId, $quotas)) {
+			unset($quotas[$teamId]);
+			$this->setQuotas($quotas);
+		}
+	}
+


Would not be necessary if we store the quota info with the team properties.

artonge · 2026-09-02T15:31:56Z

 			new Entry(key: self::REMOVE_SHARE_TOKENS_DONE, type: ValueType::BOOL, defaultRaw: false, definition: 'whether the remove share tokens repair step has already been executed', lazy: true),
 			new Entry(key: self::TEAM_FOLDER_AUTO_CREATE, type: ValueType::BOOL, defaultRaw: true, definition: 'whether Circles auto-creates team folders and allows UI/API upgrade (not exposed in admin UI)', lazy: true),
-			new Entry(key: self::TEAM_FOLDER_DEFAULT_QUOTA, type: ValueType::INT, defaultRaw: 0, definition: 'default quota in bytes for auto-created team folders (0 means unlimited)', lazy: true),
+			new Entry(key: self::TEAM_FOLDER_DEFAULT_QUOTA, type: ValueType::INT, defaultRaw: 104857600, definition: 'default quota in bytes for all team folders (0 means unlimited)', lazy: true),


Can you reuse DEFAULT_QUOTA here?

artonge · 2026-09-02T15:33:43Z

+	public function getLinkableTeamFolders(string $circleId): DataResponse {
+		$this->assertAuthenticatedUserIsTeamOwnerOrServerAdmin($circleId);
+
+		return new DataResponse(array_map(
+			static fn (\OCP\Teams\TeamFolder $folder): array => $folder->jsonSerialize(),
+			$this->getProvider()->getLinkableTeamFolders($circleId),
+		));
+	}
+
+	#[NoAdminRequired]
+	public function linkTeamFolder(string $circleId, int $folderId): DataResponse {
+		$this->assertAuthenticatedUserIsTeamOwnerOrServerAdmin($circleId);
+		$folder = $this->getProvider()->linkTeamFolder($circleId, $folderId);
+
+		return new DataResponse([
+			'success' => true,
+			'folderId' => $folder->getId(),
+			'folder' => $folder->jsonSerialize(),
+		]);
+	}


Unrelated to this PR, right?

artonge · 2026-09-02T15:34:29Z

+	 * @return DataResponse
+	 * @throws OCSException
+	 */
+	public function teamFolders(): DataResponse {


Unrelated to this PR, no?

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

cristianscheid · 2026-09-02T16:51:43Z

 * never persists a Groupfolders identifier.
 */
 class TeamFolderPolicy {
+	public const DEFAULT_QUOTA = 104857600;


Would be nice to add a comment here to explain what this number represents, to avoid guessing. Maybe something like:

Suggested change

public const DEFAULT_QUOTA = 104857600;

public const DEFAULT_QUOTA = 104857600; // 104857600 bytes ~ 100 MB

Fin-c and others added 7 commits August 28, 2026 10:43

feat(admin): add team folder management endpoints and UI integration

72ff078

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

feat(i18n): renamed team space -> team folder in adminsettingsView

5e9fb63

Co-authored-by: Copilot <copilot@github.com> Signed-off-by: Fin Clausen <Fin.Clausen@dataport.de>

first try

49d4d9b

Co-authored-by: Copilot <copilot@github.com> Signed-off-by: Fin Clausen <Fin.Clausen@dataport.de>

Merge branch 'feature/moveTeamFolder_into_adminsettings' into feature…

e7cba01

…/implement_default_Quota_for_Groups # Conflicts: # src/components/AdminTeamFolders.vue

fix tabs view

538c91c

Co-authored-by: Copilot <copilot@github.com> Signed-off-by: Fin Clausen <Fin.Clausen@dataport.de>

resize teamfolder table to max width

83b2a8d

Co-authored-by: Copilot <copilot@github.com> Signed-off-by: Fin Clausen <Fin.Clausen@dataport.de>

feat: show no-quota-mapping-banner if autocreation_teamfolder is disa…

15f6c96

…bled Co-authored-by: Copilot <copilot@github.com> 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

hefftich added 2 commits September 2, 2026 09:15

Merge remote-tracking branch 'origin/master' into feature/implement_d…

73a90d5

…efault_Quota_for_Groups

resolves merge conflicts

beab3b2

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

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 and others added 3 commits September 2, 2026 14:32

feat(teams): add per-team folder quota policy

94da687

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

fix(appinfo): limit compatibility to Nextcloud 35

b995a36

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

feat(teams): separate default and group folder quotas settings

d2ad1fd

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

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

refactor(teams): extract team folder request check

ed64ab8

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

artonge reviewed Sep 2, 2026

View reviewed changes

fix(info.xml): update Nextcloud compatibility to version 36

9492150

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

cristianscheid reviewed Sep 2, 2026

View reviewed changes

hefftich self-assigned this Sep 2, 2026

Navigation Menu

Uh oh!

Feature/implement default quota for groups - #2858

Feature/implement default quota for groups#2858
hefftich wants to merge 14 commits into
nextcloud:masterfrom
Dataport:feature/implement_default_Quota_for_Groups

hefftich commented Aug 31, 2026

Uh oh!

codecov Bot commented Aug 31, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

artonge Sep 2, 2026

Uh oh!

cristianscheid Sep 2, 2026 •

edited

Loading

Uh oh!

artonge Sep 2, 2026

Uh oh!

artonge Sep 2, 2026

Uh oh!

artonge Sep 2, 2026

Uh oh!

artonge Sep 2, 2026

Uh oh!

artonge Sep 2, 2026

Uh oh!

cristianscheid Sep 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

	public const DEFAULT_QUOTA = 104857600;
	public const DEFAULT_QUOTA = 104857600; // 104857600 bytes ~ 100 MB

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

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

artonge Sep 2, 2026

Choose a reason for hiding this comment

Uh oh!

cristianscheid Sep 2, 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!

artonge Sep 2, 2026

Choose a reason for hiding this comment

Uh oh!

artonge Sep 2, 2026

Choose a reason for hiding this comment

Uh oh!

artonge Sep 2, 2026

Choose a reason for hiding this comment

Uh oh!

artonge Sep 2, 2026

Choose a reason for hiding this comment

Uh oh!

artonge Sep 2, 2026

Choose a reason for hiding this comment

Uh oh!

cristianscheid Sep 2, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

cristianscheid Sep 2, 2026 •

edited

Loading