Skip to content

feat: add governed Team Folder subfolders and recovery - #5057

Closed
cavazquez wants to merge 2 commits into
nextcloud:masterfrom
cavazquez:feat/subfolder-quotas
Closed

cavazquez wants to merge 2 commits into
nextcloud:masterfrom
cavazquez:feat/subfolder-quotas

Conversation

@cavazquez

@cavazquez cavazquez commented Aug 27, 2026

Copy link
Copy Markdown

Summary

  • add optional quotas for direct Team Folder subfolders; their actual usage also counts towards the parent Team Folder quota
  • allow Team Folder administrators to assign scoped managers for direct subfolders from the Files sidebar
  • retain delegated-manager assignments when advanced permissions are disabled, while suspending their effect until advanced permissions are enabled again
  • add a recoverable Team Folder deletion flow with global-admin restore and permanent-purge actions
  • permanently expire archived Team Folders after 30 days through a background job
  • keep Team spaces protected from direct deletion and exclude archived folders from their active-folder queries
  • expose the API surface in the OpenAPI specification and generated TypeScript types

Safety notes

  • subfolder quota caps are not reserved allocations: configured caps may add up to more than the parent quota, but stored data cannot exceed the parent quota
  • normal deletion of a child folder in Files still uses the regular Nextcloud trash; the recovery bin applies to deletion of the Team Folder itself

Compatibility

This PR targets master (currently Nextcloud 36). The working compatibility port for Nextcloud 34 is tracked separately in #5058.

Validation

  • manual validation on the Nextcloud 34 compatibility port in Docker: direct subfolder quotas, quota enforcement, Team Folder archive, and restore
  • ESLint, Stylelint, and production frontend build on the compatibility port
  • regenerated OpenAPI specification and TypeScript types
  • git diff --check after porting to master
  • automated checks are pending on this PR

@cavazquez cavazquez changed the title feat: add quotas for direct subfolders feat: add governed Team Folder subfolders and recovery Aug 27, 2026
Signed-off-by: cavazquez <4699299+cavazquez@users.noreply.github.com>
Signed-off-by: cavazquez <4699299+cavazquez@users.noreply.github.com>
@cavazquez
cavazquez force-pushed the feat/subfolder-quotas branch from 2a24c1e to 8b56bb2 Compare August 27, 2026 21:49
@artonge

artonge commented Aug 28, 2026

Copy link
Copy Markdown
Contributor

Couldn't this already be acheived by nesting Team Folders?

@artonge

artonge commented Aug 28, 2026

Copy link
Copy Markdown
Contributor

Also, to ease the review, of the subfolders and recovery do not depend on each other, please split this in two different PRs.

@artonge

artonge commented Aug 28, 2026

Copy link
Copy Markdown
Contributor

For awarness, this has really little chances to be backported :)

@artonge

artonge commented Aug 28, 2026

Copy link
Copy Markdown
Contributor

And do not forget to read our contribution guidelines, especially around AI usage: https://github.com/nextcloud/server/blob/master/.github/CONTRIBUTING.md

@cavazquez cavazquez closed this Aug 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants