feat: add relation column type

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>

Author: Koc

lib/Controller/Api1Controller.php

@@ -1379,7 +1379,7 @@ public function createRowInTable(int $tableId, $data): DataResponse {
 	#[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
 	public function getRow(int $rowId): DataResponse {
 		try {
-			return new DataResponse($this->rowService->find($rowId, $this->userId)->jsonSerialize());
+			return new DataResponse($this->rowService->find($rowId)->jsonSerialize());
 		} catch (PermissionError $e) {
 			$this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]);
 			$message = ['message' => $e->getMessage()];

lib/Controller/RowController.php

@@ -47,7 +47,7 @@ public function indexView(int $viewId): DataResponse {
 	#[NoAdminRequired]
 	public function show(int $id): DataResponse {
 		return $this->handleError(function () use ($id) {
-			return $this->service->find($id, $this->userId);
+			return $this->service->find($id);
 		});
 	}
 

lib/Db/RowCellRelation.php

@@ -6,14 +6,13 @@
 
 class RowCellRelation extends RowCellSuper {
 	protected ?int $value = null;
-	protected ?int $valueType = null;
 
 	public function __construct() {
 		parent::__construct();
 		$this->addType('value', 'integer');
 	}
 
 	public function jsonSerialize(): array {
-		return parent::jsonSerializePreparation($this->value, $this->valueType);
+		return parent::jsonSerializePreparation($this->value);
 	}
 }

lib/Db/RowCellRelationMapper.php

@@ -28,10 +28,8 @@ public function getDbParamType() {
 		return IQueryBuilder::PARAM_INT;
 	}
 
-	/**
-	 * @inheritDoc
-	 */
-	public function format(Column $column, ?string $value) {
+	public function formatRowData(Column $column, array $row) {
+		$value = $row['value'];
 		return (int)$value;
 	}
 }

lib/Migration/Version002001Date20260109000000.php

@@ -15,11 +15,11 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
 
-		$changes = $this->createRelationTable($schema, 'relation', Types::INTEGER);
+		$changes = $this->createRowValueTable($schema, 'relation', Types::INTEGER);
 		return $changes;
 	}
 
-	private function createRelationTable(ISchemaWrapper $schema, string $name, string $type): ?ISchemaWrapper {
+	private function createRowValueTable(ISchemaWrapper $schema, string $name, string $type): ?ISchemaWrapper {
 		if (!$schema->hasTable('tables_row_cells_' . $name)) {
 			$table = $schema->createTable('tables_row_cells_' . $name);
 			$table->addColumn('id', Types::INTEGER, [

src/modules/modals/CreateColumn.vue

@@ -307,9 +307,9 @@ export default {
 			} else if (this.column.type === 'relation' && !this.column.customSettings?.relationType) {
 				showInfo(t('tables', 'Please select a relation type.'))
 			} else if (this.column.type === 'relation' && !this.column.customSettings?.targetId) {
-				showInfo(t('tables', 'Please select a entity.'))
+				showInfo(t('tables', 'Please select a target.'))
 			} else if (this.column.type === 'relation' && !this.column.customSettings?.labelColumn) {
-				showInfo(t('tables', 'Please select a display field.'))
+				showInfo(t('tables', 'Please select a value selection label.'))
 			} else {
 				this.$emit('save', this.prepareSubmitData())
 				if (this.isCustomSave) {

src/shared/components/ncTable/partials/columnTypePartials/forms/RelationForm.vue

@@ -11,6 +11,7 @@
 					:aria-label-combobox="t('tables', 'Select relation type')"
 					:disabled="column.id && column.id > 0"
 					required
+					:clearable="false"
 					@input="onRelationTypeChange">
 					<template #option="option">
 						{{ option.label }}
@@ -21,7 +22,7 @@
 
 		<div class="row space-T">
 			<div class="fix-col-4 title">
-				{{ t('tables', 'Entity') }}
+				{{ t('tables', 'Target') }}
 			</div>
 			<div class="fix-col-4">
 				<NcSelect v-model="customSettings.targetId"
@@ -30,6 +31,7 @@
 					:aria-label-combobox="t('tables', 'Select target')"
 					:disabled="column.id && column.id > 0"
 					required
+					:clearable="false"
 					@input="onTargetChange">
 					<template #option="option">
 						{{ option.emoji }} {{ option.label }}
@@ -40,15 +42,16 @@
 
 		<div class="row space-T">
 			<div class="fix-col-4 title">
-				{{ t('tables', 'Label column') }}
+				{{ t('tables', 'Value selection label') }}
 			</div>
 			<div class="fix-col-4">
 				<NcSelect v-model="customSettings.labelColumn"
 					:options="availableLabelColumns"
 					:reduce="(option) => option.id"
 					:loading="loadingColumns"
-					:aria-label-combobox="t('tables', 'Select label column')"
+					:aria-label-combobox="t('tables', 'Select value selection label')"
 					required
+					:clearable="false"
 					@input="onLabelColumnChange">
 					<template #option="option">
 						{{ option.label }}