diff --git a/lib/Constants/ColumnType.php b/lib/Constants/ColumnType.php index f296de2f74..aa189bf000 100644 --- a/lib/Constants/ColumnType.php +++ b/lib/Constants/ColumnType.php @@ -16,4 +16,5 @@ enum ColumnType: string { case DATETIME = 'datetime'; case PEOPLE = 'usergroup'; case RELATION = 'relation'; + case RELATION_LOOKUP = 'relation_lookup'; } diff --git a/lib/Controller/Api1Controller.php b/lib/Controller/Api1Controller.php index 6e53050fd7..01f62a29b0 100644 --- a/lib/Controller/Api1Controller.php +++ b/lib/Controller/Api1Controller.php @@ -844,7 +844,8 @@ public function indexViewColumns(int $viewId): DataResponse { * Get all relation data for a table * * @param int $tableId Table ID - * @return DataResponse>, array{}>|DataResponse + * @return DataResponse|DataResponse + * @psalm-return DataResponse}>, array{}>|DataResponse * * 200: Relation data returned * 403: No permissions @@ -854,6 +855,7 @@ public function indexViewColumns(int $viewId): DataResponse { #[NoCSRFRequired] #[CORS] #[RequirePermission(permission: Application::PERMISSION_READ, type: Application::NODE_TYPE_TABLE, idParam: 'tableId')] + #[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)] public function indexTableRelations(int $tableId): DataResponse { try { return new DataResponse($this->relationService->getRelationsForTable($tableId)); @@ -876,7 +878,8 @@ public function indexTableRelations(int $tableId): DataResponse { * Get all relation data for a view * * @param int $viewId View ID - * @return DataResponse>, array{}>|DataResponse + * @return DataResponse|DataResponse + * @psalm-return DataResponse}>, array{}>|DataResponse * * 200: Relation data returned * 403: No permissions @@ -886,6 +889,7 @@ public function indexTableRelations(int $tableId): DataResponse { #[NoCSRFRequired] #[CORS] #[RequirePermission(permission: Application::PERMISSION_READ, type: Application::NODE_TYPE_VIEW, idParam: 'viewId')] + #[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)] public function indexViewRelations(int $viewId): DataResponse { try { return new DataResponse($this->relationService->getRelationsForView($viewId)); @@ -910,7 +914,7 @@ public function indexViewRelations(int $viewId): DataResponse { * @param int|null $tableId Table ID * @param int|null $viewId View ID * @param string $title Title - * @param 'text'|'number'|'datetime'|'select'|'usergroup'|'relation' $type Column main type + * @param 'text'|'number'|'datetime'|'select'|'usergroup'|'relation'|'relation_lookup' $type Column main type * @param string|null $technicalName Technical name of the column * @param string|null $subtype Column sub type * @param bool $mandatory Is the column mandatory @@ -1694,7 +1698,7 @@ public function createTableShare(int $tableId, string $receiver, string $receive * * @param int $tableId Table ID * @param string $title Title - * @param 'text'|'number'|'datetime'|'select'|'usergroup'|'relation' $type Column main type + * @param 'text'|'number'|'datetime'|'select'|'usergroup'|'relation'|'relation_lookup' $type Column main type * @param string|null $technicalName Technical name of the column * @param string|null $subtype Column sub type * @param bool $mandatory Is the column mandatory diff --git a/lib/Db/Column.php b/lib/Db/Column.php index 2940ed19d4..54a702736a 100644 --- a/lib/Db/Column.php +++ b/lib/Db/Column.php @@ -107,6 +107,7 @@ class Column extends EntitySuper implements JsonSerializable { public const TYPE_DATETIME = 'datetime'; public const TYPE_USERGROUP = 'usergroup'; public const TYPE_RELATION = 'relation'; + public const TYPE_RELATION_LOOKUP = 'relation_lookup'; public const SUBTYPE_DATETIME_DATE = 'date'; public const SUBTYPE_DATETIME_TIME = 'time'; @@ -352,6 +353,20 @@ public function getCustomSettingsArray(): array { return json_decode($this->customSettings, true) ?: []; } + /** + * @template T + * @param class-string $className + * @return T + * @throws \InvalidArgumentException + */ + public function getCustomSettingsObject(string $className): mixed { + $array = $this->getCustomSettingsArray(); + if (method_exists($className, 'fromArray')) { + return $className::fromArray($array); + } + throw new \InvalidArgumentException("Class $className must have a fromArray method"); + } + /** * @throws ValueError */ diff --git a/lib/Db/Row2Mapper.php b/lib/Db/Row2Mapper.php index 7ec48500f9..5f83b5b197 100644 --- a/lib/Db/Row2Mapper.php +++ b/lib/Db/Row2Mapper.php @@ -10,6 +10,7 @@ use DateTime; use DateTimeImmutable; use OCA\Tables\Constants\UsergroupType; +use OCA\Tables\Dto\RelationLookupSettings; use OCA\Tables\Errors\InternalError; use OCA\Tables\Errors\NotFoundError; use OCA\Tables\Helper\ColumnsHelper; @@ -60,6 +61,9 @@ public function delete(Row2 $row): Row2 { $this->db->beginTransaction(); try { foreach ($this->columnsHelper->columns as $columnType) { + if ($this->isVirtualColumn($columnType)) { + continue; + } $this->getCellMapperFromType($columnType)->deleteAllForRow($row->getId()); } $this->rowSleeveMapper->deleteById($row->getId()); @@ -219,6 +223,8 @@ private function getRows(array $rowIds, array $columnIds): array { private function getRowsChunk(array $rowIds, array $columnIds): array { $qb = $this->db->getQueryBuilder(); + $columnIds = $this->addRelationColumnIdsForLookupColumns($columnIds); + $qbSqlForColumnTypes = null; foreach ($this->columnsHelper->columns as $columnType) { $qbTmp = $this->db->getQueryBuilder(); @@ -234,6 +240,9 @@ private function getRowsChunk(array $rowIds, array $columnIds): array { $qbTmp->selectAlias($qbTmp->createFunction('NULL'), 'value_type'); } + if ($this->isVirtualColumn($columnType)) { + continue; + } $qbTmp ->from('tables_row_cells_' . $columnType) ->where($qb->expr()->in('column_id', $qb->createNamedParameter($columnIds, IQueryBuilder::PARAM_INT_ARRAY, ':columnIds'))) @@ -839,6 +848,10 @@ private function insertCell(int $rowId, int $columnId, $value, ?string $lastEdit throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': ' . $e->getMessage()); } + if ($this->isVirtualColumn($column->getType())) { + return; + } + // insert new cell $cellMapper = $this->getCellMapper($column); @@ -877,6 +890,10 @@ private function insertCell(int $rowId, int $columnId, $value, ?string $lastEdit * @throws InternalError */ private function updateCell(RowCellSuper $cell, RowCellMapperSuper $mapper, $value, Column $column): void { + if ($this->isVirtualColumn($column->getType())) { + return; + } + $this->getCellMapper($column)->applyDataToEntity($column, $cell, $value); $this->updateMetaData($cell); $mapper->updateWrapper($cell); @@ -887,6 +904,9 @@ private function updateCell(RowCellSuper $cell, RowCellMapperSuper $mapper, $val */ private function insertOrUpdateCell(int $rowId, int $columnId, $value): void { $column = $this->columnMapper->find($columnId); + if ($this->isVirtualColumn($column->getType())) { + return; + } $cellMapper = $this->getCellMapper($column); try { if ($cellMapper->hasMultipleValues()) { @@ -913,6 +933,9 @@ private function getCellMapper(Column $column): RowCellMapperSuper { } private function getCellMapperFromType(string $columnType): RowCellMapperSuper { + if ($this->isVirtualColumn($columnType)) { + throw new InternalError('Virtual columns do not have cell mappers'); + } $cellMapperClassName = 'OCA\Tables\Db\RowCell' . ucfirst($columnType) . 'Mapper'; /** @var RowCellMapperSuper $cellMapper */ try { @@ -934,6 +957,9 @@ private function getColumnDbParamType(Column $column): int { * @throws InternalError */ public function deleteDataForColumn(Column $column): void { + if ($this->isVirtualColumn($column->getType())) { + return; + } try { $this->getCellMapper($column)->deleteAllForColumn($column->getId()); } catch (Exception $e) { @@ -1002,6 +1028,9 @@ private function getFormattedDefaultValue(Column $column) { case Column::TYPE_USERGROUP: $defaultValue = $this->getCellMapper($column)->filterValueToQueryParam($column, $column->getUsergroupDefault()); break; + case Column::TYPE_RELATION_LOOKUP: + $defaultValue = null; + break; } return $defaultValue; } @@ -1029,4 +1058,26 @@ private function sortRowsByIds(array $rows, array $wantedRowIds): array { return $sortedRows; } + + public function isVirtualColumn(string $columnType): bool { + return $columnType === Column::TYPE_RELATION_LOOKUP; + } + + /** + * @param int[] $columnIds + * @return int[] + */ + public function addRelationColumnIdsForLookupColumns(array $columnIds): array { + $allColumns = $this->columnMapper->findAll($columnIds); + foreach ($allColumns as $column) { + if ($column->getType() !== Column::TYPE_RELATION_LOOKUP) { + continue; + } + + $settings = $column->getCustomSettingsObject(RelationLookupSettings::class); + $columnIds[] = $settings->relationColumnId; + } + return array_values(array_unique(array_filter($columnIds))); + } + } diff --git a/lib/Dto/RelationLookupSettings.php b/lib/Dto/RelationLookupSettings.php new file mode 100644 index 0000000000..8826979280 --- /dev/null +++ b/lib/Dto/RelationLookupSettings.php @@ -0,0 +1,23 @@ +relationType === 'view'; + } +} diff --git a/lib/Helper/ColumnsHelper.php b/lib/Helper/ColumnsHelper.php index f926d2ba3c..022008e03a 100644 --- a/lib/Helper/ColumnsHelper.php +++ b/lib/Helper/ColumnsHelper.php @@ -21,6 +21,7 @@ class ColumnsHelper { Column::TYPE_SELECTION, Column::TYPE_USERGROUP, Column::TYPE_RELATION, + Column::TYPE_RELATION_LOOKUP, ]; /** diff --git a/lib/ResponseDefinitions.php b/lib/ResponseDefinitions.php index 0e502ec8de..25b84ab248 100644 --- a/lib/ResponseDefinitions.php +++ b/lib/ResponseDefinitions.php @@ -238,6 +238,8 @@ * notify-column: bool, * notify-row: bool, * } + * + * @psalm-type TablesRelationData = list}> */ class ResponseDefinitions { } diff --git a/lib/Service/ColumnService.php b/lib/Service/ColumnService.php index 341c1f13c3..3e9d9c947e 100644 --- a/lib/Service/ColumnService.php +++ b/lib/Service/ColumnService.php @@ -655,6 +655,11 @@ public function findOrCreateColumnsByTitleForTableAsArray(?int $tableId, ?int $v foreach ($titles as $title) { $i++; foreach ($allColumns as $column) { + // Skip matching columns with type relation_lookup + if ($column->getType() === Column::TYPE_RELATION_LOOKUP) { + continue; + } + if ($column->getTitle() === $title) { $result[$i] = $column; $countMatchingColumns++; diff --git a/lib/Service/ColumnTypes/RelationBusiness.php b/lib/Service/ColumnTypes/RelationBusiness.php index 7ca0a73ba8..41dc23ce5a 100644 --- a/lib/Service/ColumnTypes/RelationBusiness.php +++ b/lib/Service/ColumnTypes/RelationBusiness.php @@ -12,7 +12,7 @@ use OCA\Tables\Service\RelationService; use Psr\Log\LoggerInterface; -class RelationBusiness extends SuperBusiness implements IColumnTypeBusiness { +class RelationBusiness extends SuperBusiness { public function __construct( LoggerInterface $logger, @@ -34,7 +34,7 @@ public function parseValue($value, ?Column $column = null): string { $relationData = $this->relationService->getRelationData($column); // try to find value by label - $matchingRelation = array_filter($relationData, fn (array $relation) => $relation['label'] === $value); + $matchingRelation = array_filter($relationData, fn (array $relation) => $relation['value'] === $value); if (!empty($matchingRelation)) { return json_encode(reset($matchingRelation)['id']); } @@ -63,7 +63,7 @@ public function canBeParsed($value, ?Column $column = null): bool { $relationData = $this->relationService->getRelationData($column); // try to find value by label - $matchingRelation = array_filter($relationData, fn (array $relation) => $relation['label'] === $value); + $matchingRelation = array_filter($relationData, fn (array $relation) => $relation['value'] === $value); if (!empty($matchingRelation)) { return true; } @@ -83,7 +83,7 @@ public function validateValue(mixed $value, Column $column, string $userId, int $relationData = $this->relationService->getRelationData($column); // Try to find value by label first - $matchingRelation = array_filter($relationData, fn (array $relation) => $relation['label'] === $value); + $matchingRelation = array_filter($relationData, fn (array $relation) => $relation['value'] === $value); if (!empty($matchingRelation)) { return; } diff --git a/lib/Service/ColumnTypes/RelationLookupBusiness.php b/lib/Service/ColumnTypes/RelationLookupBusiness.php new file mode 100644 index 0000000000..d7373bfa69 --- /dev/null +++ b/lib/Service/ColumnTypes/RelationLookupBusiness.php @@ -0,0 +1,58 @@ + Cache for relation data */ private array $cacheRelationData = []; @@ -25,7 +34,8 @@ public function __construct( private ViewMapper $viewMapper, private Row2Mapper $row2Mapper, private ColumnService $columnService, - private ?string $userId, + private IUserSession $userSession, + private LoggerInterface $logger, ) { } @@ -33,7 +43,7 @@ public function __construct( * Get all relation data for a table * * @param int $tableId - * @return array Relation data grouped by column ID + * @return array}> Relation data grouped by column ID * @throws InternalError * @throws NotFoundError * @throws PermissionError @@ -42,18 +52,14 @@ public function getRelationsForTable(int $tableId): array { // Check table permissions through ColumnService $columns = $this->columnService->findAllByTable($tableId); - $relationColumns = array_filter($columns, function ($column) { - return $column->getType() === Column::TYPE_RELATION; - }); - - return $this->getRelationsForColumns($relationColumns); + return $this->getRelationsForColumnList($columns); } /** * Get all relation data for a view * * @param int $viewId - * @return array Relation data grouped by column ID + * @return array}> Relation data grouped by column ID * @throws InternalError * @throws NotFoundError * @throws PermissionError @@ -62,30 +68,71 @@ public function getRelationsForView(int $viewId): array { // Check view permissions through ColumnService $columns = $this->columnService->findAllByView($viewId); - $relationColumns = array_filter($columns, function ($column) { - return $column->getType() === Column::TYPE_RELATION; - }); + return $this->getRelationsForColumnList($columns); + } + + /** + * Get relation data for a specific column + * + * @param Column $column + * @return array Indexed per row id + */ + public function getRelationData(Column $column): array { + if ($column->getType() !== Column::TYPE_RELATION) { + return []; + } + + try { + return $this->fetchRelationValuesForTarget($column); + } catch (\InvalidArgumentException $e) { + $this->logger->warning('Invalid relation settings for column ' . $column->getId() . ': ' . $e->getMessage()); + return []; + } + } + + /** + * Get relation data for a list of columns + * + * @param Column[] $columns + * @return array}> Relation data grouped by column ID + * @throws InternalError + */ + private function getRelationsForColumnList(array $columns): array { + $relationColumns = array_filter($columns, fn (Column $column) => $column->getType() === Column::TYPE_RELATION); + $relationData = $this->fetchRelationColumns($relationColumns); + + $lookupColumns = array_filter($columns, fn (Column $column) => $column->getType() === Column::TYPE_RELATION_LOOKUP); + $relationLookupData = $this->fetchRelationLookupColumns($lookupColumns); - return $this->getRelationsForColumns($relationColumns); + return array_map( + fn (array $data) => ['column' => null, 'values' => $data], + $relationData + ) + $relationLookupData; } /** - * Get relation data for specific columns + * Fetch relation data for relation columns * - * @param Column[] $relationColumns - * @return array Relation data grouped by column ID + * @param Column[] $columns + * @return array> Relation data, indexed per column ID and row ID * @throws InternalError */ - private function getRelationsForColumns(array $relationColumns): array { - // Group columns by their target (relationType + targetId + labelColumn) + private function fetchRelationColumns(array $columns): array { $result = []; - $groupedColumns = $this->groupColumnsByTarget($relationColumns); - foreach ($groupedColumns as $target => $columns) { - $relationData = $this->getRelationDataForTarget($target, $columns[0]); + $fetchedTargets = []; - // Assign the same data to all columns with this target - foreach ($columns as $column) { - $result[$column->getId()] = $relationData; + foreach ($columns as $column) { + try { + $settings = $column->getCustomSettingsObject(RelationSettings::class); + $targetKey = $this->buildRelationCacheKey($settings->relationType, $settings->targetId, $settings->labelColumn); + + if (!isset($fetchedTargets[$targetKey])) { + $fetchedTargets[$targetKey] = $this->fetchRelationValuesForTarget($column); + } + + $result[$column->getId()] = $fetchedTargets[$targetKey]; + } catch (\InvalidArgumentException $e) { + $this->logger->warning('Invalid relation settings for column ' . $column->getId() . ': ' . $e->getMessage()); } } @@ -93,121 +140,272 @@ private function getRelationsForColumns(array $relationColumns): array { } /** - * Group relation columns by their target configuration + * Fetch relation data for relation lookup columns * * @param Column[] $columns - * @return array + * @return array}> Relation data grouped by column ID + * @throws InternalError */ - private function groupColumnsByTarget(array $columns): array { - $groups = []; + private function fetchRelationLookupColumns(array $columns): array { + $result = []; + + // Batch fetch all needed columns to avoid duplicate queries + $columnIdsToFetch = $this->collectColumnIdsForLookup($columns); + $columnsMap = $this->fetchColumnsByIds($columnIdsToFetch); foreach ($columns as $column) { - $settings = $column->getCustomSettingsArray(); - if (empty($settings['relationType']) || empty($settings['targetId']) || empty($settings['labelColumn'])) { - continue; - } + try { + $settings = $column->getCustomSettingsObject(RelationLookupSettings::class); + $relationColumn = $columnsMap[$settings->relationColumnId] ?? null; + $targetColumn = $columnsMap[$settings->targetColumnId] ?? null; + + if (!$relationColumn || !$targetColumn) { + continue; + } - $target = sprintf('%s_%s_%s', $settings['relationType'], $settings['targetId'], $settings['labelColumn']); - if (!isset($groups[$target])) { - $groups[$target] = []; + $lookupData = $this->fetchLookupValues($settings, $relationColumn); + $result[$column->getId()] = [ + 'column' => $targetColumn->jsonSerialize(), + 'values' => $lookupData, + ]; + } catch (\InvalidArgumentException $e) { + $this->logger->warning('Invalid relation lookup settings for column ' . $column->getId() . ': ' . $e->getMessage()); } - $groups[$target][] = $column; } - return $groups; + return $result; + } + + private function getCurrentUserId(): string { + $user = $this->userSession->getUser(); + return $user ? $user->getUID() : 'anonymous'; } /** - * Get relation data for a specific column + * Fetch relation values for a specific target * * @param Column $column - * @return array Indexed per row id + * @return array Indexed per row id + * @throws InternalError */ - public function getRelationData(Column $column): array { - if ($column->getType() !== Column::TYPE_RELATION) { - return []; + private function fetchRelationValuesForTarget(Column $column): array { + $settings = $column->getCustomSettingsObject(RelationSettings::class); + + $cacheKey = $this->buildRelationCacheKey($settings->relationType, $settings->targetId, $settings->labelColumn); + if (isset($this->cacheRelationData[$cacheKey])) { + return $this->cacheRelationData[$cacheKey]; } - $settings = $column->getCustomSettingsArray(); - if (empty($settings['relationType']) || empty($settings['targetId']) || empty($settings['labelColumn'])) { + try { + $targetColumn = $this->columnMapper->find($settings->labelColumn); + $rows = $this->fetchRowsForTarget($settings, [$settings->labelColumn]); + } catch (DoesNotExistException $e) { + $this->cacheRelationData[$cacheKey] = []; return []; } - $target = sprintf('%s_%s_%s', $settings['relationType'], $settings['targetId'], $settings['labelColumn']); + $result = $this->buildRelationValues($rows, $targetColumn, $settings->labelColumn); + $this->cacheRelationData[$cacheKey] = $result; + + return $result; + } - return $this->getRelationDataForTarget($target, $column); + /** + * Build a cache key for relation data + */ + private function buildRelationCacheKey(string $relationType, int $targetId, int $labelColumn): string { + return sprintf('%s_%d_%d_%s', $relationType, $targetId, $labelColumn, $this->getCurrentUserId()); } /** - * Get relation data for a specific target + * Collect all column IDs needed for lookup processing * - * @param string $target - * @param Column $column - * @return array Indexed per row id - * @throws InternalError + * @param Column[] $columns + * @return int[] */ - private function getRelationDataForTarget(string $target, Column $column): array { - // Check cache first - $cacheKey = $target . '_' . ($this->userId ?? 'anonymous'); - if (isset($this->cacheRelationData[$cacheKey])) { - return $this->cacheRelationData[$cacheKey]; + private function collectColumnIdsForLookup(array $columns): array { + $columnIds = []; + + foreach ($columns as $column) { + $settings = $column->getCustomSettingsObject(RelationLookupSettings::class); + $columnIds[] = $settings->targetColumnId; + $columnIds[] = $settings->relationColumnId; } - $settings = $column->getCustomSettingsArray(); - if (empty($settings[Column::RELATION_TYPE]) || empty($settings[Column::RELATION_TARGET_ID]) || empty($settings[Column::RELATION_LABEL_COLUMN])) { - $this->cacheRelationData[$cacheKey] = []; + return array_unique($columnIds); + } + + /** + * Fetch multiple columns by their IDs in a single batch + * + * @param int[] $columnIds + * @return array + */ + private function fetchColumnsByIds(array $columnIds): array { + if (empty($columnIds)) { return []; } - $isView = $settings[Column::RELATION_TYPE] === 'view'; - $targetId = $settings[Column::RELATION_TARGET_ID] ?? null; - try { - $targetColumn = $this->columnMapper->find($settings[Column::RELATION_LABEL_COLUMN]); - if ($isView) { - $view = $this->viewMapper->find($targetId); - $rows = $this->row2Mapper->findAll( - [$targetColumn->getId()], - $view->getTableId(), - null, - null, - $view->getFilterArray(), - $view->getSortArray(), - $this->userId - ); - } else { - $rows = $this->row2Mapper->findAll( - [$targetColumn->getId()], - $targetId, - null, - null, - null, - null, - $this->userId - ); + $columns = $this->columnMapper->findAll($columnIds); + $result = []; + foreach ($columns as $column) { + $result[$column->getId()] = $column; } + return $result; + } catch (\Exception $e) { + $this->logger->warning('Failed to fetch columns: ' . $e->getMessage()); + return []; + } + } + + /** + * Fetch lookup values for a relation lookup column + * + * @param RelationLookupSettings $settings + * @param Column $relationColumn + * @return array + */ + private function fetchLookupValues(RelationLookupSettings $settings, Column $relationColumn): array { + $relationSettings = $relationColumn->getCustomSettingsObject(RelationSettings::class); + + $cacheKey = $this->buildRelationCacheKey($relationSettings->relationType, $relationSettings->targetId, $settings->targetColumnId); + if (isset($this->cacheRelationData[$cacheKey])) { + return $this->cacheRelationData[$cacheKey]; + } + + try { + // Fetch both relation label column and lookup target column in a single query + $rows = $this->fetchRowsForTarget($relationSettings, [$relationSettings->labelColumn, $settings->targetColumnId]); + $lookupData = $this->buildLookupValues($rows, $relationSettings->labelColumn, $settings->targetColumnId); + + $this->cacheRelationData[$cacheKey] = $lookupData; + return $lookupData; } catch (DoesNotExistException $e) { - $this->cacheRelationData[$cacheKey] = []; + $this->logger->warning('Failed to fetch lookup data: ' . $e->getMessage()); return []; } + } + + /** + * Fetch rows for a relation target + * + * @param RelationSettings $settings + * @param int[] $columnIds + * @return Row2[] + * @throws DoesNotExistException + */ + private function fetchRowsForTarget(RelationSettings $settings, array $columnIds): array { + if ($settings->isView()) { + $view = $this->viewMapper->find($settings->targetId); + return $this->row2Mapper->findAll( + $columnIds, + $view->getTableId(), + null, + null, + $view->getFilterArray(), + $view->getSortArray(), + $this->getCurrentUserId() + ); + } + return $this->row2Mapper->findAll( + $columnIds, + $settings->targetId, + null, + null, + null, + null, + $this->getCurrentUserId() + ); + } + + /** + * Build relation values from rows + * + * @param Row2[] $rows + * @param Column $column + * @param int $labelColumnId + * @return array + */ + private function buildRelationValues(array $rows, Column $column, int $labelColumnId): array { $result = []; + foreach ($rows as $row) { $data = $row->getData(); - $displayFieldData = array_filter($data, function ($item) use ($settings) { - return $item['columnId'] === (int)$settings[Column::RELATION_LABEL_COLUMN]; - }); + $displayFieldData = array_filter($data, fn ($item) => $item['columnId'] === $labelColumnId); $value = reset($displayFieldData)['value'] ?? null; - // Structure compatible with Row2 format: {id: int, label: string} $rowId = (int)$row->getId(); $result[$rowId] = [ 'id' => $rowId, - 'label' => (string)$value, + 'value' => $this->formatValue($column, $value), ]; } - $this->cacheRelationData[$cacheKey] = $result; return $result; } + + /** + * Build lookup values from rows containing both relation label and target columns + * + * @param Row2[] $rows + * @param int $relationLabelColumnId + * @param int $targetColumnId + * @return array + */ + private function buildLookupValues(array $rows, int $relationLabelColumnId, int $targetColumnId): array { + $result = []; + + foreach ($rows as $row) { + $data = $row->getData(); + $rowId = (int)$row->getId(); + + // Find the relation label value + $relationLabelData = array_filter($data, fn ($item) => $item['columnId'] === $relationLabelColumnId); + $relationLabelValue = reset($relationLabelData)['value'] ?? null; + + // Find the target column value + $targetData = array_filter($data, fn ($item) => $item['columnId'] === $targetColumnId); + $targetValue = reset($targetData)['value'] ?? null; + + // Only include if relation label exists (meaning this row is referenced) + if ($relationLabelValue !== null && $relationLabelValue !== '') { + $result[$rowId] = [ + 'id' => $rowId, + 'value' => $targetValue, + ]; + } + } + + return $result; + } + + /** + * Format a cell value for display as a relation label. + * Relation lookup only supports text-line and number columns. + */ + private function formatValue(Column $column, mixed $value): string { + if ($value === null || $value === '' || $value === []) { + return ''; + } + + return match ($column->getType()) { + Column::TYPE_TEXT => trim(strip_tags((string)$value)), + Column::TYPE_NUMBER => $this->formatNumberValue($column, $value), + default => (string)$value, + }; + } + + private function formatNumberValue(Column $column, mixed $value): string { + if ($value === null || $value === '') { + return ''; + } + if (!is_numeric($value)) { + return (string)$value; + } + $decimals = $column->getNumberDecimals() ?? 0; + $formatted = number_format((float)$value, $decimals, '.', ''); + return $column->getNumberPrefix() . $formatted . $column->getNumberSuffix(); + } } diff --git a/lib/Service/RowService.php b/lib/Service/RowService.php index 252e428118..d01381377a 100644 --- a/lib/Service/RowService.php +++ b/lib/Service/RowService.php @@ -393,6 +393,10 @@ private function cleanupAndValidateData(RowDataInput $data, array $columns, ?int $column = $this->getColumnFromColumnsArray($columnId, $columns); + if ($column && $this->row2Mapper->isVirtualColumn($column->getType())) { + continue; + } + if ($column) { $this->validateColumnValueLimits($column, $entry['value']); $columnBusiness = $this->columnsHelper->getColumnBusinessObject($column); @@ -919,6 +923,8 @@ private function filterRowResult(?View $view, Row2 $row): Row2 { } $columnIds = $view->getColumnIds(); + $columnIds = $this->row2Mapper->addRelationColumnIdsForLookupColumns($columnIds); + $row->filterDataByColumns($columnIds); $row->filterDataByAliasByColumns($columnIds); diff --git a/openapi.json b/openapi.json index 0234b5c0f6..29437de912 100644 --- a/openapi.json +++ b/openapi.json @@ -673,6 +673,45 @@ } } }, + "RelationData": { + "type": "array", + "items": { + "type": "object", + "required": [ + "column", + "values" + ], + "properties": { + "column": { + "nullable": true, + "allOf": [ + { + "$ref": "#/components/schemas/Column" + } + ] + }, + "values": { + "type": "array", + "items": { + "type": "object", + "required": [ + "id", + "value" + ], + "properties": { + "id": { + "type": "integer", + "format": "int64" + }, + "value": { + "type": "object" + } + } + } + } + } + } + }, "Row": { "type": "object", "required": [ @@ -3848,7 +3887,8 @@ "datetime", "select", "usergroup", - "relation" + "relation", + "relation_lookup" ], "description": "Column main type" }, @@ -4282,7 +4322,8 @@ "datetime", "select", "usergroup", - "relation" + "relation", + "relation_lookup" ], "description": "Column main type" }, @@ -4995,6 +5036,314 @@ } } }, + "/index.php/apps/tables/api/1/tables/{tableId}/relations": { + "get": { + "operationId": "api1-index-table-relations", + "summary": "Get all relation data for a table", + "description": "This endpoint allows CORS requests", + "tags": [ + "api1" + ], + "security": [ + { + "basic_auth": [] + } + ], + "parameters": [ + { + "name": "tableId", + "in": "path", + "description": "Table ID", + "required": true, + "schema": { + "type": "integer", + "format": "int64" + } + } + ], + "responses": { + "200": { + "description": "Relation data returned", + "content": { + "application/json": { + "schema": { + "anyOf": [ + { + "$ref": "#/components/schemas/RelationData" + }, + { + "type": "array", + "items": { + "type": "object", + "required": [ + "column", + "values" + ], + "properties": { + "column": { + "nullable": true, + "allOf": [ + { + "$ref": "#/components/schemas/Column" + } + ] + }, + "values": { + "type": "array", + "items": { + "type": "object", + "required": [ + "id", + "value" + ], + "properties": { + "id": { + "type": "integer", + "format": "int64" + }, + "value": { + "type": "object" + } + } + } + } + } + } + } + ] + } + } + } + }, + "403": { + "description": "No permissions", + "content": { + "application/json": { + "schema": { + "type": "object", + "required": [ + "message" + ], + "properties": { + "message": { + "type": "string" + } + } + } + } + } + }, + "500": { + "description": "", + "content": { + "application/json": { + "schema": { + "type": "object", + "required": [ + "message" + ], + "properties": { + "message": { + "type": "string" + } + } + } + } + } + }, + "404": { + "description": "Not found", + "content": { + "application/json": { + "schema": { + "type": "object", + "required": [ + "message" + ], + "properties": { + "message": { + "type": "string" + } + } + } + } + } + }, + "401": { + "description": "Current user is not logged in", + "content": { + "application/json": { + "schema": { + "type": "object", + "required": [ + "message" + ], + "properties": { + "message": { + "type": "string" + } + } + } + } + } + } + } + } + }, + "/index.php/apps/tables/api/1/views/{viewId}/relations": { + "get": { + "operationId": "api1-index-view-relations", + "summary": "Get all relation data for a view", + "description": "This endpoint allows CORS requests", + "tags": [ + "api1" + ], + "security": [ + { + "basic_auth": [] + } + ], + "parameters": [ + { + "name": "viewId", + "in": "path", + "description": "View ID", + "required": true, + "schema": { + "type": "integer", + "format": "int64" + } + } + ], + "responses": { + "200": { + "description": "Relation data returned", + "content": { + "application/json": { + "schema": { + "anyOf": [ + { + "$ref": "#/components/schemas/RelationData" + }, + { + "type": "array", + "items": { + "type": "object", + "required": [ + "column", + "values" + ], + "properties": { + "column": { + "nullable": true, + "allOf": [ + { + "$ref": "#/components/schemas/Column" + } + ] + }, + "values": { + "type": "array", + "items": { + "type": "object", + "required": [ + "id", + "value" + ], + "properties": { + "id": { + "type": "integer", + "format": "int64" + }, + "value": { + "type": "object" + } + } + } + } + } + } + } + ] + } + } + } + }, + "403": { + "description": "No permissions", + "content": { + "application/json": { + "schema": { + "type": "object", + "required": [ + "message" + ], + "properties": { + "message": { + "type": "string" + } + } + } + } + } + }, + "500": { + "description": "", + "content": { + "application/json": { + "schema": { + "type": "object", + "required": [ + "message" + ], + "properties": { + "message": { + "type": "string" + } + } + } + } + } + }, + "404": { + "description": "Not found", + "content": { + "application/json": { + "schema": { + "type": "object", + "required": [ + "message" + ], + "properties": { + "message": { + "type": "string" + } + } + } + } + } + }, + "401": { + "description": "Current user is not logged in", + "content": { + "application/json": { + "schema": { + "type": "object", + "required": [ + "message" + ], + "properties": { + "message": { + "type": "string" + } + } + } + } + } + } + } + } + }, "/index.php/apps/tables/api/1/tables/{tableId}/rows/simple": { "get": { "operationId": "api1-index-table-rows-simple", diff --git a/src/modules/main/partials/ColumnFormComponent.vue b/src/modules/main/partials/ColumnFormComponent.vue index 491ae29b7c..37aedd10ea 100644 --- a/src/modules/main/partials/ColumnFormComponent.vue +++ b/src/modules/main/partials/ColumnFormComponent.vue @@ -23,6 +23,7 @@ import DatetimeTimeForm from '../../../shared/components/ncTable/partials/rowTyp import TextRichForm from '../../../shared/components/ncTable/partials/rowTypePartials/TextRichForm.vue' import UsergroupForm from '../../../shared/components/ncTable/partials/rowTypePartials/UsergroupForm.vue' import RelationForm from '../../../shared/components/ncTable/partials/rowTypePartials/RelationForm.vue' +import RelationLookupForm from '../../../shared/components/ncTable/partials/rowTypePartials/RelationLookupForm.vue' export default { name: 'ColumnFormComponent', @@ -42,6 +43,7 @@ export default { DatetimeTimeForm, UsergroupForm, RelationForm, + RelationLookupForm, }, props: { column: { @@ -58,7 +60,7 @@ export default { ], data() { return { - value_data: this.value, + value_data: this.getValueForColumn(), } }, computed: { @@ -79,10 +81,13 @@ export default { this.$emit('update:value', this.value_data) }, value() { - this.value_data = this.value + this.value_data = this.getValueForColumn() }, }, methods: { + getValueForColumn() { + return this.column.getValueForForm(this.value) + }, snakeToCamel(str) { str = str.toLowerCase().replace(/([-_][a-z])/g, group => group diff --git a/src/modules/main/partials/ColumnTypeSelection.vue b/src/modules/main/partials/ColumnTypeSelection.vue index 9f861c91ab..a237c6dabe 100644 --- a/src/modules/main/partials/ColumnTypeSelection.vue +++ b/src/modules/main/partials/ColumnTypeSelection.vue @@ -20,6 +20,7 @@ +
{{ props.label }}
@@ -35,6 +36,7 @@ +
{{ props.label }}
@@ -94,6 +96,7 @@ export default { { id: 'datetime', label: t('tables', 'Date and time') }, { id: 'usergroup', label: t('tables', 'Users and groups') }, { id: 'relation', label: t('tables', 'Relation') }, + { id: 'relation_lookup', label: t('tables', 'Relation lookup') }, ], } }, diff --git a/src/modules/main/partials/editViewPartials/filter/FilterEntry.vue b/src/modules/main/partials/editViewPartials/filter/FilterEntry.vue index f9612f5809..1fe291d8d8 100644 --- a/src/modules/main/partials/editViewPartials/filter/FilterEntry.vue +++ b/src/modules/main/partials/editViewPartials/filter/FilterEntry.vue @@ -215,10 +215,10 @@ export default { // Get relations from DataStore using the column's tableId const dataStore = useDataStore() const columnRelations = dataStore.getRelations(this.selectedColumn.id) - Object.values(columnRelations).forEach(item => { + Object.entries(columnRelations.values || {}).forEach(([, item]) => { options.push({ id: '@relation-id-' + item.id, - label: item.label, + label: item.value, }) }) diff --git a/src/modules/modals/CreateColumn.vue b/src/modules/modals/CreateColumn.vue index b6095ffd7f..e50a0504c0 100644 --- a/src/modules/modals/CreateColumn.vue +++ b/src/modules/modals/CreateColumn.vue @@ -127,6 +127,7 @@ import TextRichForm from '../../shared/components/ncTable/partials/columnTypePar import { ColumnTypes } from '../../shared/components/ncTable/mixins/columnHandler.js' import UsergroupForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/UsergroupForm.vue' import RelationForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/RelationForm.vue' +import RelationLookupForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/RelationLookupForm.vue' import { useTablesStore } from '../../store/store.js' import { useDataStore } from '../../store/data.js' import { mapActions } from 'pinia' @@ -155,6 +156,7 @@ export default { SelectionMultiForm, UsergroupForm, RelationForm, + RelationLookupForm, }, props: { showModal: { @@ -333,6 +335,10 @@ export default { showInfo(t('tables', 'Please select a target.')) } else if (this.column.type === ColumnTypes.Relation && !this.column.customSettings?.labelColumn) { showInfo(t('tables', 'Please select a label for relation selection.')) + } else if (this.column.type === ColumnTypes.RelationLookup && !this.column.customSettings?.relationColumnId) { + showInfo(t('tables', 'Please select a relation column.')) + } else if (this.column.type === ColumnTypes.RelationLookup && !this.column.customSettings?.targetColumnId) { + showInfo(t('tables', 'Please select a target column.')) } else { this.column.title = title this.$emit('save', this.prepareSubmitData()) @@ -409,6 +415,9 @@ export default { data.customSettings.relationType = this.column.customSettings.relationType data.customSettings.targetId = this.column.customSettings.targetId data.customSettings.labelColumn = this.column.customSettings.labelColumn + } else if (this.column.type === ColumnTypes.RelationLookup) { + data.customSettings.relationColumnId = this.column.customSettings.relationColumnId + data.customSettings.targetColumnId = this.column.customSettings.targetColumnId } return data }, diff --git a/src/modules/modals/CreateRow.vue b/src/modules/modals/CreateRow.vue index 58b8b644e0..370e5bc448 100644 --- a/src/modules/modals/CreateRow.vue +++ b/src/modules/modals/CreateRow.vue @@ -9,15 +9,15 @@ data-cy="createRowModal" @closing="actionCancel">
-
+
- {{ t('tables', '"{columnTitle}" should not be empty', { columnTitle: column.title }) }} - {{ t('tables', 'Invalid protocol. Allowed: {allowed}', {allowed: allowedProtocols.join(', ')}) }} @@ -104,7 +104,7 @@ export default { return this.checkMandatoryFields(this.row) }, hasInvalidUrlProtocol() { - return this.nonMetaColumns.some(col => col.type === 'text-link' && !this.isValidUrlProtocol(this.row[col.id])) + return this.nonMetaColumns.some(col => col.type === 'text-link' && !this.isValidUrlProtocol(this.row[col.getValueColumnId()])) }, dialogTitle() { return this.isFormMode ? t('tables', 'Fill form') : t('tables', 'Create row') diff --git a/src/modules/modals/EditColumn.vue b/src/modules/modals/EditColumn.vue index da4d90ade9..39e6165110 100644 --- a/src/modules/modals/EditColumn.vue +++ b/src/modules/modals/EditColumn.vue @@ -71,6 +71,7 @@ import DatetimeDateForm from '../../shared/components/ncTable/partials/columnTyp import DatetimeTimeForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/DatetimeTimeForm.vue' import UsergroupForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/UsergroupForm.vue' import RelationForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/RelationForm.vue' +import RelationLookupForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/RelationLookupForm.vue' import { ColumnTypes } from '../../shared/components/ncTable/mixins/columnHandler.js' import moment from '@nextcloud/moment' import { mapActions } from 'pinia' @@ -103,6 +104,7 @@ export default { NcUserBubble, UsergroupForm, RelationForm, + RelationLookupForm, }, props: { column: { diff --git a/src/modules/modals/EditRow.vue b/src/modules/modals/EditRow.vue index b4c6300645..073c96ed00 100644 --- a/src/modules/modals/EditRow.vue +++ b/src/modules/modals/EditRow.vue @@ -35,15 +35,15 @@
-
+
- {{ t('tables', '"{columnTitle}" should not be empty', { columnTitle: column.title }) }} - {{ t('tables', 'Invalid protocol. Allowed: {allowed}', {allowed: allowedProtocols.join(', ')}) }} @@ -162,7 +162,7 @@ export default { return this.checkMandatoryFields(this.localRow) }, hasInvalidUrlProtocol() { - return this.nonMetaColumns.some(col => col.type === 'text-link' && !this.isValidUrlProtocol(this.localRow[col.id])) + return this.nonMetaColumns.some(col => col.type === 'text-link' && !this.isValidUrlProtocol(this.localRow[col.getValueColumnId()])) }, }, watch: { @@ -196,12 +196,12 @@ export default { // Ensure all columns have entries, even if missing from row data this.columns.forEach(column => { - if (!(column.id in tmp)) { + if (!(column.getValueColumnId() in tmp)) { // For usergroup columns, initialize as empty array if (column.type === 'usergroup') { - tmp[column.id] = [] + tmp[column.getValueColumnId()] = [] } else { - tmp[column.id] = null + tmp[column.getValueColumnId()] = null } } }) diff --git a/src/modules/modals/ImportPreview.vue b/src/modules/modals/ImportPreview.vue index d796032a87..1deb23b606 100644 --- a/src/modules/modals/ImportPreview.vue +++ b/src/modules/modals/ImportPreview.vue @@ -120,7 +120,10 @@ export default { return [] } - const columns = this.existingColumns.map(column => ({ + // Filter out columns with type relation_lookup + const filteredColumns = this.existingColumns.filter(column => column.type !== ColumnTypes.RelationLookup) + + const columns = filteredColumns.map(column => ({ id: column.id, label: column.title, })) diff --git a/src/shared/components/ncTable/NcTable.vue b/src/shared/components/ncTable/NcTable.vue index 9608c9f3f6..7c0a1d2feb 100644 --- a/src/shared/components/ncTable/NcTable.vue +++ b/src/shared/components/ncTable/NcTable.vue @@ -120,6 +120,7 @@ import { import { MetaColumns } from './mixins/metaColumns.js' import { MagicFields } from './mixins/magicFields.js' import { FilterIds, getFiltersForColumn } from './mixins/filter.js' +import { ColumnTypes } from './mixins/columnHandler.js' export default { name: 'NcTable', @@ -354,7 +355,11 @@ export default { }) // if we should search if (searchString) { - searchStatus = column.isSearchStringFound(cell, searchString.toLowerCase()) + if (column.type === ColumnTypes.RelationLookup) { + searchStatus = column.isSearchStringFound(row.data, cell, searchString.toLowerCase()) + } else { + searchStatus = column.isSearchStringFound(cell, searchString.toLowerCase()) + } } // if filterStatus is null, this result should be ignored diff --git a/src/shared/components/ncTable/mixins/columnClass.js b/src/shared/components/ncTable/mixins/columnClass.js index 95250ccc18..0a735823a4 100644 --- a/src/shared/components/ncTable/mixins/columnClass.js +++ b/src/shared/components/ncTable/mixins/columnClass.js @@ -81,6 +81,27 @@ export class AbstractColumn { return value } + /** + * Get the id of the column whose cell holds this column's value. + * Virtual columns may source their value from another column. + * + * @return {number} The column id to read the cell value from + */ + getValueColumnId() { + return this.id + } + + /** + * Get the value for form input. + * Default implementation returns the value as-is. + * + * @param {*} value The raw value + * @return {*} The value for form input + */ + getValueForForm(value) { + return value + } + } export class AbstractUsergroupColumn extends AbstractColumn { diff --git a/src/shared/components/ncTable/mixins/columnHandler.js b/src/shared/components/ncTable/mixins/columnHandler.js index 71664a93f7..17734907ba 100644 --- a/src/shared/components/ncTable/mixins/columnHandler.js +++ b/src/shared/components/ncTable/mixins/columnHandler.js @@ -18,6 +18,7 @@ export const ColumnTypes = { Datetime: 'datetime', Usergroup: 'usergroup', Relation: 'relation', + RelationLookup: 'relation_lookup', } export function getColumnWidthStyle(column) { diff --git a/src/shared/components/ncTable/mixins/columnParser.js b/src/shared/components/ncTable/mixins/columnParser.js index 4461e6e5ce..4783ef40cb 100644 --- a/src/shared/components/ncTable/mixins/columnParser.js +++ b/src/shared/components/ncTable/mixins/columnParser.js @@ -18,6 +18,7 @@ import TextLongColumn from './columnsTypes/textLong.js' import TextRichColumn from './columnsTypes/textRich.js' import UsergroupColumn from './columnsTypes/usergroup.js' import RelationColumn from './columnsTypes/relation.js' +import RelationLookupColumn from './columnsTypes/relationLookup.js' export function parseCol(col) { const columnType = col.type + (col.subtype === '' ? '' : '-' + col.subtype) @@ -37,6 +38,7 @@ export function parseCol(col) { case ColumnTypes.DatetimeTime: return new DatetimeTimeColumn(col) case ColumnTypes.Usergroup: return new UsergroupColumn(col) case ColumnTypes.Relation: return new RelationColumn(col) + case ColumnTypes.RelationLookup: return new RelationLookupColumn(col) default: throw Error(columnType + ' is not a valid column type!') } } diff --git a/src/shared/components/ncTable/mixins/columnsTypes/relation.js b/src/shared/components/ncTable/mixins/columnsTypes/relation.js index b0e03d3ab0..f517f044d1 100644 --- a/src/shared/components/ncTable/mixins/columnsTypes/relation.js +++ b/src/shared/components/ncTable/mixins/columnsTypes/relation.js @@ -44,7 +44,7 @@ export default class RelationColumn extends AbstractColumn { getValueString(valueObject) { valueObject = valueObject || this.value || null - return this.getLabel(valueObject.value) + return this.getLabel(valueObject.value) ?? String(valueObject.value) } getLabel(rowId) { @@ -59,9 +59,9 @@ export default class RelationColumn extends AbstractColumn { } const columnRelations = dataStore.getRelations(this.id) - const option = columnRelations[rowId] + const option = columnRelations.values?.[rowId] - return option ? option.label : undefined + return option ? option.value : undefined } catch (error) { console.warn('Failed to get relation label:', error) return '' diff --git a/src/shared/components/ncTable/mixins/columnsTypes/relationLookup.js b/src/shared/components/ncTable/mixins/columnsTypes/relationLookup.js new file mode 100644 index 0000000000..9a10be0a3f --- /dev/null +++ b/src/shared/components/ncTable/mixins/columnsTypes/relationLookup.js @@ -0,0 +1,139 @@ +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +import { AbstractColumn } from '../columnClass.js' +import { useDataStore } from '../../../../../store/data.js' + +export default class RelationLookupColumn extends AbstractColumn { + + constructor(col) { + super(col) + this.type = 'relation_lookup' + this.subtype = '' + } + + /** + * Format the value for display + * @param {any} value The value to format + * @return {string} The formatted value + */ + formatValue(value) { + if (value === null || value === undefined) { + return '' + } + // Return the virtual value as is - it comes from the related table + return String(value) + } + + /** + * Parse the value from input + * @param {any} value The value to parse + * @return {any} The parsed value + */ + parseValue(value) { + // This is a virtual column, no input parsing needed + // Values come from related rows via backend + return value + } + + /** + * The lookup value is sourced from the referenced relation column's cell. + * @return {number} The relation column id to read the cell value from + */ + getValueColumnId() { + return this.customSettings.relationColumnId + } + + /** + * Get the value for form input. + * For relation lookup, extracts the value from the relation column id. + * + * @param {*} value The raw value + * @return {*} The value for form input + */ + getValueForForm(value) { + if (this.customSettings?.relationColumnId) { + return value?.[this.customSettings.relationColumnId] ?? null + } + return value + } + + getValueString(valueObject) { + valueObject = valueObject || this.value || null + if (!valueObject || valueObject.value === null || valueObject.value === undefined) { + return '' + } + + // Check if we have relation data to get the label + if (this.customSettings?.targetColumnId) { + try { + const dataStore = useDataStore() + const relationData = dataStore.getRelations(this.id) + + let value = valueObject.value + if (typeof value === 'object' && value !== null) { + value = value.value + } + + if (relationData?.values && value) { + // Get the related row data for the current value (which is the relation ID) + const relatedRow = relationData.values[value] + if (relatedRow) { + return relationData.column.getValueString({ value: relatedRow.value }) ?? String(valueObject.value) + } + } + } catch (error) { + console.warn('Failed to get relation supplement label:', error) + } + } + + // Fallback to original behavior + return String(valueObject.value) + } + + default() { + // Virtual columns don't have default values + return null + } + + /** + * Check if filter matches the cell value + * @param {any} cell The cell to check + * @param {any} filter The filter to apply + * @return {boolean} Whether the filter matches + */ + isFilterFound(cell, filter) { + return false + } + + isSearchStringFound(rowData, cell, searchString) { + const dataStore = useDataStore() + const relationLookup = dataStore.getRelations(this.id) + const cellRelationLookup = rowData?.find(item => item.columnId === this.customSettings.relationColumnId) + if (!cellRelationLookup) return '' + + let value = '' + const relatedRow = relationLookup.values?.[cellRelationLookup.value] + if (relatedRow && relationLookup.column) { + value = relationLookup.column.isSearchStringFound({ value: relatedRow.value }, searchString) + } + + return value + } + + sort(mode, nextSorts) { + const factor = mode === 'DESC' ? -1 : 1 + return (rowA, rowB) => { + let valueA = rowA.data.find(item => item.columnId === this.id)?.value || '' + let valueB = rowB.data.find(item => item.columnId === this.id)?.value || '' + + // Convert to strings for comparison + valueA = String(valueA).toLowerCase() + valueB = String(valueB).toLowerCase() + + return valueA.localeCompare(valueB, undefined) * factor || super.getNextSortsResult(nextSorts, rowA, rowB) + } + } + +} diff --git a/src/shared/components/ncTable/mixins/exportTableMixin.js b/src/shared/components/ncTable/mixins/exportTableMixin.js index e82d56b04f..de7728b67e 100644 --- a/src/shared/components/ncTable/mixins/exportTableMixin.js +++ b/src/shared/components/ncTable/mixins/exportTableMixin.js @@ -5,9 +5,11 @@ import moment from '@nextcloud/moment' import Papa from 'papaparse' import generalHelper from '../../../mixins/generalHelper.js' +import { ColumnTypes } from './columnHandler.js' import { TYPE_META_ID, TYPE_META_CREATED_BY, TYPE_META_CREATED_AT, TYPE_META_UPDATED_BY, TYPE_META_UPDATED_AT, } from '../../../../shared/constants.ts' +import { useDataStore } from '../../../../store/data.js' export default { @@ -15,19 +17,59 @@ export default { methods: { + getRelationLookupValue(column, row, dataStore) { + const relationColumnId = column.customSettings?.relationColumnId + if (!relationColumnId) { + return '' + } + + const relationCell = row.data?.find(d => d.columnId === relationColumnId) + if (!relationCell) { + return '' + } + + try { + const relationLookup = dataStore.getRelations(column.id) + if (!relationLookup?.values || !relationCell.value) { + return '' + } + + const relatedRow = relationLookup.values[relationCell.value] + if (!relatedRow || relatedRow.value === null || relatedRow.value === undefined) { + return '' + } + + try { + const valueString = relationLookup.column.getValueString({ value: relatedRow.value }) + return valueString || '' + } catch (error) { + console.warn('Failed to get value string for relation lookup:', error) + return '' + } + } catch (error) { + console.warn('Failed to get relation lookup value for export:', error) + return '' + } + }, + downloadCsv(rows, columns, fileName) { if (!rows || rows.length === 0) { console.debug('downloadCSV has empty parameter, expected array ob row objects', rows) } + const dataStore = useDataStore() const data = [] rows.forEach(row => { const rowData = { ID: row.id } columns.forEach(column => { // if a normal column if (column.id >= 0) { - const set = row.data ? row.data.find(d => d.columnId === column.id) || '' : null - rowData[column.title] = set ? column.getValueString(set) : '' + if (column.type === ColumnTypes.RelationLookup) { + rowData[column.title] = this.getRelationLookupValue(column, row, dataStore) + } else { + const set = row.data ? row.data.find(d => d.columnId === column.id) || '' : null + rowData[column.title] = set ? column.getValueString(set) : '' + } } else { // if is a meta data column (id < 0) switch (column.id) { diff --git a/src/shared/components/ncTable/partials/TableCell.vue b/src/shared/components/ncTable/partials/TableCell.vue new file mode 100644 index 0000000000..8b9fdf1ae4 --- /dev/null +++ b/src/shared/components/ncTable/partials/TableCell.vue @@ -0,0 +1,83 @@ + + + + diff --git a/src/shared/components/ncTable/partials/TableCellRelation.vue b/src/shared/components/ncTable/partials/TableCellRelation.vue index 9d2f6b9c68..2f927f2329 100644 --- a/src/shared/components/ncTable/partials/TableCellRelation.vue +++ b/src/shared/components/ncTable/partials/TableCellRelation.vue @@ -77,7 +77,7 @@ export default { ...mapState(useTablesStore, ['activeTable', 'activeView']), allRelations() { const dataStore = useDataStore() - return dataStore.getRelations(this.column.id) || {} + return dataStore.getRelations(this.column.id).values || {} }, currentOption() { if (!this.value) { @@ -86,12 +86,13 @@ export default { return this.allRelations[this.value] }, relationLabel() { - return this.currentOption ? this.currentOption.label : null + return this.currentOption ? this.currentOption.value : null }, relationOptions() { const activeElement = this.activeView || this.activeTable - if (activeElement) { + if (activeElement && !this.loading) { return Object.values(this.allRelations || {}) + .map(relation => ({ id: relation.id, label: relation.value })) } return [] }, diff --git a/src/shared/components/ncTable/partials/TableCellRelationLookup.vue b/src/shared/components/ncTable/partials/TableCellRelationLookup.vue new file mode 100644 index 0000000000..5a73116c11 --- /dev/null +++ b/src/shared/components/ncTable/partials/TableCellRelationLookup.vue @@ -0,0 +1,82 @@ + + + + diff --git a/src/shared/components/ncTable/partials/TableRow.vue b/src/shared/components/ncTable/partials/TableRow.vue index 1d8cf396a5..06e44c8c90 100644 --- a/src/shared/components/ncTable/partials/TableRow.vue +++ b/src/shared/components/ncTable/partials/TableRow.vue @@ -20,8 +20,7 @@ 'frozen-column--last': index === pinnedColumnIndex, }" @click="handleCellClick(col)"> - + + + diff --git a/src/shared/components/ncTable/partials/rowTypePartials/RelationForm.vue b/src/shared/components/ncTable/partials/rowTypePartials/RelationForm.vue index e70648246d..d2398a90e9 100644 --- a/src/shared/components/ncTable/partials/rowTypePartials/RelationForm.vue +++ b/src/shared/components/ncTable/partials/rowTypePartials/RelationForm.vue @@ -60,9 +60,10 @@ export default { relationOptions() { const dataStore = useDataStore() const activeElement = this.activeView || this.activeTable - if (activeElement) { - const columnRelations = dataStore.getRelations(this.column.id) - return Object.values(columnRelations) + if (activeElement && !this.loading) { + const columnRelations = dataStore.getRelations(this.column.id).values + return Object.values(columnRelations || {}) + .map(relation => ({ id: relation.id, label: relation.value })) } return [] }, diff --git a/src/shared/components/ncTable/partials/rowTypePartials/RelationLookupForm.vue b/src/shared/components/ncTable/partials/rowTypePartials/RelationLookupForm.vue new file mode 100644 index 0000000000..2fc84f6586 --- /dev/null +++ b/src/shared/components/ncTable/partials/rowTypePartials/RelationLookupForm.vue @@ -0,0 +1,31 @@ + + + + diff --git a/src/store/data.js b/src/store/data.js index 75fc23a92f..360f5239ca 100644 --- a/src/store/data.js +++ b/src/store/data.js @@ -227,6 +227,7 @@ export const useDataStore = defineStore('data', { } Object.entries(res.data).forEach(([columnId, relations]) => { + relations.column = relations.column ? parseCol(relations.column) : null this.relations[columnId] = relations }) this.relationsLoading[stateId] = false diff --git a/src/types/openapi/openapi.ts b/src/types/openapi/openapi.ts index 04c0714642..4dc5fe486b 100644 --- a/src/types/openapi/openapi.ts +++ b/src/types/openapi/openapi.ts @@ -332,6 +332,46 @@ export type paths = { readonly patch?: never; readonly trace?: never; }; + readonly "/index.php/apps/tables/api/1/tables/{tableId}/relations": { + readonly parameters: { + readonly query?: never; + readonly header?: never; + readonly path?: never; + readonly cookie?: never; + }; + /** + * Get all relation data for a table + * @description This endpoint allows CORS requests + */ + readonly get: operations["api1-index-table-relations"]; + readonly put?: never; + readonly post?: never; + readonly delete?: never; + readonly options?: never; + readonly head?: never; + readonly patch?: never; + readonly trace?: never; + }; + readonly "/index.php/apps/tables/api/1/views/{viewId}/relations": { + readonly parameters: { + readonly query?: never; + readonly header?: never; + readonly path?: never; + readonly cookie?: never; + }; + /** + * Get all relation data for a view + * @description This endpoint allows CORS requests + */ + readonly get: operations["api1-index-view-relations"]; + readonly put?: never; + readonly post?: never; + readonly delete?: never; + readonly options?: never; + readonly head?: never; + readonly patch?: never; + readonly trace?: never; + }; readonly "/index.php/apps/tables/api/1/tables/{tableId}/rows/simple": { readonly parameters: { readonly query?: never; @@ -1160,6 +1200,14 @@ export type components = { }; }; }; + readonly RelationData: readonly { + readonly column: components["schemas"]["Column"] | null; + readonly values: readonly { + /** Format: int64 */ + readonly id: number; + readonly value: Record; + }[]; + }[]; readonly Row: { /** Format: int64 */ readonly id: number; @@ -2823,7 +2871,7 @@ export interface operations { * @description Column main type * @enum {string} */ - readonly type: "text" | "number" | "datetime" | "select" | "usergroup" | "relation"; + readonly type: "text" | "number" | "datetime" | "select" | "usergroup" | "relation" | "relation_lookup"; /** @description Column sub type */ readonly subtype?: string | null; /** @description Is the column mandatory */ @@ -3085,7 +3133,7 @@ export interface operations { * @description Column main type * @enum {string} */ - readonly type: "text" | "number" | "datetime" | "select" | "usergroup" | "relation"; + readonly type: "text" | "number" | "datetime" | "select" | "usergroup" | "relation" | "relation_lookup"; /** @description Column sub type */ readonly subtype?: string | null; /** @description Is the column mandatory */ @@ -3519,6 +3567,152 @@ export interface operations { }; }; }; + readonly "api1-index-table-relations": { + readonly parameters: { + readonly query?: never; + readonly header?: never; + readonly path: { + /** @description Table ID */ + readonly tableId: number; + }; + readonly cookie?: never; + }; + readonly requestBody?: never; + readonly responses: { + /** @description Relation data returned */ + readonly 200: { + headers: { + readonly [name: string]: unknown; + }; + content: { + readonly "application/json": components["schemas"]["RelationData"] | readonly { + readonly column: components["schemas"]["Column"] | null; + readonly values: readonly { + /** Format: int64 */ + readonly id: number; + readonly value: Record; + }[]; + }[]; + }; + }; + /** @description Current user is not logged in */ + readonly 401: { + headers: { + readonly [name: string]: unknown; + }; + content: { + readonly "application/json": { + readonly message: string; + }; + }; + }; + /** @description No permissions */ + readonly 403: { + headers: { + readonly [name: string]: unknown; + }; + content: { + readonly "application/json": { + readonly message: string; + }; + }; + }; + /** @description Not found */ + readonly 404: { + headers: { + readonly [name: string]: unknown; + }; + content: { + readonly "application/json": { + readonly message: string; + }; + }; + }; + readonly 500: { + headers: { + readonly [name: string]: unknown; + }; + content: { + readonly "application/json": { + readonly message: string; + }; + }; + }; + }; + }; + readonly "api1-index-view-relations": { + readonly parameters: { + readonly query?: never; + readonly header?: never; + readonly path: { + /** @description View ID */ + readonly viewId: number; + }; + readonly cookie?: never; + }; + readonly requestBody?: never; + readonly responses: { + /** @description Relation data returned */ + readonly 200: { + headers: { + readonly [name: string]: unknown; + }; + content: { + readonly "application/json": components["schemas"]["RelationData"] | readonly { + readonly column: components["schemas"]["Column"] | null; + readonly values: readonly { + /** Format: int64 */ + readonly id: number; + readonly value: Record; + }[]; + }[]; + }; + }; + /** @description Current user is not logged in */ + readonly 401: { + headers: { + readonly [name: string]: unknown; + }; + content: { + readonly "application/json": { + readonly message: string; + }; + }; + }; + /** @description No permissions */ + readonly 403: { + headers: { + readonly [name: string]: unknown; + }; + content: { + readonly "application/json": { + readonly message: string; + }; + }; + }; + /** @description Not found */ + readonly 404: { + headers: { + readonly [name: string]: unknown; + }; + content: { + readonly "application/json": { + readonly message: string; + }; + }; + }; + readonly 500: { + headers: { + readonly [name: string]: unknown; + }; + content: { + readonly "application/json": { + readonly message: string; + }; + }; + }; + }; + }; readonly "api1-index-table-rows-simple": { readonly parameters: { readonly query?: { diff --git a/tests/integration/features/APIv1.feature b/tests/integration/features/APIv1.feature index 06fbfe2b77..a2e8f16d45 100644 --- a/tests/integration/features/APIv1.feature +++ b/tests/integration/features/APIv1.feature @@ -700,6 +700,65 @@ Feature: APIv1 When user "participant2" fetches relations for table "secret-orders" Then the reported status is "404" + @api1 @relation @relation-lookup + Scenario: Create a relation lookup column and fetch relations for a table + Given table "Products" with emoji "๐Ÿ“ฆ" exists for user "participant1" as "products" + Then column "name" exists with following properties + | type | text | + | subtype | line | + | mandatory | 0 | + Then column "category" exists with following properties + | type | text | + | subtype | line | + | mandatory | 0 | + Then row exists with following values + | name | Apple | + | category | Fruit | + Then row exists with following values + | name | Banana | + | category | Berry | + Given table "Orders" with emoji "๐Ÿ›’" exists for user "participant1" as "orders" + Then relation column "product" exists on table "orders" pointing to table "products" using label column "name" + Then relation lookup column "product category" exists on table "orders" for relation column "product" using target column "category" + When user "participant1" fetches relations for table "orders" + Then the reported status is "200" + Then the relations response contains 2 entries for column "product" + Then the relations response for column "product" has an entry with label "Apple" + Then the relations response for column "product" has an entry with label "Banana" + Then the relations response contains 2 entries for column "product category" + Then the relations response for column "product category" has an entry with value "Fruit" + Then the relations response for column "product category" has an entry with value "Berry" + + @api1 @relation @relation-lookup + Scenario: Create a relation lookup column for a relation pointing to a view + Given table "Fruits" with emoji "๐ŸŽ" exists for user "participant1" as "fruits" + Then column "name" exists with following properties + | type | text | + | subtype | line | + | mandatory | 0 | + Then column "color" exists with following properties + | type | text | + | subtype | line | + | mandatory | 0 | + Then row exists with following values + | name | Apple | + | color | Red | + Then row exists with following values + | name | Banana | + | color | Yellow | + When user "participant1" create view "Fruit View" with emoji "๐Ÿ‘" for "fruits" as "fruit-view" + Given table "Baskets" with emoji "๐Ÿงบ" exists for user "participant1" as "baskets" + Then relation column "fruit" exists on table "baskets" pointing to view "fruit-view" using label column "name" + Then relation lookup column "fruit color" exists on table "baskets" for relation column "fruit" using target column "color" + When user "participant1" fetches relations for table "baskets" + Then the reported status is "200" + Then the relations response contains 2 entries for column "fruit" + Then the relations response for column "fruit" has an entry with label "Apple" + Then the relations response for column "fruit" has an entry with label "Banana" + Then the relations response contains 2 entries for column "fruit color" + Then the relations response for column "fruit color" has an entry with value "Red" + Then the relations response for column "fruit color" has an entry with value "Yellow" + @api1 @columns @rows Scenario: Column technicalName is returned and dataByAlias maps alias to row values Given table "Alias test" with emoji "๐Ÿ”–" exists for user "participant1" as "base1" diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php index 2def946228..b955acf19b 100644 --- a/tests/integration/features/bootstrap/FeatureContext.php +++ b/tests/integration/features/bootstrap/FeatureContext.php @@ -2672,6 +2672,74 @@ public function createRelationColumnToView(string $title, string $tableName, str $this->collectionManager->register($newColumn, 'column', $newColumn['id'], $title); } + /** + * @Then relation lookup column :title exists on table :tableName for relation column :relationColumnName using target column :targetColumnName + */ + public function createRelationLookupColumn(string $title, string $tableName, string $relationColumnName, string $targetColumnName): void { + $relationColumnId = (int)$this->collectionManager->getByAlias('column', $relationColumnName)['id']; + $targetColumnId = (int)$this->collectionManager->getByAlias('column', $targetColumnName)['id']; + + $props = [ + 'title' => $title, + 'type' => 'relation_lookup', + 'mandatory' => 0, + 'customSettings' => [ + 'relationColumnId' => $relationColumnId, + 'targetColumnId' => $targetColumnId, + ], + ]; + + $this->sendRequest( + 'POST', + '/apps/tables/api/1/tables/' . $this->tableIds[$tableName] . '/columns', + $props + ); + + $newColumn = $this->getDataFromResponse($this->response); + $this->columnId = $newColumn['id']; + + Assert::assertEquals(200, $this->response->getStatusCode()); + Assert::assertEquals($title, $newColumn['title']); + Assert::assertEquals('relation_lookup', $newColumn['type']); + + $this->collectionManager->register($newColumn, 'column', $newColumn['id'], $title); + } + + /** + * @Then relation lookup column :title exists on table :tableName for relation column :relationColumnName using target column :targetColumnName added to view :viewName + */ + public function createRelationLookupColumnAddedToView(string $title, string $tableName, string $relationColumnName, string $targetColumnName, string $viewName): void { + $relationColumnId = (int)$this->collectionManager->getByAlias('column', $relationColumnName)['id']; + $targetColumnId = (int)$this->collectionManager->getByAlias('column', $targetColumnName)['id']; + $viewId = $this->viewIds[$viewName]; + + $props = [ + 'title' => $title, + 'type' => 'relation_lookup', + 'mandatory' => 0, + 'selectedViewIds' => [$viewId], + 'customSettings' => [ + 'relationColumnId' => $relationColumnId, + 'targetColumnId' => $targetColumnId, + ], + ]; + + $this->sendRequest( + 'POST', + '/apps/tables/api/1/tables/' . $this->tableIds[$tableName] . '/columns', + $props + ); + + $newColumn = $this->getDataFromResponse($this->response); + $this->columnId = $newColumn['id']; + + Assert::assertEquals(200, $this->response->getStatusCode()); + Assert::assertEquals($title, $newColumn['title']); + Assert::assertEquals('relation_lookup', $newColumn['type']); + + $this->collectionManager->register($newColumn, 'column', $newColumn['id'], $title); + } + /** * @When user :user fetches relations for table :tableName */ @@ -2707,7 +2775,7 @@ public function theRelationsResponseContainsEntriesForColumn(int $count, string Assert::assertNotNull($this->relationsData, 'Relations response was not fetched or returned non-200'); $columnId = (int)$this->collectionManager->getByAlias('column', $columnName)['id']; Assert::assertArrayHasKey($columnId, $this->relationsData, 'Column "' . $columnName . '" (id=' . $columnId . ') not found in relations response'); - Assert::assertCount($count, $this->relationsData[$columnId], 'Expected ' . $count . ' entries for column "' . $columnName . '"'); + Assert::assertCount($count, $this->relationsData[$columnId]['values'], 'Expected ' . $count . ' entries for column "' . $columnName . '"'); } /** @@ -2717,10 +2785,21 @@ public function theRelationsResponseForColumnHasEntryWithLabel(string $columnNam Assert::assertNotNull($this->relationsData, 'Relations response was not fetched or returned non-200'); $columnId = (int)$this->collectionManager->getByAlias('column', $columnName)['id']; Assert::assertArrayHasKey($columnId, $this->relationsData, 'Column "' . $columnName . '" not found in relations response'); - $labels = array_column($this->relationsData[$columnId], 'label'); + $labels = array_column($this->relationsData[$columnId]['values'], 'value'); Assert::assertContains($label, $labels, 'Label "' . $label . '" not found in relations for column "' . $columnName . '"'); } + /** + * @Then the relations response for column :columnName has an entry with value :value + */ + public function theRelationsResponseForColumnHasEntryWithValue(string $columnName, string $value): void { + Assert::assertNotNull($this->relationsData, 'Relations response was not fetched or returned non-200'); + $columnId = (int)$this->collectionManager->getByAlias('column', $columnName)['id']; + Assert::assertArrayHasKey($columnId, $this->relationsData, 'Column "' . $columnName . '" not found in relations response'); + $values = array_column($this->relationsData[$columnId]['values'], 'value'); + Assert::assertContains($value, $values, 'Value "' . $value . '" not found in relations for column "' . $columnName . '"'); + } + /** * @Then the relations response is empty */