feat: add support for teams in usergroup column

.github/workflows/cypress-custom.yml

@@ -79,6 +79,13 @@ jobs:
           path: apps/text
           ref: ${{ env.text_app_ref }}
 
+      - name: Checkout circles app
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+        with:
+          repository: nextcloud/circles
+          path: apps/circles
+          ref: ${{ env.server-versions }}
+
       - name: Checkout app
         uses: actions/checkout@v3
         with:
@@ -126,6 +133,7 @@ jobs:
           cat config/config.php
           ./occ user:list
           ./occ app:enable --force text
+          ./occ app:enable --force circles
           ./occ app:enable --force ${{ env.APP_NAME }}
           ./occ config:system:set query_log_file --value '/home/runner/work/${{ env.APP_NAME }}/${{ env.APP_NAME }}/query.log'
           php -S 127.0.0.1:8081 > /tmp/requestlog 2>&1 &

appinfo/info.xml

@@ -25,7 +25,7 @@ Share your tables and views with users and groups within your cloud.
 Have a good time and manage whatever you want.
 
 ]]></description>
-	<version>0.9.0-dev.1</version>
+	<version>0.9.0-dev.2</version>
 	<licence>agpl</licence>
 	<author mail="[email protected]">Florian Steffens</author>
 	<namespace>Tables</namespace>

cypress/e2e/ToDo list.json

@@ -1 +1 @@
-{"title":"ToDo list","emoji":"\u2705","columns":[{"id":491,"tableId":132,"title":"Task","createdBy":"admin","createdByDisplayName":"admin","createdAt":"2024-08-26 12:58:43","lastEditBy":"admin","lastEditByDisplayName":"admin","lastEditAt":"2024-08-26 12:58:43","type":"text","subtype":"line","mandatory":true,"description":"","numberDefault":null,"numberMin":null,"numberMax":null,"numberDecimals":0,"numberPrefix":"","numberSuffix":"","textDefault":"","textAllowedPattern":"","textMaxLength":-1,"selectionOptions":[],"selectionDefault":"","datetimeDefault":"","usergroupDefault":[],"usergroupMultipleItems":false,"usergroupSelectUsers":false,"usergroupSelectGroups":false,"showUserStatus":false},{"id":492,"tableId":132,"title":"Description","createdBy":"admin","createdByDisplayName":"admin","createdAt":"2024-08-26 12:58:43","lastEditBy":"admin","lastEditByDisplayName":"admin","lastEditAt":"2024-08-26 12:58:43","type":"text","subtype":"rich","mandatory":false,"description":"Title or short description","numberDefault":null,"numberMin":null,"numberMax":null,"numberDecimals":0,"numberPrefix":"","numberSuffix":"","textDefault":"","textAllowedPattern":"","textMaxLength":-1,"selectionOptions":[],"selectionDefault":"","datetimeDefault":"","usergroupDefault":[],"usergroupMultipleItems":false,"usergroupSelectUsers":false,"usergroupSelectGroups":false,"showUserStatus":false},{"id":493,"tableId":132,"title":"Target","createdBy":"admin","createdByDisplayName":"admin","createdAt":"2024-08-26 12:58:43","lastEditBy":"admin","lastEditByDisplayName":"admin","lastEditAt":"2024-08-26 12:58:43","type":"text","subtype":"rich","mandatory":false,"description":"Date, time or whatever","numberDefault":null,"numberMin":null,"numberMax":null,"numberDecimals":0,"numberPrefix":"","numberSuffix":"","textDefault":"","textAllowedPattern":"","textMaxLength":-1,"selectionOptions":[],"selectionDefault":"","datetimeDefault":"","usergroupDefault":[],"usergroupMultipleItems":false,"usergroupSelectUsers":false,"usergroupSelectGroups":false,"showUserStatus":false},{"id":494,"tableId":132,"title":"Progress","createdBy":"admin","createdByDisplayName":"admin","createdAt":"2024-08-26 12:58:43","lastEditBy":"admin","lastEditByDisplayName":"admin","lastEditAt":"2024-08-26 12:58:43","type":"number","subtype":"progress","mandatory":false,"description":"","numberDefault":0,"numberMin":null,"numberMax":null,"numberDecimals":0,"numberPrefix":"","numberSuffix":"","textDefault":"","textAllowedPattern":"","textMaxLength":-1,"selectionOptions":[],"selectionDefault":"","datetimeDefault":"","usergroupDefault":[],"usergroupMultipleItems":false,"usergroupSelectUsers":false,"usergroupSelectGroups":false,"showUserStatus":false},{"id":495,"tableId":132,"title":"Comments","createdBy":"admin","createdByDisplayName":"admin","createdAt":"2024-08-26 12:58:43","lastEditBy":"admin","lastEditByDisplayName":"admin","lastEditAt":"2024-08-26 12:58:43","type":"text","subtype":"rich","mandatory":false,"description":"","numberDefault":null,"numberMin":null,"numberMax":null,"numberDecimals":0,"numberPrefix":"","numberSuffix":"","textDefault":"","textAllowedPattern":"","textMaxLength":-1,"selectionOptions":[],"selectionDefault":"","datetimeDefault":"","usergroupDefault":[],"usergroupMultipleItems":false,"usergroupSelectUsers":false,"usergroupSelectGroups":false,"showUserStatus":false},{"id":496,"tableId":132,"title":"Proofed","createdBy":"admin","createdByDisplayName":"admin","createdAt":"2024-08-26 12:58:43","lastEditBy":"admin","lastEditByDisplayName":"admin","lastEditAt":"2024-08-26 12:58:43","type":"selection","subtype":"check","mandatory":false,"description":"","numberDefault":null,"numberMin":null,"numberMax":null,"numberDecimals":0,"numberPrefix":"","numberSuffix":"","textDefault":"","textAllowedPattern":"","textMaxLength":-1,"selectionOptions":[],"selectionDefault":"","datetimeDefault":"","usergroupDefault":[],"usergroupMultipleItems":false,"usergroupSelectUsers":false,"usergroupSelectGroups":false,"showUserStatus":false}],"views":[],"description":"","tablesVersion":"0.8.0-beta.2"}
+{"title":"ToDo list","emoji":"\u2705","columns":[{"id":491,"tableId":132,"title":"Task","createdBy":"admin","createdByDisplayName":"admin","createdAt":"2024-08-26 12:58:43","lastEditBy":"admin","lastEditByDisplayName":"admin","lastEditAt":"2024-08-26 12:58:43","type":"text","subtype":"line","mandatory":true,"description":"","numberDefault":null,"numberMin":null,"numberMax":null,"numberDecimals":0,"numberPrefix":"","numberSuffix":"","textDefault":"","textAllowedPattern":"","textMaxLength":-1,"selectionOptions":[],"selectionDefault":"","datetimeDefault":"","usergroupDefault":[],"usergroupMultipleItems":false,"usergroupSelectUsers":false,"usergroupSelectGroups":false,"usergroupSelectTeams":false,"showUserStatus":false},{"id":492,"tableId":132,"title":"Description","createdBy":"admin","createdByDisplayName":"admin","createdAt":"2024-08-26 12:58:43","lastEditBy":"admin","lastEditByDisplayName":"admin","lastEditAt":"2024-08-26 12:58:43","type":"text","subtype":"rich","mandatory":false,"description":"Title or short description","numberDefault":null,"numberMin":null,"numberMax":null,"numberDecimals":0,"numberPrefix":"","numberSuffix":"","textDefault":"","textAllowedPattern":"","textMaxLength":-1,"selectionOptions":[],"selectionDefault":"","datetimeDefault":"","usergroupDefault":[],"usergroupMultipleItems":false,"usergroupSelectUsers":false,"usergroupSelectGroups":false,"usergroupSelectTeams":false,"showUserStatus":false},{"id":493,"tableId":132,"title":"Target","createdBy":"admin","createdByDisplayName":"admin","createdAt":"2024-08-26 12:58:43","lastEditBy":"admin","lastEditByDisplayName":"admin","lastEditAt":"2024-08-26 12:58:43","type":"text","subtype":"rich","mandatory":false,"description":"Date, time or whatever","numberDefault":null,"numberMin":null,"numberMax":null,"numberDecimals":0,"numberPrefix":"","numberSuffix":"","textDefault":"","textAllowedPattern":"","textMaxLength":-1,"selectionOptions":[],"selectionDefault":"","datetimeDefault":"","usergroupDefault":[],"usergroupMultipleItems":false,"usergroupSelectUsers":false,"usergroupSelectGroups":false,"usergroupSelectTeams":false,"showUserStatus":false},{"id":494,"tableId":132,"title":"Progress","createdBy":"admin","createdByDisplayName":"admin","createdAt":"2024-08-26 12:58:43","lastEditBy":"admin","lastEditByDisplayName":"admin","lastEditAt":"2024-08-26 12:58:43","type":"number","subtype":"progress","mandatory":false,"description":"","numberDefault":0,"numberMin":null,"numberMax":null,"numberDecimals":0,"numberPrefix":"","numberSuffix":"","textDefault":"","textAllowedPattern":"","textMaxLength":-1,"selectionOptions":[],"selectionDefault":"","datetimeDefault":"","usergroupDefault":[],"usergroupMultipleItems":false,"usergroupSelectUsers":false,"usergroupSelectGroups":false,"usergroupSelectTeams":false,"showUserStatus":false},{"id":495,"tableId":132,"title":"Comments","createdBy":"admin","createdByDisplayName":"admin","createdAt":"2024-08-26 12:58:43","lastEditBy":"admin","lastEditByDisplayName":"admin","lastEditAt":"2024-08-26 12:58:43","type":"text","subtype":"rich","mandatory":false,"description":"","numberDefault":null,"numberMin":null,"numberMax":null,"numberDecimals":0,"numberPrefix":"","numberSuffix":"","textDefault":"","textAllowedPattern":"","textMaxLength":-1,"selectionOptions":[],"selectionDefault":"","datetimeDefault":"","usergroupDefault":[],"usergroupMultipleItems":false,"usergroupSelectUsers":false,"usergroupSelectGroups":false,"usergroupSelectTeams":false,"showUserStatus":false},{"id":496,"tableId":132,"title":"Proofed","createdBy":"admin","createdByDisplayName":"admin","createdAt":"2024-08-26 12:58:43","lastEditBy":"admin","lastEditByDisplayName":"admin","lastEditAt":"2024-08-26 12:58:43","type":"selection","subtype":"check","mandatory":false,"description":"","numberDefault":null,"numberMin":null,"numberMax":null,"numberDecimals":0,"numberPrefix":"","numberSuffix":"","textDefault":"","textAllowedPattern":"","textMaxLength":-1,"selectionOptions":[],"selectionDefault":"","datetimeDefault":"","usergroupDefault":[],"usergroupMultipleItems":false,"usergroupSelectUsers":false,"usergroupSelectGroups":false,"usergroupSelectTeams":false, "showUserStatus":false}],"views":[],"description":"","tablesVersion":"0.8.0-beta.2"}

cypress/e2e/column-usergroup.cy.js

@@ -31,7 +31,7 @@ describe('Test column ' + columnTitle, () => {
 	it('Create column and rows with default values', () => {
 		cy.createTable(tableTitle)
         cy.loadTable(tableTitle)
-        cy.createUsergroupColumn(columnTitle, true, true, true, [localUser.userId, nonLocalUser.userId], true)
+        cy.createUsergroupColumn(columnTitle, true, true, true, true, [localUser.userId, nonLocalUser.userId], true)
         cy.get('button').contains('Create row').click()
         cy.get('[data-cy="createRowSaveButton"]').click()
         cy.get('[data-cy="ncTable"] table tr td .user-bubble__name').contains(localUser.userId).should('be.visible')
@@ -41,7 +41,7 @@ describe('Test column ' + columnTitle, () => {
     it('Create column and rows without default values', () => {
 		cy.createTable(tableTitle)
         cy.loadTable(tableTitle)
-        cy.createUsergroupColumn(columnTitle, true, false, false, [], true)
+        cy.createUsergroupColumn(columnTitle, true, false, false, false, [], true)
 
         cy.get('button').contains('Create row').click()
         cy.get('[data-cy="usergroupRowSelect"] input').type(nonLocalUser.userId)
@@ -53,7 +53,7 @@ describe('Test column ' + columnTitle, () => {
     it('Create and edit rows', () => {
 		cy.createTable(tableTitle)
         cy.loadTable(tableTitle)
-        cy.createUsergroupColumn(columnTitle, true, true, true, [localUser.userId], true)
+        cy.createUsergroupColumn(columnTitle, true, true, true, true, [localUser.userId], true)
         cy.get('button').contains('Create row').click()
         cy.get('[data-cy="createRowSaveButton"]').click()
         cy.get('[data-cy="ncTable"] table tr td .user-bubble__name').contains(localUser.userId).should('be.visible')

cypress/support/commands.js

@@ -159,7 +159,7 @@ Cypress.Commands.add('unifiedSearch', (term) => {
 	cy.get('.unified-search__results .unified-search__result-line-one span').contains(term, { matchCase: false }).should('exist')
 })
 
-Cypress.Commands.add('createUsergroupColumn', (title, selectUsers, selectGroups, hasMultipleValues, defaultValue, isFirstColumn) => {
+Cypress.Commands.add('createUsergroupColumn', (title, selectUsers, selectGroups, selectCircles, hasMultipleValues, defaultValue, isFirstColumn) => {
 	cy.openCreateColumnModal(isFirstColumn)
 	cy.get('[data-cy="columnTypeFormInput"]').clear().type(title)
 	cy.get('.columnTypeSelection .vs__open-indicator').click({ force: true })
@@ -169,12 +169,15 @@ Cypress.Commands.add('createUsergroupColumn', (title, selectUsers, selectGroups,
 		cy.get('[data-cy="usergroupMultipleSwitch"] .checkbox-content').click({ force: true })
 	}
 
-	if (selectUsers && selectGroups) {
-		cy.get('[data-cy="userAndGroupSwitch"] .checkbox-content').click()
-	} else if (selectUsers) {
-		cy.get('[data-cy="userSwitch"] .checkbox-content').click()
-	} else if (selectGroups) {
-		cy.get('[data-cy="groupSwitch"] .checkbox-content').click()
+	if (selectGroups) {
+		cy.get('[data-cy="groupsSwitch"] input').click({ force: true })
+	}
+	if (selectCircles) {
+		cy.get('[data-cy="teamsSwitch"] input').click({ force: true })
+	}
+	// Users is always checked by default, and we can only disable it if some other option is already enabled
+	if (!selectUsers & (selectGroups || selectCircles)) {
+		cy.get('[data-cy="usersSwitch"] input').click({ force: true })
 	}
 
 	defaultValue.forEach((value) => {

lib/Controller/Api1Controller.php

@@ -779,6 +779,7 @@ public function indexViewColumns(int $viewId): DataResponse {
 	 * @param bool|null $usergroupMultipleItems Can select multiple users or/and groups, if column is usergroup
 	 * @param bool|null $usergroupSelectUsers Can select users, if column type is usergroup
 	 * @param bool|null $usergroupSelectGroups Can select groups, if column type is usergroup
+	 * @param bool|null $usergroupSelectTeams Can select teams, if column type is usergroup
 	 * @param bool|null $usergroupShowUserStatus Whether to show the user's status, if column type is usergroup
 	 * @param int[]|null $selectedViewIds View IDs where this column should be added to be presented
 	 *
@@ -819,6 +820,7 @@ public function createColumn(
 		?bool $usergroupMultipleItems = null,
 		?bool $usergroupSelectUsers = null,
 		?bool $usergroupSelectGroups = null,
+		?bool $usergroupSelectTeams = null,
 		?bool $usergroupShowUserStatus = null,
 
 		?array $selectedViewIds = []
@@ -850,6 +852,7 @@ public function createColumn(
 					usergroupMultipleItems: $usergroupMultipleItems,
 					usergroupSelectUsers: $usergroupSelectUsers,
 					usergroupSelectGroups: $usergroupSelectGroups,
+					usergroupSelectTeams: $usergroupSelectTeams,
 					showUserStatus: $usergroupShowUserStatus
 				),
 				$selectedViewIds
@@ -893,6 +896,7 @@ public function createColumn(
 	 * @param bool|null $usergroupMultipleItems Can select multiple users or/and groups, if column is usergroup
 	 * @param bool|null $usergroupSelectUsers Can select users, if column type is usergroup
 	 * @param bool|null $usergroupSelectGroups Can select groups, if column type is usergroup
+	 * @param bool|null $usergroupSelectTeams Can select teams, if column type is usergroup
 	 * @param bool|null $usergroupShowUserStatus Whether to show the user's status, if column type is usergroup
 	 *
 	 * @return DataResponse<Http::STATUS_OK, TablesColumn, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
@@ -929,6 +933,7 @@ public function updateColumn(
 		?bool $usergroupMultipleItems,
 		?bool $usergroupSelectUsers,
 		?bool $usergroupSelectGroups,
+		?bool $usergroupSelectTeams,
 		?bool $usergroupShowUserStatus,
 
 	): DataResponse {
@@ -958,6 +963,7 @@ public function updateColumn(
 					usergroupMultipleItems: $usergroupMultipleItems,
 					usergroupSelectUsers: $usergroupSelectUsers,
 					usergroupSelectGroups: $usergroupSelectGroups,
+					usergroupSelectTeams: $usergroupSelectTeams,
 					showUserStatus: $usergroupShowUserStatus
 				)
 			);
@@ -1498,6 +1504,7 @@ public function createTableShare(int $tableId, string $receiver, string $receive
 	 * @param bool|null $usergroupMultipleItems Can select multiple users or/and groups, if column is usergroup
 	 * @param bool|null $usergroupSelectUsers Can select users, if column type is usergroup
 	 * @param bool|null $usergroupSelectGroups Can select groups, if column type is usergroup
+	 * @param bool|null $usergroupSelectTeams Can select teams, if column type is usergroup
 	 * @param bool|null $usergroupShowUserStatus Whether to show the user's status, if column type is usergroup
 	 * @param int[]|null $selectedViewIds View IDs where this column should be added to be presented
 	 *
@@ -1539,6 +1546,7 @@ public function createTableColumn(
 		?bool $usergroupMultipleItems = null,
 		?bool $usergroupSelectUsers = null,
 		?bool $usergroupSelectGroups = null,
+		?bool $usergroupSelectTeams = null,
 		?bool $usergroupShowUserStatus = null,
 		?array $selectedViewIds = []
 	): DataResponse {
@@ -1569,6 +1577,7 @@ public function createTableColumn(
 					usergroupMultipleItems: $usergroupMultipleItems,
 					usergroupSelectUsers: $usergroupSelectUsers,
 					usergroupSelectGroups: $usergroupSelectGroups,
+					usergroupSelectTeams: $usergroupSelectTeams,
 					showUserStatus: $usergroupShowUserStatus
 				),
 				$selectedViewIds

lib/Controller/ApiColumnsController.php

@@ -295,6 +295,7 @@ public function createDatetimeColumn(int $baseNodeId, string $title, ?string $da
 	 * @param boolean $usergroupMultipleItems Whether you can select multiple users or/and groups
 	 * @param boolean $usergroupSelectUsers Whether you can select users
 	 * @param boolean $usergroupSelectGroups Whether you can select groups
+	 * @param boolean $usergroupSelectTeams Whether you can select teams
 	 * @param boolean $showUserStatus Whether to show the user's status
 	 * @param string|null $description Description
 	 * @param int[]|null $selectedViewIds View IDs where this columns should be added
@@ -311,7 +312,7 @@ public function createDatetimeColumn(int $baseNodeId, string $title, ?string $da
 	 */
 	#[NoAdminRequired]
 	#[RequirePermission(permission: Application::PERMISSION_MANAGE, typeParam: 'baseNodeType', idParam: 'baseNodeId')]
-	public function createUsergroupColumn(int $baseNodeId, string $title, ?string $usergroupDefault, bool $usergroupMultipleItems = null, bool $usergroupSelectUsers = null, bool $usergroupSelectGroups = null, bool $showUserStatus = null, string $description = null, ?array $selectedViewIds = [], bool $mandatory = false, string $baseNodeType = 'table'): DataResponse {
+	public function createUsergroupColumn(int $baseNodeId, string $title, ?string $usergroupDefault, bool $usergroupMultipleItems = null, bool $usergroupSelectUsers = null, bool $usergroupSelectGroups = null, bool $usergroupSelectTeams = null, bool $showUserStatus = null, string $description = null, ?array $selectedViewIds = [], bool $mandatory = false, string $baseNodeType = 'table'): DataResponse {
 		$tableId = $baseNodeType === 'table' ? $baseNodeId : null;
 		$viewId = $baseNodeType === 'view' ? $baseNodeId : null;
 		$column = $this->service->create(
@@ -327,6 +328,7 @@ public function createUsergroupColumn(int $baseNodeId, string $title, ?string $u
 				usergroupMultipleItems: $usergroupMultipleItems,
 				usergroupSelectUsers: $usergroupSelectUsers,
 				usergroupSelectGroups: $usergroupSelectGroups,
+				usergroupSelectTeams: $usergroupSelectTeams,
 				showUserStatus: $showUserStatus
 			),
 			$selectedViewIds

lib/Controller/ApiTablesController.php

@@ -165,6 +165,7 @@ public function createFromScheme(string $title, string $emoji, string $descripti
 						usergroupMultipleItems: $column['usergroupMultipleItems'],
 						usergroupSelectUsers: $column['usergroupSelectUsers'],
 						usergroupSelectGroups: $column['usergroupSelectGroups'],
+						usergroupSelectTeams: $column['usergroupSelectTeams'],
 						showUserStatus: $column['showUserStatus'],
 					)
 				);