Skip to content

feat(teamspaces): support linking existing group folders for team folder management - #5076

Closed
tomek2k1 wants to merge 3 commits into
masterfrom
feature/moveTeamFolder_into_adminsettings
Closed

tomek2k1 wants to merge 3 commits into
masterfrom
feature/moveTeamFolder_into_adminsettings

Conversation

@tomek2k1

@tomek2k1 tomek2k1 commented Sep 3, 2026

Copy link
Copy Markdown
Contributor

This PR extends the Team Spaces integration by allowing an existing group folder to be linked as a team's primary team folder.

🤖 AI (if applicable)

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

@tomek2k1 tomek2k1 added this to the Nextcloud 35 milestone Sep 3, 2026
@tomek2k1 tomek2k1 self-assigned this Sep 3, 2026
@tomek2k1 tomek2k1 added the 3. to review Items that need to be reviewed label Sep 3, 2026
@github-project-automation github-project-automation Bot moved this to Backlog in 👥 Teams Sep 3, 2026
@tomek2k1 tomek2k1 moved this from Backlog to In review in 👥 Teams Sep 3, 2026
@jospoortvliet jospoortvliet added bug and removed bug labels Sep 3, 2026
@artonge
artonge force-pushed the feature/moveTeamFolder_into_adminsettings branch from c34c298 to e8a5a57 Compare September 3, 2026 17:52
@artonge

artonge commented Sep 3, 2026

Copy link
Copy Markdown
Contributor

I extracted the implementation of the missing ITeamFolderProvider methods here: #5078

@cristianscheid cristianscheid left a comment •

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since some parts of this PR were extracted from here and added on #5078 (already merged), please rebase this PR to sync with master.

Comment thread lib/Controller/FolderController.php Outdated
@tomek2k1
tomek2k1 force-pushed the feature/moveTeamFolder_into_adminsettings branch from e8a5a57 to afe8065 Compare September 4, 2026 12:51
@alimmroth alimmroth linked an issue Sep 6, 2026 that may be closed by this pull request
@tomek2k1
tomek2k1 force-pushed the feature/moveTeamFolder_into_adminsettings branch from 09987ad to ed18f47 Compare September 8, 2026 12:30

@cristianscheid cristianscheid left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

beside comments below, there are also some conflicts to be resolved

Comment thread lib/Controller/FolderController.php Outdated

$query = $this->selectWithFileCache();
$query->leftJoin('f', 'group_folders_groups', 'g', $query->expr()->eq('f.folder_id', 'g.folder_id'))
->where($query->expr()->orX(

@cristianscheid cristianscheid Sep 9, 2026 •

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't this allow returning duplicate folder rows? For example, if a folder has more than one row in group_folders_groups (e.g. shared with multiple groups).

Maybe we could do something similar to what's done on getAllFoldersWithSize() and add a groupBy('f.folder_id')?

…der table

Co-authored-by: Copilot <copilot@github.com> GPT-5.6 Terra

Signed-off-by: Fin Clausen <Fin.Clausen@dataport.de>
@tomek2k1
tomek2k1 force-pushed the feature/moveTeamFolder_into_adminsettings branch 2 times, most recently from fa0d637 to be9b876 Compare September 10, 2026 10:14
Fin-c and others added 2 commits September 10, 2026 12:16
…ota support in admin Settings

Signed-off-by: Fin Clausen <Fin.Clausen@dataport.de>
Co-authored-by: Cristian Scheid <74515775+cristianscheid@users.noreply.github.com>
Signed-off-by: Tomasz Trillò <t.trillo@gmx.de>
@tomek2k1
tomek2k1 force-pushed the feature/moveTeamFolder_into_adminsettings branch from be9b876 to cc9334d Compare September 10, 2026 10:16
@tomek2k1

Copy link
Copy Markdown
Contributor Author

Unnecessary

@tomek2k1 tomek2k1 closed this Sep 16, 2026
@github-project-automation github-project-automation Bot moved this from In review to Done in 👥 Teams Sep 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Items that need to be reviewed

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Rename the former "Team folders" back to "Group folders"

5 participants