Merge pull request #2598 from nextcloud/enh/column-uuids

feat: add UUIDs to columns

Author: blizzz

.github/workflows/playwright.yml

@@ -40,6 +40,9 @@ jobs:
           cache: 'npm'
           node-version-file: 'package.json'
 
+      - name: Set up dependencies
+        run: composer i --no-dev
+
       - name: Install dependencies
         run: npm ci
 
@@ -54,6 +57,16 @@ jobs:
         env:
           SERVER_BRANCH: ${{ matrix.server-versions }}
 
+      - name: Show logs
+        if: failure()
+        run: |
+          for id in $(docker ps -aq); do
+            docker container inspect "$id" --format '=== Logs for container {{.Name}} ==='
+            docker logs "$id" >> nextcloud.log
+          done
+          echo '=== Nextcloud server logs ==='
+          docker exec nextcloud-e2e-test-server_tables cat data/nextcloud.log
+
       - name: Upload test results
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         if: always()

.scoper-production-dependencies

@@ -4,3 +4,5 @@ maennchen/zipstream-php
 markbaker/complex
 markbaker/matrix
 psr/simple-cache
+symfony/uid
+symfony/polyfill-uuid

appinfo/info.xml

@@ -26,7 +26,7 @@ Share your tables and views with users and groups within your cloud.
 Have a good time and manage whatever you want.
 
 ]]></description>
-	<version>2.2.0</version>
+	<version>2.2.1-dev.0</version>
 	<licence>AGPL-3.0-or-later</licence>
 	<author>Nextcloud GmbH and Nextcloud contributors</author>
 	<namespace>Tables</namespace>

composer.json

@@ -39,7 +39,7 @@
     "lint": "find . -name \\*.php -not -path './vendor/*' -not -path './build/*' -print0 | xargs -0 -n1 php -l",
     "cs:check": "php-cs-fixer fix --dry-run --diff",
     "cs:fix": "php-cs-fixer fix",
-    "psalm": "./vendor/bin/psalm.phar --show-info=false --no-cache",
+    "psalm": "@php ./vendor/bin/psalm.phar --show-info=false --no-cache",
     "psalm:update-baseline": "./vendor/bin/psalm.phar --update-baseline",
     "psalm:fix": "./vendor/bin/psalm.phar --no-cache --alter --issues=InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType",
     "psalm:fix:dry": "./vendor/bin/psalm.phar --no-cache --alter --issues=InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType --dry-run",
@@ -65,6 +65,7 @@
   "require": {
     "phpoffice/phpspreadsheet": "^5.1",
     "ext-json": "*",
-    "bamarni/composer-bin-plugin": "^1.9.1"
+    "bamarni/composer-bin-plugin": "^1.9.1",
+    "symfony/uid": "^6.4"
   }
 }

composer.lock

@@ -298,9 +298,9 @@ private function formatSelectionValue(Column $column, mixed $value): mixed {
 			return '';
 		}
 
-		foreach ($column->getSelectionOptionsArray() as $option) {
-			if ((int)$option['id'] === (int)$value) {
-				return $option['label'];
+		foreach ($column->getSelectionOptionsCollection() as $option) {
+			if ($option->key() === (int)$value) {
+				return $option->label();
 			}
 		}
 
@@ -318,9 +318,9 @@ private function isMultiSelection(Column $column): bool {
 	private function getSelectionLabels(Column $column, array $values): array {
 		$labels = [];
 		foreach ($values as $value) {
-			foreach ($column->getSelectionOptionsArray() as $option) {
-				if ((int)$option['id'] === (int)$value) {
-					$labels[] = $option['label'];
+			foreach ($column->getSelectionOptionsCollection() as $option) {
+				if ($option->key() === (int)$value) {
+					$labels[] = $option->label();
 					break;
 				}
 			}

lib/Analytics/AnalyticsDatasource.php

@@ -22,6 +22,7 @@
 use OCA\Tables\Service\ColumnService;
 use OCA\Tables\Service\TableService;
 use OCA\Tables\Service\ViewService;
+use OCA\Tables\Vendor\Symfony\Component\Uid\Uuid;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
@@ -153,6 +154,9 @@ public function createFromScheme(string $title, string $emoji, string $descripti
 			$table = $this->service->create($title, 'custom', $emoji, $description);
 			$colMap = [];
 			foreach ($columns as $column) {
+				if (isset($column['uuid']) && !Uuid::isValid($column['uuid'])) {
+					throw new \InvalidArgumentException('Invalid UUID provided');
+				}
 				$col = $this->columnService->create(
 					$this->userId,
 					$table->getId(),
@@ -182,7 +186,8 @@ public function createFromScheme(string $title, string $emoji, string $descripti
 						usergroupSelectGroups: $column['usergroupSelectGroups'],
 						usergroupSelectTeams: $column['usergroupSelectTeams'],
 						showUserStatus: $column['showUserStatus'],
-						customSettings: empty($column['customSettings']) ? null : json_encode($column['customSettings'])
+						customSettings: empty($column['customSettings']) ? null : json_encode($column['customSettings']),
+						uuid: $column['uuid'] ?? null,
 					)
 				);
 				$colMap[$column['id']] = $col->getId();