From dceee48a341172ad3d422dbe3ad4919760c42214 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Tue, 28 Jan 2025 22:05:42 +0100
Subject: [PATCH 01/11] feat(Api): add v2 OCS Api to get table/view rows

- also changes Api Route definition to attribute

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 REUSE.toml                                    |   6 +
 appinfo/routes.php                            |   2 -
 lib/Activity/ChangeSet.php                    |   4 +-
 lib/Analytics/AnalyticsDatasource.php         |   2 +-
 lib/Controller/RowOCSController.php           | 192 ++++++++++-
 lib/Db/LegacyRowMapper.php                    |   2 +-
 lib/Db/Row2Mapper.php                         |   2 +-
 lib/Db/RowCellMapperSuper.php                 |   5 +-
 lib/Db/RowCellSuper.php                       |   2 +-
 lib/Db/RowQuery.php                           |  77 +++++
 lib/Model/FilterInput.php                     |  15 +
 lib/Model/RowDataInput.php                    |   5 +-
 lib/Service/ImportService.php                 |   5 +-
 lib/Service/RowService.php                    |  77 +++++
 .../ValueObject/ColumnOrderInformation.php    |   2 +-
 tests/integration/features/RowOCS.feature     | 298 ++++++++++++++++++
 .../features/bootstrap/FeatureContext.php     | 107 +++++++
 vendor-bin/rector/composer.json               |   1 +
 vendor-bin/rector/composer.lock               |  18 ++
 19 files changed, 807 insertions(+), 15 deletions(-)
 create mode 100644 lib/Db/RowQuery.php
 create mode 100644 lib/Model/FilterInput.php
 create mode 100644 tests/integration/features/RowOCS.feature
 create mode 100644 vendor-bin/rector/composer.json
 create mode 100644 vendor-bin/rector/composer.lock

diff --git a/REUSE.toml b/REUSE.toml
index 519b115aaf..1b25e862b1 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -29,6 +29,12 @@ precedence = "aggregate"
 SPDX-FileCopyrightText = "2025 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
 
+[[annotations]]
+path = ["vendor-bin/rector/composer.json", "vendor-bin/rector/composer.lock"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2025 Nextcloud GmbH and Nextcloud contributors"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
 [[annotations]]
 path = ["img/app-dark.svg", "img/app.svg", "img/view.svg", "img/view-dark.svg", "img/material/*.svg"]
 precedence = "aggregate"
diff --git a/appinfo/routes.php b/appinfo/routes.php
index b92ee2f831..9e19e1d604 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -156,8 +156,6 @@
 		['name' => 'Context#transfer', 'url' => '/api/2/contexts/{contextId}/transfer', 'verb' => 'PUT'],
 		['name' => 'Context#updateContentOrder', 'url' => '/api/2/contexts/{contextId}/pages/{pageId}', 'verb' => 'PUT'],
 
-		['name' => 'RowOCS#createRow',	'url' => '/api/2/{nodeCollection}/{nodeId}/rows', 'verb' => 'POST', 'requirements' => ['nodeCollection' => '(tables|views)', 'nodeId' => '(\d+)']],
-
 		['name' => 'Config#getTableConfig', 'url' => '/api/2/config/table/{id}', 'verb' => 'GET'],
 		['name' => 'Config#getViewConfig', 'url' => '/api/2/config/view/{id}', 'verb' => 'GET'],
 		['name' => 'Config#setValue', 'url' => '/api/2/config/{key}', 'verb' => 'POST'],
diff --git a/lib/Activity/ChangeSet.php b/lib/Activity/ChangeSet.php
index 4ec67cde9d..ea850a537a 100644
--- a/lib/Activity/ChangeSet.php
+++ b/lib/Activity/ChangeSet.php
@@ -24,11 +24,11 @@ public function __construct(
 		}
 	}
 
-	public function setBefore($before) {
+	public function setBefore(Entity $before) {
 		$this->before = clone $before;
 	}
 
-	public function setAfter($after) {
+	public function setAfter(Entity $after) {
 		$this->after = clone $after;
 	}
 
diff --git a/lib/Analytics/AnalyticsDatasource.php b/lib/Analytics/AnalyticsDatasource.php
index 9963c9f8d6..0d0ee5e29d 100644
--- a/lib/Analytics/AnalyticsDatasource.php
+++ b/lib/Analytics/AnalyticsDatasource.php
@@ -338,7 +338,7 @@ private function formatBooleanValue(mixed $value): string {
 		return '';
 	}
 
-	private function formatTextValue(Column $column, mixed $value): string {
+	private function formatTextValue(Column $column, string $value): string {
 		if ($value === null || $value === '') {
 			return '';
 		}
diff --git a/lib/Controller/RowOCSController.php b/lib/Controller/RowOCSController.php
index 60ef07efaf..ad72d120b6 100644
--- a/lib/Controller/RowOCSController.php
+++ b/lib/Controller/RowOCSController.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -7,7 +9,9 @@
 
 namespace OCA\Tables\Controller;
 
+use InvalidArgumentException;
 use OCA\Tables\AppInfo\Application;
+use OCA\Tables\Db\RowQuery;
 use OCA\Tables\Errors\BadRequestError;
 use OCA\Tables\Errors\InternalError;
 use OCA\Tables\Errors\NotFoundError;
@@ -17,9 +21,13 @@
 use OCA\Tables\Model\RowDataInput;
 use OCA\Tables\ResponseDefinitions;
 use OCA\Tables\Service\RowService;
+use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\ApiRoute;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
+use OCP\DB\Exception;
 use OCP\IL10N;
 use OCP\IRequest;
 use Psr\Log\LoggerInterface;
@@ -42,10 +50,14 @@ public function __construct(
 	/**
 	 * [api v2] Create a new row in a table or a view
 	 *
-	 * @param 'tables'|'views' $nodeCollection Indicates whether to create a row on a table or view
+	 * @param 'tables'|'views' $nodeCollection Indicates whether to create a
+	 *                                         row on a table or view
 	 * @param int $nodeId The identifier of the targeted table or view
-	 * @param string|array<string, mixed> $data An array containing the column identifiers and their values
-	 * @return DataResponse<Http::STATUS_OK, TablesRow, array{}>|DataResponse<Http::STATUS_FORBIDDEN|Http::STATUS_BAD_REQUEST|Http::STATUS_NOT_FOUND|Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
+	 * @param string|array<string, mixed> $data An array containing the column
+	 *                                          identifiers and their values
+	 * @return DataResponse<Http::STATUS_OK, TablesRow,
+	 *     array{}>|DataResponse<Http::STATUS_FORBIDDEN|Http::STATUS_BAD_REQUEST|Http::STATUS_NOT_FOUND|Http::STATUS_INTERNAL_SERVER_ERROR,
+	 *     array{message: string}, array{}>
 	 *
 	 * 200: Row returned
 	 * 400: Invalid request parameters
@@ -55,6 +67,7 @@ public function __construct(
 	 */
 	#[NoAdminRequired]
 	#[RequirePermission(permission: Application::PERMISSION_CREATE, typeParam: 'nodeCollection')]
+	#[ApiRoute(verb: 'POST', url: '/api/2/{nodeCollection}/{nodeId}/rows', requirements: ['nodeCollection' => '(tables|views)', 'nodeId' => '(\d+)'])]
 	public function createRow(string $nodeCollection, int $nodeId, mixed $data): DataResponse {
 		if (is_string($data)) {
 			$data = json_decode($data, true);
@@ -88,4 +101,177 @@ public function createRow(string $nodeCollection, int $nodeId, mixed $data): Dat
 			return $this->handleError($e);
 		}
 	}
+
+	/**
+	 * [api v2] Get a number of rows from a table or view
+	 *
+	 * Both `filter` and `sort` are passed as JSON encoded strings.
+	 *
+	 * The filter is a list of filter groups, each group being a list of single
+	 * filter definitions. Definitions within a group are AND-connected, while
+	 * the groups themselves are OR-connected.
+	 *
+	 * When reading from a view, the provided filter is added to each of the
+	 * view's existing filter groups, so the view's base rules are always
+	 * enforced.
+	 *
+	 * A provided sort order overrides the view's default sort order. The view's
+	 * default sort order is only used when no sort order is provided.
+	 *
+	 * @param 'tables'|'views' $nodeCollection Indicates whether to read from a table or a view
+	 * @psalm-param int<0,max> $nodeId The ID of the table or view
+	 * @psalm-param ?int<1,500> $limit Number of rows to return between 1 and 500, fetches all by default (optional)
+	 * @psalm-param ?int<0,max> $offset Offset of the rows to be returned (optional)
+	 * @param ?string $filter JSON encoded list of filter groups. Definitions within a group are AND-connected, groups are OR-connected, e.g. `[[{"columnId":1,"operator":"contains","value":"foo"}]]` (optional)
+	 * @param ?string $sort JSON encoded list of sort rules, e.g. `[{"columnId":1,"mode":"ASC"}]` (optional)
+	 * @return DataResponse<Http::STATUS_OK, list<TablesRow>, array{}>|DataResponse<Http::STATUS_FORBIDDEN|Http::STATUS_BAD_REQUEST|Http::STATUS_NOT_FOUND|Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
+	 *
+	 * 200: Rows returned
+	 * 400: Invalid request parameters
+	 * 403: No permissions
+	 * 404: Not found
+	 * 500: Internal error
+	 */
+	#[NoAdminRequired]
+	#[RequirePermission(permission: Application::PERMISSION_READ, typeParam: 'nodeCollection')]
+	#[ApiRoute(
+		verb: 'GET',
+		url: '/api/2/{nodeCollection}/{nodeId}/rows',
+		requirements: ['nodeCollection' => '(tables|views)', 'nodeId' => '(\\d+)']
+	)]
+	public function getRows(string $nodeCollection, int $nodeId, ?int $limit = null, ?int $offset = null, ?string $filter = null, ?string $sort = null): DataResponse {
+		try {
+			if (($limit !== null && ($limit <= 0 || $limit > 500))
+				|| ($offset !== null && $offset < 0)
+			) {
+				throw new InvalidArgumentException('Offset or limit parameter is out of bounds');
+			}
+
+			$queryData = new RowQuery(
+				nodeType: $nodeCollection === 'tables' ? Application::NODE_TYPE_TABLE : Application::NODE_TYPE_VIEW,
+				nodeId: $nodeId,
+			);
+			$queryData->setLimit($limit)
+				->setOffset($offset)
+				// the provided filter is set here; any filter defined on a view
+				// is merged in on the service level
+				->setFilter($this->parseFilter($filter))
+				->setSort($this->parseSort($sort))
+				->setUserId($this->userId);
+
+			$rows = $this->rowService->findAllByQuery($queryData);
+			return new DataResponse($this->rowService->formatRows($rows));
+		} catch (DoesNotExistException $e) {
+			return $this->handleNotFoundError(new NotFoundError($e->getMessage(), $e->getCode(), $e));
+		} catch (MultipleObjectsReturnedException|InvalidArgumentException $e) {
+			return $this->handleBadRequestError(new BadRequestError($e->getMessage(), $e->getCode(), $e));
+		} catch (InternalError|Exception $e) {
+			return $this->handleError($e);
+		}
+	}
+
+	/**
+	 * Decode and validate the JSON encoded filter parameter.
+	 *
+	 * @return list<list<array{columnId: int, operator: string, value: string|int|float}>>|null
+	 * @throws InvalidArgumentException
+	 */
+	protected function parseFilter(?string $filter): ?array {
+		if ($filter === null || $filter === '') {
+			return null;
+		}
+		$decoded = json_decode($filter, true);
+		if (!is_array($decoded)) {
+			throw new InvalidArgumentException('Invalid filter supplied');
+		}
+		foreach ($decoded as $filterGroup) {
+			if (!is_array($filterGroup)) {
+				throw new InvalidArgumentException('Invalid filter supplied');
+			}
+			foreach ($filterGroup as $singleFilter) {
+				$this->assertFilterValue($singleFilter);
+			}
+		}
+		return $decoded;
+	}
+
+	/**
+	 * Decode and validate the JSON encoded sort parameter.
+	 *
+	 * @return list<array{columnId: int, mode: 'ASC'|'DESC'}>|null
+	 * @throws InvalidArgumentException
+	 */
+	protected function parseSort(?string $sort): ?array {
+		if ($sort === null || $sort === '') {
+			return null;
+		}
+		$decoded = json_decode($sort, true);
+		if (!is_array($decoded)) {
+			throw new InvalidArgumentException('Invalid sort data supplied');
+		}
+		foreach ($decoded as $singleSortRule) {
+			$this->assertSortValue($singleSortRule);
+		}
+		return $decoded;
+	}
+
+	/**
+	 * @throws InvalidArgumentException
+	 */
+	protected function assertFilterValue(mixed $filter): void {
+		if (!is_array($filter)
+			|| !isset($filter['columnId'], $filter['operator'], $filter['value'])
+			|| count($filter) !== 3
+		) {
+			throw new InvalidArgumentException('Invalid filter supplied');
+		}
+		// values higher than PHP_INT_MAX will be capped to PHP_INT_MAX on cast,
+		// checking it roughly is sufficient.
+		// the lower value boundary is the lowest meta column id in \OCA\Tables\Db\Column
+		$maxDigits = strlen((string)PHP_INT_MAX);
+		if (!is_numeric($filter['columnId'])
+			|| (int)$filter['columnId'] < -5
+			|| !preg_match('/^-?\\d{0,' . $maxDigits . '}$/', (string)$filter['columnId'])
+		) {
+			throw new InvalidArgumentException(sprintf('Invalid column id supplied: %s', (string)$filter['columnId']));
+		}
+		if (!in_array($filter['operator'], [
+			'begins-with',
+			'ends-with',
+			'contains',
+			'is-equal',
+			'is-greater-than',
+			'is-greater-than-or-equal',
+			'is-lower-than',
+			'is-lower-than-or-equal',
+			'is-empty',
+		], true)) {
+			throw new InvalidArgumentException('Invalid filter operator supplied');
+		}
+	}
+
+	/**
+	 * @throws InvalidArgumentException
+	 */
+	protected function assertSortValue(mixed $sort): void {
+		if (!is_array($sort)
+			|| !isset($sort['columnId'], $sort['mode'])
+			|| count($sort) !== 2
+		) {
+			throw new InvalidArgumentException('Invalid sort data supplied');
+		}
+		// values higher than PHP_INT_MAX will be capped to PHP_INT_MAX on cast,
+		// checking it roughly is sufficient.
+		// the lower value boundary is the lowest meta column id in \OCA\Tables\Db\Column
+		$maxDigits = strlen((string)PHP_INT_MAX);
+		if (!is_numeric($sort['columnId'])
+			|| (int)$sort['columnId'] < -5
+			|| !preg_match('/^-?\\d{0,' . $maxDigits . '}$/', (string)$sort['columnId'])
+		) {
+			throw new InvalidArgumentException('Invalid column id supplied');
+		}
+		if ($sort['mode'] !== 'DESC' && $sort['mode'] !== 'ASC') {
+			throw new InvalidArgumentException('Invalid sort mode supplied');
+		}
+	}
 }
diff --git a/lib/Db/LegacyRowMapper.php b/lib/Db/LegacyRowMapper.php
index 95f04a2bb7..b39859ca07 100644
--- a/lib/Db/LegacyRowMapper.php
+++ b/lib/Db/LegacyRowMapper.php
@@ -82,7 +82,7 @@ public function find(int $id): LegacyRow {
 		return $this->findEntity($qb);
 	}
 
-	private function buildFilterByColumnType($qb, array $filter, string $filterId): ?IQueryFunction {
+	private function buildFilterByColumnType(IQueryBuilder $qb, array $filter, string $filterId): ?IQueryFunction {
 		try {
 			$columnQbClassName = 'OCA\Tables\Db\ColumnTypes\\';
 			$type = explode('-', $filter['columnType'])[0];
diff --git a/lib/Db/Row2Mapper.php b/lib/Db/Row2Mapper.php
index 7ec48500f9..b8dffd2ec8 100644
--- a/lib/Db/Row2Mapper.php
+++ b/lib/Db/Row2Mapper.php
@@ -161,7 +161,7 @@ private function getWantedRowIds(string $userId, int $tableId, ?array $filter =
 			throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': ' . $e->getMessage(), );
 		}
 
-		return array_map(fn (array $item) => $item['id'], $result->fetchAll());
+		return array_map(static fn (array $item) => $item['id'], $result->fetchAll());
 	}
 
 	/**
diff --git a/lib/Db/RowCellMapperSuper.php b/lib/Db/RowCellMapperSuper.php
index be377c5d87..460e2095e8 100644
--- a/lib/Db/RowCellMapperSuper.php
+++ b/lib/Db/RowCellMapperSuper.php
@@ -41,7 +41,10 @@ public function formatRowData(Column $column, array $row) {
 	 * Transform value from a filter rule to the actual query parameter used
 	 * for constructing the view filter query
 	 */
-	public function filterValueToQueryParam(Column $column, mixed $value): mixed {
+	/**
+	 * @param array|float|null|string $value
+	 */
+	public function filterValueToQueryParam(Column $column, array|string|float|null $value): mixed {
 		return $value;
 	}
 
diff --git a/lib/Db/RowCellSuper.php b/lib/Db/RowCellSuper.php
index 29c3e366bb..58fc632fa6 100644
--- a/lib/Db/RowCellSuper.php
+++ b/lib/Db/RowCellSuper.php
@@ -60,7 +60,7 @@ public function setColumnIdWrapper(int $columnId) {
 		$this->setColumnId($columnId);
 	}
 
-	public function setValueWrapper($value) {
+	public function setValueWrapper(array|float|null $value) {
 		$this->setValue($value);
 	}
 }
diff --git a/lib/Db/RowQuery.php b/lib/Db/RowQuery.php
new file mode 100644
index 0000000000..c307071b93
--- /dev/null
+++ b/lib/Db/RowQuery.php
@@ -0,0 +1,77 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Tables\Db;
+
+class RowQuery {
+	protected ?string $userId = null;
+	protected ?int $limit = null;
+	protected ?int $offset = null;
+	protected ?array $filter = null;
+	protected ?array $sort = null;
+
+	public function __construct(
+		protected int $nodeType,
+		protected int $nodeId,
+	) {
+	}
+
+	public function getNodeType(): int {
+		return $this->nodeType;
+	}
+
+	public function getNodeId(): int {
+		return $this->nodeId;
+	}
+
+	public function getUserId(): ?string {
+		return $this->userId;
+	}
+
+	public function setUserId(?string $userId): self {
+		$this->userId = $userId;
+		return $this;
+	}
+
+	public function getLimit(): ?int {
+		return $this->limit;
+	}
+
+	public function setLimit(?int $limit): self {
+		$this->limit = $limit;
+		return $this;
+	}
+
+	public function getOffset(): ?int {
+		return $this->offset;
+	}
+
+	public function setOffset(?int $offset): self {
+		$this->offset = $offset;
+		return $this;
+	}
+
+	public function getFilter(): ?array {
+		return $this->filter;
+	}
+
+	public function setFilter(?array $filter): self {
+		$this->filter = $filter;
+		return $this;
+	}
+
+	public function getSort(): ?array {
+		return $this->sort;
+	}
+
+	public function setSort(?array $sort): self {
+		$this->sort = $sort;
+		return $this;
+	}
+}
diff --git a/lib/Model/FilterInput.php b/lib/Model/FilterInput.php
new file mode 100644
index 0000000000..ec96cd3c57
--- /dev/null
+++ b/lib/Model/FilterInput.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace OCA\Tables\Model;
+
+use OCP\IRequest;
+
+// TODO: This is a protoype. declare and copyright is missing and proper logic
+
+class FilterInput {
+	public array $filter;
+	public function __construct(IRequest $request) {
+		$value = $request->getParam('filter', '[]');
+		$this->filter = json_decode($value, true) ?? [];
+	}
+}
diff --git a/lib/Model/RowDataInput.php b/lib/Model/RowDataInput.php
index dbef7fde0b..21f54cd2f9 100644
--- a/lib/Model/RowDataInput.php
+++ b/lib/Model/RowDataInput.php
@@ -24,7 +24,10 @@ class RowDataInput implements ArrayAccess, Iterator {
 	/** @psalm-var array<array{'columnId': int, 'value': mixed}> */
 	protected array $data = [];
 
-	public function add(int $columnId, mixed $value): self {
+	/**
+	 * @param array|float|int|null|string $value
+	 */
+	public function add(int $columnId, array|string|int|float|null $value): self {
 		$this->data[] = [self::DATA_KEY => $columnId, self::DATA_VAL => $value];
 		return $this;
 	}
diff --git a/lib/Service/ImportService.php b/lib/Service/ImportService.php
index 42122ff45d..d241b96194 100644
--- a/lib/Service/ImportService.php
+++ b/lib/Service/ImportService.php
@@ -698,7 +698,10 @@ private function upsertRow(Row $row, array $columnBusinesses): void {
 		}
 	}
 
-	private function valueToDateTimeImmutable(mixed $value): ?DateTimeImmutable {
+	/**
+	 * @param null|string $value
+	 */
+	private function valueToDateTimeImmutable(string|null $value): ?DateTimeImmutable {
 		if (
 			$value === false
 			|| $value === null
diff --git a/lib/Service/RowService.php b/lib/Service/RowService.php
index 252e428118..60007fb425 100644
--- a/lib/Service/RowService.php
+++ b/lib/Service/RowService.php
@@ -8,10 +8,12 @@
 namespace OCA\Tables\Service;
 
 use OCA\Tables\Activity\ActivityManager;
+use OCA\Tables\AppInfo\Application;
 use OCA\Tables\Db\Column;
 use OCA\Tables\Db\ColumnMapper;
 use OCA\Tables\Db\Row2;
 use OCA\Tables\Db\Row2Mapper;
+use OCA\Tables\Db\RowQuery;
 use OCA\Tables\Db\Table;
 use OCA\Tables\Db\TableMapper;
 use OCA\Tables\Db\View;
@@ -85,6 +87,81 @@ public function formatRowsForPublicShare(array $rows): array {
 		}, $rows);
 	}
 
+	/**
+	 * Fetch rows for a table or view, applying the given filter and sort rules.
+	 *
+	 * When reading from a view, the provided filter is added to each of the
+	 * view's filter groups so that the view's base rules are always enforced.
+	 * A provided sort order overrides the view's default sort order; the view
+	 * default is only used when no sort order is given.
+	 *
+	 * @return Row2[]
+	 * @throws DoesNotExistException
+	 * @throws MultipleObjectsReturnedException
+	 * @throws InternalError
+	 */
+	public function findAllByQuery(RowQuery $rowQuery): array {
+		$tableId = $rowQuery->getNodeId();
+		$userId = $rowQuery->getUserId() ?? '';
+		$filter = $rowQuery->getFilter();
+		$sort = $rowQuery->getSort();
+
+		if ($rowQuery->getNodeType() === Application::NODE_TYPE_VIEW) {
+			$view = $this->viewMapper->find($rowQuery->getNodeId());
+			$tableId = $view->getTableId();
+			$showColumnIds = $view->getColumnIds();
+
+			$filter = $this->mergeFilterWithViewFilter($filter, $view->getFilterArray());
+
+			if ($sort === null) {
+				$sort = $view->getSortArray();
+			}
+
+			$userId = $this->resolveFilterUserId($userId, $view);
+		} else {
+			$tableColumns = $this->columnMapper->findAllByTable($tableId);
+			$showColumnIds = array_map(static fn (Column $column) => $column->getId(), $tableColumns);
+		}
+
+		return $this->row2Mapper->findAll(
+			$showColumnIds,
+			$tableId,
+			$rowQuery->getLimit(),
+			$rowQuery->getOffset(),
+			$filter,
+			$sort,
+			$userId,
+		);
+	}
+
+	/**
+	 * Combine a user supplied filter with a view's base filter.
+	 *
+	 * A filter is a list of OR-connected groups, each group being a list of
+	 * AND-connected conditions. To enforce the view's rules while also applying
+	 * the user's filter, the user's conditions are appended to every base
+	 * group, resulting in (group AND userFilter) OR ... When the view has no
+	 * base filter, the user's filter is used as-is.
+	 *
+	 * @param list<list<array{columnId: int, operator: string, value: mixed}>>|null $filter
+	 * @param list<list<array{columnId: int, operator: string, value: mixed}>> $viewFilter
+	 * @return list<list<array{columnId: int, operator: string, value: mixed}>>
+	 */
+	private function mergeFilterWithViewFilter(?array $filter, array $viewFilter): array {
+		if ($filter === null || $filter === []) {
+			return $viewFilter;
+		}
+		if ($viewFilter === []) {
+			return $filter;
+		}
+		$userConditions = array_merge(...$filter);
+		$merged = [];
+		foreach ($viewFilter as $group) {
+			$merged[] = array_merge($group, $userConditions);
+		}
+		return $merged;
+	}
+
 	/**
 	 * @param int $tableId
 	 * @param string $userId
diff --git a/lib/Service/ValueObject/ColumnOrderInformation.php b/lib/Service/ValueObject/ColumnOrderInformation.php
index e7d0a12945..f0b4b4192b 100644
--- a/lib/Service/ValueObject/ColumnOrderInformation.php
+++ b/lib/Service/ValueObject/ColumnOrderInformation.php
@@ -84,7 +84,7 @@ public function jsonSerialize(): array {
 		];
 	}
 
-	protected function ensureType(string $offset, mixed $value): int|bool {
+	protected function ensureType(string $offset, bool|int $value): int|bool {
 		return match ($offset) {
 			self::KEY_ID,
 			self::KEY_ORDER => (int)$value,
diff --git a/tests/integration/features/RowOCS.feature b/tests/integration/features/RowOCS.feature
new file mode 100644
index 0000000000..1a71c84d3d
--- /dev/null
+++ b/tests/integration/features/RowOCS.feature
@@ -0,0 +1,298 @@
+# SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: AGPL-3.0-or-later
+Feature: RowOCS
+  Background:
+    Given user "participant1-v2" exists
+    Given user "participant2-v2" exists
+    Given user "participant3-v2" exists
+    Given table "Table 1 via api v2" with emoji "👋" exists for user "participant1-v2" as "t1" via v2
+    And column "one" exists with following properties
+      | type          | text                    |
+      | subtype       | line                    |
+      | mandatory     | 0                       |
+    And column "two" exists with following properties
+      | type          | number                  |
+      | mandatory     | 1                       |
+      | numberDefault | 10                      |
+    And column "three" exists with following properties
+      | type          | selection               |
+      | subtype       | check                   |
+      | mandatory     | 1                       |
+    And column "four" exists with following properties
+      | type          | datetime                |
+      | subtype       | date                    |
+      | mandatory     | 0                       |
+    And column "five" exists with following properties
+      | type          | usergroup               |
+      | mandatory     | 1                       |
+      | usergroupMultipleItems  | true          |
+      | usergroupSelectUsers    | true          |
+      | usergroupSelectGroups   | false         |
+      | usergroupSelectTeams    | false         |
+    And using "table" "t1"
+    And user "participant1-v2" creates row "r1" with following values:
+      | one           | Row one                 |
+      | two           | 1600                    |
+      | three         | true                    |
+      | four          | 2025-01-01              |
+      | five          | [{"id": "alice", "type": 0}] |
+    And user "participant1-v2" creates row "r2" with following values:
+      | one           | Row two                 |
+      | two           | 1604                    |
+      | three         | false                   |
+      | four          | 2025-01-12              |
+      | five          | [{"id": "bob", "type": 0},{"id": "clarence", "type": 0}] |
+    And user "participant1-v2" creates row "r3" with following values:
+      | one           | Row three               |
+      | two           | 1628                    |
+      | three         | true                    |
+      | four          | 2025-01-23              |
+      | five          | [{"id": "dany", "type": 0}] |
+    And user "participant1-v2" creates row "r4" with following values:
+      | one           | Row four                |
+      | two           | 1669                    |
+      | three         | false                   |
+      | four          | 2025-02-03              |
+      | five          | [{"id": "elias", "type": 0},{"id": "fran", "type": 0}] |
+    And user "participant1-v2" creates row "r5" with following values:
+      | one           | Row five                |
+      | two           | 1711                    |
+      | three         | true                    |
+      | four          | 2025-02-14              |
+      | five          | [{"id": "george", "type": 0},{"id": "hannah", "type": 0},{"id": "ines", "type": 0}] |
+    And user "participant1-v2" creates row "r6" with following values:
+      | one           | Row six                 |
+      | two           | 1729                    |
+      | three         | true                    |
+      | four          | 2025-02-25              |
+      | five          | [{"id": "jamie", "type": 0}] |
+    And user "participant1-v2" creates row "r7" with following values:
+      | one           | Row seven               |
+      | two           | 1794                    |
+      | three         | false                   |
+      | four          | 2025-03-08              |
+      | five          | [{"id": "kate", "type": 0},{"id": "lena", "type": 0}] |
+    And user "participant1-v2" creates row "r8" with following values:
+      | one           | Row eight               |
+      | two           | 1827                    |
+      | three         | false                   |
+      | four          | 2025-03-19              |
+      | five          | [{"id": "moe", "type": 0}] |
+    And user "participant1-v2" creates row "r9" with following values:
+      | one           | Row nine                |
+      | two           | 1924                    |
+      | three         | true                    |
+      | four          | 2025-03-30              |
+      | five          | [{"id": "nora", "type": 0}] |
+    And user "participant1-v2" creates row "r10" with following values:
+      | one           | Row ten                 |
+      | two           | 1994                    |
+      | three         | true                    |
+      | four          | 2025-04-10              |
+      | five          | [{"id": "otto", "type": 0},{"id": "pierre", "type": 0}] |
+    And user "participant1-v2" creates row "r11" with following values:
+      | one           | Row eleven              |
+      | two           | 2006                    |
+      | three         | true                    |
+      | four          | 2025-04-21              |
+      | five          | [{"id": "quinn", "type": 0},{"id": "roberta", "type": 0}] |
+    And user "participant1-v2" creates row "r12" with following values:
+      | one           | Row twelve              |
+      | two           | 2023                    |
+      | three         | false                   |
+      | four          | 2025-05-05              |
+      | five          | [{"id": "samir", "type": 0},{"id": "teresa", "type": 0}] |
+    And user "participant1-v2" creates row "r13" with following values:
+      | one           | Row thirteen            |
+      | two           | 2061                    |
+      | three         | false                   |
+      | four          | 2025-05-16              |
+      | five          | [{"id": "udai", "type": 0},{"id": "vera", "type": 0},{"id": "xuan", "type": 0}] |
+    And user "participant1-v2" creates row "r14" with following values:
+      | one           | Row fourteen            |
+      | two           | 2083                    |
+      | three         | false                   |
+      | four          | 2025-05-27              |
+      | five          | [{"id": "yvonne", "type": 0},{"id": "zara", "type": 0},{"id": "ahmad", "type": 0}] |
+    And user "participant1-v2" creates row "r15" with following values:
+      | one           | Row fifteen             |
+      | two           | 2137                    |
+      | three         | true                   |
+      | four          | 2025-06-07              |
+      | five          | [{"id": "bertram", "type": 0}] |
+    And user "participant1-v2" shares table with user "participant2-v2"
+    And user "participant1-v2" create view "v1" with emoji "⚡️" for "t1" as "v1"
+    And user "participant1-v2" shares view "v1" with "participant3-v2"
+
+  @tables
+  Scenario: Get all rows from a table
+    Given as user "participant2-v2"
+    When the current user fetches all rows from "table" "t1"
+    Then the reported status is 200
+    And 15 rows have been loaded
+
+  @views
+  Scenario: Get all rows from a view
+    Given as user "participant3-v2"
+    When the current user fetches all rows from "view" "v1"
+    Then the reported status is 200
+    And 15 rows have been loaded
+
+  @tables @views
+  Scenario Outline: Get rows from a table or view with an out-of-bounds offset
+    Given as user "<user>"
+    When the current user fetches rows from "<type>" "<alias>" with those parameters
+      | offset | <offset> |
+    Then the reported status is <responseCode>
+    And <rowsReturned> rows have been loaded
+
+  Examples:
+    | user            | type  | alias | offset | responseCode | rowsReturned  |
+    | participant2-v2 | table |    t1 |     -1 |          400 |            0  |
+    | participant3-v2 |  view |    v1 |     -1 |          400 |            0  |
+    | participant2-v2 | table |    t1 |    200 |          200 |            0  |
+    | participant3-v2 |  view |    v1 |    200 |          200 |            0  |
+
+  @tables @views
+  Scenario Outline: Get rows from a table or view with an offset
+    Given as user "<user>"
+    When the current user fetches rows from "<type>" "<alias>" with those parameters
+      | offset | 5 |
+    Then the reported status is 200
+    And 10 rows have been loaded
+    And rows "r1,r2,r3,r4,r5" are not included in the response
+
+    Examples:
+      | user            | type  | alias |
+      | participant2-v2 | table |    t1 |
+      | participant3-v2 |  view |    v1 |
+
+  @tables @views
+  Scenario Outline: Get rows from a table or view with an out-of-bounds limit
+    Given as user "<user>"
+    When the current user fetches rows from "<type>" "<alias>" with those parameters
+      | limit | <limit> |
+    Then the reported status is <responseCode>
+    And <rowsReturned> rows have been loaded
+
+    Examples:
+      | user            | type  | alias | limit | responseCode | rowsReturned  |
+      | participant2-v2 | table |    t1 |    -1 |          400 |            0  |
+      | participant3-v2 |  view |    v1 |    -1 |          400 |            0  |
+      | participant2-v2 | table |    t1 |     0 |          400 |            0  |
+      | participant3-v2 |  view |    v1 |     0 |          400 |            0  |
+      | participant2-v2 | table |    t1 |   555 |          400 |            0  |
+      | participant3-v2 |  view |    v1 |   555 |          400 |            0  |
+
+  @tables @views
+  Scenario Outline: Get rows from a table or view with a limit
+    Given as user "<user>"
+    When the current user fetches rows from "<type>" "<alias>" with those parameters
+      | limit | 5 |
+    Then the reported status is 200
+    And 5 rows have been loaded
+    And rows "r6,r7,r8,r9,r10,r11,r12,r13,r14,r15" are not included in the response
+
+    Examples:
+      | user            | type  | alias |
+      | participant2-v2 | table |    t1 |
+      | participant3-v2 |  view |    v1 |
+
+  @tables @views
+  Scenario Outline: Get rows from a table or view with a text filter
+    Given as user "<user>"
+    When the current user fetches rows from "<type>" "<alias>" with those parameters
+      | filter | one,contains,t |
+    Then the reported status is 200
+    And 8 rows have been loaded
+    And rows "r2,r3,r8,r10,r12,r13,r14,r15" are included in the response
+    And rows "r1,r4,r5,r6,r7,r9,r11" are not included in the response
+
+    Examples:
+      | user            | type  | alias |
+      | participant2-v2 | table |    t1 |
+      | participant3-v2 |  view |    v1 |
+
+  @tables @views
+  Scenario Outline: Get rows from a table or view with a numeric filter
+    Given as user "<user>"
+    When the current user fetches rows from "<type>" "<alias>" with those parameters
+      | filter | two,is-greater-than,2000 |
+    Then the reported status is 200
+    And 5 rows have been loaded
+    And rows "r11,r12,r13,r14,r15" are included in the response
+    And rows "r1,r2,r3,r4,r5,r6,r7,r8,r9,r10" are not included in the response
+
+    Examples:
+      | user            | type  | alias |
+      | participant2-v2 | table |    t1 |
+      | participant3-v2 |  view |    v1 |
+
+  @tables @views
+  Scenario Outline: Get rows from a table or view sorted descending
+    Given as user "<user>"
+    When the current user fetches rows from "<type>" "<alias>" with those parameters
+      | sort  | two,DESC |
+      | limit | 3        |
+    Then the reported status is 200
+    And 3 rows have been loaded
+    And the rows are returned in the order "r15,r14,r13"
+
+    Examples:
+      | user            | type  | alias |
+      | participant2-v2 | table |    t1 |
+      | participant3-v2 |  view |    v1 |
+
+  @tables @views
+  Scenario Outline: Get rows from a table or view sorted ascending
+    Given as user "<user>"
+    When the current user fetches rows from "<type>" "<alias>" with those parameters
+      | sort  | two,ASC |
+      | limit | 3       |
+    Then the reported status is 200
+    And 3 rows have been loaded
+    And the rows are returned in the order "r1,r2,r3"
+
+    Examples:
+      | user            | type  | alias |
+      | participant2-v2 | table |    t1 |
+      | participant3-v2 |  view |    v1 |
+
+  @tables @views
+  Scenario Outline: Reject an invalid filter operator
+    Given as user "<user>"
+    When the current user fetches rows from "<type>" "<alias>" with those parameters
+      | filter | one,not-an-operator,t |
+    Then the reported status is 400
+
+    Examples:
+      | user            | type  | alias |
+      | participant2-v2 | table |    t1 |
+      | participant3-v2 |  view |    v1 |
+
+  @tables @views
+  Scenario Outline: Reject an invalid sort mode
+    Given as user "<user>"
+    When the current user fetches rows from "<type>" "<alias>" with those parameters
+      | sort | two,SIDEWAYS |
+    Then the reported status is 400
+
+    Examples:
+      | user            | type  | alias |
+      | participant2-v2 | table |    t1 |
+      | participant3-v2 |  view |    v1 |
+
+  @views
+  Scenario: A view's base filter is combined with the request filter
+    Given user "participant1-v2" create view "v2" with emoji "🔎" for "t1" as "v2"
+    And user "participant1-v2" sets filter to view "v2"
+      | column | operator        | value |
+      | two    | is-greater-than | 1700  |
+    And user "participant1-v2" shares view "v2" with "participant3-v2"
+    And as user "participant3-v2"
+    When the current user fetches rows from "view" "v2" with those parameters
+      | filter | one,contains,t |
+    Then the reported status is 200
+    And 6 rows have been loaded
+    And rows "r8,r10,r12,r13,r14,r15" are included in the response
+    And rows "r2,r3" are not included in the response
diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php
index 2def946228..8bd4c548ef 100644
--- a/tests/integration/features/bootstrap/FeatureContext.php
+++ b/tests/integration/features/bootstrap/FeatureContext.php
@@ -3284,6 +3284,113 @@ public function viewHasExactRows(string $viewName, TableNode $expectedRows): voi
 		}
 	}
 
+	/**
+	 * @When the current user fetches all rows from :nodeType :nodeId
+	 */
+	public function theCurrentUserFetchesAllRowsFromCollection(string $nodeType, string $nodeAlias): void {
+		$nodeId = $this->collectionManager->getByAlias($nodeType, $nodeAlias)['id'];
+		$this->sendOcsRequest('GET', sprintf('/apps/tables/api/2/%ss/%d/rows', $nodeType, $nodeId));
+	}
+
+	/**
+	 * @When the current user fetches rows from :nodeType :nodeId with those parameters
+	 */
+	public function theCurrentUserFetchesRowsFromWithThoseParameters(string $nodeType, string $nodeAlias, TableNode $parameters): void {
+		$query = '';
+		foreach ($parameters->getRows() as $row) {
+			$parameterName = $row[0];
+			if ($parameterName === 'filter') {
+				// `<columnAlias>,<operator>,<value>` is turned into a single
+				// filter group holding a single filter definition
+				[$columnAlias, $operator, $value] = explode(',', $row[1]);
+				$columnId = $this->collectionManager->getByAlias('column', $columnAlias)['id'];
+				$parameterValue = json_encode([ // all filter groups
+					[ // single filter group
+						[ // single filter definition
+							'columnId' => $columnId,
+							'operator' => $operator,
+							'value' => $value,
+						],
+					],
+				]);
+			} elseif ($parameterName === 'sort') {
+				// `<columnAlias>,<mode>` is turned into a single sort rule
+				[$columnAlias, $mode] = explode(',', $row[1]);
+				$columnId = $this->collectionManager->getByAlias('column', $columnAlias)['id'];
+				$parameterValue = json_encode([
+					[
+						'columnId' => $columnId,
+						'mode' => $mode,
+					],
+				]);
+			} else {
+				$parameterValue = $row[1];
+			}
+			$query .= $parameterName . '=' . urlencode($parameterValue) . '&';
+		}
+		$nodeId = $this->collectionManager->getByAlias($nodeType, $nodeAlias)['id'];
+		$this->sendOcsRequest('GET', sprintf('/apps/tables/api/2/%ss/%d/rows?%s', $nodeType, $nodeId, $query));
+	}
+
+	/**
+	 * @Given :numberOfRows rows have been loaded
+	 */
+	public function rowsHaveBeenLoaded(int $numberOfRows): void {
+		$responseData = $this->getDataFromResponse($this->response)['ocs']['data'];
+		// do not count the error message, if present
+		unset($responseData['message']);
+		Assert::assertCount($numberOfRows, $responseData);
+		$returnedIDs = [];
+		foreach ($responseData as $row) {
+			$returnedIDs[] = $this->collectionManager->getById('row', $row['id']);
+		}
+		$this->collectionManager->register($returnedIDs, 'returnedRowIDs', 0);
+	}
+
+	/**
+	 * @Given rows :rowAliasList are not included in the response
+	 */
+	public function rowsAreNotIncludedInTheResponse(string $rowAliasList): void {
+		$unexpectedRowAliases = array_map('trim', explode(',', $rowAliasList));
+		$returnedRowIds = $this->collectionManager->getById('returnedRowIDs', 0);
+		foreach ($unexpectedRowAliases as $unexpectedRowAlias) {
+			$row = $this->collectionManager->getByAlias('row', $unexpectedRowAlias);
+			Assert::assertNotContains($row['id'], $returnedRowIds);
+		}
+	}
+
+	/**
+	 * @Given rows :rowAliasList are included in the response
+	 */
+	public function rowsAreIncludedInTheResponse(string $rowAliasList): void {
+		$unexpectedRowAliases = array_map('trim', explode(',', $rowAliasList));
+		$returnedRowIds = $this->collectionManager->getById('returnedRowIDs', 0);
+		foreach ($unexpectedRowAliases as $unexpectedRowAlias) {
+			$row = $this->collectionManager->getByAlias('row', $unexpectedRowAlias);
+			Assert::assertContains($row['id'], $returnedRowIds);
+		}
+	}
+
+	/**
+	 * @Then the rows are returned in the order :rowAliasList
+	 */
+	public function theRowsAreReturnedInTheOrder(string $rowAliasList): void {
+		$expectedRowAliases = array_map('trim', explode(',', $rowAliasList));
+		$responseData = $this->getDataFromResponse($this->response)['ocs']['data'];
+		// do not count the error message, if present
+		unset($responseData['message']);
+		$responseData = array_values($responseData);
+		Assert::assertCount(count($expectedRowAliases), $responseData);
+		foreach ($expectedRowAliases as $index => $expectedRowAlias) {
+			$expectedRow = $this->collectionManager->getByAlias('row', $expectedRowAlias);
+			Assert::assertSame(
+				$expectedRow['id'],
+				$responseData[$index]['id'],
+				sprintf('Row at position %d does not match the expected row "%s"', $index, $expectedRowAlias),
+			);
+		}
+	}
+
 	/**
 	 * @Then the last created row has the following dataByAlias
 	 *
diff --git a/vendor-bin/rector/composer.json b/vendor-bin/rector/composer.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/vendor-bin/rector/composer.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/vendor-bin/rector/composer.lock b/vendor-bin/rector/composer.lock
new file mode 100644
index 0000000000..ba8d41762c
--- /dev/null
+++ b/vendor-bin/rector/composer.lock
@@ -0,0 +1,18 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "d751713988987e9331980363e24189ce",
+    "packages": [],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": {},
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {},
+    "platform-dev": {},
+    "plugin-api-version": "2.9.0"
+}

From e1ac28b85501b5109843130436deb838e86c9be8 Mon Sep 17 00:00:00 2001
From: Kostiantyn Miakshyn <molodchick@gmail.com>
Date: Sun, 23 Aug 2026 21:30:07 +0200
Subject: [PATCH 02/11] Move filtes/sorging/pagination to backend, add reload
 button

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>
---
 lib/Constants/FilterOperator.php              |   1 +
 lib/Controller/PublicRowOCSController.php     |  74 ++++++-
 lib/Controller/RowOCSController.php           | 144 ++++----------
 lib/Db/Row2Mapper.php                         |  91 ++++++++-
 lib/Db/RowCellSelectionMapper.php             |   3 +
 lib/Db/RowQuery.php                           |  66 +++++++
 lib/Service/RowService.php                    |  36 ++++
 lib/Service/ValueObject/Filter.php            |   2 +-
 src/modules/main/partials/TableView.vue       |   5 +
 src/modules/main/sections/DataTable.vue       |   5 +
 src/modules/main/sections/MainWrapper.vue     | 185 +++++++++++++++++-
 src/modules/main/sections/PublicElement.vue   |  22 ++-
 .../main/sections/PublicMainWrapper.vue       | 159 +++++++++++++--
 src/modules/main/sections/Table.vue           |   6 +-
 src/modules/main/sections/View.vue            |   5 +
 src/shared/components/ncTable/NcTable.vue     | 152 +-------------
 .../ncTable/partials/TableHeader.vue          |   1 +
 .../ncTable/sections/CustomTable.vue          |   7 +
 .../components/ncTable/sections/Options.vue   |  28 ++-
 .../ncTable/sections/PaginationBlock.vue      |  28 ++-
 src/store/data.js                             | 147 +++++++++++++-
 21 files changed, 855 insertions(+), 312 deletions(-)

diff --git a/lib/Constants/FilterOperator.php b/lib/Constants/FilterOperator.php
index 1bf49d8228..5b7665fea4 100644
--- a/lib/Constants/FilterOperator.php
+++ b/lib/Constants/FilterOperator.php
@@ -12,6 +12,7 @@ enum FilterOperator: string {
 	case BEGINS_WITH = 'begins-with';
 	case ENDS_WITH = 'ends-with';
 	case CONTAINS = 'contains';
+	case CONTAINS_ITEM = 'contains-item';
 	case DOES_NOT_CONTAIN = 'does-not-contain';
 	case IS_EQUAL = 'is-equal';
 	case IS_NOT_EQUAL = 'is-not-equal';
diff --git a/lib/Controller/PublicRowOCSController.php b/lib/Controller/PublicRowOCSController.php
index 9ac88b6768..6a753ce1c9 100644
--- a/lib/Controller/PublicRowOCSController.php
+++ b/lib/Controller/PublicRowOCSController.php
@@ -8,13 +8,12 @@
 
 namespace OCA\Tables\Controller;
 
-use OCA\Tables\AppInfo\Application;
 use OCA\Tables\Db\Row2Mapper;
+use OCA\Tables\Db\RowQuery;
 use OCA\Tables\Errors\BadRequestError;
 use OCA\Tables\Errors\InternalError;
 use OCA\Tables\Errors\NotFoundError;
 use OCA\Tables\Errors\PermissionError;
-use OCA\Tables\Helper\ConversionHelper;
 use OCA\Tables\Middleware\Attribute\AssertShareAccessIsAccessible;
 use OCA\Tables\Model\RowDataInput;
 use OCA\Tables\ResponseDefinitions;
@@ -67,7 +66,7 @@ public function __construct(
 	#[ApiRoute(verb: 'GET', url: '/api/2/public/{token}/rows', requirements: ['token' => '[a-zA-Z0-9]{16}'])]
 	#[OpenAPI]
 	#[AnonRateLimit(limit: 20, period: 30)]
-	public function getRows(string $token, ?int $limit, ?int $offset): DataResponse {
+	public function getRows(string $token, ?int $limit, ?int $offset, ?string $filter = null, ?string $sort = null, ?string $search = null): DataResponse {
 		try {
 			$shareToken = new ShareToken($token);
 			$share = $this->shareService->findByToken($shareToken);
@@ -79,13 +78,18 @@ public function getRows(string $token, ?int $limit, ?int $offset): DataResponse
 			$limit = $limit !== null ? max(0, min(500, $limit)) : null;
 			$offset = $offset !== null ? max(0, $offset) : null;
 
-			$nodeType = ConversionHelper::stringNodeType2Const($share->getNodeType());
-			if ($nodeType === Application::NODE_TYPE_TABLE) {
-				$rows = $this->rowService->findAllByTable($share->getNodeId(), '', $limit, $offset);
-			} elseif ($nodeType === Application::NODE_TYPE_VIEW) {
-				$rows = $this->rowService->findAllByView($share->getNodeId(), '', $limit, $offset);
-			}
+			$queryData = RowQuery::buildFromInput(
+				nodeType: $share->getNodeType(),
+				nodeId: $share->getNodeId(),
+				userId: '',
+				limit: $limit,
+				offset: $offset,
+				filter: $filter,
+				sort: $sort,
+				search: $search,
+			);
 
+			$rows = $this->rowService->findAllByQuery($queryData);
 			$formattedRows = $this->rowService->formatRowsForPublicShare($rows);
 			return new DataResponse($formattedRows);
 		} catch (PermissionError $e) {
@@ -99,6 +103,57 @@ public function getRows(string $token, ?int $limit, ?int $offset): DataResponse
 		}
 	}
 
+	/**
+	 * [api v2] Count rows from a link share
+	 *
+	 * @param string $token The share token
+	 * @param string|null $filter Optional: a JSON encoded filter parameter
+	 * @param string|null $sort Optional: a JSON encoded sort parameter
+	 * @param string|null $search Optional: a search string
+	 * @return DataResponse<Http::STATUS_OK, array{count: int}, array{}>|DataResponse<Http::STATUS_FORBIDDEN|Http::STATUS_BAD_REQUEST|Http::STATUS_NOT_FOUND|Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
+	 *
+	 * 200: Count is returned
+	 * 400: Invalid request parameters
+	 * 403: No permissions
+	 * 404: Not found
+	 * 500: Internal error
+	 */
+	#[PublicPage]
+	#[AssertShareAccessIsAccessible]
+	#[ApiRoute(verb: 'GET', url: '/api/2/public/{token}/rows/count', requirements: ['token' => '[a-zA-Z0-9]{16}'])]
+	#[OpenAPI]
+	#[AnonRateLimit(limit: 20, period: 30)]
+	public function countRows(string $token, ?string $filter = null, ?string $sort = null, ?string $search = null): DataResponse {
+		try {
+			$shareToken = new ShareToken($token);
+			$share = $this->shareService->findByToken($shareToken);
+
+			if (!$share->getPermissionRead()) {
+				return $this->handlePermissionError(new PermissionError('No read permission on this share'));
+			}
+
+			$queryData = RowQuery::buildFromInput(
+				nodeType: $share->getNodeType(),
+				nodeId: $share->getNodeId(),
+				userId: '',
+				filter: $filter,
+				sort: $sort,
+				search: $search,
+			);
+
+			$count = $this->rowService->countByQuery($queryData);
+			return new DataResponse(['count' => $count]);
+		} catch (PermissionError $e) {
+			return $this->handlePermissionError($e);
+		} catch (InternalError $e) {
+			return $this->handleError($e);
+		} catch (NotFoundError $e) {
+			return $this->handleNotFoundError($e);
+		} catch (BadRequestError $e) {
+			return $this->handleBadRequestError($e);
+		}
+	}
+
 	/**
 	 * [api v2] Create a row in a link share
 	 *
@@ -259,4 +314,5 @@ public function deleteRow(string $token, int $rowId): DataResponse {
 			return $this->handleError($e);
 		}
 	}
+
 }
diff --git a/lib/Controller/RowOCSController.php b/lib/Controller/RowOCSController.php
index ad72d120b6..2738c2de90 100644
--- a/lib/Controller/RowOCSController.php
+++ b/lib/Controller/RowOCSController.php
@@ -139,7 +139,7 @@ public function createRow(string $nodeCollection, int $nodeId, mixed $data): Dat
 		url: '/api/2/{nodeCollection}/{nodeId}/rows',
 		requirements: ['nodeCollection' => '(tables|views)', 'nodeId' => '(\\d+)']
 	)]
-	public function getRows(string $nodeCollection, int $nodeId, ?int $limit = null, ?int $offset = null, ?string $filter = null, ?string $sort = null): DataResponse {
+	public function getRows(string $nodeCollection, int $nodeId, ?int $limit = null, ?int $offset = null, ?string $filter = null, ?string $sort = null, ?string $search = null): DataResponse {
 		try {
 			if (($limit !== null && ($limit <= 0 || $limit > 500))
 				|| ($offset !== null && $offset < 0)
@@ -147,17 +147,16 @@ public function getRows(string $nodeCollection, int $nodeId, ?int $limit = null,
 				throw new InvalidArgumentException('Offset or limit parameter is out of bounds');
 			}
 
-			$queryData = new RowQuery(
-				nodeType: $nodeCollection === 'tables' ? Application::NODE_TYPE_TABLE : Application::NODE_TYPE_VIEW,
+			$queryData = RowQuery::buildFromInput(
+				nodeType: $nodeCollection,
 				nodeId: $nodeId,
+				userId: $this->userId,
+				limit: $limit,
+				offset: $offset,
+				filter: $filter,
+				sort: $sort,
+				search: $search,
 			);
-			$queryData->setLimit($limit)
-				->setOffset($offset)
-				// the provided filter is set here; any filter defined on a view
-				// is merged in on the service level
-				->setFilter($this->parseFilter($filter))
-				->setSort($this->parseSort($sort))
-				->setUserId($this->userId);
 
 			$rows = $this->rowService->findAllByQuery($queryData);
 			return new DataResponse($this->rowService->formatRows($rows));
@@ -170,108 +169,33 @@ public function getRows(string $nodeCollection, int $nodeId, ?int $limit = null,
 		}
 	}
 
-	/**
-	 * Decode and validate the JSON encoded filter parameter.
-	 *
-	 * @return list<list<array{columnId: int, operator: string, value: string|int|float}>>|null
-	 * @throws InvalidArgumentException
-	 */
-	protected function parseFilter(?string $filter): ?array {
-		if ($filter === null || $filter === '') {
-			return null;
-		}
-		$decoded = json_decode($filter, true);
-		if (!is_array($decoded)) {
-			throw new InvalidArgumentException('Invalid filter supplied');
-		}
-		foreach ($decoded as $filterGroup) {
-			if (!is_array($filterGroup)) {
-				throw new InvalidArgumentException('Invalid filter supplied');
-			}
-			foreach ($filterGroup as $singleFilter) {
-				$this->assertFilterValue($singleFilter);
-			}
-		}
-		return $decoded;
-	}
-
-	/**
-	 * Decode and validate the JSON encoded sort parameter.
-	 *
-	 * @return list<array{columnId: int, mode: 'ASC'|'DESC'}>|null
-	 * @throws InvalidArgumentException
-	 */
-	protected function parseSort(?string $sort): ?array {
-		if ($sort === null || $sort === '') {
-			return null;
-		}
-		$decoded = json_decode($sort, true);
-		if (!is_array($decoded)) {
-			throw new InvalidArgumentException('Invalid sort data supplied');
-		}
-		foreach ($decoded as $singleSortRule) {
-			$this->assertSortValue($singleSortRule);
-		}
-		return $decoded;
-	}
+	#[NoAdminRequired]
+	#[RequirePermission(permission: Application::PERMISSION_READ, typeParam: 'nodeCollection')]
+	#[ApiRoute(
+		verb: 'GET',
+		url: '/api/2/{nodeCollection}/{nodeId}/rows/count',
+		requirements: ['nodeCollection' => '(tables|views)', 'nodeId' => '(\\d+)']
+	)]
+	public function countRows(string $nodeCollection, int $nodeId, ?string $filter = null, ?string $sort = null, ?string $search = null): DataResponse {
+		try {
+			$queryData = RowQuery::buildFromInput(
+				nodeType: $nodeCollection,
+				nodeId: $nodeId,
+				userId: $this->userId,
+				filter: $filter,
+				sort: $sort,
+				search: $search,
+			);
 
-	/**
-	 * @throws InvalidArgumentException
-	 */
-	protected function assertFilterValue(mixed $filter): void {
-		if (!is_array($filter)
-			|| !isset($filter['columnId'], $filter['operator'], $filter['value'])
-			|| count($filter) !== 3
-		) {
-			throw new InvalidArgumentException('Invalid filter supplied');
-		}
-		// values higher than PHP_INT_MAX will be capped to PHP_INT_MAX on cast,
-		// checking it roughly is sufficient.
-		// the lower value boundary is the lowest meta column id in \OCA\Tables\Db\Column
-		$maxDigits = strlen((string)PHP_INT_MAX);
-		if (!is_numeric($filter['columnId'])
-			|| (int)$filter['columnId'] < -5
-			|| !preg_match('/^-?\\d{0,' . $maxDigits . '}$/', (string)$filter['columnId'])
-		) {
-			throw new InvalidArgumentException(sprintf('Invalid column id supplied: %s', (string)$filter['columnId']));
-		}
-		if (!in_array($filter['operator'], [
-			'begins-with',
-			'ends-with',
-			'contains',
-			'is-equal',
-			'is-greater-than',
-			'is-greater-than-or-equal',
-			'is-lower-than',
-			'is-lower-than-or-equal',
-			'is-empty',
-		], true)) {
-			throw new InvalidArgumentException('Invalid filter operator supplied');
+			$count = $this->rowService->countByQuery($queryData);
+			return new DataResponse(['count' => $count]);
+		} catch (DoesNotExistException $e) {
+			return $this->handleNotFoundError(new NotFoundError($e->getMessage(), $e->getCode(), $e));
+		} catch (MultipleObjectsReturnedException|InvalidArgumentException $e) {
+			return $this->handleBadRequestError(new BadRequestError($e->getMessage(), $e->getCode(), $e));
+		} catch (InternalError|\Exception $e) {
+			return $this->handleError($e);
 		}
 	}
 
-	/**
-	 * @throws InvalidArgumentException
-	 */
-	protected function assertSortValue(mixed $sort): void {
-		if (!is_array($sort)
-			|| !isset($sort['columnId'], $sort['mode'])
-			|| count($sort) !== 2
-		) {
-			throw new InvalidArgumentException('Invalid sort data supplied');
-		}
-		// values higher than PHP_INT_MAX will be capped to PHP_INT_MAX on cast,
-		// checking it roughly is sufficient.
-		// the lower value boundary is the lowest meta column id in \OCA\Tables\Db\Column
-		$maxDigits = strlen((string)PHP_INT_MAX);
-		if (!is_numeric($sort['columnId'])
-			|| (int)$sort['columnId'] < -5
-			|| !preg_match('/^-?\\d{0,' . $maxDigits . '}$/', (string)$sort['columnId'])
-		) {
-			throw new InvalidArgumentException('Invalid column id supplied');
-		}
-		if ($sort['mode'] !== 'DESC' && $sort['mode'] !== 'ASC') {
-			throw new InvalidArgumentException('Invalid sort mode supplied');
-		}
-	}
 }
diff --git a/lib/Db/Row2Mapper.php b/lib/Db/Row2Mapper.php
index b8dffd2ec8..5420466c3c 100644
--- a/lib/Db/Row2Mapper.php
+++ b/lib/Db/Row2Mapper.php
@@ -132,7 +132,7 @@ public function setUserId(string $userId): void {
 	 * @return int[]
 	 * @throws InternalError
 	 */
-	private function getWantedRowIds(string $userId, int $tableId, ?array $filter = null, ?array $sort = null, ?int $limit = null, ?int $offset = null): array {
+	private function getWantedRowIds(string $userId, int $tableId, ?array $filter = null, ?array $sort = null, ?int $limit = null, ?int $offset = null, ?array $showColumnIds = null, ?string $search = null): array {
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->select('sleeves.id')
@@ -143,6 +143,10 @@ private function getWantedRowIds(string $userId, int $tableId, ?array $filter =
 			$this->addFilterToQuery($qb, $filter, $userId);
 		}
 
+		if ($search !== null && $search !== '' && $showColumnIds) {
+			$this->addSearchToQuery($qb, $search, $showColumnIds);
+		}
+
 		$this->addSortQueryForMultipleSleeveFinder($qb, 'sleeves', $sort);
 
 		$qb->groupBy('sleeves.id');
@@ -175,11 +179,11 @@ private function getWantedRowIds(string $userId, int $tableId, ?array $filter =
 	 * @return Row2[]
 	 * @throws InternalError
 	 */
-	public function findAll(array $showColumnIds, int $tableId, ?int $limit = null, ?int $offset = null, ?array $filter = null, ?array $sort = null, ?string $userId = null): array {
+	public function findAll(array $showColumnIds, int $tableId, ?int $limit = null, ?int $offset = null, ?array $filter = null, ?array $sort = null, ?string $search = null, ?string $userId = null): array {
 		try {
 			$this->columnMapper->preloadColumns($showColumnIds, $filter, $sort);
 
-			$wantedRowIdsArray = $this->getWantedRowIds($userId, $tableId, $filter, $sort, $limit, $offset);
+			$wantedRowIdsArray = $this->getWantedRowIds($userId ?? '', $tableId, $filter, $sort, $limit, $offset);
 
 			// Get rows without SQL sorting
 			$rows = $this->getRows($wantedRowIdsArray, $showColumnIds);
@@ -192,6 +196,29 @@ public function findAll(array $showColumnIds, int $tableId, ?int $limit = null,
 		}
 	}
 
+	/**
+	 * @param int[] $showColumnIds
+	 * @param int $tableId
+	 * @param array|null $filter
+	 * @param array|null $sort
+	 * @param string|null $search
+	 * @param string|null $userId
+	 * @return int
+	 * @throws InternalError
+	 */
+	public function count(array $showColumnIds, int $tableId, ?array $filter = null, ?array $sort = null, ?string $search = null, ?string $userId = null): int {
+		try {
+			$this->columnMapper->preloadColumns($showColumnIds, $filter, $sort);
+
+			$wantedRowIdsArray = $this->getWantedRowIds($userId ?? '', $tableId, $filter, $sort, null, null, $showColumnIds, $search);
+
+			return count($wantedRowIdsArray);
+		} catch (DoesNotExistException $e) {
+			$this->logger->error($e->getMessage(), ['exception' => $e]);
+			throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': ' . $e->getMessage());
+		}
+	}
+
 	/**
 	 * @param array $rowIds
 	 * @param array $columnIds
@@ -486,6 +513,23 @@ private function getFilterExpression(IQueryBuilder $qb, Column $column, string $
 				}
 				$filterExpression = $qb->expr()->like('value', $qb->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%', $paramType));
 				break;
+			case 'contains-item':
+				$values = is_array($value) ? $value : [$value];
+				if ($column->getType() === 'selection' && $column->getSubtype() === 'multi') {
+					$filterExpressions = [];
+					foreach ($values as $singleValue) {
+						$singleValue = (string)$singleValue;
+						$filterExpressions[] = $qb2->expr()->like('value', $qb->createNamedParameter('[' . $this->db->escapeLikeParameter($singleValue) . ']', IQueryBuilder::PARAM_STR));
+						$filterExpressions[] = $qb2->expr()->like('value', $qb->createNamedParameter('[' . $this->db->escapeLikeParameter($singleValue) . ',%'));
+						$filterExpressions[] = $qb2->expr()->like('value', $qb->createNamedParameter('%,' . $this->db->escapeLikeParameter($singleValue) . ']%'));
+						$filterExpressions[] = $qb2->expr()->like('value', $qb->createNamedParameter('%,' . $this->db->escapeLikeParameter($singleValue) . ',%'));
+					}
+					$filterExpression = $qb2->expr()->orX(...$filterExpressions);
+				} else {
+					$filterExpression = $qb2->expr()->in('value', $qb->createNamedParameter($values, IQueryBuilder::PARAM_STR_ARRAY));
+				}
+				$includeDefault = !empty(array_intersect((array)($defaultValue ?? []), $values));
+				break;
 			case 'does-not-contain':
 				if (is_array($value) && $column->getType() === Column::TYPE_USERGROUP) {
 					$filterExpressions = [];
@@ -593,7 +637,7 @@ private function getFilterExpression(IQueryBuilder $qb, Column $column, string $
 	/**
 	 * @throws InternalError
 	 */
-	private function getMetaFilterExpression(IQueryBuilder $qb, int $columnId, string $operator, string $value): IQueryBuilder {
+	private function getMetaFilterExpression(IQueryBuilder $qb, int $columnId, string $operator, string|array $value): IQueryBuilder {
 		$qb2 = $this->db->getQueryBuilder();
 		$qb2->select('id');
 		$qb2->from('tables_row_sleeves');
@@ -1029,4 +1073,43 @@ private function sortRowsByIds(array $rows, array $wantedRowIds): array {
 
 		return $sortedRows;
 	}
+
+	private function addSearchToQuery(IQueryBuilder $qb, string $search, array $showColumnIds): void {
+		$qb->andWhere(
+			$qb->expr()->in(
+				'sleeves.id',
+				$qb->createFunction($this->getSearchSubquery($qb, $search, $showColumnIds)->getSQL())
+			)
+		);
+	}
+
+	private function getSearchSubquery(IQueryBuilder $qb, string $search, array $showColumnIds): IQueryBuilder {
+		$searchParam = $qb->createNamedParameter('%' . $this->db->escapeLikeParameter($search) . '%', IQueryBuilder::PARAM_STR, ':search');
+		$columnIdsParam = $qb->createNamedParameter($showColumnIds, IQueryBuilder::PARAM_INT_ARRAY, ':searchColumnIds');
+
+		$qbSqlForColumnTypes = null;
+		foreach ($this->columnsHelper->columns as $columnType) {
+			$qbTmp = $this->db->getQueryBuilder();
+			$qbTmp->select('row_id')
+				->from('tables_row_cells_' . $columnType)
+				->where($qb->expr()->in('column_id', $columnIdsParam))
+				->andWhere($qb->expr()->like(
+					$qb->expr()->castColumn('value', IQueryBuilder::PARAM_STR),
+					$searchParam
+				));
+
+			if ($qbSqlForColumnTypes) {
+				$qbSqlForColumnTypes .= ' UNION ALL ' . $qbTmp->getSQL() . ' ';
+			} else {
+				$qbSqlForColumnTypes = '(' . $qbTmp->getSQL();
+			}
+		}
+		$qbSqlForColumnTypes .= ')';
+
+		$searchQb = $this->db->getQueryBuilder();
+		$searchQb->select('row_id')
+			->from($qb->createFunction($qbSqlForColumnTypes), 't_search');
+
+		return $searchQb;
+	}
 }
diff --git a/lib/Db/RowCellSelectionMapper.php b/lib/Db/RowCellSelectionMapper.php
index eba5332f1e..9c7e47045c 100644
--- a/lib/Db/RowCellSelectionMapper.php
+++ b/lib/Db/RowCellSelectionMapper.php
@@ -22,6 +22,9 @@ public function __construct(IDBConnection $db) {
 	}
 
 	public function filterValueToQueryParam(Column $column, mixed $value): mixed {
+		if (is_array($value)) {
+			return $value;
+		}
 		return $this->valueToJsonDbValue($column, $value);
 	}
 
diff --git a/lib/Db/RowQuery.php b/lib/Db/RowQuery.php
index c307071b93..c28aa9f4a5 100644
--- a/lib/Db/RowQuery.php
+++ b/lib/Db/RowQuery.php
@@ -9,12 +9,18 @@
 
 namespace OCA\Tables\Db;
 
+use InvalidArgumentException;
+use OCA\Tables\Helper\ConversionHelper;
+use OCA\Tables\Model\FilterSet;
+use OCA\Tables\Model\SortRuleSet;
+
 class RowQuery {
 	protected ?string $userId = null;
 	protected ?int $limit = null;
 	protected ?int $offset = null;
 	protected ?array $filter = null;
 	protected ?array $sort = null;
+	protected ?string $search = null;
 
 	public function __construct(
 		protected int $nodeType,
@@ -74,4 +80,64 @@ public function setSort(?array $sort): self {
 		$this->sort = $sort;
 		return $this;
 	}
+
+	public function getSearch(): ?string {
+		return $this->search;
+	}
+
+	public function setSearch(?string $search): self {
+		$this->search = $search;
+		return $this;
+	}
+
+	/**
+	 * Build a RowQuery from request parameters.
+	 *
+	 * @return self
+	 * @throws InvalidArgumentException
+	 */
+	public static function buildFromInput(string $nodeType, int $nodeId, string $userId, ?int $limit = null, ?int $offset = null, ?string $filter = null, ?string $sort = null, ?string $search = null): self {
+		$rowQuery = new self(ConversionHelper::stringNodeType2Const($nodeType), $nodeId);
+		$rowQuery->setLimit($limit)
+			->setOffset($offset)
+			->setFilter(self::parseFilter($filter))
+			->setSort(self::parseSort($sort))
+			->setSearch($search !== '' && $search !== null ? $search : null)
+			->setUserId($userId);
+		return $rowQuery;
+	}
+
+	/**
+	 * Decode and validate the JSON encoded filter parameter.
+	 *
+	 * @return list<list<array{columnId: int, operator: string, value: string|int|float|list<string|int>}>>|null
+	 * @throws InvalidArgumentException
+	 */
+	private static function parseFilter(?string $filter): ?array {
+		if ($filter === null || $filter === '') {
+			return null;
+		}
+		$decoded = json_decode($filter, true);
+		if (!is_array($decoded)) {
+			throw new InvalidArgumentException('Invalid filter supplied');
+		}
+		return FilterSet::createFromInputArray($decoded)->jsonSerialize();
+	}
+
+	/**
+	 * Decode and validate the JSON encoded sort parameter.
+	 *
+	 * @return list<array{columnId: int, mode: 'ASC'|'DESC'}>|null
+	 * @throws InvalidArgumentException
+	 */
+	private static function parseSort(?string $sort): ?array {
+		if ($sort === null || $sort === '') {
+			return null;
+		}
+		$decoded = json_decode($sort, true);
+		if (!is_array($decoded)) {
+			throw new InvalidArgumentException('Invalid sort data supplied');
+		}
+		return SortRuleSet::createFromInputArray($decoded)->jsonSerialize();
+	}
 }
diff --git a/lib/Service/RowService.php b/lib/Service/RowService.php
index 60007fb425..8e2da31903 100644
--- a/lib/Service/RowService.php
+++ b/lib/Service/RowService.php
@@ -105,6 +105,7 @@ public function findAllByQuery(RowQuery $rowQuery): array {
 		$userId = $rowQuery->getUserId() ?? '';
 		$filter = $rowQuery->getFilter();
 		$sort = $rowQuery->getSort();
+		$search = $rowQuery->getSearch();
 
 		if ($rowQuery->getNodeType() === Application::NODE_TYPE_VIEW) {
 			$view = $this->viewMapper->find($rowQuery->getNodeId());
@@ -130,6 +131,41 @@ public function findAllByQuery(RowQuery $rowQuery): array {
 			$rowQuery->getOffset(),
 			$filter,
 			$sort,
+			$search,
+			$userId,
+		);
+	}
+
+	public function countByQuery(RowQuery $rowQuery): int {
+		$tableId = $rowQuery->getNodeId();
+		$userId = $rowQuery->getUserId() ?? '';
+		$filter = $rowQuery->getFilter();
+		$sort = $rowQuery->getSort();
+		$search = $rowQuery->getSearch();
+
+		if ($rowQuery->getNodeType() === Application::NODE_TYPE_VIEW) {
+			$view = $this->viewMapper->find($rowQuery->getNodeId());
+			$tableId = $view->getTableId();
+			$showColumnIds = $view->getColumnIds();
+
+			$filter = $this->mergeFilterWithViewFilter($filter, $view->getFilterArray());
+
+			if ($sort === null) {
+				$sort = $view->getSortArray();
+			}
+
+			$userId = $this->resolveFilterUserId($userId, $view);
+		} else {
+			$tableColumns = $this->columnMapper->findAllByTable($tableId);
+			$showColumnIds = array_map(static fn (Column $column) => $column->getId(), $tableColumns);
+		}
+
+		return $this->row2Mapper->count(
+			$showColumnIds,
+			$tableId,
+			$filter,
+			$sort,
+			$search,
 			$userId,
 		);
 	}
diff --git a/lib/Service/ValueObject/Filter.php b/lib/Service/ValueObject/Filter.php
index 08c476241e..9194c90471 100644
--- a/lib/Service/ValueObject/Filter.php
+++ b/lib/Service/ValueObject/Filter.php
@@ -16,7 +16,7 @@ class Filter implements JsonSerializable {
 	public function __construct(
 		protected readonly int $columnId,
 		protected readonly FilterOperator $operator,
-		protected readonly string $value,
+		protected readonly string|array $value,
 	) {
 	}
 
diff --git a/src/modules/main/partials/TableView.vue b/src/modules/main/partials/TableView.vue
index 3b99b004e3..533cf00f61 100644
--- a/src/modules/main/partials/TableView.vue
+++ b/src/modules/main/partials/TableView.vue
@@ -6,6 +6,7 @@
 	<NcTable v-if="columns.length > 0"
 		v-model:view-setting="localViewSetting"
 		:rows="rows"
+		:total-rows="totalRows"
 		:columns="columns"
 		:element-id="element.id"
 		:is-view="isView"
@@ -55,6 +56,10 @@ export default {
 			type: Array,
 			default: () => [],
 		},
+		totalRows: {
+			type: Number,
+			default: null,
+		},
 		columns: {
 			type: Array,
 			default: () => [],
diff --git a/src/modules/main/sections/DataTable.vue b/src/modules/main/sections/DataTable.vue
index c72f8d7734..3fa20da62e 100644
--- a/src/modules/main/sections/DataTable.vue
+++ b/src/modules/main/sections/DataTable.vue
@@ -77,6 +77,7 @@
 				v-model:view-setting="localViewSetting"
 				v-model:selected-rows="localSelectedRows"
 				:rows="rows"
+				:total-rows="totalRows"
 				:columns="columns"
 				:element="table"
 				:is-view="false"
@@ -212,6 +213,10 @@ export default {
 			type: Array,
 			default: null,
 		},
+		totalRows: {
+			type: Number,
+			default: null,
+		},
 		viewSetting: {
 			type: Object,
 			default: null,
diff --git a/src/modules/main/sections/MainWrapper.vue b/src/modules/main/sections/MainWrapper.vue
index a0d60f6763..b55fb3e8ac 100644
--- a/src/modules/main/sections/MainWrapper.vue
+++ b/src/modules/main/sections/MainWrapper.vue
@@ -11,7 +11,9 @@
 				:view="element"
 				:columns="columns"
 				:rows="rows"
+				:total-rows="totalRows"
 				:view-setting="viewSetting"
+				@update:viewSetting="viewSetting = $event"
 				@create-column="createColumn"
 				@import="openImportModal"
 				@download-csv="downloadCSV"
@@ -22,7 +24,9 @@
 				:table="element"
 				:columns="columns"
 				:rows="rows"
+				:total-rows="totalRows"
 				:view-setting="viewSetting"
+				@update:viewSetting="viewSetting = $event"
 				@create-column="createColumn"
 				@import="openImportModal"
 				@download-csv="downloadCSV"
@@ -36,7 +40,7 @@
 <script>
 
 import { mapState, mapActions, storeToRefs } from 'pinia'
-import { emit } from '@nextcloud/event-bus'
+import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 import CustomView from './View.vue'
 import CustomTable from './Table.vue'
 import permissionsMixin from '../../../shared/components/ncTable/mixins/permissionsMixin.js'
@@ -68,19 +72,29 @@ export default {
 	},
 	setup(props) {
 		const store = useDataStore()
-		const { getColumns, getRows } = storeToRefs(store)
+		const { getColumns, getRows, getTotalRows } = storeToRefs(store)
 		// When using storeToRefs, only the top-level state is made reactive.
 		// To make nested dynamic keys reactive, you need to use a computed property or watch for changes.
 		const rows = computed(() => getRows.value(props.isView, props.element.id))
 		const columns = computed(() => getColumns.value(props.isView, props.element.id))
-		return { rows, columns, dataStore: store }
+		const totalRows = computed(() => getTotalRows.value(props.isView, props.element.id))
+		return { rows, columns, totalRows, dataStore: store }
 	},
 
 	data() {
 		return {
 			localLoading: false,
+			reloadInProgress: false,
+			viewSettingInProgress: false,
 			lastActiveElement: null,
 			viewSetting: {},
+			lastViewSettingFilter: null,
+			lastViewSettingSorting: null,
+			lastViewSettingSearchString: null,
+			rowsLoading: false,
+			rowsPerPage: 100,
+			pageNumber: 1,
+			paginationOffset: 0,
 		}
 	},
 
@@ -95,14 +109,45 @@ export default {
 		activeRowId() {
 			this.reload()
 		},
+		viewSetting: {
+			handler() {
+				const newFilter = this.viewSetting?.filter ? JSON.stringify(this.viewSetting.filter) : null
+				const newSorting = this.viewSetting?.sorting ? JSON.stringify(this.viewSetting.sorting) : null
+				const newSearchString = this.viewSetting?.searchString || null
+				if (newFilter === this.lastViewSettingFilter && newSorting === this.lastViewSettingSorting && newSearchString === this.lastViewSettingSearchString) {
+					return
+				}
+				const oldFilter = this.lastViewSettingFilter
+				const oldSorting = this.lastViewSettingSorting
+				const oldSearchString = this.lastViewSettingSearchString
+				this.lastViewSettingFilter = newFilter
+				this.lastViewSettingSorting = newSorting
+				this.lastViewSettingSearchString = newSearchString
+				this.onViewSettingChanged(oldFilter, oldSorting, oldSearchString)
+			},
+			deep: true,
+		},
+		rowsLoading() {
+			emit('tables:rows-loading', this.rowsLoading)
+		},
 	},
 
 	beforeMount() {
 		this.reload(true)
 	},
 
+	mounted() {
+		subscribe('tables:pagination-changed', this.onPaginationChanged)
+		subscribe('tables:reload', this.onReloadRequested)
+	},
+
+	beforeUnmount() {
+		unsubscribe('tables:pagination-changed', this.onPaginationChanged)
+		unsubscribe('tables:reload', this.onReloadRequested)
+	},
+
 	methods: {
-		...mapActions(useDataStore, ['removeRows', 'clearState', 'loadColumnsFromBE', 'loadRowsFromBE', 'loadRelationsFromBE']),
+		...mapActions(useDataStore, ['removeRows', 'clearState', 'loadColumnsFromBE', 'loadRowsFromBE', 'loadRowsCountFromBE', 'loadRelationsFromBE']),
 		...mapActions(useTablesStore, ['validateExportAccess']),
 		createColumn() {
 			emit('tables:column:create', { isView: this.isView, element: this.element })
@@ -158,6 +203,7 @@ export default {
 			const isLastElementSameAndView = this.element.id === this.lastActiveElement?.id && this.isView === this.lastActiveElement?.isView
 
 			if (!this.lastActiveElement || this.element.id !== this.lastActiveElement.id || isLastElementSameAndView || this.isView !== this.lastActiveElement.isView || force) {
+				this.reloadInProgress = true
 				this.localLoading = true
 
 				// Since we show one page at a time, no need keep other tables in the store
@@ -167,6 +213,8 @@ export default {
 				if (this.element?.sort?.length) {
 					this.viewSetting.presetSorting = [...this.element.sort]
 				}
+				this.pageNumber = 1
+				this.paginationOffset = 0
 
 				await this.loadColumnsFromBE({
 					view: this.isView ? this.element : null,
@@ -180,10 +228,27 @@ export default {
 				})
 
 				if (this.canReadData(this.element)) {
-					await this.loadRowsFromBE({
-						viewId: this.isView ? this.element.id : null,
-						tableId: !this.isView ? this.element.id : null,
-					})
+					this.rowsLoading = true
+					try {
+						await this.loadRowsCountFromBE({
+							viewId: this.isView ? this.element.id : null,
+							tableId: !this.isView ? this.element.id : null,
+							filter: this.viewSetting?.filter,
+							sort: this.viewSetting?.sorting,
+							search: this.viewSetting?.searchString,
+						})
+						await this.loadRowsFromBE({
+							viewId: this.isView ? this.element.id : null,
+							tableId: !this.isView ? this.element.id : null,
+							filter: this.viewSetting?.filter,
+							sort: this.viewSetting?.sorting,
+							search: this.viewSetting?.searchString,
+							limit: this.rowsPerPage,
+							offset: this.paginationOffset,
+						})
+					} finally {
+						this.rowsLoading = false
+					}
 				} else {
 					await this.removeRows({
 						isView: this.isView,
@@ -201,6 +266,110 @@ export default {
 					}
 				}
 				this.localLoading = false
+				this.reloadInProgress = false
+			}
+		},
+		async onViewSettingChanged(oldFilter, oldSorting, oldSearchString) {
+			if (this.reloadInProgress || this.rowsLoading || !this.element) {
+				return
+			}
+			const filterChanged = this.lastViewSettingFilter !== oldFilter
+			const sortingChanged = this.lastViewSettingSorting !== oldSorting
+			const searchStringChanged = this.lastViewSettingSearchString !== oldSearchString
+			if (!filterChanged && !sortingChanged && !searchStringChanged) {
+				return
+			}
+			this.viewSettingInProgress = filterChanged || searchStringChanged
+			this.rowsLoading = true
+			try {
+				const viewId = this.isView ? this.element.id : null
+				const tableId = !this.isView ? this.element.id : null
+				if (filterChanged || searchStringChanged) {
+					this.pageNumber = 1
+					this.paginationOffset = 0
+					emit('tables:pagination-changed', { pageNumber: 1, rowsPerPage: this.rowsPerPage })
+					await this.loadRowsCountFromBE({
+						viewId,
+						tableId,
+						filter: this.viewSetting?.filter,
+						sort: this.viewSetting?.sorting,
+						search: this.viewSetting?.searchString,
+					})
+					await this.loadRowsFromBE({
+						viewId,
+						tableId,
+						filter: this.viewSetting?.filter,
+						sort: this.viewSetting?.sorting,
+						search: this.viewSetting?.searchString,
+						limit: this.rowsPerPage,
+						offset: this.paginationOffset,
+					})
+				} else if (sortingChanged) {
+					this.paginationOffset = (this.pageNumber - 1) * this.rowsPerPage
+					await this.loadRowsFromBE({
+						viewId,
+						tableId,
+						filter: this.viewSetting?.filter,
+						sort: this.viewSetting?.sorting,
+						search: this.viewSetting?.searchString,
+						limit: this.rowsPerPage,
+						offset: this.paginationOffset,
+					})
+				}
+			} finally {
+				this.rowsLoading = false
+				this.viewSettingInProgress = false
+			}
+		},
+		async onPaginationChanged({ pageNumber, rowsPerPage }) {
+			if (!this.element || this.viewSettingInProgress || this.rowsLoading) {
+				return
+			}
+			this.pageNumber = pageNumber
+			if (rowsPerPage) {
+				this.rowsPerPage = rowsPerPage
+			}
+			this.paginationOffset = (this.pageNumber - 1) * this.rowsPerPage
+			this.rowsLoading = true
+			const viewId = this.isView ? this.element.id : null
+			const tableId = !this.isView ? this.element.id : null
+			try {
+				await this.loadRowsFromBE({
+					viewId,
+					tableId,
+					filter: this.viewSetting?.filter,
+					sort: this.viewSetting?.sorting,
+					limit: this.rowsPerPage,
+					offset: this.paginationOffset,
+				})
+			} finally {
+				this.rowsLoading = false
+			}
+		},
+		async onReloadRequested() {
+			if (!this.element || this.rowsLoading) {
+				return
+			}
+			this.rowsLoading = true
+			const viewId = this.isView ? this.element.id : null
+			const tableId = !this.isView ? this.element.id : null
+			try {
+				await this.loadRowsCountFromBE({
+					viewId,
+					tableId,
+					filter: this.viewSetting?.filter,
+					sort: this.viewSetting?.sorting,
+				})
+				await this.loadRowsFromBE({
+					viewId,
+					tableId,
+					filter: this.viewSetting?.filter,
+					sort: this.viewSetting?.sorting,
+					limit: this.rowsPerPage,
+					offset: this.paginationOffset,
+				})
+			} finally {
+				this.rowsLoading = false
 			}
 		},
 	},
diff --git a/src/modules/main/sections/PublicElement.vue b/src/modules/main/sections/PublicElement.vue
index 3d902c687c..7aedb5a4ca 100644
--- a/src/modules/main/sections/PublicElement.vue
+++ b/src/modules/main/sections/PublicElement.vue
@@ -8,7 +8,7 @@
 		<TableDescription :description="element.description" :read-only="true" />
 		<div class="table-wrapper">
 			<EmptyView v-if="columns.length === 0" :view="element" />
-			<TableView v-else :rows="rows" :columns="columns" :element="element"
+			<TableView v-else :rows="rows" :columns="columns" :element="element" :total-rows="totalRows" :view-setting="localViewSetting" @update:view-setting="onViewSettingUpdate"
 				:can-read-rows="element.onSharePermissions.read"
 				:can-create-rows="element.onSharePermissions.create"
 				:can-edit-rows="element.onSharePermissions.update"
@@ -106,11 +106,20 @@ export default {
 			type: Array,
 			default: () => [],
 		},
+		totalRows: {
+			type: Number,
+			default: null,
+		},
+		viewSetting: {
+			type: Object,
+			default: null,
+		},
 	},
 
 	emits: [
 		'download-csv',
 		'download-filtered-csv',
+		'update:viewSetting',
 	],
 	data() {
 		return {
@@ -118,9 +127,16 @@ export default {
 			prefillData: null,
 			editRow: null,
 			rowsToDelete: null,
+			localViewSetting: this.viewSetting,
 		}
 	},
 
+	watch: {
+		viewSetting() {
+			this.localViewSetting = this.viewSetting
+		},
+	},
+
 	computed: {
 		isFormMode() {
 			return this.element.onSharePermissions.create && !this.element.onSharePermissions.read
@@ -152,6 +168,10 @@ export default {
 
 	methods: {
 		t,
+		onViewSettingUpdate(viewSetting) {
+			this.localViewSetting = viewSetting
+			this.$emit('update:viewSetting', viewSetting)
+		},
 	},
 }
 </script>
diff --git a/src/modules/main/sections/PublicMainWrapper.vue b/src/modules/main/sections/PublicMainWrapper.vue
index 53bd3cc764..8a2f66d6db 100644
--- a/src/modules/main/sections/PublicMainWrapper.vue
+++ b/src/modules/main/sections/PublicMainWrapper.vue
@@ -7,7 +7,7 @@
 		<div v-if="loading" class="icon-loading" />
 
 		<div v-else>
-			<PublicElement :element="publicElement" :columns="columns" :rows="rows" @download-csv="downloadCSV" @download-filtered-csv="downloadFilteredCSV" />
+			<PublicElement :element="publicElement" :columns="columns" :rows="rows" :total-rows="totalRows" :view-setting="viewSetting" @update:viewSetting="viewSetting = $event" @download-csv="downloadCSV" @download-filtered-csv="downloadFilteredCSV" />
 		</div>
 	</div>
 </template>
@@ -19,6 +19,7 @@ import exportTableMixin from '../../../shared/components/ncTable/mixins/exportTa
 import { useDataStore } from '../../../store/data.js'
 import { useTablesStore } from '../../../store/store.js'
 import { computed } from 'vue'
+import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { loadState } from '@nextcloud/initial-state'
 import { showError } from '@nextcloud/dialogs'
 import { translate as t } from '@nextcloud/l10n'
@@ -44,18 +45,28 @@ export default {
 
 	setup(props) {
 		const store = useDataStore()
-		const { getColumns, getRows } = storeToRefs(store)
+		const { getColumns, getRows, getTotalRows } = storeToRefs(store)
 
 		const stateKey = 'public-' + props.token
 		const rows = computed(() => getRows.value(false, stateKey))
 		const columns = computed(() => getColumns.value(false, stateKey))
+		const totalRows = computed(() => getTotalRows.value(false, stateKey))
 
-		return { rows, columns }
+		return { rows, columns, totalRows, dataStore: store }
 	},
 
 	data() {
 		return {
 			loading: false,
+			viewSetting: {},
+			lastViewSettingFilter: null,
+			lastViewSettingSorting: null,
+			lastViewSettingSearchString: null,
+			rowsPerPage: 100,
+			pageNumber: 1,
+			paginationOffset: 0,
+			rowsLoading: false,
+			viewSettingInProgress: false,
 			publicElement: {
 				id: 'public',
 				emoji: nodeData.emoji,
@@ -75,24 +86,146 @@ export default {
 
 	beforeMount() {
 		this.setPublicToken(this.token)
-		this.loadData()
+		this.reload()
+	},
+
+	mounted() {
+		subscribe('tables:pagination-changed', this.onPaginationChanged)
+	},
+
+	beforeUnmount() {
+		unsubscribe('tables:pagination-changed', this.onPaginationChanged)
+	},
+
+	watch: {
+		viewSetting: {
+			handler() {
+				const newFilter = this.viewSetting?.filter ? JSON.stringify(this.viewSetting.filter) : null
+				const newSorting = this.viewSetting?.sorting ? JSON.stringify(this.viewSetting.sorting) : null
+				const newSearchString = this.viewSetting?.searchString || null
+				if (newFilter === this.lastViewSettingFilter && newSorting === this.lastViewSettingSorting && newSearchString === this.lastViewSettingSearchString) {
+					return
+				}
+				const oldFilter = this.lastViewSettingFilter
+				const oldSorting = this.lastViewSettingSorting
+				const oldSearchString = this.lastViewSettingSearchString
+				this.lastViewSettingFilter = newFilter
+				this.lastViewSettingSorting = newSorting
+				this.lastViewSettingSearchString = newSearchString
+				this.onViewSettingChanged(oldFilter, oldSorting, oldSearchString)
+			},
+			deep: true,
+		},
 	},
 
 	methods: {
-		...mapActions(useDataStore, ['loadPublicColumnsFromBE', 'loadPublicRowsFromBE', 'setPublicToken']),
+		...mapActions(useDataStore, ['loadPublicColumnsFromBE', 'loadPublicRowsFromBE', 'loadPublicRowsCountFromBE', 'setPublicToken']),
 		...mapActions(useTablesStore, ['validatePublicExportAccess']),
 
-		async loadData() {
+		async reload() {
+			if (!this.token) {
+				return
+			}
+
 			this.loading = true
+			this.pageNumber = 1
+			this.paginationOffset = 0
+
+			await this.loadPublicColumnsFromBE({ token: this.token })
+
+			this.rowsLoading = true
+			try {
+				await this.loadPublicRowsCountFromBE({
+					token: this.token,
+					filter: this.viewSetting?.filter,
+					sort: this.viewSetting?.sorting,
+					search: this.viewSetting?.searchString,
+				})
+				await this.loadPublicRowsFromBE({
+					token: this.token,
+					filter: this.viewSetting?.filter,
+					sort: this.viewSetting?.sorting,
+					search: this.viewSetting?.searchString,
+					limit: this.rowsPerPage,
+					offset: this.paginationOffset,
+				})
+			} finally {
+				this.rowsLoading = false
+			}
+
+			this.loading = false
+		},
+
+		async onViewSettingChanged(oldFilter, oldSorting, oldSearchString) {
+			if (this.loading || this.rowsLoading) {
+				return
+			}
+			const filterChanged = this.lastViewSettingFilter !== oldFilter
+			const sortingChanged = this.lastViewSettingSorting !== oldSorting
+			const searchStringChanged = this.lastViewSettingSearchString !== oldSearchString
+			if (!filterChanged && !sortingChanged && !searchStringChanged) {
+				return
+			}
+			this.viewSettingInProgress = filterChanged || searchStringChanged
+			this.rowsLoading = true
+			try {
+				if (filterChanged || searchStringChanged) {
+					this.pageNumber = 1
+					this.paginationOffset = 0
+					emit('tables:pagination-changed', { pageNumber: 1, rowsPerPage: this.rowsPerPage })
+					await this.loadPublicRowsCountFromBE({
+						token: this.token,
+						filter: this.viewSetting?.filter,
+						sort: this.viewSetting?.sorting,
+						search: this.viewSetting?.searchString,
+					})
+					await this.loadPublicRowsFromBE({
+						token: this.token,
+						filter: this.viewSetting?.filter,
+						sort: this.viewSetting?.sorting,
+						search: this.viewSetting?.searchString,
+						limit: this.rowsPerPage,
+						offset: this.paginationOffset,
+					})
+				} else if (sortingChanged) {
+					this.paginationOffset = (this.pageNumber - 1) * this.rowsPerPage
+					await this.loadPublicRowsFromBE({
+						token: this.token,
+						filter: this.viewSetting?.filter,
+						sort: this.viewSetting?.sorting,
+						search: this.viewSetting?.searchString,
+						limit: this.rowsPerPage,
+						offset: this.paginationOffset,
+					})
+				}
+			} finally {
+				this.rowsLoading = false
+				this.viewSettingInProgress = false
+			}
+		},
+
+		async onPaginationChanged({ pageNumber, rowsPerPage }) {
+			if (this.loading || this.viewSettingInProgress || this.rowsLoading) {
+				return
+			}
+			this.pageNumber = pageNumber
+			if (rowsPerPage) {
+				this.rowsPerPage = rowsPerPage
+			}
+			this.paginationOffset = (this.pageNumber - 1) * this.rowsPerPage
+
+			this.rowsLoading = true
 			try {
-				await Promise.all([
-					this.loadPublicColumnsFromBE({ token: this.token }),
-					this.loadPublicRowsFromBE({ token: this.token }),
-				])
-			} catch (e) {
-				console.error('Error loading public data', e)
+				await this.loadPublicRowsFromBE({
+					token: this.token,
+					filter: this.viewSetting?.filter,
+					sort: this.viewSetting?.sorting,
+					search: this.viewSetting?.searchString,
+					limit: this.rowsPerPage,
+					offset: this.paginationOffset,
+				})
 			} finally {
-				this.loading = false
+				this.rowsLoading = false
 			}
 		},
 
diff --git a/src/modules/main/sections/Table.vue b/src/modules/main/sections/Table.vue
index 20da815562..e9778ccba0 100644
--- a/src/modules/main/sections/Table.vue
+++ b/src/modules/main/sections/Table.vue
@@ -13,7 +13,7 @@
 			@toggle-share="$emit('toggle-share')"
 			@show-integration="$emit('show-integration')"
 			@create-view="createView" />
-		<DataTable v-model:view-setting="localViewSetting" :table="table" :columns="columns" :rows="rows"
+		<DataTable v-model:view-setting="localViewSetting" :table="table" :columns="columns" :rows="rows" :total-rows="totalRows"
 			@create-column="$emit('create-column')"
 			@import="$emit('import')"
 			@download-csv="$emit('download-csv')"
@@ -54,6 +54,10 @@ export default {
 			type: Array,
 			default: null,
 		},
+		totalRows: {
+			type: Number,
+			default: null,
+		},
 		viewSetting: {
 			type: Object,
 			default: null,
diff --git a/src/modules/main/sections/View.vue b/src/modules/main/sections/View.vue
index d0e7864a67..8654ff37eb 100644
--- a/src/modules/main/sections/View.vue
+++ b/src/modules/main/sections/View.vue
@@ -11,6 +11,7 @@
 			<TableView v-else
 				v-model:view-setting="localViewSetting"
 				:rows="rows"
+				:total-rows="totalRows"
 				:columns="columns"
 				:element="view"
 				:is-view="true"
@@ -133,6 +134,10 @@ export default {
 			type: Array,
 			default: null,
 		},
+		totalRows: {
+			type: Number,
+			default: null,
+		},
 		viewSetting: {
 			type: Object,
 			default: null,
diff --git a/src/shared/components/ncTable/NcTable.vue b/src/shared/components/ncTable/NcTable.vue
index 9608c9f3f6..70c02620ac 100644
--- a/src/shared/components/ncTable/NcTable.vue
+++ b/src/shared/components/ncTable/NcTable.vue
@@ -43,7 +43,7 @@ deselect-all-rows        -> unselect all rows, e.g. after deleting selected rows
 <template>
 	<div ref="table" class="NcTable" data-cy="ncTable">
 		<div class="options row" style="padding-right: calc(var(--default-grid-baseline) * 2);">
-			<Options v-model:view-setting="localViewSetting" :rows="getSearchedAndFilteredAndSortedRows" :all-rows="rows" :columns="parsedColumns" :element-id="elementId"
+			<Options v-model:view-setting="localViewSetting" :rows="getSearchedAndFilteredAndSortedRows" :all-rows="rows" :total="totalRows" :columns="parsedColumns" :element-id="elementId"
 				:is-view="isView"
 				:selected-rows="localSelectedRows"
 				:show-options="parsedColumns.length !== 0" :config="config" @create-row="$emit('create-row')"
@@ -53,7 +53,7 @@ deselect-all-rows        -> unselect all rows, e.g. after deleting selected rows
 		</div>
 		<div class="custom-table row">
 			<CustomTable v-if="config.canReadRows || (config.canCreateRows && rows.length > 0)" v-model:view-setting="localViewSetting"
-				:columns="parsedColumns" :rows="getSearchedAndFilteredAndSortedRows" :is-view="isView" :element-id="elementId"
+				:columns="parsedColumns" :rows="getSearchedAndFilteredAndSortedRows" :total-rows="totalRows" :is-view="isView" :element-id="elementId"
 				:config="config" @create-row="$emit('create-row')"
 				@edit-row="rowId => $emit('edit-row', rowId)"
 				@copy-row="rowId => $emit('copy-row', rowId)"
@@ -110,16 +110,6 @@ import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { parseCol } from './mixins/columnParser.js'
 import { AbstractColumn } from './mixins/columnClass.js'
 import { translate as t } from '@nextcloud/l10n'
-import {
-	TYPE_META_CREATED_AT,
-	TYPE_META_CREATED_BY,
-	TYPE_META_ID,
-	TYPE_META_UPDATED_AT,
-	TYPE_META_UPDATED_BY,
-} from '../../constants.ts'
-import { MetaColumns } from './mixins/metaColumns.js'
-import { MagicFields } from './mixins/magicFields.js'
-import { FilterIds, getFiltersForColumn } from './mixins/filter.js'
 
 export default {
 	name: 'NcTable',
@@ -133,6 +123,10 @@ export default {
 			type: Array,
 			default: () => [],
 		},
+		totalRows: {
+			type: Number,
+			default: null,
+		},
 		columns: {
 			type: Array,
 			default: () => [],
@@ -270,128 +264,8 @@ export default {
 		sorting() {
 			return this.viewSetting?.sorting
 		},
-		getSearchedAndFilteredRows() {
-			// if we don't have to search and/or filter
-			if (!this.viewSetting?.filter?.length > 0 && !this.viewSetting?.searchString) {
-				// cleanup markers
-				if (this.rows && this.columns) {
-					this.rows.forEach(row => {
-						if (row && row.data) {
-							this.columns.forEach(column => {
-								const cell = row.data.find(item => item && item.columnId === column.id)
-								if (cell === undefined) {
-									return
-								}
-								delete cell.searchStringFound
-								delete cell.filterFound
-							})
-						}
-					})
-				}
-				return this.rows || []
-			}
-
-			const data = [] // array of rows
-			const searchString = this.viewSetting?.searchString
-			// each row
-			if (!this.rows || !this.columns) {
-				return []
-			}
-
-			for (const row of this.rows) {
-				if (!row || !row.data) {
-					continue
-				}
-				let filterStatusRow = null
-				let searchStatusRow = false
-
-				// each column in a row => cell
-				this.columns.forEach(column => {
-					let filterStatus = null
-					let searchStatus = true
-					const filters = getFiltersForColumn(column, this.viewSetting)
-					let cell
-					if (column.id < 0) {
-						cell = { columnId: column.id }
-						switch (column.id) {
-						case TYPE_META_ID:
-							cell.value = row.id
-							break
-						case TYPE_META_CREATED_BY:
-							cell.value = row.createdBy
-							break
-						case TYPE_META_UPDATED_BY:
-							cell.value = row.editedBy
-							break
-						case TYPE_META_CREATED_AT:
-							cell.value = row.createdAt
-							break
-						case TYPE_META_UPDATED_AT:
-							cell.value = row.editedAt
-							break
-						}
-					} else {
-						cell = row.data.find(item => item && item.columnId === column.id)
-					}
-
-					// if we don't have a value for this cell
-					if (cell === undefined) {
-						if (searchString) {
-							searchStatus = false
-						}
-						cell = { columnId: column.id, value: null }
-					}
-					// cleanup possible old markers
-					delete cell.searchStringFound
-					delete cell.filterFound
-
-					// apply filters (if any)
-					filters.forEach(fil => {
-						this.addMagicFieldsValues(fil)
-						if (filterStatus === null || filterStatus === true) {
-							filterStatus = column.isFilterFound(cell, fil)
-						}
-					})
-					// if we should search
-					if (searchString) {
-						searchStatus = column.isSearchStringFound(cell, searchString.toLowerCase())
-					}
-
-					// if filterStatus is null, this result should be ignored
-					if (filterStatus !== null && (filterStatusRow || filterStatusRow === null)) {
-						filterStatusRow = filterStatus
-					}
-
-					// filterStatusRow = filterStatus
-					searchStatusRow = searchStatusRow || searchStatus
-				})
-
-				if ((filterStatusRow || filterStatusRow === null) && searchStatusRow) {
-					data.push({ ...row })
-				}
-			}
-			return data
-		},
 		getSearchedAndFilteredAndSortedRows() {
-			const allColumns = this.columns.concat(MetaColumns)
-			const sort = (sortCols) => {
-				const sortColumn = allColumns.find(item => item.id === sortCols?.[0].columnId)
-				const nextSorts = []
-				for (let i = 1; i < sortCols.length; i++) {
-					const sortColumn = allColumns.find(item => item.id === sortCols[i].columnId)
-					nextSorts.push(sortColumn?.sort?.(sortCols[i].mode))
-				}
-				return [...this.getSearchedAndFilteredRows].sort(sortColumn?.sort?.(sortCols[0].mode, nextSorts))
-			}
-
-			// if we have to sort
-			if (this.viewSetting?.presetSorting) {
-				return sort(this.viewSetting.presetSorting)
-			}
-			if (this.viewSetting?.sorting) {
-				return sort(this.viewSetting.sorting)
-			}
-			return this.getSearchedAndFilteredRows
+			return this.rows || []
 		},
 	},
 	watch: {
@@ -434,18 +308,6 @@ export default {
 			this.localViewSetting.searchString = str !== '' ? str : null
 			this.localViewSetting = JSON.parse(JSON.stringify(this.localViewSetting))
 		},
-		addMagicFieldsValues(filter) {
-			if (FilterIds.ContainsItem === filter.operator.id) {
-				return
-			}
-
-			Object.values(MagicFields).forEach(field => {
-				const newFilterValue = filter.value.replace('@' + field.id, field.replace)
-				if (filter.value !== newFilterValue) {
-					filter.magicValuesEnriched = newFilterValue
-				}
-			})
-		},
 	},
 }
 </script>
diff --git a/src/shared/components/ncTable/partials/TableHeader.vue b/src/shared/components/ncTable/partials/TableHeader.vue
index ec86961524..e1f876885b 100644
--- a/src/shared/components/ncTable/partials/TableHeader.vue
+++ b/src/shared/components/ncTable/partials/TableHeader.vue
@@ -164,6 +164,7 @@ export default {
 			const index = this.localViewSetting?.filter?.findIndex(item => item.columnId + item.operator.id + item.value === id)
 			if (index !== -1) {
 				this.localViewSetting.filter.splice(index, 1)
+				this.localViewSetting = JSON.parse(JSON.stringify(this.localViewSetting))
 			}
 		},
 		castToFilter(operatorId) {
diff --git a/src/shared/components/ncTable/sections/CustomTable.vue b/src/shared/components/ncTable/sections/CustomTable.vue
index 040cf08cb7..9852ecd96c 100644
--- a/src/shared/components/ncTable/sections/CustomTable.vue
+++ b/src/shared/components/ncTable/sections/CustomTable.vue
@@ -72,6 +72,10 @@ export default {
 			type: Array,
 			default: () => [],
 		},
+		totalRows: {
+			type: Number,
+			default: null,
+		},
 		columns: {
 			type: Array,
 			default: () => [],
@@ -121,6 +125,9 @@ export default {
 
 	computed: {
 		currentPageRows() {
+			if (this.totalRows !== null) {
+				return this.rows
+			}
 			return this.rows.slice((this.pageNumber - 1) * this.rowsPerPage, ((this.pageNumber - 1) * this.rowsPerPage) + this.rowsPerPage)
 		},
 	},
diff --git a/src/shared/components/ncTable/sections/Options.vue b/src/shared/components/ncTable/sections/Options.vue
index 7f2ade57bf..fc4ed1a51f 100644
--- a/src/shared/components/ncTable/sections/Options.vue
+++ b/src/shared/components/ncTable/sections/Options.vue
@@ -24,7 +24,13 @@
 					<SearchForm :columns="columns" :search-string="getSearchString"
 						@set-search-string="str => $emit('set-search-string', str)" />
 				</div>
-				<PaginationBlock :rows="rows" />
+				<NcButton v-if="config.canReadRows" :aria-label="t('tables', 'Reload rows')" type="tertiary" @click="onReload">
+					<template #icon>
+						<NcLoadingIcon v-if="rowsLoading" :size="20" />
+						<Refresh v-else :size="20" />
+					</template>
+				</NcButton>
+				<PaginationBlock :total="total" />
 			</div>
 
 			<div v-if="selectedRows.length > 0" class="selected-rows-option">
@@ -64,12 +70,13 @@
 </template>
 
 <script>
-import { NcButton, NcActions, NcActionButton } from '@nextcloud/vue'
-import { emit } from '@nextcloud/event-bus'
+import { NcButton, NcActions, NcActionButton, NcLoadingIcon } from '@nextcloud/vue'
+import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 import Plus from 'vue-material-design-icons/Plus.vue'
 import Check from 'vue-material-design-icons/CheckboxBlankOutline.vue'
 import Delete from 'vue-material-design-icons/TrashCanOutline.vue'
 import TrayArrowDown from 'vue-material-design-icons/TrayArrowDown.vue'
+import Refresh from 'vue-material-design-icons/Refresh.vue'
 import viewportHelper from '../../../mixins/viewportHelper.js'
 import SearchForm from '../partials/SearchForm.vue'
 import PaginationBlock from './PaginationBlock.vue'
@@ -83,10 +90,12 @@ export default {
 		NcActionButton,
 		SearchForm,
 		NcButton,
+		NcLoadingIcon,
 		Plus,
 		Check,
 		Delete,
 		TrayArrowDown,
+		Refresh,
 		PaginationBlock,
 	},
 
@@ -101,6 +110,10 @@ export default {
 			type: Array,
 			default: () => [],
 		},
+		total: {
+			type: Number,
+			default: null,
+		},
 		allRows: {
 			type: Array,
 			default: () => [],
@@ -140,6 +153,7 @@ export default {
 	data() {
 		return {
 			optionsDivWidth: null,
+			rowsLoading: false,
 		}
 	},
 
@@ -165,10 +179,12 @@ export default {
 	mounted() {
 		this.updateOptionsDivWidth()
 		window.addEventListener('resize', this.updateOptionsDivWidth)
+		subscribe('tables:rows-loading', this.setRowsLoading)
 	},
 
 	beforeUnmount() {
 		window.removeEventListener('resize', this.updateOptionsDivWidth)
+		unsubscribe('tables:rows-loading', this.setRowsLoading)
 	},
 
 	methods: {
@@ -180,6 +196,12 @@ export default {
 		exportFiltered() {
 			this.$emit('download-filtered-csv', this.rows)
 		},
+		onReload() {
+			emit('tables:reload')
+		},
+		setRowsLoading(loading) {
+			this.rowsLoading = loading
+		},
 		exportSelected() {
 			this.$emit('download-filtered-csv', this.getSelectedRows)
 		},
diff --git a/src/shared/components/ncTable/sections/PaginationBlock.vue b/src/shared/components/ncTable/sections/PaginationBlock.vue
index 14416ac628..ff3a62543c 100644
--- a/src/shared/components/ncTable/sections/PaginationBlock.vue
+++ b/src/shared/components/ncTable/sections/PaginationBlock.vue
@@ -52,7 +52,7 @@ import ChevronRightIcon from 'vue-material-design-icons/ChevronRight.vue'
 import ChevronLeftIcon from 'vue-material-design-icons/ChevronLeft.vue'
 import { NcButton, NcSelect, NcTextField } from '@nextcloud/vue'
 import { translate as t } from '@nextcloud/l10n'
-import { emit } from '@nextcloud/event-bus'
+import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 
 export default {
 	name: 'PaginationBlock',
@@ -68,9 +68,9 @@ export default {
 	},
 
 	props: {
-		rows: {
-			type: Array,
-			default: () => [],
+		total: {
+			type: Number,
+			default: null,
 		},
 	},
 
@@ -83,7 +83,8 @@ export default {
 
 	computed: {
 		totalPages() {
-			return Math.max(1, Math.ceil(this.rows.length / this.rowsPerPage))
+			const total = this.total ?? 0
+			return Math.max(1, Math.ceil(total / this.rowsPerPage))
 		},
 	},
 
@@ -96,13 +97,24 @@ export default {
 			this.validatePageInput()
 			emit('tables:pagination-changed', { pageNumber: this.pageNumber, rowsPerPage: this.rowsPerPage })
 		},
-		rows() {
-			this.validatePageInput()
-		},
+	},
+
+	mounted() {
+		subscribe('tables:pagination-changed', this.handlePaginationChanged)
+	},
+
+	beforeUnmount() {
+		unsubscribe('tables:pagination-changed', this.handlePaginationChanged)
 	},
 
 	methods: {
 		t,
+		handlePaginationChanged({ pageNumber, rowsPerPage }) {
+			this.pageNumber = pageNumber
+			if (rowsPerPage) {
+				this.rowsPerPage = rowsPerPage
+			}
+		},
 		validatePageInput() {
 			// Ensure page number is within valid range
 			if (this.pageNumber < 1) {
diff --git a/src/store/data.js b/src/store/data.js
index 75fc23a92f..c179f1bfad 100644
--- a/src/store/data.js
+++ b/src/store/data.js
@@ -21,6 +21,7 @@ export const useDataStore = defineStore('data', {
 		loading: {},
 		rows: {},
 		columns: {},
+		rowCounts: {},
 		publicToken: null,
 		relations: {},
 		relationsLoading: {},
@@ -35,6 +36,10 @@ export const useDataStore = defineStore('data', {
 			const stateId = typeof elementId === 'string' && elementId.startsWith('public-') ? elementId : genStateKey(isView, elementId)
 			return state.rows[stateId] ?? []
 		},
+		getTotalRows: (state) => (isView, elementId) => {
+			const stateId = typeof elementId === 'string' && elementId.startsWith('public-') ? elementId : genStateKey(isView, elementId)
+			return state.rowCounts[stateId] ?? 0
+		},
 		getRelations: (state) => (columnId) => {
 			if (state.relations[columnId] === undefined) {
 				state.relations[columnId] = {}
@@ -52,6 +57,7 @@ export const useDataStore = defineStore('data', {
 			this.loading = {}
 			this.columns = {}
 			this.rows = {}
+			this.rowCounts = {}
 			this.publicToken = null
 			this.relations = {}
 			this.relationsLoading = {}
@@ -233,34 +239,121 @@ export const useDataStore = defineStore('data', {
 		},
 
 		// ROWS
-		async loadRowsFromBE({ tableId, viewId }) {
+		async loadRowsFromBE({ tableId, viewId, filter = null, sort = null, search = null, limit = null, offset = null }) {
 			const stateId = genStateKey(!!(viewId), viewId ?? tableId)
 			this.loading[stateId] = true
 			let res = null
 
+			const params = {}
+			if (filter && filter.length > 0) {
+				const backendFilter = [filter.map(rule => ({
+					columnId: rule.columnId,
+					operator: rule.operator?.id ?? rule.operator,
+					value: rule.value,
+				}))]
+				params.filter = JSON.stringify(backendFilter)
+			}
+			if (search) {
+				params.search = search
+			}
+			if (sort && sort.length > 0) {
+				params.sort = JSON.stringify(sort)
+			}
+			if (limit !== null) {
+				params.limit = limit
+			}
+			if (offset !== null) {
+				params.offset = offset
+			}
+
 			try {
-				if (viewId) {
-					res = await axios.get(generateUrl('/apps/tables/row/view/' + viewId))
-				} else {
-					res = await axios.get(generateUrl('/apps/tables/row/table/' + tableId))
-				}
+				const collection = viewId ? 'views' : 'tables'
+				const nodeId = viewId ?? tableId
+				res = await axios.get(generateOcsUrl('/apps/tables/api/2/' + collection + '/' + nodeId + '/rows'), { params })
 			} catch (e) {
 				displayError(e, t('tables', 'Could not load rows.'))
 				return false
 			}
 
-			this.rows[stateId] = res.data
+			if (!res?.data?.ocs?.data || !Array.isArray(res.data.ocs.data)) {
+				const e = new Error('Expected array, but is not')
+				displayError(e, 'Format for loaded rows not valid.')
+				return false
+			}
+
+			this.rows[stateId] = res.data.ocs.data
 			this.loading[stateId] = false
 			return true
 		},
 
-		async loadPublicRowsFromBE({ token }) {
+		async loadRowsCountFromBE({ tableId, viewId, filter = null, sort = null, search = null }) {
+			const stateId = genStateKey(!!(viewId), viewId ?? tableId)
+			let res = null
+
+			const params = {}
+			if (filter && filter.length > 0) {
+				const backendFilter = [filter.map(rule => ({
+					columnId: rule.columnId,
+					operator: rule.operator?.id ?? rule.operator,
+					value: rule.value,
+				}))]
+				params.filter = JSON.stringify(backendFilter)
+			}
+			if (search) {
+				params.search = search
+			}
+			if (sort && sort.length > 0) {
+				params.sort = JSON.stringify(sort)
+			}
+
+			try {
+				const collection = viewId ? 'views' : 'tables'
+				const nodeId = viewId ?? tableId
+				res = await axios.get(generateOcsUrl('/apps/tables/api/2/' + collection + '/' + nodeId + '/rows/count'), { params })
+			} catch (e) {
+				displayError(e, t('tables', 'Could not load row count.'))
+				return false
+			}
+
+			if (!res?.data?.ocs?.data || typeof res.data.ocs.data.count !== 'number') {
+				const e = new Error('Expected count, but is not')
+				displayError(e, 'Format for loaded row count not valid.')
+				return false
+			}
+
+			this.rowCounts[stateId] = res.data.ocs.data.count
+			return true
+		},
+
+		async loadPublicRowsFromBE({ token, filter = null, sort = null, search = null, limit = null, offset = null }) {
 			const stateId = 'public-' + token
 			this.loading[stateId] = true
 			let res
 
+			const params = {}
+			if (filter && filter.length > 0) {
+				const backendFilter = [filter.map(rule => ({
+					columnId: rule.columnId,
+					operator: rule.operator?.id ?? rule.operator,
+					value: rule.value,
+				}))]
+				params.filter = JSON.stringify(backendFilter)
+			}
+			if (search) {
+				params.search = search
+			}
+			if (sort && sort.length > 0) {
+				params.sort = JSON.stringify(sort)
+			}
+			if (limit !== null) {
+				params.limit = limit
+			}
+			if (offset !== null) {
+				params.offset = offset
+			}
+
 			try {
-				res = await axios.get(generateOcsUrl('/apps/tables/api/2/public/' + token + '/rows'))
+				res = await axios.get(generateOcsUrl('/apps/tables/api/2/public/' + token + '/rows'), { params })
 			} catch (e) {
 				return false
 			}
@@ -270,6 +363,42 @@ export const useDataStore = defineStore('data', {
 			return true
 		},
 
+		async loadPublicRowsCountFromBE({ token, filter = null, sort = null, search = null }) {
+			const stateId = 'public-' + token
+			let res = null
+
+			const params = {}
+			if (filter && filter.length > 0) {
+				const backendFilter = [filter.map(rule => ({
+					columnId: rule.columnId,
+					operator: rule.operator?.id ?? rule.operator,
+					value: rule.value,
+				}))]
+				params.filter = JSON.stringify(backendFilter)
+			}
+			if (search) {
+				params.search = search
+			}
+			if (sort && sort.length > 0) {
+				params.sort = JSON.stringify(sort)
+			}
+
+			try {
+				res = await axios.get(generateOcsUrl('/apps/tables/api/2/public/' + token + '/rows/count'), { params })
+			} catch (e) {
+				return false
+			}
+
+			if (!res?.data?.ocs?.data || typeof res.data.ocs.data.count !== 'number') {
+				const e = new Error('Expected count, but is not')
+				displayError(e, 'Format for loaded row count not valid.')
+				return false
+			}
+
+			this.rowCounts[stateId] = res.data.ocs.data.count
+			return true
+		},
+
 		removeRows({ isView, elementId }) {
 			const stateId = genStateKey(isView, elementId)
 			this.rows[stateId] = []

From 47d3b3475242992f288e6e2742f6cf188a58465c Mon Sep 17 00:00:00 2001
From: Kostiantyn Miakshyn <molodchick@gmail.com>
Date: Sun, 23 Aug 2026 22:57:43 +0200
Subject: [PATCH 03/11] Store filters in query params

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>
---
 lib/Db/Row2Mapper.php                         |   4 +-
 src/modules/main/sections/MainWrapper.vue     |  52 +++++++-
 .../main/sections/PublicMainWrapper.vue       |  43 +++++-
 .../ncTable/partials/SearchForm.vue           |   8 +-
 src/shared/utils/urlState.js                  | 122 ++++++++++++++++++
 5 files changed, 218 insertions(+), 11 deletions(-)
 create mode 100644 src/shared/utils/urlState.js

diff --git a/lib/Db/Row2Mapper.php b/lib/Db/Row2Mapper.php
index 5420466c3c..db876b37cd 100644
--- a/lib/Db/Row2Mapper.php
+++ b/lib/Db/Row2Mapper.php
@@ -183,7 +183,7 @@ public function findAll(array $showColumnIds, int $tableId, ?int $limit = null,
 		try {
 			$this->columnMapper->preloadColumns($showColumnIds, $filter, $sort);
 
-			$wantedRowIdsArray = $this->getWantedRowIds($userId ?? '', $tableId, $filter, $sort, $limit, $offset);
+			$wantedRowIdsArray = $this->getWantedRowIds($userId ?? '', $tableId, $filter, $sort, $limit, $offset, $showColumnIds, $search);
 
 			// Get rows without SQL sorting
 			$rows = $this->getRows($wantedRowIdsArray, $showColumnIds);
@@ -1093,7 +1093,7 @@ private function getSearchSubquery(IQueryBuilder $qb, string $search, array $sho
 			$qbTmp->select('row_id')
 				->from('tables_row_cells_' . $columnType)
 				->where($qb->expr()->in('column_id', $columnIdsParam))
-				->andWhere($qb->expr()->like(
+				->andWhere($qb->expr()->iLike(
 					$qb->expr()->castColumn('value', IQueryBuilder::PARAM_STR),
 					$searchParam
 				));
diff --git a/src/modules/main/sections/MainWrapper.vue b/src/modules/main/sections/MainWrapper.vue
index b55fb3e8ac..1d682908b7 100644
--- a/src/modules/main/sections/MainWrapper.vue
+++ b/src/modules/main/sections/MainWrapper.vue
@@ -49,6 +49,7 @@ import { useTablesStore } from '../../../store/store.js'
 import { useDataStore } from '../../../store/data.js'
 import { computed } from 'vue'
 import { showError } from '@nextcloud/dialogs'
+import { buildUrlQuery, parseUrlQuery } from '../../../shared/utils/urlState.js'
 
 export default {
 	name: 'MainWrapper',
@@ -95,6 +96,7 @@ export default {
 			rowsPerPage: 100,
 			pageNumber: 1,
 			paginationOffset: 0,
+			applyUrlStateOnReload: false,
 		}
 	},
 
@@ -133,6 +135,7 @@ export default {
 	},
 
 	beforeMount() {
+		this.applyUrlStateOnReload = true
 		this.reload(true)
 	},
 
@@ -209,12 +212,17 @@ export default {
 				// Since we show one page at a time, no need keep other tables in the store
 				this.clearState()
 
-				this.viewSetting = {}
-				if (this.element?.sort?.length) {
-					this.viewSetting.presetSorting = [...this.element.sort]
+				if (this.applyUrlStateOnReload) {
+					this.applyUrlStateOnReload = false
+					this.applyUrlState()
+				} else {
+					this.viewSetting = {}
+					if (this.element?.sort?.length) {
+						this.viewSetting.presetSorting = [...this.element.sort]
+					}
+					this.pageNumber = 1
+					this.paginationOffset = 0
 				}
-				this.pageNumber = 1
-				this.paginationOffset = 0
 
 				await this.loadColumnsFromBE({
 					view: this.isView ? this.element : null,
@@ -267,9 +275,36 @@ export default {
 				}
 				this.localLoading = false
 				this.reloadInProgress = false
+				this.$nextTick(() => {
+					emit('tables:pagination-changed', { pageNumber: this.pageNumber, rowsPerPage: this.rowsPerPage })
+				})
 			}
 		},
-		async onViewSettingChanged(oldFilter, oldSorting, oldSearchString) {
+			applyUrlState() {
+			const { filter, sorting, searchString, pageNumber, rowsPerPage } = parseUrlQuery(this.$route.query)
+			this.pageNumber = pageNumber
+			this.rowsPerPage = rowsPerPage
+			this.paginationOffset = (this.pageNumber - 1) * this.rowsPerPage
+			const viewSetting = {
+				filter,
+				sorting,
+				searchString,
+			}
+			if (this.element?.sort?.length) {
+				viewSetting.presetSorting = [...this.element.sort]
+			}
+			this.lastViewSettingFilter = viewSetting?.filter ? JSON.stringify(viewSetting.filter) : null
+			this.lastViewSettingSorting = viewSetting?.sorting ? JSON.stringify(viewSetting.sorting) : null
+			this.lastViewSettingSearchString = viewSetting?.searchString || null
+			this.viewSetting = viewSetting
+		},
+
+		updateUrlFromState() {
+			const query = buildUrlQuery(this.viewSetting, this.pageNumber, this.rowsPerPage)
+			this.$router.replace({ query }).catch(() => {})
+		},
+
+	async onViewSettingChanged(oldFilter, oldSorting, oldSearchString) {
 			if (this.reloadInProgress || this.rowsLoading || !this.element) {
 				return
 			}
@@ -319,12 +354,16 @@ export default {
 			} finally {
 				this.rowsLoading = false
 				this.viewSettingInProgress = false
+				this.updateUrlFromState()
 			}
 		},
 		async onPaginationChanged({ pageNumber, rowsPerPage }) {
 			if (!this.element || this.viewSettingInProgress || this.rowsLoading) {
 				return
 			}
+			if (this.pageNumber === pageNumber && this.rowsPerPage === rowsPerPage) {
+				return
+			}
 			this.pageNumber = pageNumber
 			if (rowsPerPage) {
 				this.rowsPerPage = rowsPerPage
@@ -344,6 +383,7 @@ export default {
 				})
 			} finally {
 				this.rowsLoading = false
+				this.updateUrlFromState()
 			}
 		},
 		async onReloadRequested() {
diff --git a/src/modules/main/sections/PublicMainWrapper.vue b/src/modules/main/sections/PublicMainWrapper.vue
index 8a2f66d6db..8c54745809 100644
--- a/src/modules/main/sections/PublicMainWrapper.vue
+++ b/src/modules/main/sections/PublicMainWrapper.vue
@@ -21,6 +21,7 @@ import { useTablesStore } from '../../../store/store.js'
 import { computed } from 'vue'
 import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { loadState } from '@nextcloud/initial-state'
+import { buildUrlQuery, parseUrlQuery } from '../../../shared/utils/urlState.js'
 import { showError } from '@nextcloud/dialogs'
 import { translate as t } from '@nextcloud/l10n'
 
@@ -67,6 +68,7 @@ export default {
 			paginationOffset: 0,
 			rowsLoading: false,
 			viewSettingInProgress: false,
+			applyUrlStateOnReload: false,
 			publicElement: {
 				id: 'public',
 				emoji: nodeData.emoji,
@@ -86,6 +88,7 @@ export default {
 
 	beforeMount() {
 		this.setPublicToken(this.token)
+		this.applyUrlStateOnReload = true
 		this.reload()
 	},
 
@@ -128,8 +131,15 @@ export default {
 			}
 
 			this.loading = true
-			this.pageNumber = 1
-			this.paginationOffset = 0
+
+			if (this.applyUrlStateOnReload) {
+				this.applyUrlStateOnReload = false
+				this.applyUrlState()
+			} else {
+				this.viewSetting = {}
+				this.pageNumber = 1
+				this.paginationOffset = 0
+			}
 
 			await this.loadPublicColumnsFromBE({ token: this.token })
 
@@ -154,6 +164,30 @@ export default {
 			}
 
 			this.loading = false
+			this.$nextTick(() => {
+				emit('tables:pagination-changed', { pageNumber: this.pageNumber, rowsPerPage: this.rowsPerPage })
+			})
+		},
+
+		applyUrlState() {
+			const { filter, sorting, searchString, pageNumber, rowsPerPage } = parseUrlQuery(this.$route.query)
+			this.pageNumber = pageNumber
+			this.rowsPerPage = rowsPerPage
+			this.paginationOffset = (this.pageNumber - 1) * this.rowsPerPage
+			const viewSetting = {
+				filter,
+				sorting,
+				searchString,
+			}
+			this.lastViewSettingFilter = viewSetting?.filter ? JSON.stringify(viewSetting.filter) : null
+			this.lastViewSettingSorting = viewSetting?.sorting ? JSON.stringify(viewSetting.sorting) : null
+			this.lastViewSettingSearchString = viewSetting?.searchString || null
+			this.viewSetting = viewSetting
+		},
+
+		updateUrlFromState() {
+			const query = buildUrlQuery(this.viewSetting, this.pageNumber, this.rowsPerPage)
+			this.$router.replace({ query }).catch(() => {})
 		},
 
 		async onViewSettingChanged(oldFilter, oldSorting, oldSearchString) {
@@ -201,6 +235,7 @@ export default {
 			} finally {
 				this.rowsLoading = false
 				this.viewSettingInProgress = false
+				this.updateUrlFromState()
 			}
 		},
 
@@ -208,6 +243,9 @@ export default {
 			if (this.loading || this.viewSettingInProgress || this.rowsLoading) {
 				return
 			}
+			if (this.pageNumber === pageNumber && this.rowsPerPage === rowsPerPage) {
+				return
+			}
 			this.pageNumber = pageNumber
 			if (rowsPerPage) {
 				this.rowsPerPage = rowsPerPage
@@ -226,6 +264,7 @@ export default {
 				})
 			} finally {
 				this.rowsLoading = false
+				this.updateUrlFromState()
 			}
 		},
 
diff --git a/src/shared/components/ncTable/partials/SearchForm.vue b/src/shared/components/ncTable/partials/SearchForm.vue
index c0dbf6a36e..9a17eac157 100644
--- a/src/shared/components/ncTable/partials/SearchForm.vue
+++ b/src/shared/components/ncTable/partials/SearchForm.vue
@@ -45,10 +45,16 @@ export default {
 	],
 	data() {
 		return {
-			localValue: '',
+			localValue: this.searchString || '',
 		}
 	},
 
+	watch: {
+		searchString() {
+			this.localValue = this.searchString || ''
+		},
+	},
+
 	methods: {
 		t,
 		debounceSubmit: debounce(function() {
diff --git a/src/shared/utils/urlState.js b/src/shared/utils/urlState.js
new file mode 100644
index 0000000000..395066ec78
--- /dev/null
+++ b/src/shared/utils/urlState.js
@@ -0,0 +1,122 @@
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { getFilterWithId } from '../components/ncTable/mixins/filter.js'
+
+const QUERY_KEYS = {
+	filter: 'filter',
+	sort: 'sort',
+	search: 'search',
+	page: 'page',
+	perPage: 'perPage',
+}
+
+const DEFAULT_ROWS_PER_PAGE = 100
+
+/**
+ * Build a URL query object from the current table view state.
+ *
+ * @param {object} viewSetting The view setting object.
+ * @param {number} pageNumber The current page number.
+ * @param {number} rowsPerPage The current rows per page.
+ * @returns {object} A query object to be used with Vue Router.
+ */
+function serializeFilterRule(rule) {
+	return {
+		columnId: rule?.columnId,
+		operator: rule?.operator?.id ?? rule?.operator,
+		value: rule?.value,
+	}
+}
+
+function serializeSortRule(rule) {
+	return {
+		columnId: rule?.columnId,
+		mode: rule?.mode,
+	}
+}
+
+export function buildUrlQuery(viewSetting, pageNumber, rowsPerPage) {
+	const query = {}
+
+	if (viewSetting?.filter?.length) {
+		query[QUERY_KEYS.filter] = JSON.stringify(viewSetting.filter.map(serializeFilterRule))
+	}
+
+	if (viewSetting?.sorting?.length) {
+		query[QUERY_KEYS.sort] = JSON.stringify(viewSetting.sorting.map(serializeSortRule))
+	}
+
+	if (viewSetting?.searchString) {
+		query[QUERY_KEYS.search] = viewSetting.searchString
+	}
+
+	if (pageNumber && pageNumber > 1) {
+		query[QUERY_KEYS.page] = String(pageNumber)
+	}
+
+	if (rowsPerPage && rowsPerPage !== DEFAULT_ROWS_PER_PAGE) {
+		query[QUERY_KEYS.perPage] = String(rowsPerPage)
+	}
+
+	return query
+}
+
+/**
+ * Parse the current URL query into a view state object.
+ *
+ * @param {object} query The Vue Router query object.
+ * @returns {object} The parsed state.
+ */
+export function parseUrlQuery(query) {
+	const state = {
+		filter: [],
+		sorting: [],
+		searchString: null,
+		pageNumber: 1,
+		rowsPerPage: DEFAULT_ROWS_PER_PAGE,
+	}
+
+	if (query[QUERY_KEYS.filter]) {
+		try {
+			const parsed = JSON.parse(query[QUERY_KEYS.filter])
+			state.filter = Array.isArray(parsed)
+				? parsed.map(rule => ({
+					...rule,
+					operator: typeof rule?.operator === 'string'
+						? (getFilterWithId(rule.operator) ?? rule.operator)
+						: rule?.operator,
+				}))
+				: []
+		} catch (e) {
+			state.filter = []
+		}
+	}
+
+	if (query[QUERY_KEYS.sort]) {
+		try {
+			const parsed = JSON.parse(query[QUERY_KEYS.sort])
+			state.sorting = Array.isArray(parsed) ? parsed : []
+		} catch (e) {
+			state.sorting = []
+		}
+	}
+
+	if (query[QUERY_KEYS.search]) {
+		state.searchString = String(query[QUERY_KEYS.search])
+	}
+
+	if (query[QUERY_KEYS.page]) {
+		const parsed = parseInt(query[QUERY_KEYS.page], 10)
+		state.pageNumber = isNaN(parsed) || parsed < 1 ? 1 : parsed
+	}
+
+	if (query[QUERY_KEYS.perPage]) {
+		const parsed = parseInt(query[QUERY_KEYS.perPage], 10)
+		state.rowsPerPage = isNaN(parsed) || parsed < 1 ? DEFAULT_ROWS_PER_PAGE : parsed
+	}
+
+	return state
+}

From 94be0014b62fac1eb72c97253c2a2b5fdc34627b Mon Sep 17 00:00:00 2001
From: Kostiantyn Miakshyn <molodchick@gmail.com>
Date: Sun, 23 Aug 2026 23:16:43 +0200
Subject: [PATCH 04/11] Move export to backend as well

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>
---
 lib/Controller/PublicRowOCSController.php     | 54 +++++++++++
 lib/Controller/RowOCSController.php           | 48 ++++++++++
 lib/Db/Row2Mapper.php                         | 10 +-
 lib/Db/RowQuery.php                           | 30 +++++-
 lib/Service/RowService.php                    | 93 +++++++++++++++++++
 package.json                                  |  1 -
 src/modules/main/sections/MainWrapper.vue     | 39 +++++++-
 .../main/sections/PublicMainWrapper.vue       | 31 ++++++-
 src/pages/Context.vue                         | 22 +++--
 src/shared/components/ncTable/NcTable.vue     |  5 +-
 .../ncTable/mixins/exportTableMixin.js        | 52 -----------
 src/store/data.js                             | 76 +++++++++++++++
 12 files changed, 389 insertions(+), 72 deletions(-)

diff --git a/lib/Controller/PublicRowOCSController.php b/lib/Controller/PublicRowOCSController.php
index 6a753ce1c9..0086f97a5a 100644
--- a/lib/Controller/PublicRowOCSController.php
+++ b/lib/Controller/PublicRowOCSController.php
@@ -25,6 +25,7 @@
 use OCP\AppFramework\Http\Attribute\ApiRoute;
 use OCP\AppFramework\Http\Attribute\OpenAPI;
 use OCP\AppFramework\Http\Attribute\PublicPage;
+use OCP\AppFramework\Http\DataDownloadResponse;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IL10N;
 use OCP\IRequest;
@@ -154,6 +155,59 @@ public function countRows(string $token, ?string $filter = null, ?string $sort =
 		}
 	}
 
+	/**
+	 * [api v2] Export all rows from a link share as a CSV file
+	 *
+	 * @param string $token The share token
+	 * @param ?string $filter Optional: a JSON encoded filter parameter
+	 * @param ?string $sort Optional: a JSON encoded sort parameter
+	 * @param ?string $search Optional: a search string
+	 * @param ?string $rowIds Optional: a JSON encoded list of row IDs to export
+	 * @return DataDownloadResponse<Http::STATUS_OK, array{headers: array<string, string>}>|DataResponse<Http::STATUS_FORBIDDEN|Http::STATUS_BAD_REQUEST|Http::STATUS_NOT_FOUND|Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
+	 *
+	 * 200: CSV file is returned
+	 * 400: Invalid request parameters
+	 * 403: No permissions
+	 * 404: Not found
+	 * 500: Internal error
+	 */
+	#[PublicPage]
+	#[AssertShareAccessIsAccessible]
+	#[ApiRoute(verb: 'GET', url: '/api/2/public/{token}/rows/export', requirements: ['token' => '[a-zA-Z0-9]{16}'])]
+	#[OpenAPI]
+	#[AnonRateLimit(limit: 20, period: 30)]
+	public function exportRows(string $token, ?string $filter = null, ?string $sort = null, ?string $search = null, ?string $rowIds = null): DataDownloadResponse|DataResponse {
+		try {
+			$shareToken = new ShareToken($token);
+			$share = $this->shareService->findByToken($shareToken);
+
+			if (!$share->getPermissionRead()) {
+				return $this->handlePermissionError(new PermissionError('No read permission on this share'));
+			}
+
+			$queryData = RowQuery::buildFromInput(
+				nodeType: $share->getNodeType(),
+				nodeId: $share->getNodeId(),
+				userId: '',
+				filter: $filter,
+				sort: $sort,
+				search: $search,
+				rowIds: $rowIds,
+			);
+
+			$csv = $this->rowService->exportCsv($queryData);
+			return new DataDownloadResponse($csv, 'export.csv', 'text/csv');
+		} catch (PermissionError $e) {
+			return $this->handlePermissionError($e);
+		} catch (InternalError $e) {
+			return $this->handleError($e);
+		} catch (NotFoundError $e) {
+			return $this->handleNotFoundError($e);
+		} catch (BadRequestError $e) {
+			return $this->handleBadRequestError($e);
+		}
+	}
+
 	/**
 	 * [api v2] Create a row in a link share
 	 *
diff --git a/lib/Controller/RowOCSController.php b/lib/Controller/RowOCSController.php
index 2738c2de90..e9c8d4c259 100644
--- a/lib/Controller/RowOCSController.php
+++ b/lib/Controller/RowOCSController.php
@@ -26,6 +26,7 @@
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\ApiRoute;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\AppFramework\Http\DataDownloadResponse;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\DB\Exception;
 use OCP\IL10N;
@@ -198,4 +199,51 @@ public function countRows(string $nodeCollection, int $nodeId, ?string $filter =
 		}
 	}
 
+	/**
+	 * [api v2] Export all rows from a table or view as a CSV file
+	 *
+	 * @param string $nodeCollection 'tables' or 'views'
+	 * @param int $nodeId The table or view ID
+	 * @param ?string $filter JSON encoded list of filter groups (optional)
+	 * @param ?string $sort JSON encoded list of sort rules (optional)
+	 * @param ?string $search Search string (optional)
+	 * @param ?string $rowIds JSON encoded list of row IDs to export (optional)
+	 * @return DataDownloadResponse<Http::STATUS_OK, array{headers: array<string, string>}>|DataResponse<Http::STATUS_FORBIDDEN|Http::STATUS_BAD_REQUEST|Http::STATUS_NOT_FOUND|Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
+	 *
+	 * 200: CSV file is returned
+	 * 400: Invalid request parameters
+	 * 403: No permissions
+	 * 404: Not found
+	 * 500: Internal error
+	 */
+	#[NoAdminRequired]
+	#[RequirePermission(permission: Application::PERMISSION_READ, typeParam: 'nodeCollection')]
+	#[ApiRoute(
+		verb: 'GET',
+		url: '/api/2/{nodeCollection}/{nodeId}/rows/export',
+		requirements: ['nodeCollection' => '(tables|views)', 'nodeId' => '(\d+)']
+	)]
+	public function exportRows(string $nodeCollection, int $nodeId, ?string $filter = null, ?string $sort = null, ?string $search = null, ?string $rowIds = null): DataDownloadResponse|DataResponse {
+		try {
+			$queryData = RowQuery::buildFromInput(
+				nodeType: $nodeCollection,
+				nodeId: $nodeId,
+				userId: $this->userId,
+				filter: $filter,
+				sort: $sort,
+				search: $search,
+				rowIds: $rowIds,
+			);
+
+			$csv = $this->rowService->exportCsv($queryData);
+			return new DataDownloadResponse($csv, 'export.csv', 'text/csv');
+		} catch (DoesNotExistException $e) {
+			return $this->handleNotFoundError(new NotFoundError($e->getMessage(), $e->getCode(), $e));
+		} catch (MultipleObjectsReturnedException|InvalidArgumentException $e) {
+			return $this->handleBadRequestError(new BadRequestError($e->getMessage(), $e->getCode(), $e));
+		} catch (InternalError|Exception $e) {
+			return $this->handleError($e);
+		}
+	}
+
 }
diff --git a/lib/Db/Row2Mapper.php b/lib/Db/Row2Mapper.php
index db876b37cd..0a1e4fa517 100644
--- a/lib/Db/Row2Mapper.php
+++ b/lib/Db/Row2Mapper.php
@@ -132,7 +132,7 @@ public function setUserId(string $userId): void {
 	 * @return int[]
 	 * @throws InternalError
 	 */
-	private function getWantedRowIds(string $userId, int $tableId, ?array $filter = null, ?array $sort = null, ?int $limit = null, ?int $offset = null, ?array $showColumnIds = null, ?string $search = null): array {
+	private function getWantedRowIds(string $userId, int $tableId, ?array $filter = null, ?array $sort = null, ?int $limit = null, ?int $offset = null, ?array $showColumnIds = null, ?string $search = null, ?array $rowIds = null): array {
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->select('sleeves.id')
@@ -147,6 +147,10 @@ private function getWantedRowIds(string $userId, int $tableId, ?array $filter =
 			$this->addSearchToQuery($qb, $search, $showColumnIds);
 		}
 
+		if ($rowIds !== null && $rowIds !== []) {
+			$qb->andWhere($qb->expr()->in('sleeves.id', $qb->createNamedParameter($rowIds, IQueryBuilder::PARAM_INT_ARRAY)));
+		}
+
 		$this->addSortQueryForMultipleSleeveFinder($qb, 'sleeves', $sort);
 
 		$qb->groupBy('sleeves.id');
@@ -179,11 +183,11 @@ private function getWantedRowIds(string $userId, int $tableId, ?array $filter =
 	 * @return Row2[]
 	 * @throws InternalError
 	 */
-	public function findAll(array $showColumnIds, int $tableId, ?int $limit = null, ?int $offset = null, ?array $filter = null, ?array $sort = null, ?string $search = null, ?string $userId = null): array {
+	public function findAll(array $showColumnIds, int $tableId, ?int $limit = null, ?int $offset = null, ?array $filter = null, ?array $sort = null, ?string $search = null, ?string $userId = null, ?array $rowIds = null): array {
 		try {
 			$this->columnMapper->preloadColumns($showColumnIds, $filter, $sort);
 
-			$wantedRowIdsArray = $this->getWantedRowIds($userId ?? '', $tableId, $filter, $sort, $limit, $offset, $showColumnIds, $search);
+			$wantedRowIdsArray = $this->getWantedRowIds($userId ?? '', $tableId, $filter, $sort, $limit, $offset, $showColumnIds, $search, $rowIds);
 
 			// Get rows without SQL sorting
 			$rows = $this->getRows($wantedRowIdsArray, $showColumnIds);
diff --git a/lib/Db/RowQuery.php b/lib/Db/RowQuery.php
index c28aa9f4a5..ab4c64d53b 100644
--- a/lib/Db/RowQuery.php
+++ b/lib/Db/RowQuery.php
@@ -21,6 +21,7 @@ class RowQuery {
 	protected ?array $filter = null;
 	protected ?array $sort = null;
 	protected ?string $search = null;
+	protected ?array $rowIds = null;
 
 	public function __construct(
 		protected int $nodeType,
@@ -90,23 +91,50 @@ public function setSearch(?string $search): self {
 		return $this;
 	}
 
+	public function getRowIds(): ?array {
+		return $this->rowIds;
+	}
+
+	public function setRowIds(?array $rowIds): self {
+		$this->rowIds = $rowIds;
+		return $this;
+	}
+
 	/**
 	 * Build a RowQuery from request parameters.
 	 *
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public static function buildFromInput(string $nodeType, int $nodeId, string $userId, ?int $limit = null, ?int $offset = null, ?string $filter = null, ?string $sort = null, ?string $search = null): self {
+	public static function buildFromInput(string $nodeType, int $nodeId, string $userId, ?int $limit = null, ?int $offset = null, ?string $filter = null, ?string $sort = null, ?string $search = null, ?string $rowIds = null): self {
 		$rowQuery = new self(ConversionHelper::stringNodeType2Const($nodeType), $nodeId);
 		$rowQuery->setLimit($limit)
 			->setOffset($offset)
 			->setFilter(self::parseFilter($filter))
 			->setSort(self::parseSort($sort))
 			->setSearch($search !== '' && $search !== null ? $search : null)
+			->setRowIds(self::parseRowIds($rowIds))
 			->setUserId($userId);
 		return $rowQuery;
 	}
 
+	/**
+	 * Decode and validate the JSON encoded row ID list.
+	 *
+	 * @return list<int>|null
+	 * @throws InvalidArgumentException
+	 */
+	private static function parseRowIds(?string $rowIds): ?array {
+		if ($rowIds === null || $rowIds === '') {
+			return null;
+		}
+		$decoded = json_decode($rowIds, true);
+		if (!is_array($decoded) || array_filter($decoded, 'is_int') !== $decoded) {
+			throw new InvalidArgumentException('Invalid row IDs supplied');
+		}
+		return array_map('intval', $decoded);
+	}
+
 	/**
 	 * Decode and validate the JSON encoded filter parameter.
 	 *
diff --git a/lib/Service/RowService.php b/lib/Service/RowService.php
index 8e2da31903..3a56de8290 100644
--- a/lib/Service/RowService.php
+++ b/lib/Service/RowService.php
@@ -87,6 +87,99 @@ public function formatRowsForPublicShare(array $rows): array {
 		}, $rows);
 	}
 
+	/**
+	 * Export all matching rows as a CSV string.
+	 *
+	 * @param RowQuery $rowQuery
+	 * @return string
+	 * @throws DoesNotExistException
+	 * @throws MultipleObjectsReturnedException
+	 * @throws InternalError
+	 * @throws NotFoundError
+	 */
+	public function exportCsv(RowQuery $rowQuery): string {
+		$tableId = $rowQuery->getNodeId();
+		$showColumnIds = [];
+		$filter = $rowQuery->getFilter();
+		$sort = $rowQuery->getSort();
+		$search = $rowQuery->getSearch();
+
+		if ($rowQuery->getNodeType() === Application::NODE_TYPE_VIEW) {
+			$view = $this->viewMapper->find($rowQuery->getNodeId());
+			$tableId = $view->getTableId();
+			$showColumnIds = $view->getColumnIds();
+			$filter = $this->mergeFilterWithViewFilter($filter, $view->getFilterArray());
+			if ($sort === null) {
+				$sort = $view->getSortArray();
+			}
+		} else {
+			$showColumnIds = array_map(static fn (Column $column) => $column->getId(), $this->columnMapper->findAllByTable($tableId));
+		}
+
+		$columns = $this->columnMapper->findAll($showColumnIds);
+		$columnsById = [];
+		foreach ($columns as $column) {
+			$columnsById[$column->getId()] = $column;
+		}
+
+		$orderedColumns = array_map(static fn (int $columnId) => $columnsById[$columnId], $showColumnIds);
+
+		$rows = $this->row2Mapper->findAll(
+			$showColumnIds,
+			$tableId,
+			null,
+			null,
+			$filter,
+			$sort,
+			$search,
+			$rowQuery->getUserId() ?? '',
+			$rowQuery->getRowIds(),
+		);
+
+		return $this->buildCsv($orderedColumns, $rows);
+	}
+
+	/**
+	 * @param Column[] $columns
+	 * @param Row2[] $rows
+	 */
+	private function buildCsv(array $columns, array $rows): string {
+		$handle = fopen('php://temp', 'r+');
+		if ($handle === false) {
+			throw new InternalError('Could not create CSV buffer.');
+		}
+
+		$headers = ['ID'];
+		foreach ($columns as $column) {
+			$headers[] = $column->getTitle();
+		}
+		fputcsv($handle, $headers);
+
+		foreach ($rows as $row) {
+			$cellValues = [];
+			foreach ($row->getData() as $cell) {
+				$cellValues[(int)$cell['columnId']] = $cell['value'];
+			}
+
+			$line = [(string)$row->getId()];
+			foreach ($columns as $column) {
+				$value = $cellValues[$column->getId()] ?? '';
+				if ($value === null) {
+					$value = '';
+				} elseif (!is_string($value)) {
+					$value = json_encode($value);
+				}
+				$line[] = $value;
+			}
+			fputcsv($handle, $line);
+		}
+
+		rewind($handle);
+		$csv = stream_get_contents($handle);
+		fclose($handle);
+		return $csv ?: '';
+	}
+
 	/**
 	 * Fetch rows for a table or view, applying the given filter and sort rules.
 	 *
diff --git a/package.json b/package.json
index 40ba34f4e3..6bbf233287 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,6 @@
     "@vueuse/core": "^12.8.2",
     "debounce": "^3.0.0",
     "dompurify": "^3.4.13",
-    "papaparse": "^5.6.0",
     "pinia": "^2.3.1",
     "vue": "^3.5.13",
     "vue-material-design-icons": "^5.3.1",
diff --git a/src/modules/main/sections/MainWrapper.vue b/src/modules/main/sections/MainWrapper.vue
index 1d682908b7..684dc43041 100644
--- a/src/modules/main/sections/MainWrapper.vue
+++ b/src/modules/main/sections/MainWrapper.vue
@@ -150,7 +150,7 @@ export default {
 	},
 
 	methods: {
-		...mapActions(useDataStore, ['removeRows', 'clearState', 'loadColumnsFromBE', 'loadRowsFromBE', 'loadRowsCountFromBE', 'loadRelationsFromBE']),
+		...mapActions(useDataStore, ['removeRows', 'clearState', 'loadColumnsFromBE', 'loadRowsFromBE', 'loadRowsCountFromBE', 'loadRowsForExportFromBE', 'loadRelationsFromBE']),
 		...mapActions(useTablesStore, ['validateExportAccess']),
 		createColumn() {
 			emit('tables:column:create', { isView: this.isView, element: this.element })
@@ -168,7 +168,15 @@ export default {
 				return
 			}
 
-			this.downloadCsv(this.rows, this.columns, this.element.title)
+			const viewId = this.isView ? this.element.id : null
+			const tableId = !this.isView ? this.element.id : null
+			const csv = await this.loadRowsForExportFromBE({
+				viewId,
+				tableId,
+			})
+			if (csv) {
+				this.downloadFile(csv, this.element.title + '.csv')
+			}
 		},
 		async downloadFilteredCSV(rows) {
 			const access = await this.validateExportAccess({
@@ -183,7 +191,32 @@ export default {
 				return
 			}
 
-			this.downloadCsv(rows, this.columns, this.element.title)
+			if (rows !== this.rows) {
+				const viewId = this.isView ? this.element.id : null
+				const tableId = !this.isView ? this.element.id : null
+				const csv = await this.loadRowsForExportFromBE({
+					viewId,
+					tableId,
+					rowIds: rows.map(row => row.id),
+				})
+				if (csv) {
+					this.downloadFile(csv, this.element.title + '.csv')
+				}
+				return
+			}
+
+			const viewId = this.isView ? this.element.id : null
+			const tableId = !this.isView ? this.element.id : null
+			const csv = await this.loadRowsForExportFromBE({
+				viewId,
+				tableId,
+				filter: this.viewSetting?.filter,
+				sort: this.viewSetting?.sorting,
+				search: this.viewSetting?.searchString,
+			})
+			if (csv) {
+				this.downloadFile(csv, this.element.title + '.csv')
+			}
 		},
 		toggleShare() {
 			emit('tables:sidebar:sharing', { open: true, tab: 'sharing' })
diff --git a/src/modules/main/sections/PublicMainWrapper.vue b/src/modules/main/sections/PublicMainWrapper.vue
index 8c54745809..4f88f13f94 100644
--- a/src/modules/main/sections/PublicMainWrapper.vue
+++ b/src/modules/main/sections/PublicMainWrapper.vue
@@ -122,7 +122,7 @@ export default {
 	},
 
 	methods: {
-		...mapActions(useDataStore, ['loadPublicColumnsFromBE', 'loadPublicRowsFromBE', 'loadPublicRowsCountFromBE', 'setPublicToken']),
+		...mapActions(useDataStore, ['loadPublicColumnsFromBE', 'loadPublicRowsFromBE', 'loadPublicRowsCountFromBE', 'loadPublicRowsForExportFromBE', 'setPublicToken']),
 		...mapActions(useTablesStore, ['validatePublicExportAccess']),
 
 		async reload() {
@@ -276,7 +276,12 @@ export default {
 				}
 				return
 			}
-			this.downloadCsv(this.rows, this.columns, 'public-export')
+			const csv = await this.loadPublicRowsForExportFromBE({
+				token: this.token,
+			})
+			if (csv) {
+				this.downloadFile(csv, 'public-export.csv')
+			}
 		},
 		async downloadFilteredCSV(rows) {
 			const access = await this.validatePublicExportAccess(this.token)
@@ -286,7 +291,27 @@ export default {
 				}
 				return
 			}
-			this.downloadCsv(rows, this.columns, 'public-export')
+
+			if (rows !== this.rows) {
+				const csv = await this.loadPublicRowsForExportFromBE({
+					token: this.token,
+					rowIds: rows.map(row => row.id),
+				})
+				if (csv) {
+					this.downloadFile(csv, 'public-export.csv')
+				}
+				return
+			}
+
+			const csv = await this.loadPublicRowsForExportFromBE({
+				token: this.token,
+				filter: this.viewSetting?.filter,
+				sort: this.viewSetting?.sorting,
+				search: this.viewSetting?.searchString,
+			})
+			if (csv) {
+				this.downloadFile(csv, 'public-export.csv')
+			}
 		},
 	},
 }
diff --git a/src/pages/Context.vue b/src/pages/Context.vue
index f4d8a6f412..5c33b7fbb5 100644
--- a/src/pages/Context.vue
+++ b/src/pages/Context.vue
@@ -158,7 +158,7 @@ export default {
 
 	methods: {
 		...mapActions(useTablesStore, ['loadContext', 'validateExportAccess', 'loadContextTable', 'loadContextView']),
-		...mapActions(useDataStore, ['loadColumnsFromBE', 'loadRowsFromBE']),
+		...mapActions(useDataStore, ['loadColumnsFromBE', 'loadRowsFromBE', 'loadRowsForExportFromBE']),
 		contextSignature() {
 			const ctx = this.activeContext
 			return ctx ? `${ctx.id}:${Object.keys(ctx.nodes || {}).sort().join(',')}` : null
@@ -277,9 +277,13 @@ export default {
 				return
 			}
 
-			const rowId = this.getKey(isView, element.id)
-			const colId = this.getKey(isView, element.id)
-			this.downloadCsv(this.rows[rowId], this.columns[colId], element.title)
+			const csv = await this.loadRowsForExportFromBE({
+				tableId: isView ? null : element.id,
+				viewId: isView ? element.id : null,
+			})
+			if (csv) {
+				this.downloadFile(csv, element.title + '.csv')
+			}
 		},
 		async downloadFilteredCSV(rows, element, isView) {
 			const access = await this.validateExportAccess({
@@ -294,8 +298,14 @@ export default {
 				return
 			}
 
-			const colId = this.getKey(isView, element.id)
-			this.downloadCsv(rows, this.columns[colId], element.title)
+			const csv = await this.loadRowsForExportFromBE({
+				tableId: isView ? null : element.id,
+				viewId: isView ? element.id : null,
+				rowIds: rows.map(row => row.id),
+			})
+			if (csv) {
+				this.downloadFile(csv, element.title + '.csv')
+			}
 		},
 		getKey(isView, id) {
 			return isView ? 'view-' + id : id
diff --git a/src/shared/components/ncTable/NcTable.vue b/src/shared/components/ncTable/NcTable.vue
index 70c02620ac..64d0d92aaf 100644
--- a/src/shared/components/ncTable/NcTable.vue
+++ b/src/shared/components/ncTable/NcTable.vue
@@ -62,7 +62,7 @@ deselect-all-rows        -> unselect all rows, e.g. after deleting selected rows
 				@edit-column="col => $emit('edit-column', col)"
 				@delete-column="col => $emit('delete-column', col)"
 				@update-selected-rows="rowIds => localSelectedRows = rowIds"
-				@download-csv="data => downloadCsv(data, parsedColumns, table)">
+				@download-csv="$emit('download-csv')">
 				<template #actions>
 					<slot name="actions"
 						:is-filtered="isFilteredComputed"
@@ -101,7 +101,6 @@ deselect-all-rows        -> unselect all rows, e.g. after deleting selected rows
 
 import Options from './sections/Options.vue'
 import CustomTable from './sections/CustomTable.vue'
-import exportTableMixin from './mixins/exportTableMixin.js'
 import { NcEmptyContent, NcButton } from '@nextcloud/vue'
 import Plus from 'vue-material-design-icons/Plus.vue'
 import Cancel from 'vue-material-design-icons/Cancel.vue'
@@ -116,7 +115,6 @@ export default {
 
 	components: { CustomTable, Options, NcButton, NcEmptyContent, Plus, Cancel, FileDocumentEditOutline },
 
-	mixins: [exportTableMixin],
 
 	props: {
 		rows: {
@@ -211,6 +209,7 @@ export default {
 		'delete-column',
 		'delete-row',
 		'delete-selected-rows',
+		'download-csv',
 		'download-filtered-csv',
 		'edit-column',
 		'edit-row',
diff --git a/src/shared/components/ncTable/mixins/exportTableMixin.js b/src/shared/components/ncTable/mixins/exportTableMixin.js
index e82d56b04f..79a27ff07f 100644
--- a/src/shared/components/ncTable/mixins/exportTableMixin.js
+++ b/src/shared/components/ncTable/mixins/exportTableMixin.js
@@ -2,65 +2,13 @@
  * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import moment from '@nextcloud/moment'
-import Papa from 'papaparse'
 import generalHelper from '../../../mixins/generalHelper.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'
 
 export default {
 
 	mixins: [generalHelper],
 
 	methods: {
-
-		downloadCsv(rows, columns, fileName) {
-			if (!rows || rows.length === 0) {
-				console.debug('downloadCSV has empty parameter, expected array ob row objects', rows)
-			}
-
-			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) : ''
-					} else {
-						// if is a meta data column (id < 0)
-						switch (column.id) {
-						case TYPE_META_ID:
-							rowData[column.title] = row.id
-							break
-						case TYPE_META_CREATED_BY:
-							rowData[column.title] = row.createdBy
-							break
-						case TYPE_META_UPDATED_BY:
-							rowData[column.title] = row.lastEditBy
-							break
-						case TYPE_META_CREATED_AT:
-							rowData[column.title] = row.createdAt
-							break
-						case TYPE_META_UPDATED_AT:
-							rowData[column.title] = row.lastEditAt
-							break
-						}
-					}
-				})
-				data.push(rowData)
-			})
-
-			const csv = Papa.unparse(data, {
-				escapeFormulae: true,
-			})
-
-			// remove smileys from title
-			const tableTitle = fileName.replace(/([#0-9]\u20E3)|[\xA9\xAE\u203C\u2047-\u2049\u2122\u2139\u3030\u303D\u3297\u3299][\uFE00-\uFEFF]?|[\u2190-\u21FF][\uFE00-\uFEFF]?|[\u2300-\u23FF][\uFE00-\uFEFF]?|[\u2460-\u24FF][\uFE00-\uFEFF]?|[\u25A0-\u25FF][\uFE00-\uFEFF]?|[\u2600-\u27BF][\uFE00-\uFEFF]?|[\u2900-\u297F][\uFE00-\uFEFF]?|[\u2B00-\u2BF0][\uFE00-\uFEFF]?|(?:\uD83C[\uDC00-\uDFFF]|\uD83D[\uDC00-\uDEFF])[\uFE00-\uFEFF]?/g, '')
-			this.downloadFile(csv, moment().format('YY-MM-DD_HH-mm') + '_' + tableTitle + '.csv')
-		},
-
 		downloadFile(content, fileName) {
 			const blob = new Blob([content], { type: 'text/csv;charset=utf-8;' })
 			const url = URL.createObjectURL(blob)
diff --git a/src/store/data.js b/src/store/data.js
index c179f1bfad..0c92e9515d 100644
--- a/src/store/data.js
+++ b/src/store/data.js
@@ -325,6 +325,82 @@ export const useDataStore = defineStore('data', {
 			return true
 		},
 
+		async loadRowsForExportFromBE({ tableId, viewId, filter = null, sort = null, search = null, rowIds = null }) {
+			const params = {}
+			if (filter && filter.length > 0) {
+				const backendFilter = [filter.map(rule => ({
+					columnId: rule.columnId,
+					operator: rule.operator?.id ?? rule.operator,
+					value: rule.value,
+				}))]
+				params.filter = JSON.stringify(backendFilter)
+			}
+			if (search) {
+				params.search = search
+			}
+			if (sort && sort.length > 0) {
+				params.sort = JSON.stringify(sort)
+			}
+			if (rowIds && rowIds.length > 0) {
+				params.rowIds = JSON.stringify(rowIds)
+			}
+
+			let res = null
+			try {
+				const collection = viewId ? 'views' : 'tables'
+				const nodeId = viewId ?? tableId
+				res = await axios.get(generateOcsUrl('/apps/tables/api/2/' + collection + '/' + nodeId + '/rows/export'), { params, responseType: 'text' })
+			} catch (e) {
+				displayError(e, t('tables', 'Could not load rows for export.'))
+				return false
+			}
+
+			if (typeof res?.data !== 'string') {
+				const e = new Error('Expected CSV text, but is not')
+				displayError(e, 'Format for exported rows not valid.')
+				return false
+			}
+
+			return res.data
+		},
+
+		async loadPublicRowsForExportFromBE({ token, filter = null, sort = null, search = null, rowIds = null }) {
+			const params = {}
+			if (filter && filter.length > 0) {
+				const backendFilter = [filter.map(rule => ({
+					columnId: rule.columnId,
+					operator: rule.operator?.id ?? rule.operator,
+					value: rule.value,
+				}))]
+				params.filter = JSON.stringify(backendFilter)
+			}
+			if (search) {
+				params.search = search
+			}
+			if (sort && sort.length > 0) {
+				params.sort = JSON.stringify(sort)
+			}
+			if (rowIds && rowIds.length > 0) {
+				params.rowIds = JSON.stringify(rowIds)
+			}
+
+			let res = null
+			try {
+				res = await axios.get(generateOcsUrl('/apps/tables/api/2/public/' + token + '/rows/export'), { params, responseType: 'text' })
+			} catch (e) {
+				displayError(e, t('tables', 'Could not load public rows for export.'))
+				return false
+			}
+
+			if (typeof res?.data !== 'string') {
+				const e = new Error('Expected CSV text, but is not')
+				displayError(e, 'Format for exported public rows not valid.')
+				return false
+			}
+
+			return res.data
+		},
+
 		async loadPublicRowsFromBE({ token, filter = null, sort = null, search = null, limit = null, offset = null }) {
 			const stateId = 'public-' + token
 			this.loading[stateId] = true

From 702a7936b46f9bb2418ee8662d042bef49e176a0 Mon Sep 17 00:00:00 2001
From: Kostiantyn Miakshyn <molodchick@gmail.com>
Date: Mon, 24 Aug 2026 00:21:22 +0200
Subject: [PATCH 05/11] Share row ids

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>
---
 lib/Controller/PublicRowOCSController.php     |  3 +-
 lib/Controller/RowOCSController.php           |  3 +-
 lib/Db/Row2Mapper.php                         |  4 +-
 lib/Service/RowService.php                    |  2 +
 src/modules/main/sections/MainWrapper.vue     | 17 +++++-
 .../main/sections/PublicMainWrapper.vue       | 17 +++++-
 .../components/ncTable/sections/Options.vue   | 53 +++++++++++++++++++
 src/shared/utils/urlState.js                  | 15 +++++-
 src/store/data.js                             | 20 +++++--
 9 files changed, 121 insertions(+), 13 deletions(-)

diff --git a/lib/Controller/PublicRowOCSController.php b/lib/Controller/PublicRowOCSController.php
index 0086f97a5a..d0f8e3011b 100644
--- a/lib/Controller/PublicRowOCSController.php
+++ b/lib/Controller/PublicRowOCSController.php
@@ -67,7 +67,7 @@ public function __construct(
 	#[ApiRoute(verb: 'GET', url: '/api/2/public/{token}/rows', requirements: ['token' => '[a-zA-Z0-9]{16}'])]
 	#[OpenAPI]
 	#[AnonRateLimit(limit: 20, period: 30)]
-	public function getRows(string $token, ?int $limit, ?int $offset, ?string $filter = null, ?string $sort = null, ?string $search = null): DataResponse {
+	public function getRows(string $token, ?int $limit, ?int $offset, ?string $filter = null, ?string $sort = null, ?string $search = null, ?string $rowIds = null): DataResponse {
 		try {
 			$shareToken = new ShareToken($token);
 			$share = $this->shareService->findByToken($shareToken);
@@ -88,6 +88,7 @@ public function getRows(string $token, ?int $limit, ?int $offset, ?string $filte
 				filter: $filter,
 				sort: $sort,
 				search: $search,
+				rowIds: $rowIds,
 			);
 
 			$rows = $this->rowService->findAllByQuery($queryData);
diff --git a/lib/Controller/RowOCSController.php b/lib/Controller/RowOCSController.php
index e9c8d4c259..35a9ee2443 100644
--- a/lib/Controller/RowOCSController.php
+++ b/lib/Controller/RowOCSController.php
@@ -140,7 +140,7 @@ public function createRow(string $nodeCollection, int $nodeId, mixed $data): Dat
 		url: '/api/2/{nodeCollection}/{nodeId}/rows',
 		requirements: ['nodeCollection' => '(tables|views)', 'nodeId' => '(\\d+)']
 	)]
-	public function getRows(string $nodeCollection, int $nodeId, ?int $limit = null, ?int $offset = null, ?string $filter = null, ?string $sort = null, ?string $search = null): DataResponse {
+	public function getRows(string $nodeCollection, int $nodeId, ?int $limit = null, ?int $offset = null, ?string $filter = null, ?string $sort = null, ?string $search = null, ?string $rowIds = null): DataResponse {
 		try {
 			if (($limit !== null && ($limit <= 0 || $limit > 500))
 				|| ($offset !== null && $offset < 0)
@@ -157,6 +157,7 @@ public function getRows(string $nodeCollection, int $nodeId, ?int $limit = null,
 				filter: $filter,
 				sort: $sort,
 				search: $search,
+				rowIds: $rowIds,
 			);
 
 			$rows = $this->rowService->findAllByQuery($queryData);
diff --git a/lib/Db/Row2Mapper.php b/lib/Db/Row2Mapper.php
index 0a1e4fa517..5d52cc119a 100644
--- a/lib/Db/Row2Mapper.php
+++ b/lib/Db/Row2Mapper.php
@@ -210,11 +210,11 @@ public function findAll(array $showColumnIds, int $tableId, ?int $limit = null,
 	 * @return int
 	 * @throws InternalError
 	 */
-	public function count(array $showColumnIds, int $tableId, ?array $filter = null, ?array $sort = null, ?string $search = null, ?string $userId = null): int {
+	public function count(array $showColumnIds, int $tableId, ?array $filter = null, ?array $sort = null, ?string $search = null, ?string $userId = null, ?array $rowIds = null): int {
 		try {
 			$this->columnMapper->preloadColumns($showColumnIds, $filter, $sort);
 
-			$wantedRowIdsArray = $this->getWantedRowIds($userId ?? '', $tableId, $filter, $sort, null, null, $showColumnIds, $search);
+			$wantedRowIdsArray = $this->getWantedRowIds($userId ?? '', $tableId, $filter, $sort, null, null, $showColumnIds, $search, $rowIds);
 
 			return count($wantedRowIdsArray);
 		} catch (DoesNotExistException $e) {
diff --git a/lib/Service/RowService.php b/lib/Service/RowService.php
index 3a56de8290..c9cc0cd4c0 100644
--- a/lib/Service/RowService.php
+++ b/lib/Service/RowService.php
@@ -226,6 +226,7 @@ public function findAllByQuery(RowQuery $rowQuery): array {
 			$sort,
 			$search,
 			$userId,
+			$rowQuery->getRowIds(),
 		);
 	}
 
@@ -260,6 +261,7 @@ public function countByQuery(RowQuery $rowQuery): int {
 			$sort,
 			$search,
 			$userId,
+			$rowQuery->getRowIds(),
 		);
 	}
 
diff --git a/src/modules/main/sections/MainWrapper.vue b/src/modules/main/sections/MainWrapper.vue
index 684dc43041..fc3db8524c 100644
--- a/src/modules/main/sections/MainWrapper.vue
+++ b/src/modules/main/sections/MainWrapper.vue
@@ -97,6 +97,7 @@ export default {
 			pageNumber: 1,
 			paginationOffset: 0,
 			applyUrlStateOnReload: false,
+			urlRowIds: null,
 		}
 	},
 
@@ -277,6 +278,7 @@ export default {
 							filter: this.viewSetting?.filter,
 							sort: this.viewSetting?.sorting,
 							search: this.viewSetting?.searchString,
+							rowIds: this.urlRowIds,
 						})
 						await this.loadRowsFromBE({
 							viewId: this.isView ? this.element.id : null,
@@ -286,6 +288,7 @@ export default {
 							search: this.viewSetting?.searchString,
 							limit: this.rowsPerPage,
 							offset: this.paginationOffset,
+							rowIds: this.urlRowIds,
 						})
 					} finally {
 						this.rowsLoading = false
@@ -314,10 +317,11 @@ export default {
 			}
 		},
 			applyUrlState() {
-			const { filter, sorting, searchString, pageNumber, rowsPerPage } = parseUrlQuery(this.$route.query)
+			const { filter, sorting, searchString, pageNumber, rowsPerPage, rowIds } = parseUrlQuery(this.$route.query)
 			this.pageNumber = pageNumber
 			this.rowsPerPage = rowsPerPage
 			this.paginationOffset = (this.pageNumber - 1) * this.rowsPerPage
+			this.urlRowIds = rowIds
 			const viewSetting = {
 				filter,
 				sorting,
@@ -333,7 +337,7 @@ export default {
 		},
 
 		updateUrlFromState() {
-			const query = buildUrlQuery(this.viewSetting, this.pageNumber, this.rowsPerPage)
+			const query = buildUrlQuery(this.viewSetting, this.pageNumber, this.rowsPerPage, this.urlRowIds)
 			this.$router.replace({ query }).catch(() => {})
 		},
 
@@ -348,6 +352,11 @@ export default {
 				return
 			}
 			this.viewSettingInProgress = filterChanged || searchStringChanged
+
+			if (!this.viewSetting?.filter?.length && !this.viewSetting?.sorting?.length && !this.viewSetting?.searchString) {
+				this.urlRowIds = null
+			}
+
 			this.rowsLoading = true
 			try {
 				const viewId = this.isView ? this.element.id : null
@@ -362,6 +371,7 @@ export default {
 						filter: this.viewSetting?.filter,
 						sort: this.viewSetting?.sorting,
 						search: this.viewSetting?.searchString,
+						rowIds: this.urlRowIds,
 					})
 					await this.loadRowsFromBE({
 						viewId,
@@ -371,6 +381,7 @@ export default {
 						search: this.viewSetting?.searchString,
 						limit: this.rowsPerPage,
 						offset: this.paginationOffset,
+						rowIds: this.urlRowIds,
 					})
 				} else if (sortingChanged) {
 					this.paginationOffset = (this.pageNumber - 1) * this.rowsPerPage
@@ -382,6 +393,7 @@ export default {
 						search: this.viewSetting?.searchString,
 						limit: this.rowsPerPage,
 						offset: this.paginationOffset,
+						rowIds: this.urlRowIds,
 					})
 				}
 			} finally {
@@ -413,6 +425,7 @@ export default {
 					sort: this.viewSetting?.sorting,
 					limit: this.rowsPerPage,
 					offset: this.paginationOffset,
+					rowIds: this.urlRowIds,
 				})
 			} finally {
 				this.rowsLoading = false
diff --git a/src/modules/main/sections/PublicMainWrapper.vue b/src/modules/main/sections/PublicMainWrapper.vue
index 4f88f13f94..385cf72c97 100644
--- a/src/modules/main/sections/PublicMainWrapper.vue
+++ b/src/modules/main/sections/PublicMainWrapper.vue
@@ -69,6 +69,7 @@ export default {
 			rowsLoading: false,
 			viewSettingInProgress: false,
 			applyUrlStateOnReload: false,
+			urlRowIds: null,
 			publicElement: {
 				id: 'public',
 				emoji: nodeData.emoji,
@@ -150,6 +151,7 @@ export default {
 					filter: this.viewSetting?.filter,
 					sort: this.viewSetting?.sorting,
 					search: this.viewSetting?.searchString,
+					rowIds: this.urlRowIds,
 				})
 				await this.loadPublicRowsFromBE({
 					token: this.token,
@@ -158,6 +160,7 @@ export default {
 					search: this.viewSetting?.searchString,
 					limit: this.rowsPerPage,
 					offset: this.paginationOffset,
+					rowIds: this.urlRowIds,
 				})
 			} finally {
 				this.rowsLoading = false
@@ -170,10 +173,11 @@ export default {
 		},
 
 		applyUrlState() {
-			const { filter, sorting, searchString, pageNumber, rowsPerPage } = parseUrlQuery(this.$route.query)
+			const { filter, sorting, searchString, pageNumber, rowsPerPage, rowIds } = parseUrlQuery(this.$route.query)
 			this.pageNumber = pageNumber
 			this.rowsPerPage = rowsPerPage
 			this.paginationOffset = (this.pageNumber - 1) * this.rowsPerPage
+			this.urlRowIds = rowIds
 			const viewSetting = {
 				filter,
 				sorting,
@@ -186,7 +190,7 @@ export default {
 		},
 
 		updateUrlFromState() {
-			const query = buildUrlQuery(this.viewSetting, this.pageNumber, this.rowsPerPage)
+			const query = buildUrlQuery(this.viewSetting, this.pageNumber, this.rowsPerPage, this.urlRowIds)
 			this.$router.replace({ query }).catch(() => {})
 		},
 
@@ -201,6 +205,11 @@ export default {
 				return
 			}
 			this.viewSettingInProgress = filterChanged || searchStringChanged
+
+			if (!this.viewSetting?.filter?.length && !this.viewSetting?.sorting?.length && !this.viewSetting?.searchString) {
+				this.urlRowIds = null
+			}
+
 			this.rowsLoading = true
 			try {
 				if (filterChanged || searchStringChanged) {
@@ -212,6 +221,7 @@ export default {
 						filter: this.viewSetting?.filter,
 						sort: this.viewSetting?.sorting,
 						search: this.viewSetting?.searchString,
+						rowIds: this.urlRowIds,
 					})
 					await this.loadPublicRowsFromBE({
 						token: this.token,
@@ -220,6 +230,7 @@ export default {
 						search: this.viewSetting?.searchString,
 						limit: this.rowsPerPage,
 						offset: this.paginationOffset,
+						rowIds: this.urlRowIds,
 					})
 				} else if (sortingChanged) {
 					this.paginationOffset = (this.pageNumber - 1) * this.rowsPerPage
@@ -230,6 +241,7 @@ export default {
 						search: this.viewSetting?.searchString,
 						limit: this.rowsPerPage,
 						offset: this.paginationOffset,
+						rowIds: this.urlRowIds,
 					})
 				}
 			} finally {
@@ -261,6 +273,7 @@ export default {
 					search: this.viewSetting?.searchString,
 					limit: this.rowsPerPage,
 					offset: this.paginationOffset,
+					rowIds: this.urlRowIds,
 				})
 			} finally {
 				this.rowsLoading = false
diff --git a/src/shared/components/ncTable/sections/Options.vue b/src/shared/components/ncTable/sections/Options.vue
index fc4ed1a51f..e3bc559a4f 100644
--- a/src/shared/components/ncTable/sections/Options.vue
+++ b/src/shared/components/ncTable/sections/Options.vue
@@ -50,6 +50,18 @@
 						</template>
 						{{ t('tables', 'Export filtered rows') }}
 					</NcActionButton>
+					<NcActionButton v-if="!sharedLinkUrl" :close-after-click="false" data-cy="shareSelectedBtn" @click="shareSelected">
+						<template #icon>
+							<ShareVariantOutline :size="20" />
+						</template>
+						{{ t('tables', 'Share selected rows') }}
+					</NcActionButton>
+					<NcActionButton v-else close-after-click data-cy="openSelectedBtn" @click="openSharedLink">
+						<template #icon>
+							<OpenInNew :size="20" />
+						</template>
+						{{ t('tables', 'Open') }}
+					</NcActionButton>
 					<NcActionButton v-if="config.canDeleteRows" close-after-click @click="deleteSelectedRows">
 						<template #icon>
 							<Delete :size="20" />
@@ -77,6 +89,11 @@ import Check from 'vue-material-design-icons/CheckboxBlankOutline.vue'
 import Delete from 'vue-material-design-icons/TrashCanOutline.vue'
 import TrayArrowDown from 'vue-material-design-icons/TrayArrowDown.vue'
 import Refresh from 'vue-material-design-icons/Refresh.vue'
+import ShareVariantOutline from 'vue-material-design-icons/ShareVariantOutline.vue'
+import OpenInNew from 'vue-material-design-icons/OpenInNew.vue'
+import { generateUrl, getBaseUrl } from '@nextcloud/router'
+import { showError, showSuccess } from '@nextcloud/dialogs'
+import '@nextcloud/dialogs/style.css'
 import viewportHelper from '../../../mixins/viewportHelper.js'
 import SearchForm from '../partials/SearchForm.vue'
 import PaginationBlock from './PaginationBlock.vue'
@@ -96,6 +113,8 @@ export default {
 		Delete,
 		TrayArrowDown,
 		Refresh,
+		ShareVariantOutline,
+		OpenInNew,
 		PaginationBlock,
 	},
 
@@ -154,6 +173,8 @@ export default {
 		return {
 			optionsDivWidth: null,
 			rowsLoading: false,
+			sharedLinkUrl: null,
+			openLinkTimeout: null,
 		}
 	},
 
@@ -185,6 +206,7 @@ export default {
 	beforeUnmount() {
 		window.removeEventListener('resize', this.updateOptionsDivWidth)
 		unsubscribe('tables:rows-loading', this.setRowsLoading)
+		this.clearOpenLink()
 	},
 
 	methods: {
@@ -205,6 +227,37 @@ export default {
 		exportSelected() {
 			this.$emit('download-filtered-csv', this.getSelectedRows)
 		},
+		async shareSelected() {
+			const rowIds = this.selectedRows.join(',')
+			const base = (this.isView ? 'view' : 'table') + '/{elementId}?rowIds={rowIds}'
+			const path = generateUrl('apps/tables/#/' + base, { elementId: this.elementId, rowIds })
+			const url = getBaseUrl() + path
+
+			try {
+				await navigator.clipboard.writeText(url)
+				showSuccess(t('tables', 'Link to selected rows copied to clipboard'))
+				this.sharedLinkUrl = url
+				this.openLinkTimeout = setTimeout(() => {
+					this.sharedLinkUrl = null
+					this.openLinkTimeout = null
+				}, 5000)
+			} catch (e) {
+				console.error('Could not copy selected row link to clipboard', e)
+				showError(t('tables', 'Could not copy link to clipboard'))
+			}
+		},
+		openSharedLink() {
+			if (this.sharedLinkUrl) {
+				window.open(this.sharedLinkUrl, '_blank', 'noopener,noreferrer')
+			}
+		},
+		clearOpenLink() {
+			if (this.openLinkTimeout) {
+				clearTimeout(this.openLinkTimeout)
+				this.openLinkTimeout = null
+				this.sharedLinkUrl = null
+			}
+		},
 		getRowById(rowId) {
 			const index = this.allRows.findIndex(row => row.id === rowId)
 			return this.allRows[index]
diff --git a/src/shared/utils/urlState.js b/src/shared/utils/urlState.js
index 395066ec78..cea3f68f78 100644
--- a/src/shared/utils/urlState.js
+++ b/src/shared/utils/urlState.js
@@ -11,6 +11,7 @@ const QUERY_KEYS = {
 	search: 'search',
 	page: 'page',
 	perPage: 'perPage',
+	rowIds: 'rowIds',
 }
 
 const DEFAULT_ROWS_PER_PAGE = 100
@@ -38,7 +39,7 @@ function serializeSortRule(rule) {
 	}
 }
 
-export function buildUrlQuery(viewSetting, pageNumber, rowsPerPage) {
+export function buildUrlQuery(viewSetting, pageNumber, rowsPerPage, rowIds = null) {
 	const query = {}
 
 	if (viewSetting?.filter?.length) {
@@ -61,6 +62,10 @@ export function buildUrlQuery(viewSetting, pageNumber, rowsPerPage) {
 		query[QUERY_KEYS.perPage] = String(rowsPerPage)
 	}
 
+	if (rowIds && rowIds.length > 0) {
+		query[QUERY_KEYS.rowIds] = rowIds.join(',')
+	}
+
 	return query
 }
 
@@ -77,6 +82,7 @@ export function parseUrlQuery(query) {
 		searchString: null,
 		pageNumber: 1,
 		rowsPerPage: DEFAULT_ROWS_PER_PAGE,
+		rowIds: null,
 	}
 
 	if (query[QUERY_KEYS.filter]) {
@@ -118,5 +124,12 @@ export function parseUrlQuery(query) {
 		state.rowsPerPage = isNaN(parsed) || parsed < 1 ? DEFAULT_ROWS_PER_PAGE : parsed
 	}
 
+	if (query[QUERY_KEYS.rowIds]) {
+		state.rowIds = String(query[QUERY_KEYS.rowIds])
+			.split(',')
+			.map(id => parseInt(id, 10))
+			.filter(id => !isNaN(id))
+	}
+
 	return state
 }
diff --git a/src/store/data.js b/src/store/data.js
index 0c92e9515d..2e5c8b1bdd 100644
--- a/src/store/data.js
+++ b/src/store/data.js
@@ -239,7 +239,7 @@ export const useDataStore = defineStore('data', {
 		},
 
 		// ROWS
-		async loadRowsFromBE({ tableId, viewId, filter = null, sort = null, search = null, limit = null, offset = null }) {
+		async loadRowsFromBE({ tableId, viewId, filter = null, sort = null, search = null, limit = null, offset = null, rowIds = null }) {
 			const stateId = genStateKey(!!(viewId), viewId ?? tableId)
 			this.loading[stateId] = true
 			let res = null
@@ -265,6 +265,9 @@ export const useDataStore = defineStore('data', {
 			if (offset !== null) {
 				params.offset = offset
 			}
+			if (rowIds && rowIds.length > 0) {
+				params.rowIds = JSON.stringify(rowIds)
+			}
 
 			try {
 				const collection = viewId ? 'views' : 'tables'
@@ -286,7 +289,7 @@ export const useDataStore = defineStore('data', {
 			return true
 		},
 
-		async loadRowsCountFromBE({ tableId, viewId, filter = null, sort = null, search = null }) {
+		async loadRowsCountFromBE({ tableId, viewId, filter = null, sort = null, search = null, rowIds = null }) {
 			const stateId = genStateKey(!!(viewId), viewId ?? tableId)
 			let res = null
 
@@ -305,6 +308,9 @@ export const useDataStore = defineStore('data', {
 			if (sort && sort.length > 0) {
 				params.sort = JSON.stringify(sort)
 			}
+			if (rowIds && rowIds.length > 0) {
+				params.rowIds = JSON.stringify(rowIds)
+			}
 
 			try {
 				const collection = viewId ? 'views' : 'tables'
@@ -401,7 +407,7 @@ export const useDataStore = defineStore('data', {
 			return res.data
 		},
 
-		async loadPublicRowsFromBE({ token, filter = null, sort = null, search = null, limit = null, offset = null }) {
+		async loadPublicRowsFromBE({ token, filter = null, sort = null, search = null, limit = null, offset = null, rowIds = null }) {
 			const stateId = 'public-' + token
 			this.loading[stateId] = true
 			let res
@@ -427,6 +433,9 @@ export const useDataStore = defineStore('data', {
 			if (offset !== null) {
 				params.offset = offset
 			}
+			if (rowIds && rowIds.length > 0) {
+				params.rowIds = JSON.stringify(rowIds)
+			}
 
 			try {
 				res = await axios.get(generateOcsUrl('/apps/tables/api/2/public/' + token + '/rows'), { params })
@@ -439,7 +448,7 @@ export const useDataStore = defineStore('data', {
 			return true
 		},
 
-		async loadPublicRowsCountFromBE({ token, filter = null, sort = null, search = null }) {
+		async loadPublicRowsCountFromBE({ token, filter = null, sort = null, search = null, rowIds = null }) {
 			const stateId = 'public-' + token
 			let res = null
 
@@ -458,6 +467,9 @@ export const useDataStore = defineStore('data', {
 			if (sort && sort.length > 0) {
 				params.sort = JSON.stringify(sort)
 			}
+			if (rowIds && rowIds.length > 0) {
+				params.rowIds = JSON.stringify(rowIds)
+			}
 
 			try {
 				res = await axios.get(generateOcsUrl('/apps/tables/api/2/public/' + token + '/rows/count'), { params })

From 3401868592c1e709b8f4b54708a94ead044a44b3 Mon Sep 17 00:00:00 2001
From: Kostiantyn Miakshyn <molodchick@gmail.com>
Date: Mon, 24 Aug 2026 00:55:14 +0200
Subject: [PATCH 06/11] cleanup

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>
---
 .../components/ncTable/mixins/columnClass.js  | 36 +-----------
 .../ncTable/mixins/columnHandler.js           | 13 +++++
 .../ncTable/mixins/columnsTypes/datetime.js   | 57 -------------------
 .../mixins/columnsTypes/datetimeDate.js       | 43 --------------
 .../mixins/columnsTypes/datetimeTime.js       | 43 --------------
 .../ncTable/mixins/columnsTypes/number.js     | 43 --------------
 .../mixins/columnsTypes/numberProgress.js     | 31 ----------
 .../mixins/columnsTypes/numberStars.js        | 31 ----------
 .../ncTable/mixins/columnsTypes/relation.js   | 30 ----------
 .../ncTable/mixins/columnsTypes/selection.js  | 43 --------------
 .../mixins/columnsTypes/selectionCheck.js     | 45 ---------------
 .../mixins/columnsTypes/selectionMulti.js     | 41 -------------
 .../ncTable/mixins/columnsTypes/textLine.js   | 45 ---------------
 .../ncTable/mixins/columnsTypes/textLink.js   | 54 ------------------
 .../ncTable/mixins/columnsTypes/textLong.js   | 20 -------
 .../ncTable/mixins/columnsTypes/textRich.js   | 16 ------
 .../ncTable/mixins/columnsTypes/usergroup.js  | 27 ---------
 .../components/ncTable/partials/TableRow.vue  |  4 +-
 18 files changed, 17 insertions(+), 605 deletions(-)

diff --git a/src/shared/components/ncTable/mixins/columnClass.js b/src/shared/components/ncTable/mixins/columnClass.js
index 95250ccc18..57a2b89946 100644
--- a/src/shared/components/ncTable/mixins/columnClass.js
+++ b/src/shared/components/ncTable/mixins/columnClass.js
@@ -4,6 +4,7 @@
  */
 import { Filters } from './filter.js'
 import { MagicFields } from './magicFields.js'
+import { BACKEND_SORTABLE_TYPES } from './columnHandler.js'
 
 export class AbstractColumn {
 
@@ -27,20 +28,7 @@ export class AbstractColumn {
 	}
 
 	canSort() {
-		return typeof this.sort === 'function'
-	}
-
-	getNextSortsResult(nextSorts, rowA, rowB) {
-		if (!nextSorts) {
-			return 0
-		}
-		for (const sort of nextSorts) {
-			const result = sort(rowA, rowB)
-			if (result !== 0) {
-				return result
-			}
-		}
-		return 0
+		return BACKEND_SORTABLE_TYPES.has(this.type)
 	}
 
 	getPossibleOperators() {
@@ -51,26 +39,6 @@ export class AbstractColumn {
 		return Object.values(MagicFields).filter(item => item.goodFor.includes(this.type))
 	}
 
-	isSearchStringFound(cellValue, cell, searchString) {
-		if (cellValue != null && cellValue.toLowerCase().includes(searchString)) {
-			cell.searchStringFound = true
-			return true
-		}
-		return false
-	}
-
-	isFilterFound(filterMethod, cell) {
-		if (filterMethod()) {
-			cell.filterFound = true
-			return true
-		}
-		return false
-	}
-
-	getValueString(valueObject) {
-		return valueObject.value
-	}
-
 	/**
 	 * parse an input value
 	 *
diff --git a/src/shared/components/ncTable/mixins/columnHandler.js b/src/shared/components/ncTable/mixins/columnHandler.js
index 71664a93f7..c8e5c21df3 100644
--- a/src/shared/components/ncTable/mixins/columnHandler.js
+++ b/src/shared/components/ncTable/mixins/columnHandler.js
@@ -20,6 +20,19 @@ export const ColumnTypes = {
 	Relation: 'relation',
 }
 
+export const BACKEND_SORTABLE_TYPES = new Set([
+	ColumnTypes.TextLine,
+	ColumnTypes.TextLink,
+	ColumnTypes.Selection,
+	ColumnTypes.SelectionMulti,
+	ColumnTypes.Number,
+	ColumnTypes.NumberStars,
+	ColumnTypes.NumberProgress,
+	ColumnTypes.DatetimeDate,
+	ColumnTypes.DatetimeTime,
+	ColumnTypes.Datetime,
+])
+
 export function getColumnWidthStyle(column) {
 	const width = column.customSettings?.width ? `min(${column.customSettings.width}px, 90vw)` : null
 
diff --git a/src/shared/components/ncTable/mixins/columnsTypes/datetime.js b/src/shared/components/ncTable/mixins/columnsTypes/datetime.js
index e4d32af108..6b60012e70 100644
--- a/src/shared/components/ncTable/mixins/columnsTypes/datetime.js
+++ b/src/shared/components/ncTable/mixins/columnsTypes/datetime.js
@@ -5,11 +5,6 @@
 import { AbstractDatetimeColumn } from '../columnClass.js'
 import { ColumnTypes } from '../columnHandler.js'
 import Moment from '@nextcloud/moment'
-import { FilterIds } from '../filter.js'
-import {
-	TYPE_META_CREATED_AT,
-	TYPE_META_UPDATED_AT,
-} from '../../../../constants.ts'
 
 export default class DatetimeColumn extends AbstractDatetimeColumn {
 
@@ -22,56 +17,4 @@ export default class DatetimeColumn extends AbstractDatetimeColumn {
 		return Moment(value, 'YYYY-MM-DD HH:mm:ss').format('lll')
 	}
 
-	sort(mode, nextSorts) {
-		const factor = mode === 'DESC' ? -1 : 1
-		return (rowA, rowB) => {
-			let tmpA = rowA.data.find(item => item.columnId === this.id)?.value || ''
-			let tmpB = rowB.data.find(item => item.columnId === this.id)?.value || ''
-			if (this.id === TYPE_META_CREATED_AT) {
-				tmpA = rowA.createdAt
-				tmpB = rowB.createdAt
-			}
-			if (this.id === TYPE_META_UPDATED_AT) {
-				tmpA = rowA.lastEditAt
-				tmpB = rowB.lastEditAt
-			}
-
-			if (!tmpA && tmpB) {
-				return -1 * factor
-			}
-			if (tmpA && !tmpB) {
-				return 1 * factor
-			}
-			if (!tmpA && !tmpB) {
-				return super.getNextSortsResult(nextSorts, rowA, rowB)
-			}
-
-			const valueA = new Moment(tmpA, 'YYYY-MM-DD HH:mm')
-			const valueB = new Moment(tmpB, 'YYYY-MM-DD HH:mm')
-			return (valueA.diff(valueB)) * factor || super.getNextSortsResult(nextSorts, rowA, rowB)
-		}
-	}
-
-	isSearchStringFound(cell, searchString) {
-		const date = new Moment(cell.value, 'YYYY-MM-DD HH:mm').format('lll')
-		return super.isSearchStringFound(date, cell, searchString)
-	}
-
-	isFilterFound(cell, filter) {
-		const filterValue = filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value
-		const filterDate = new Moment(filterValue, 'YYYY-MM-DD HH:mm')
-		const valueDate = new Moment(cell.value, 'YYYY-MM-DD HH:mm')
-
-		const filterMethod = {
-			[FilterIds.IsEqual]() { return filterDate.isSame(valueDate) },
-			[FilterIds.IsNotEqual]() { return !filterDate.isSame(valueDate) },
-			[FilterIds.IsGreaterThan]() { return filterDate.isBefore(valueDate) },
-			[FilterIds.IsGreaterThanOrEqual]() { return filterDate.isSameOrBefore(valueDate) },
-			[FilterIds.IsLowerThan]() { return filterDate.isAfter(valueDate) },
-			[FilterIds.IsLowerThanOrEqual]() { return filterDate.isSameOrAfter(valueDate) },
-			[FilterIds.IsEmpty]() { return !cell.value },
-		}[filter.operator.id]
-		return super.isFilterFound(filterMethod, cell)
-	}
-
 }
diff --git a/src/shared/components/ncTable/mixins/columnsTypes/datetimeDate.js b/src/shared/components/ncTable/mixins/columnsTypes/datetimeDate.js
index db3d9cf6d6..68dceb69fd 100644
--- a/src/shared/components/ncTable/mixins/columnsTypes/datetimeDate.js
+++ b/src/shared/components/ncTable/mixins/columnsTypes/datetimeDate.js
@@ -5,7 +5,6 @@
 import { AbstractDatetimeColumn } from '../columnClass.js'
 import { ColumnTypes } from '../columnHandler.js'
 import Moment from '@nextcloud/moment'
-import { FilterIds } from '../filter.js'
 
 export default class DatetimeDateColumn extends AbstractDatetimeColumn {
 
@@ -18,46 +17,4 @@ export default class DatetimeDateColumn extends AbstractDatetimeColumn {
 		return Moment(value, 'YYYY-MM-DD HH:mm:ss').format('ll')
 	}
 
-	sort(mode, nextSorts) {
-		const factor = mode === 'DESC' ? -1 : 1
-		return (rowA, rowB) => {
-			const tmpA = rowA.data.find(item => item.columnId === this.id)?.value || ''
-			const valueA = new Moment(tmpA)
-			const tmpB = rowB.data.find(item => item.columnId === this.id)?.value || ''
-			const valueB = new Moment(tmpB)
-			if (!tmpA && tmpB) {
-				return -1 * factor
-			}
-			if (tmpA && !tmpB) {
-				return 1 * factor
-			}
-			if (!tmpA && !tmpB) {
-				return super.getNextSortsResult(nextSorts, rowA, rowB)
-			}
-			return (valueA.diff(valueB)) * factor || super.getNextSortsResult(nextSorts, rowA, rowB)
-		}
-	}
-
-	isSearchStringFound(cell, searchString) {
-		const date = new Moment(cell.value, 'YYYY-MM-DD').format('ll')
-		return super.isSearchStringFound(date, cell, searchString)
-	}
-
-	isFilterFound(cell, filter) {
-		const filterValue = filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value
-		const filterDate = new Moment(filterValue)
-		const valueDate = new Moment(cell.value)
-
-		const filterMethod = {
-			[FilterIds.IsEqual]() { return filterDate.isSame(valueDate) },
-			[FilterIds.IsNotEqual]() { return !filterDate.isSame(valueDate) },
-			[FilterIds.IsGreaterThan]() { return filterDate.isBefore(valueDate) },
-			[FilterIds.IsGreaterThanOrEqual]() { return filterDate.isSameOrBefore(valueDate) },
-			[FilterIds.IsLowerThan]() { return filterDate.isAfter(valueDate) },
-			[FilterIds.IsLowerThanOrEqual]() { return filterDate.isSameOrAfter(valueDate) },
-			[FilterIds.IsEmpty]() { return !cell.value },
-		}[filter.operator.id]
-		return super.isFilterFound(filterMethod, cell)
-	}
-
 }
diff --git a/src/shared/components/ncTable/mixins/columnsTypes/datetimeTime.js b/src/shared/components/ncTable/mixins/columnsTypes/datetimeTime.js
index 04dc8a3a97..65518cc2d8 100644
--- a/src/shared/components/ncTable/mixins/columnsTypes/datetimeTime.js
+++ b/src/shared/components/ncTable/mixins/columnsTypes/datetimeTime.js
@@ -5,7 +5,6 @@
 import { AbstractDatetimeColumn } from '../columnClass.js'
 import { ColumnTypes } from '../columnHandler.js'
 import Moment from '@nextcloud/moment'
-import { FilterIds } from '../filter.js'
 
 export default class DatetimeTimeColumn extends AbstractDatetimeColumn {
 
@@ -18,46 +17,4 @@ export default class DatetimeTimeColumn extends AbstractDatetimeColumn {
 		return Moment(value, 'HH:mm:ss').format('LT')
 	}
 
-	sort(mode, nextSorts) {
-		const factor = mode === 'DESC' ? -1 : 1
-		return (rowA, rowB) => {
-			const tmpA = rowA.data.find(item => item.columnId === this.id)?.value || ''
-			const valueA = new Moment(tmpA, 'HH:mm')
-			const tmpB = rowB.data.find(item => item.columnId === this.id)?.value || ''
-			const valueB = new Moment(tmpB, 'HH:mm')
-			if (!tmpA && tmpB) {
-				return -1 * factor
-			}
-			if (tmpA && !tmpB) {
-				return 1 * factor
-			}
-			if (!tmpA && !tmpB) {
-				return super.getNextSortsResult(nextSorts, rowA, rowB)
-			}
-			return (valueA.diff(valueB)) * factor || super.getNextSortsResult(nextSorts, rowA, rowB)
-		}
-	}
-
-	isSearchStringFound(cell, searchString) {
-		const time = new Moment(cell.value, 'YYYY-MM-DD HH:mm').format('lll')
-		return super.isSearchStringFound(time, cell, searchString)
-	}
-
-	isFilterFound(cell, filter) {
-		const filterValue = filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value
-		const filterTime = new Moment(filterValue, 'HH:mm')
-		const valueTime = new Moment(cell.value, 'HH:mm')
-
-		const filterMethod = {
-			[FilterIds.IsEqual]() { return filterTime.isSame(valueTime) },
-			[FilterIds.IsNotEqual]() { return !filterTime.isSame(valueTime) },
-			[FilterIds.IsGreaterThan]() { return filterTime.isBefore(valueTime) },
-			[FilterIds.IsGreaterThanOrEqual]() { return filterTime.isSameOrBefore(valueTime) },
-			[FilterIds.IsLowerThan]() { return filterTime.isAfter(valueTime) },
-			[FilterIds.IsLowerThanOrEqual]() { return filterTime.isSameOrAfter(valueTime) },
-			[FilterIds.IsEmpty]() { return !cell.value },
-		}[filter.operator.id]
-		return super.isFilterFound(filterMethod, cell)
-	}
-
 }
diff --git a/src/shared/components/ncTable/mixins/columnsTypes/number.js b/src/shared/components/ncTable/mixins/columnsTypes/number.js
index b343817351..3c54bbdd8e 100644
--- a/src/shared/components/ncTable/mixins/columnsTypes/number.js
+++ b/src/shared/components/ncTable/mixins/columnsTypes/number.js
@@ -4,8 +4,6 @@
  */
 import { AbstractNumberColumn } from '../columnClass.js'
 import { ColumnTypes } from '../columnHandler.js'
-import { FilterIds } from '../filter.js'
-import { TYPE_META_ID } from '../../../../constants.ts'
 
 export default class NumberColumn extends AbstractNumberColumn {
 
@@ -19,47 +17,6 @@ export default class NumberColumn extends AbstractNumberColumn {
 		this.numberSuffix = data.numberSuffix
 	}
 
-	sort(mode, nextSorts) {
-		const factor = mode === 'DESC' ? -1 : 1
-		return (rowA, rowB) => {
-			let valueA = rowA.data.find(item => item.columnId === this.id)?.value || null
-			let valueB = rowB.data.find(item => item.columnId === this.id)?.value || null
-			if (this.id === TYPE_META_ID) {
-				valueA = rowA.id
-				valueB = rowB.id
-			}
-			if (!valueA && valueB) {
-				return -1 * factor
-			}
-			if (valueA && !valueB) {
-				return 1 * factor
-			}
-			if (!valueA && !valueB) {
-				return super.getNextSortsResult(nextSorts, rowA, rowB)
-			}
-			return ((valueA < valueB) ? -1 : (valueA > valueB) ? 1 : 0) * factor || super.getNextSortsResult(nextSorts, rowA, rowB)
-		}
-	}
-
-	isSearchStringFound(cell, searchString) {
-		return super.isSearchStringFound(('' + cell.value), cell, searchString)
-	}
-
-	isFilterFound(cell, filter) {
-		const filterValue = filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value
-
-		const filterMethod = {
-			[FilterIds.IsEqual]() { return parseInt(cell.value) === parseInt(filterValue) },
-			[FilterIds.IsNotEqual]() { return parseInt(cell.value) !== parseInt(filterValue) },
-			[FilterIds.IsGreaterThan]() { return parseInt(cell.value) > parseInt(filterValue) },
-			[FilterIds.IsGreaterThanOrEqual]() { return parseInt(cell.value) >= parseInt(filterValue) },
-			[FilterIds.IsLowerThan]() { return parseInt(cell.value) < parseInt(filterValue) },
-			[FilterIds.IsLowerThanOrEqual]() { return parseInt(cell.value) <= parseInt(filterValue) },
-			[FilterIds.IsEmpty]() { return !cell.value },
-		}[filter.operator.id]
-		return super.isFilterFound(filterMethod, cell)
-	}
-
 	parseValue(value) {
 		return value === null ? null : parseFloat(value)
 	}
diff --git a/src/shared/components/ncTable/mixins/columnsTypes/numberProgress.js b/src/shared/components/ncTable/mixins/columnsTypes/numberProgress.js
index a391c62ddd..6be54fbda5 100644
--- a/src/shared/components/ncTable/mixins/columnsTypes/numberProgress.js
+++ b/src/shared/components/ncTable/mixins/columnsTypes/numberProgress.js
@@ -4,7 +4,6 @@
  */
 import { AbstractNumberColumn } from '../columnClass.js'
 import { ColumnTypes } from '../columnHandler.js'
-import { FilterIds } from '../filter.js'
 
 export default class NumberProgressColumn extends AbstractNumberColumn {
 
@@ -13,36 +12,6 @@ export default class NumberProgressColumn extends AbstractNumberColumn {
 		this.type = ColumnTypes.NumberProgress
 	}
 
-	sort(mode, nextSorts) {
-		const factor = mode === 'DESC' ? -1 : 1
-		return (rowA, rowB) => {
-			const tmpA = rowA.data.find(item => item.columnId === this.id)?.value || 0
-			const valueA = parseInt(tmpA)
-			const tmpB = rowB.data.find(item => item.columnId === this.id)?.value || 0
-			const valueB = parseInt(tmpB)
-			return ((valueA < valueB) ? -1 : (valueA > valueB) ? 1 : 0) * factor || super.getNextSortsResult(nextSorts, rowA, rowB)
-		}
-	}
-
-	isSearchStringFound(cell, searchString) {
-		return super.isSearchStringFound(('' + cell.value), cell, searchString)
-	}
-
-	isFilterFound(cell, filter) {
-		const filterValue = filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value
-
-		const filterMethod = {
-			[FilterIds.IsEqual]() { return parseInt(cell.value) === parseInt(filterValue) },
-			[FilterIds.IsNotEqual]() { return parseInt(cell.value) !== parseInt(filterValue) },
-			[FilterIds.IsGreaterThan]() { return parseInt(cell.value) > parseInt(filterValue) },
-			[FilterIds.IsGreaterThanOrEqual]() { return parseInt(cell.value) >= parseInt(filterValue) },
-			[FilterIds.IsLowerThan]() { return parseInt(cell.value) < parseInt(filterValue) },
-			[FilterIds.IsLowerThanOrEqual]() { return parseInt(cell.value) <= parseInt(filterValue) },
-			[FilterIds.IsEmpty]() { return !cell.value },
-		}[filter.operator.id]
-		return super.isFilterFound(filterMethod, cell)
-	}
-
 	parseValue(value) {
 		return parseInt(value)
 	}
diff --git a/src/shared/components/ncTable/mixins/columnsTypes/numberStars.js b/src/shared/components/ncTable/mixins/columnsTypes/numberStars.js
index 754d9f3aea..96e5429340 100644
--- a/src/shared/components/ncTable/mixins/columnsTypes/numberStars.js
+++ b/src/shared/components/ncTable/mixins/columnsTypes/numberStars.js
@@ -4,7 +4,6 @@
  */
 import { AbstractNumberColumn } from '../columnClass.js'
 import { ColumnTypes } from '../columnHandler.js'
-import { FilterIds } from '../filter.js'
 
 export default class NumberStarsColumn extends AbstractNumberColumn {
 
@@ -13,34 +12,4 @@ export default class NumberStarsColumn extends AbstractNumberColumn {
 		this.type = ColumnTypes.NumberStars
 	}
 
-	sort(mode, nextSorts) {
-		const factor = mode === 'DESC' ? -1 : 1
-		return (rowA, rowB) => {
-			const tmpA = rowA.data.find(item => item.columnId === this.id)?.value
-			const valueA = Number.isNaN(parseInt(tmpA)) ? -1 : parseInt(tmpA)
-			const tmpB = rowB.data.find(item => item.columnId === this.id)?.value
-			const valueB = Number.isNaN(parseInt(tmpB)) ? -1 : parseInt(tmpB)
-			return ((valueA < valueB) ? -1 : (valueA > valueB) ? 1 : 0) * factor || super.getNextSortsResult(nextSorts, rowA, rowB)
-		}
-	}
-
-	isSearchStringFound(cell, searchString) {
-		return super.isSearchStringFound(('' + cell.value), cell, searchString)
-	}
-
-	isFilterFound(cell, filter) {
-		const filterValue = filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value
-
-		const filterMethod = {
-			[FilterIds.IsEqual]() { return parseInt(cell.value ? cell.value : 0) === parseInt(filterValue) },
-			[FilterIds.IsNotEqual]() { return parseInt(cell.value ? cell.value : 0) !== parseInt(filterValue) },
-			[FilterIds.IsGreaterThan]() { return parseInt(cell.value ? cell.value : 0) > parseInt(filterValue) },
-			[FilterIds.IsGreaterThanOrEqual]() { return parseInt(cell.value ? cell.value : 0) >= parseInt(filterValue) },
-			[FilterIds.IsLowerThan]() { return parseInt(cell.value ? cell.value : 0) < parseInt(filterValue) },
-			[FilterIds.IsLowerThanOrEqual]() { return parseInt(cell.value ? cell.value : 0) <= parseInt(filterValue) },
-			[FilterIds.IsEmpty]() { return !cell.value },
-		}[filter.operator.id]
-		return super.isFilterFound(filterMethod, cell)
-	}
-
 }
diff --git a/src/shared/components/ncTable/mixins/columnsTypes/relation.js b/src/shared/components/ncTable/mixins/columnsTypes/relation.js
index b0e03d3ab0..5ca2665d8f 100644
--- a/src/shared/components/ncTable/mixins/columnsTypes/relation.js
+++ b/src/shared/components/ncTable/mixins/columnsTypes/relation.js
@@ -5,7 +5,6 @@
 import { AbstractColumn } from '../columnClass.js'
 import { useDataStore } from '../../../../../store/data.js'
 import { useTablesStore } from '../../../../../store/store.js'
-import { FilterIds } from '../filter.js'
 import { ColumnTypes } from '../columnHandler.js'
 
 export default class RelationColumn extends AbstractColumn {
@@ -42,11 +41,6 @@ export default class RelationColumn extends AbstractColumn {
 		return value
 	}
 
-	getValueString(valueObject) {
-		valueObject = valueObject || this.value || null
-		return this.getLabel(valueObject.value)
-	}
-
 	getLabel(rowId) {
 		// Try to get relation data from the store
 		try {
@@ -72,28 +66,4 @@ export default class RelationColumn extends AbstractColumn {
 		return null
 	}
 
-	/**
-	 * Check if filter matches the cell value
-	 * @param {object} cell The cell to check
-	 * @param {object} filter The filter to apply
-	 * @return {boolean} Whether the filter matches
-	 */
-	isFilterFound(cell, filter) {
-		const filterValue = filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value
-		const cellLabel = this.getLabel(cell.value)
-		const filterMethod = {
-			[FilterIds.Contains]() { return cellLabel?.toLowerCase().includes(filterValue?.toLowerCase()) },
-			[FilterIds.DoesNotContain]() { return !cellLabel?.toLowerCase().includes(filterValue?.toLowerCase()) },
-			[FilterIds.IsEqual]() { return cellLabel === filterValue },
-			[FilterIds.IsNotEqual]() { return cellLabel !== filterValue },
-			[FilterIds.IsEmpty]() { return !cellLabel },
-		}[filter.operator.id]
-		return super.isFilterFound(filterMethod, cell)
-	}
-
-	isSearchStringFound(cell, searchString) {
-		const value = this.getValueString(cell)
-		return super.isSearchStringFound(value, cell, searchString)
-	}
-
 }
diff --git a/src/shared/components/ncTable/mixins/columnsTypes/selection.js b/src/shared/components/ncTable/mixins/columnsTypes/selection.js
index 31d3f9a31a..a7540bffa7 100644
--- a/src/shared/components/ncTable/mixins/columnsTypes/selection.js
+++ b/src/shared/components/ncTable/mixins/columnsTypes/selection.js
@@ -4,7 +4,6 @@
  */
 import { AbstractSelectionColumn } from '../columnClass.js'
 import { ColumnTypes } from '../columnHandler.js'
-import { FilterIds } from '../filter.js'
 
 export default class SelectionColumn extends AbstractSelectionColumn {
 
@@ -14,11 +13,6 @@ export default class SelectionColumn extends AbstractSelectionColumn {
 		this.selectionOptions = data.selectionOptions
 	}
 
-	getValueString(valueObject) {
-		valueObject = valueObject || this.value || null
-		return this.getLabel(valueObject.value)
-	}
-
 	getLabel(id) {
 		const i = this.selectionOptions?.findIndex((obj) => obj.id === id)
 		return this.selectionOptions[i]?.label
@@ -29,43 +23,6 @@ export default class SelectionColumn extends AbstractSelectionColumn {
 		return !!this.selectionOptions[i]?.deleted
 	}
 
-	sort(mode, nextSorts) {
-		const factor = mode === 'DESC' ? -1 : 1
-		return (rowA, rowB) => {
-			const selectionIdA = parseInt(rowA.data.find(item => item.columnId === this.id)?.value)
-			const vA = Number.isNaN(selectionIdA) ? '' : this.selectionOptions.find(item => item.id === selectionIdA)?.label
-			const valueA = this.removeEmoji(vA).trim()
-			const selectionIdB = parseInt(rowB.data.find(item => item.columnId === this.id)?.value ?? null)
-			const vB = Number.isNaN(selectionIdB) ? '' : this.selectionOptions.find(item => item.id === selectionIdB)?.label
-			const valueB = this.removeEmoji(vB).trim()
-			return ((valueA < valueB) ? -1 : (valueA > valueB) ? 1 : 0) * factor || super.getNextSortsResult(nextSorts, rowA, rowB)
-		}
-	}
-
-	removeEmoji(str) {
-		return str.replace(/([#0-9]\u20E3)|[\xA9\xAE\u203C\u2047-\u2049\u2122\u2139\u3030\u303D\u3297\u3299][\uFE00-\uFEFF]?|[\u2190-\u21FF][\uFE00-\uFEFF]?|[\u2300-\u23FF][\uFE00-\uFEFF]?|[\u2460-\u24FF][\uFE00-\uFEFF]?|[\u25A0-\u25FF][\uFE00-\uFEFF]?|[\u2600-\u27BF][\uFE00-\uFEFF]?|[\u2900-\u297F][\uFE00-\uFEFF]?|[\u2B00-\u2BF0][\uFE00-\uFEFF]?|(?:\uD83C[\uDC00-\uDFFF]|\uD83D[\uDC00-\uDEFF])[\uFE00-\uFEFF]?/g, '')
-	}
-
-	isSearchStringFound(cell, searchString) {
-		return super.isSearchStringFound(this.getLabel(cell.value), cell, searchString)
-	}
-
-	isFilterFound(cell, filter) {
-		const filterValue = filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value
-		const cellLabel = this.getLabel(cell.value)
-		const filterMethod = {
-			[FilterIds.ContainsItem]() { return filterValue.map(option => option.id).includes(cell.value) },
-			[FilterIds.Contains]() { return cellLabel?.toLowerCase().includes(filterValue?.toLowerCase()) },
-			[FilterIds.DoesNotContain]() { return !cellLabel?.toLowerCase().includes(filterValue?.toLowerCase()) },
-			[FilterIds.BeginsWith]() { return cellLabel?.startsWith(filterValue) },
-			[FilterIds.EndsWith]() { return cellLabel?.endsWith(filterValue) },
-			[FilterIds.IsEqual]() { return cellLabel === filterValue },
-			[FilterIds.IsNotEqual]() { return cellLabel !== filterValue },
-			[FilterIds.IsEmpty]() { return !cellLabel },
-		}[filter.operator.id]
-		return super.isFilterFound(filterMethod, cell)
-	}
-
 	parseValue(value) {
 		return parseInt(value)
 	}
diff --git a/src/shared/components/ncTable/mixins/columnsTypes/selectionCheck.js b/src/shared/components/ncTable/mixins/columnsTypes/selectionCheck.js
index e4730406b4..032127e134 100644
--- a/src/shared/components/ncTable/mixins/columnsTypes/selectionCheck.js
+++ b/src/shared/components/ncTable/mixins/columnsTypes/selectionCheck.js
@@ -4,7 +4,6 @@
  */
 import { AbstractSelectionColumn } from '../columnClass.js'
 import { ColumnTypes } from '../columnHandler.js'
-import { FilterIds } from '../filter.js'
 
 export default class SelectionCheckColumn extends AbstractSelectionColumn {
 
@@ -13,48 +12,4 @@ export default class SelectionCheckColumn extends AbstractSelectionColumn {
 		this.type = ColumnTypes.SelectionCheck
 	}
 
-	sort(mode, nextSorts) {
-		const factor = mode === 'DESC' ? -1 : 1
-		return (rowA, rowB) => {
-			const tmpA = rowA.data.find(item => item.columnId === this.id)?.value || ''
-			const valueA = (tmpA === true || tmpA === 'true')
-			const tmpB = rowB.data.find(item => item.columnId === this.id)?.value || ''
-			const valueB = (tmpB === true || tmpB === 'true')
-			return (valueA - valueB) * factor || super.getNextSortsResult(nextSorts, rowA, rowB)
-		}
-	}
-
-	isSearchStringFound(cell, searchString) {
-		return false
-	}
-
-	isFilterFound(cell, filter) {
-		const filterValue = filter.magicValuesEnriched ?? filter.value
-
-		// Normalize cell value to boolean
-		const cellBoolean = (cell.value === 'true') || (cell.value === true)
-
-		// Handle different filter value formats that might come from magic values
-		let filterBoolean
-		if (typeof filterValue === 'boolean') {
-			filterBoolean = filterValue
-		} else if (typeof filterValue === 'string') {
-			const normalized = filterValue.toLowerCase().trim()
-			filterBoolean = (normalized === 'true') || (normalized === 'yes')
-				? true
-				: (normalized === 'false') || (normalized === 'no')
-					? false
-					: Boolean(normalized)
-		} else {
-			filterBoolean = Boolean(filterValue)
-		}
-
-		const filterMethod = {
-			[FilterIds.IsEqual]() { return cellBoolean === filterBoolean },
-			[FilterIds.IsNotEqual]() { return cellBoolean !== filterBoolean },
-			[FilterIds.IsEmpty]() { return cell.value === null || cell.value === undefined || cell.value === '' },
-		}[filter.operator.id]
-		return filterMethod ? filterMethod() : super.isFilterFound(filterMethod, cell)
-	}
-
 }
diff --git a/src/shared/components/ncTable/mixins/columnsTypes/selectionMulti.js b/src/shared/components/ncTable/mixins/columnsTypes/selectionMulti.js
index 89e9fd4f02..958aa0d1f1 100644
--- a/src/shared/components/ncTable/mixins/columnsTypes/selectionMulti.js
+++ b/src/shared/components/ncTable/mixins/columnsTypes/selectionMulti.js
@@ -4,7 +4,6 @@
  */
 import { AbstractSelectionColumn } from '../columnClass.js'
 import { ColumnTypes } from '../columnHandler.js'
-import { FilterIds } from '../filter.js'
 
 export default class SelectionMutliColumn extends AbstractSelectionColumn {
 
@@ -21,21 +20,6 @@ export default class SelectionMutliColumn extends AbstractSelectionColumn {
 		return JSON.parse(this.selectionDefault)
 	}
 
-	getValueString(valueObject) {
-		valueObject = valueObject || this.value || null
-
-		const valueObjects = this.getObjects(valueObject.value)
-		let ret = ''
-		valueObjects?.forEach(obj => {
-			if (ret === '') {
-				ret = obj.label
-			} else {
-				ret += ', ' + obj.label
-			}
-		})
-		return ret
-	}
-
 	getDefaultObjects() {
 		return this.getObjects(this.default())
 	}
@@ -62,29 +46,4 @@ export default class SelectionMutliColumn extends AbstractSelectionColumn {
 		}
 	}
 
-	isSearchStringFound(cell, searchString) {
-		return super.isSearchStringFound(this.getValueString(cell), cell, searchString)
-	}
-
-	isFilterFound(cell, filter) {
-		const filterValue = filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value
-		const valueString = this.getValueString(cell)
-
-		const filterMethod = {
-			[FilterIds.ContainsItem]() {
-				if ((!cell.value || !cell.value.length) && filter.value.length > 0) {
-					return false
-				}
-				const filterOptionIds = filter.value.map(option => option.id)
-				return cell.value.filter(v => filterOptionIds.includes(v)).length > 0
-			},
-			[FilterIds.Contains]() { return valueString?.includes(filterValue) },
-			[FilterIds.DoesNotContain]() { return !valueString?.includes(filterValue) },
-			[FilterIds.IsEqual]() { return valueString === filterValue },
-			[FilterIds.IsNotEqual]() { return valueString !== filterValue },
-			[FilterIds.IsEmpty]() { return !valueString },
-		}[filter.operator.id]
-		return super.isFilterFound(filterMethod, cell)
-	}
-
 }
diff --git a/src/shared/components/ncTable/mixins/columnsTypes/textLine.js b/src/shared/components/ncTable/mixins/columnsTypes/textLine.js
index e1408f225f..227f11dfa2 100644
--- a/src/shared/components/ncTable/mixins/columnsTypes/textLine.js
+++ b/src/shared/components/ncTable/mixins/columnsTypes/textLine.js
@@ -4,8 +4,6 @@
  */
 import { AbstractTextColumn } from '../columnClass.js'
 import { ColumnTypes } from '../columnHandler.js'
-import { FilterIds } from '../filter.js'
-import { TYPE_META_CREATED_BY, TYPE_META_UPDATED_BY } from '../../../../constants.ts'
 
 export default class TextLineColumn extends AbstractTextColumn {
 
@@ -16,47 +14,4 @@ export default class TextLineColumn extends AbstractTextColumn {
 		this.textUnique = data.textUnique
 	}
 
-	sort(mode, nextSorts) {
-		const factor = mode === 'DESC' ? -1 : 1
-		return (rowA, rowB) => {
-			let valueA = rowA.data.find(item => item.columnId === this.id)?.value?.toLowerCase() || ''
-			let valueB = rowB.data.find(item => item.columnId === this.id)?.value?.toLowerCase() || ''
-			if (this.id === TYPE_META_CREATED_BY) {
-				valueA = rowA.createdBy?.toLowerCase() || ''
-				valueB = rowB.createdBy?.toLowerCase() || ''
-			}
-			if (this.id === TYPE_META_UPDATED_BY) {
-				valueA = rowA.lastEditBy?.toLowerCase() || ''
-				valueB = rowB.lastEditBy?.toLowerCase() || ''
-			}
-			return valueA.localeCompare(valueB, undefined) * factor || super.getNextSortsResult(nextSorts, rowA, rowB)
-		}
-	}
-
-	getValueString(valueObject) {
-		return valueObject.value.replace(/(<([^>]+)>)/ig, '')
-	}
-
-	isSearchStringFound(cell, searchString) {
-		return super.isSearchStringFound(cell.value, cell, searchString)
-	}
-
-	isFilterFound(cell, filter) {
-		const filterValue = (filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value).toLowerCase()
-		const cellValue = cell.value?.toLowerCase()
-		if (!cellValue & filter.operator.id !== FilterIds.IsEmpty) return false
-		const filterMethod = {
-			[FilterIds.Contains]() { return cellValue.includes(filterValue) },
-			[FilterIds.DoesNotContain]() { return !cellValue.includes(filterValue) },
-			[FilterIds.BeginsWith]() { return cellValue.startsWith(filterValue) },
-			[FilterIds.EndsWith]() { return cellValue.endsWith(filterValue) },
-			[FilterIds.IsEqual]() { return cellValue === filterValue },
-			[FilterIds.IsNotEqual]() { return cellValue !== filterValue },
-			[FilterIds.IsEmpty]() { return !cellValue },
-		}[filter.operator.id]
-
-		return super.isFilterFound(filterMethod, cell)
-
-	}
-
 }
diff --git a/src/shared/components/ncTable/mixins/columnsTypes/textLink.js b/src/shared/components/ncTable/mixins/columnsTypes/textLink.js
index e0328f68f5..49805f2555 100644
--- a/src/shared/components/ncTable/mixins/columnsTypes/textLink.js
+++ b/src/shared/components/ncTable/mixins/columnsTypes/textLink.js
@@ -4,7 +4,6 @@
  */
 import { AbstractTextColumn } from '../columnClass.js'
 import { ColumnTypes } from '../columnHandler.js'
-import { FilterIds } from '../filter.js'
 
 export default class TextLinkColumn extends AbstractTextColumn {
 
@@ -14,57 +13,4 @@ export default class TextLinkColumn extends AbstractTextColumn {
 		this.textAllowedPattern = data.textAllowedPattern
 	}
 
-	sort(mode, nextSorts) {
-		const factor = mode === 'DESC' ? -1 : 1
-		return (rowA, rowB) => {
-			const tmpA = rowA.data.find(item => item.columnId === this.id)?.value?.toLowerCase() || ''
-			const valueA = this.getValueFromCellValue(tmpA)
-			const tmpB = rowB.data.find(item => item.columnId === this.id)?.value?.toLowerCase() || ''
-			const valueB = this.getValueFromCellValue(tmpB)
-			return valueA.localeCompare(valueB, undefined) * factor || super.getNextSortsResult(nextSorts, rowA, rowB)
-		}
-	}
-
-	getValueFromCellValue(cellValue) {
-		// check if the value is the old string or the new object
-		try {
-			const parseResult = JSON.parse(cellValue)
-			return parseResult?.title || ''
-		} catch (err) {
-			// old string value
-			return cellValue
-		}
-	}
-
-	getValueString(valueObject) {
-		try {
-			const parseResult = JSON.parse(valueObject.value)
-			const link = parseResult?.resourceUrl ? ' (' + parseResult?.resourceUrl + ')' : ''
-			return parseResult?.title + link || ''
-		} catch (err) {
-			// old string value
-			return valueObject.value
-		}
-	}
-
-	isSearchStringFound(cell, searchString) {
-		return super.isSearchStringFound(cell.value, cell, searchString)
-	}
-
-	isFilterFound(cell, filter) {
-		const filterValue = filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value
-		const value = this.getValueFromCellValue(cell.value)
-
-		const filterMethod = {
-			[FilterIds.Contains]() { return value.includes(filterValue) },
-			[FilterIds.DoesNotContain]() { return !value.includes(filterValue) },
-			[FilterIds.BeginsWith]() { return value.startsWith(filterValue) },
-			[FilterIds.EndsWith]() { return value.endsWith(filterValue) },
-			[FilterIds.IsEqual]() { return value === filterValue },
-			[FilterIds.IsNotEqual]() { return value !== filterValue },
-			[FilterIds.IsEmpty]() { return !value },
-		}[filter.operator.id]
-		return super.isFilterFound(filterMethod, cell)
-	}
-
 }
diff --git a/src/shared/components/ncTable/mixins/columnsTypes/textLong.js b/src/shared/components/ncTable/mixins/columnsTypes/textLong.js
index a6b35728b3..554162a2fb 100644
--- a/src/shared/components/ncTable/mixins/columnsTypes/textLong.js
+++ b/src/shared/components/ncTable/mixins/columnsTypes/textLong.js
@@ -4,7 +4,6 @@
  */
 import { AbstractTextColumn } from '../columnClass.js'
 import { ColumnTypes } from '../columnHandler.js'
-import { FilterIds } from '../filter.js'
 
 export default class TextLongColumn extends AbstractTextColumn {
 
@@ -13,23 +12,4 @@ export default class TextLongColumn extends AbstractTextColumn {
 		this.type = ColumnTypes.TextLong
 	}
 
-	getValueString(valueObject) {
-		return valueObject.value.replace(/(<([^>]+)>)/ig, '')
-	}
-
-	isSearchStringFound(cell, searchString) {
-		return super.isSearchStringFound(cell.value, cell, searchString)
-	}
-
-	isFilterFound(cell, filter) {
-		const filterValue = filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value
-
-		const filterMethod = {
-			[FilterIds.Contains]() { return cell.value.includes(filterValue) },
-			[FilterIds.DoesNotContain]() { return !cell.value.includes(filterValue) },
-			[FilterIds.IsEmpty]() { return !cell.value },
-		}[filter.operator.id]
-		return super.isFilterFound(filterMethod, cell)
-	}
-
 }
diff --git a/src/shared/components/ncTable/mixins/columnsTypes/textRich.js b/src/shared/components/ncTable/mixins/columnsTypes/textRich.js
index 4bb039c36b..1f3d96e495 100644
--- a/src/shared/components/ncTable/mixins/columnsTypes/textRich.js
+++ b/src/shared/components/ncTable/mixins/columnsTypes/textRich.js
@@ -4,7 +4,6 @@
  */
 import { AbstractTextColumn } from '../columnClass.js'
 import { ColumnTypes } from '../columnHandler.js'
-import { FilterIds } from '../filter.js'
 
 export default class TextRichColumn extends AbstractTextColumn {
 
@@ -13,19 +12,4 @@ export default class TextRichColumn extends AbstractTextColumn {
 		this.type = ColumnTypes.TextRich
 	}
 
-	isSearchStringFound(cell, searchString) {
-		return super.isSearchStringFound(cell.value, cell, searchString)
-	}
-
-	isFilterFound(cell, filter) {
-		const filterValue = filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value
-
-		const filterMethod = {
-			[FilterIds.Contains]() { return cell.value && cell.value.includes(filterValue) },
-			[FilterIds.DoesNotContain]() { return cell.value && !cell.value.includes(filterValue) },
-			[FilterIds.IsEmpty]() { return !cell.value },
-		}[filter.operator.id]
-		return super.isFilterFound(filterMethod, cell)
-	}
-
 }
diff --git a/src/shared/components/ncTable/mixins/columnsTypes/usergroup.js b/src/shared/components/ncTable/mixins/columnsTypes/usergroup.js
index 3cd565dc84..e0809832ec 100644
--- a/src/shared/components/ncTable/mixins/columnsTypes/usergroup.js
+++ b/src/shared/components/ncTable/mixins/columnsTypes/usergroup.js
@@ -17,31 +17,4 @@ export default class UsergroupColumn extends AbstractUsergroupColumn {
 		this.usergroupSelectTeams = data.usergroupSelectTeams
 	}
 
-	getValueString(valueObject) {
-		valueObject = valueObject || this.value || null
-
-		const valueObjects = this.getObjects(valueObject.value)
-		let ret = ''
-		valueObjects?.forEach(obj => {
-			if (ret === '') {
-				ret = obj.id
-			} else {
-				ret += ', ' + obj.id
-			}
-		})
-		return ret
-	}
-
-	getObjects(values) {
-		const objects = []
-		values?.forEach(item => {
-			objects.push(item)
-		})
-		return objects
-	}
-
-	isSearchStringFound(cell, searchString) {
-		return super.isSearchStringFound(this.getValueString(cell), cell, searchString)
-	}
-
 }
diff --git a/src/shared/components/ncTable/partials/TableRow.vue b/src/shared/components/ncTable/partials/TableRow.vue
index 1d8cf396a5..69455c4696 100644
--- a/src/shared/components/ncTable/partials/TableRow.vue
+++ b/src/shared/components/ncTable/partials/TableRow.vue
@@ -13,8 +13,8 @@
 				...getFrozenColumnStyle(col, index, pinnedColumnIndex, config.canSelectRows, visibleColumns, columnWidths),
 			}"
 			:class="{
-				'search-result': getCell(col.id)?.searchStringFound,
-				'filter-result': getCell(col.id)?.filterFound,
+				'search-result': false,
+				'filter-result': false,
 				'fixed-width': col.customSettings?.width > 0,
 				'frozen-column': index <= pinnedColumnIndex,
 				'frozen-column--last': index === pinnedColumnIndex,

From e941b89fa86760cc4c71a0e8a575a726a84c4131 Mon Sep 17 00:00:00 2001
From: Kostiantyn Miakshyn <molodchick@gmail.com>
Date: Mon, 24 Aug 2026 01:40:41 +0200
Subject: [PATCH 07/11] cleanup and pipelines fix

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>
---
 REUSE.toml                                    |    6 -
 lib/Activity/ChangeSet.php                    |    4 +-
 lib/Analytics/AnalyticsDatasource.php         |    2 +-
 lib/Controller/PublicRowOCSController.php     |   14 +-
 lib/Controller/RowOCSController.php           |   27 +-
 lib/Db/Row2Mapper.php                         |   17 +-
 lib/Db/RowCellMapperSuper.php                 |    5 +-
 lib/Db/RowCellSuper.php                       |    2 +-
 lib/Db/RowQuery.php                           |    8 +-
 lib/Model/FilterInput.php                     |   15 -
 lib/Model/RowDataInput.php                    |    5 +-
 lib/Service/ImportService.php                 |    5 +-
 lib/Service/RowService.php                    |    4 +-
 .../ValueObject/ColumnOrderInformation.php    |    2 +-
 openapi.json                                  | 2041 ++++++++++++++---
 src/modules/main/sections/PublicElement.vue   |   16 +-
 .../main/sections/PublicMainWrapper.vue       |   28 +-
 src/shared/components/ncTable/NcTable.vue     |    1 -
 .../components/ncTable/sections/Options.vue   |    2 +-
 src/shared/utils/urlState.js                  |    5 +-
 src/types/openapi/openapi.ts                  |  969 ++++++--
 vendor-bin/rector/composer.json               |    1 -
 vendor-bin/rector/composer.lock               |   18 -
 23 files changed, 2645 insertions(+), 552 deletions(-)
 delete mode 100644 lib/Model/FilterInput.php
 delete mode 100644 vendor-bin/rector/composer.json
 delete mode 100644 vendor-bin/rector/composer.lock

diff --git a/REUSE.toml b/REUSE.toml
index 1b25e862b1..519b115aaf 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -29,12 +29,6 @@ precedence = "aggregate"
 SPDX-FileCopyrightText = "2025 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
 
-[[annotations]]
-path = ["vendor-bin/rector/composer.json", "vendor-bin/rector/composer.lock"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2025 Nextcloud GmbH and Nextcloud contributors"
-SPDX-License-Identifier = "AGPL-3.0-or-later"
-
 [[annotations]]
 path = ["img/app-dark.svg", "img/app.svg", "img/view.svg", "img/view-dark.svg", "img/material/*.svg"]
 precedence = "aggregate"
diff --git a/lib/Activity/ChangeSet.php b/lib/Activity/ChangeSet.php
index ea850a537a..4ec67cde9d 100644
--- a/lib/Activity/ChangeSet.php
+++ b/lib/Activity/ChangeSet.php
@@ -24,11 +24,11 @@ public function __construct(
 		}
 	}
 
-	public function setBefore(Entity $before) {
+	public function setBefore($before) {
 		$this->before = clone $before;
 	}
 
-	public function setAfter(Entity $after) {
+	public function setAfter($after) {
 		$this->after = clone $after;
 	}
 
diff --git a/lib/Analytics/AnalyticsDatasource.php b/lib/Analytics/AnalyticsDatasource.php
index 0d0ee5e29d..9963c9f8d6 100644
--- a/lib/Analytics/AnalyticsDatasource.php
+++ b/lib/Analytics/AnalyticsDatasource.php
@@ -338,7 +338,7 @@ private function formatBooleanValue(mixed $value): string {
 		return '';
 	}
 
-	private function formatTextValue(Column $column, string $value): string {
+	private function formatTextValue(Column $column, mixed $value): string {
 		if ($value === null || $value === '') {
 			return '';
 		}
diff --git a/lib/Controller/PublicRowOCSController.php b/lib/Controller/PublicRowOCSController.php
index d0f8e3011b..ace1fd3e02 100644
--- a/lib/Controller/PublicRowOCSController.php
+++ b/lib/Controller/PublicRowOCSController.php
@@ -52,8 +52,12 @@ public function __construct(
 	 * [api v2] Fetch all rows from a link share
 	 *
 	 * @param string $token The share token
-	 * @param int|null $limit Optional: maximum number of results, capped at 500
-	 * @param int|null $offset Optional: the offset for this operation
+	 * @psalm-param ?int<1,500> $limit Number of rows to return between 1 and 500, fetches all by default (optional)
+	 * @psalm-param ?int<0,max> $offset Offset of the rows to be returned (optional)
+	 * @param string|null $filter Optional: a JSON encoded filter parameter
+	 * @param string|null $sort Optional: a JSON encoded sort parameter
+	 * @param string|null $search Optional: a search string
+	 * @param string|null $rowIds Optional: a JSON encoded list of row IDs
 	 * @return DataResponse<Http::STATUS_OK, list<TablesPublicRow>, array{}>|DataResponse<Http::STATUS_FORBIDDEN|Http::STATUS_BAD_REQUEST|Http::STATUS_NOT_FOUND|Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
 	 *
 	 * 200: Rows are returned
@@ -76,9 +80,6 @@ public function getRows(string $token, ?int $limit, ?int $offset, ?string $filte
 				return $this->handlePermissionError(new PermissionError('No read permission on this share'));
 			}
 
-			$limit = $limit !== null ? max(0, min(500, $limit)) : null;
-			$offset = $offset !== null ? max(0, $offset) : null;
-
 			$queryData = RowQuery::buildFromInput(
 				nodeType: $share->getNodeType(),
 				nodeId: $share->getNodeId(),
@@ -89,6 +90,7 @@ public function getRows(string $token, ?int $limit, ?int $offset, ?string $filte
 				sort: $sort,
 				search: $search,
 				rowIds: $rowIds,
+				normalizePagination: true,
 			);
 
 			$rows = $this->rowService->findAllByQuery($queryData);
@@ -164,7 +166,7 @@ public function countRows(string $token, ?string $filter = null, ?string $sort =
 	 * @param ?string $sort Optional: a JSON encoded sort parameter
 	 * @param ?string $search Optional: a search string
 	 * @param ?string $rowIds Optional: a JSON encoded list of row IDs to export
-	 * @return DataDownloadResponse<Http::STATUS_OK, array{headers: array<string, string>}>|DataResponse<Http::STATUS_FORBIDDEN|Http::STATUS_BAD_REQUEST|Http::STATUS_NOT_FOUND|Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
+	 * @return DataDownloadResponse<Http::STATUS_OK, 'text/csv', array{}>|DataResponse<Http::STATUS_FORBIDDEN|Http::STATUS_BAD_REQUEST|Http::STATUS_NOT_FOUND|Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
 	 *
 	 * 200: CSV file is returned
 	 * 400: Invalid request parameters
diff --git a/lib/Controller/RowOCSController.php b/lib/Controller/RowOCSController.php
index 35a9ee2443..92decc4c2c 100644
--- a/lib/Controller/RowOCSController.php
+++ b/lib/Controller/RowOCSController.php
@@ -125,6 +125,8 @@ public function createRow(string $nodeCollection, int $nodeId, mixed $data): Dat
 	 * @psalm-param ?int<0,max> $offset Offset of the rows to be returned (optional)
 	 * @param ?string $filter JSON encoded list of filter groups. Definitions within a group are AND-connected, groups are OR-connected, e.g. `[[{"columnId":1,"operator":"contains","value":"foo"}]]` (optional)
 	 * @param ?string $sort JSON encoded list of sort rules, e.g. `[{"columnId":1,"mode":"ASC"}]` (optional)
+	 * @param ?string $search Search string (optional)
+	 * @param ?string $rowIds JSON encoded list of row IDs (optional)
 	 * @return DataResponse<Http::STATUS_OK, list<TablesRow>, array{}>|DataResponse<Http::STATUS_FORBIDDEN|Http::STATUS_BAD_REQUEST|Http::STATUS_NOT_FOUND|Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
 	 *
 	 * 200: Rows returned
@@ -142,12 +144,6 @@ public function createRow(string $nodeCollection, int $nodeId, mixed $data): Dat
 	)]
 	public function getRows(string $nodeCollection, int $nodeId, ?int $limit = null, ?int $offset = null, ?string $filter = null, ?string $sort = null, ?string $search = null, ?string $rowIds = null): DataResponse {
 		try {
-			if (($limit !== null && ($limit <= 0 || $limit > 500))
-				|| ($offset !== null && $offset < 0)
-			) {
-				throw new InvalidArgumentException('Offset or limit parameter is out of bounds');
-			}
-
 			$queryData = RowQuery::buildFromInput(
 				nodeType: $nodeCollection,
 				nodeId: $nodeId,
@@ -158,6 +154,7 @@ public function getRows(string $nodeCollection, int $nodeId, ?int $limit = null,
 				sort: $sort,
 				search: $search,
 				rowIds: $rowIds,
+				normalizePagination: true,
 			);
 
 			$rows = $this->rowService->findAllByQuery($queryData);
@@ -171,6 +168,22 @@ public function getRows(string $nodeCollection, int $nodeId, ?int $limit = null,
 		}
 	}
 
+	/**
+	 * [api v2] Count rows from a table or view
+	 *
+	 * @param 'tables'|'views' $nodeCollection Indicates whether to read from a table or a view
+	 * @psalm-param int<0,max> $nodeId The ID of the table or view
+	 * @param string|null $filter Optional: a JSON encoded filter parameter
+	 * @param string|null $sort Optional: a JSON encoded sort parameter
+	 * @param string|null $search Optional: a search string
+	 * @return DataResponse<Http::STATUS_OK, array{count: int}, array{}>|DataResponse<Http::STATUS_FORBIDDEN|Http::STATUS_BAD_REQUEST|Http::STATUS_NOT_FOUND|Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
+	 *
+	 * 200: Count is returned
+	 * 400: Invalid request parameters
+	 * 403: No permissions
+	 * 404: Not found
+	 * 500: Internal error
+	 */
 	#[NoAdminRequired]
 	#[RequirePermission(permission: Application::PERMISSION_READ, typeParam: 'nodeCollection')]
 	#[ApiRoute(
@@ -209,7 +222,7 @@ public function countRows(string $nodeCollection, int $nodeId, ?string $filter =
 	 * @param ?string $sort JSON encoded list of sort rules (optional)
 	 * @param ?string $search Search string (optional)
 	 * @param ?string $rowIds JSON encoded list of row IDs to export (optional)
-	 * @return DataDownloadResponse<Http::STATUS_OK, array{headers: array<string, string>}>|DataResponse<Http::STATUS_FORBIDDEN|Http::STATUS_BAD_REQUEST|Http::STATUS_NOT_FOUND|Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
+	 * @return DataDownloadResponse<Http::STATUS_OK, 'text/csv', array{}>|DataResponse<Http::STATUS_FORBIDDEN|Http::STATUS_BAD_REQUEST|Http::STATUS_NOT_FOUND|Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
 	 *
 	 * 200: CSV file is returned
 	 * 400: Invalid request parameters
diff --git a/lib/Db/Row2Mapper.php b/lib/Db/Row2Mapper.php
index 5d52cc119a..194092505d 100644
--- a/lib/Db/Row2Mapper.php
+++ b/lib/Db/Row2Mapper.php
@@ -180,10 +180,11 @@ private function getWantedRowIds(string $userId, int $tableId, ?array $filter =
 	 * @param array|null $filter
 	 * @param array|null $sort
 	 * @param string|null $userId
+	 * @param string|null $search
 	 * @return Row2[]
 	 * @throws InternalError
 	 */
-	public function findAll(array $showColumnIds, int $tableId, ?int $limit = null, ?int $offset = null, ?array $filter = null, ?array $sort = null, ?string $search = null, ?string $userId = null, ?array $rowIds = null): array {
+	public function findAll(array $showColumnIds, int $tableId, ?int $limit = null, ?int $offset = null, ?array $filter = null, ?array $sort = null, ?string $userId = null, ?string $search = null, ?array $rowIds = null): array {
 		try {
 			$this->columnMapper->preloadColumns($showColumnIds, $filter, $sort);
 
@@ -1093,14 +1094,16 @@ private function getSearchSubquery(IQueryBuilder $qb, string $search, array $sho
 
 		$qbSqlForColumnTypes = null;
 		foreach ($this->columnsHelper->columns as $columnType) {
+			$innerQb = $this->db->getQueryBuilder();
+			$innerQb->select('row_id')
+				->selectAlias($innerQb->expr()->castColumn('value', IQueryBuilder::PARAM_STR), 'search_value')
+				->from('tables_row_cells_' . $columnType)
+				->where($innerQb->expr()->in('column_id', $columnIdsParam));
+
 			$qbTmp = $this->db->getQueryBuilder();
 			$qbTmp->select('row_id')
-				->from('tables_row_cells_' . $columnType)
-				->where($qb->expr()->in('column_id', $columnIdsParam))
-				->andWhere($qb->expr()->iLike(
-					$qb->expr()->castColumn('value', IQueryBuilder::PARAM_STR),
-					$searchParam
-				));
+				->from($qbTmp->createFunction('(' . $innerQb->getSQL() . ')'), 't')
+				->where($qbTmp->expr()->iLike('t.search_value', $searchParam));
 
 			if ($qbSqlForColumnTypes) {
 				$qbSqlForColumnTypes .= ' UNION ALL ' . $qbTmp->getSQL() . ' ';
diff --git a/lib/Db/RowCellMapperSuper.php b/lib/Db/RowCellMapperSuper.php
index 460e2095e8..be377c5d87 100644
--- a/lib/Db/RowCellMapperSuper.php
+++ b/lib/Db/RowCellMapperSuper.php
@@ -41,10 +41,7 @@ public function formatRowData(Column $column, array $row) {
 	 * Transform value from a filter rule to the actual query parameter used
 	 * for constructing the view filter query
 	 */
-	/**
-	 * @param array|float|null|string $value
-	 */
-	public function filterValueToQueryParam(Column $column, array|string|float|null $value): mixed {
+	public function filterValueToQueryParam(Column $column, mixed $value): mixed {
 		return $value;
 	}
 
diff --git a/lib/Db/RowCellSuper.php b/lib/Db/RowCellSuper.php
index 58fc632fa6..29c3e366bb 100644
--- a/lib/Db/RowCellSuper.php
+++ b/lib/Db/RowCellSuper.php
@@ -60,7 +60,7 @@ public function setColumnIdWrapper(int $columnId) {
 		$this->setColumnId($columnId);
 	}
 
-	public function setValueWrapper(array|float|null $value) {
+	public function setValueWrapper($value) {
 		$this->setValue($value);
 	}
 }
diff --git a/lib/Db/RowQuery.php b/lib/Db/RowQuery.php
index ab4c64d53b..f2a549a3fa 100644
--- a/lib/Db/RowQuery.php
+++ b/lib/Db/RowQuery.php
@@ -103,10 +103,16 @@ public function setRowIds(?array $rowIds): self {
 	/**
 	 * Build a RowQuery from request parameters.
 	 *
+	 * @param bool $normalizePagination Clamp limit and offset to valid ranges instead of throwing.
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public static function buildFromInput(string $nodeType, int $nodeId, string $userId, ?int $limit = null, ?int $offset = null, ?string $filter = null, ?string $sort = null, ?string $search = null, ?string $rowIds = null): self {
+	public static function buildFromInput(string $nodeType, int $nodeId, string $userId, ?int $limit = null, ?int $offset = null, ?string $filter = null, ?string $sort = null, ?string $search = null, ?string $rowIds = null, bool $normalizePagination = false): self {
+		if ($normalizePagination) {
+			$limit = $limit !== null ? max(0, min(500, $limit)) : null;
+			$offset = $offset !== null ? max(0, $offset) : null;
+		}
+
 		$rowQuery = new self(ConversionHelper::stringNodeType2Const($nodeType), $nodeId);
 		$rowQuery->setLimit($limit)
 			->setOffset($offset)
diff --git a/lib/Model/FilterInput.php b/lib/Model/FilterInput.php
deleted file mode 100644
index ec96cd3c57..0000000000
--- a/lib/Model/FilterInput.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace OCA\Tables\Model;
-
-use OCP\IRequest;
-
-// TODO: This is a protoype. declare and copyright is missing and proper logic
-
-class FilterInput {
-	public array $filter;
-	public function __construct(IRequest $request) {
-		$value = $request->getParam('filter', '[]');
-		$this->filter = json_decode($value, true) ?? [];
-	}
-}
diff --git a/lib/Model/RowDataInput.php b/lib/Model/RowDataInput.php
index 21f54cd2f9..dbef7fde0b 100644
--- a/lib/Model/RowDataInput.php
+++ b/lib/Model/RowDataInput.php
@@ -24,10 +24,7 @@ class RowDataInput implements ArrayAccess, Iterator {
 	/** @psalm-var array<array{'columnId': int, 'value': mixed}> */
 	protected array $data = [];
 
-	/**
-	 * @param array|float|int|null|string $value
-	 */
-	public function add(int $columnId, array|string|int|float|null $value): self {
+	public function add(int $columnId, mixed $value): self {
 		$this->data[] = [self::DATA_KEY => $columnId, self::DATA_VAL => $value];
 		return $this;
 	}
diff --git a/lib/Service/ImportService.php b/lib/Service/ImportService.php
index d241b96194..42122ff45d 100644
--- a/lib/Service/ImportService.php
+++ b/lib/Service/ImportService.php
@@ -698,10 +698,7 @@ private function upsertRow(Row $row, array $columnBusinesses): void {
 		}
 	}
 
-	/**
-	 * @param null|string $value
-	 */
-	private function valueToDateTimeImmutable(string|null $value): ?DateTimeImmutable {
+	private function valueToDateTimeImmutable(mixed $value): ?DateTimeImmutable {
 		if (
 			$value === false
 			|| $value === null
diff --git a/lib/Service/RowService.php b/lib/Service/RowService.php
index c9cc0cd4c0..7130edb1b6 100644
--- a/lib/Service/RowService.php
+++ b/lib/Service/RowService.php
@@ -131,8 +131,8 @@ public function exportCsv(RowQuery $rowQuery): string {
 			null,
 			$filter,
 			$sort,
-			$search,
 			$rowQuery->getUserId() ?? '',
+			$search,
 			$rowQuery->getRowIds(),
 		);
 
@@ -224,8 +224,8 @@ public function findAllByQuery(RowQuery $rowQuery): array {
 			$rowQuery->getOffset(),
 			$filter,
 			$sort,
-			$search,
 			$userId,
+			$search,
 			$rowQuery->getRowIds(),
 		);
 	}
diff --git a/lib/Service/ValueObject/ColumnOrderInformation.php b/lib/Service/ValueObject/ColumnOrderInformation.php
index f0b4b4192b..e7d0a12945 100644
--- a/lib/Service/ValueObject/ColumnOrderInformation.php
+++ b/lib/Service/ValueObject/ColumnOrderInformation.php
@@ -84,7 +84,7 @@ public function jsonSerialize(): array {
 		];
 	}
 
-	protected function ensureType(string $offset, bool|int $value): int|bool {
+	protected function ensureType(string $offset, mixed $value): int|bool {
 		return match ($offset) {
 			self::KEY_ID,
 			self::KEY_ORDER => (int)$value,
diff --git a/openapi.json b/openapi.json
index 0234b5c0f6..4dd6e87176 100644
--- a/openapi.json
+++ b/openapi.json
@@ -12695,14 +12695,922 @@
                 }
             }
         },
-        "/ocs/v2.php/apps/tables/api/2/{nodeCollection}/{nodeId}/rows": {
+        "/ocs/v2.php/apps/tables/api/2/config/table/{id}": {
+            "get": {
+                "operationId": "config-get-table-config",
+                "summary": "Gets the config for a specific table",
+                "tags": [
+                    "config"
+                ],
+                "security": [
+                    {
+                        "bearer_auth": []
+                    },
+                    {
+                        "basic_auth": []
+                    }
+                ],
+                "parameters": [
+                    {
+                        "name": "id",
+                        "in": "path",
+                        "description": "Table id",
+                        "required": true,
+                        "schema": {
+                            "type": "integer",
+                            "format": "int64"
+                        }
+                    },
+                    {
+                        "name": "OCS-APIRequest",
+                        "in": "header",
+                        "description": "Required to be true for the API request to pass",
+                        "required": true,
+                        "schema": {
+                            "type": "boolean",
+                            "default": true
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Table config returned",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "$ref": "#/components/schemas/NotifyConfig"
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "401": {
+                        "description": "Current user is not logged in",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {}
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/ocs/v2.php/apps/tables/api/2/config/view/{id}": {
+            "get": {
+                "operationId": "config-get-view-config",
+                "summary": "Gets the config for a specific view",
+                "tags": [
+                    "config"
+                ],
+                "security": [
+                    {
+                        "bearer_auth": []
+                    },
+                    {
+                        "basic_auth": []
+                    }
+                ],
+                "parameters": [
+                    {
+                        "name": "id",
+                        "in": "path",
+                        "description": "View id",
+                        "required": true,
+                        "schema": {
+                            "type": "integer",
+                            "format": "int64"
+                        }
+                    },
+                    {
+                        "name": "OCS-APIRequest",
+                        "in": "header",
+                        "description": "Required to be true for the API request to pass",
+                        "required": true,
+                        "schema": {
+                            "type": "boolean",
+                            "default": true
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "View config returned",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "$ref": "#/components/schemas/NotifyConfig"
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "401": {
+                        "description": "Current user is not logged in",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {}
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/ocs/v2.php/apps/tables/api/2/config/{key}": {
+            "post": {
+                "operationId": "config-set-value",
+                "summary": "Sets a config value for a specific key",
+                "tags": [
+                    "config"
+                ],
+                "security": [
+                    {
+                        "bearer_auth": []
+                    },
+                    {
+                        "basic_auth": []
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "type": "object",
+                                "required": [
+                                    "value"
+                                ],
+                                "properties": {
+                                    "value": {
+                                        "type": "object",
+                                        "description": "Config value"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                "parameters": [
+                    {
+                        "name": "key",
+                        "in": "path",
+                        "description": "Config key",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    {
+                        "name": "OCS-APIRequest",
+                        "in": "header",
+                        "description": "Required to be true for the API request to pass",
+                        "required": true,
+                        "schema": {
+                            "type": "boolean",
+                            "default": true
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Config updated",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "type": "boolean"
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "bad request",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "403": {
+                        "description": "No permissions",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "401": {
+                        "description": "Current user is not logged in",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {}
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/ocs/v2.php/apps/tables/api/2/public/{token}/columns": {
+            "get": {
+                "operationId": "api_public_columns-index-by-public-link",
+                "summary": "[api v2] Get all columns for a table or a view shared by link",
+                "description": "Return an empty array if no columns were found",
+                "tags": [
+                    "api_public_columns"
+                ],
+                "security": [
+                    {},
+                    {
+                        "bearer_auth": []
+                    },
+                    {
+                        "basic_auth": []
+                    }
+                ],
+                "parameters": [
+                    {
+                        "name": "token",
+                        "in": "path",
+                        "description": "The share token",
+                        "required": true,
+                        "schema": {
+                            "type": "string",
+                            "pattern": "^[a-zA-Z0-9]{16}$"
+                        }
+                    },
+                    {
+                        "name": "OCS-APIRequest",
+                        "in": "header",
+                        "description": "Required to be true for the API request to pass",
+                        "required": true,
+                        "schema": {
+                            "type": "boolean",
+                            "default": true
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Columns are returned",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "type": "array",
+                                                    "items": {
+                                                        "$ref": "#/components/schemas/PublicColumn"
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "403": {
+                        "description": "No permissions",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "Invalid request parameters",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "404": {
+                        "description": "Not found",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal error",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/ocs/v2.php/apps/tables/api/2/public/{token}/rows": {
+            "get": {
+                "operationId": "public_rowocs-get-rows",
+                "summary": "[api v2] Fetch all rows from a link share",
+                "tags": [
+                    "public_rowocs"
+                ],
+                "security": [
+                    {},
+                    {
+                        "bearer_auth": []
+                    },
+                    {
+                        "basic_auth": []
+                    }
+                ],
+                "parameters": [
+                    {
+                        "name": "token",
+                        "in": "path",
+                        "description": "The share token",
+                        "required": true,
+                        "schema": {
+                            "type": "string",
+                            "pattern": "^[a-zA-Z0-9]{16}$"
+                        }
+                    },
+                    {
+                        "name": "limit",
+                        "in": "query",
+                        "description": "Number of rows to return between 1 and 500, fetches all by default (optional)",
+                        "schema": {
+                            "type": "integer",
+                            "format": "int64",
+                            "nullable": true,
+                            "minimum": 1,
+                            "maximum": 500
+                        }
+                    },
+                    {
+                        "name": "offset",
+                        "in": "query",
+                        "description": "Offset of the rows to be returned (optional)",
+                        "schema": {
+                            "type": "integer",
+                            "format": "int64",
+                            "nullable": true,
+                            "minimum": 0
+                        }
+                    },
+                    {
+                        "name": "filter",
+                        "in": "query",
+                        "description": "Optional: a JSON encoded filter parameter",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
+                        }
+                    },
+                    {
+                        "name": "sort",
+                        "in": "query",
+                        "description": "Optional: a JSON encoded sort parameter",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
+                        }
+                    },
+                    {
+                        "name": "search",
+                        "in": "query",
+                        "description": "Optional: a search string",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
+                        }
+                    },
+                    {
+                        "name": "rowIds",
+                        "in": "query",
+                        "description": "Optional: a JSON encoded list of row IDs",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
+                        }
+                    },
+                    {
+                        "name": "OCS-APIRequest",
+                        "in": "header",
+                        "description": "Required to be true for the API request to pass",
+                        "required": true,
+                        "schema": {
+                            "type": "boolean",
+                            "default": true
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Rows are returned",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "type": "array",
+                                                    "items": {
+                                                        "$ref": "#/components/schemas/PublicRow"
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "403": {
+                        "description": "No permissions",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "Invalid request parameters",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "404": {
+                        "description": "Not found",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal error",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            },
             "post": {
-                "operationId": "rowocs-create-row",
-                "summary": "[api v2] Create a new row in a table or a view",
+                "operationId": "public_rowocs-create-row",
+                "summary": "[api v2] Create a row in a link share",
                 "tags": [
-                    "rowocs"
+                    "public_rowocs"
                 ],
                 "security": [
+                    {},
                     {
                         "bearer_auth": []
                     },
@@ -12741,27 +13649,13 @@
                 },
                 "parameters": [
                     {
-                        "name": "nodeCollection",
+                        "name": "token",
                         "in": "path",
-                        "description": "Indicates whether to create a row on a table or view",
+                        "description": "The share token",
                         "required": true,
                         "schema": {
                             "type": "string",
-                            "enum": [
-                                "tables",
-                                "views"
-                            ],
-                            "pattern": "^(tables|views)$"
-                        }
-                    },
-                    {
-                        "name": "nodeId",
-                        "in": "path",
-                        "description": "The identifier of the targeted table or view",
-                        "required": true,
-                        "schema": {
-                            "type": "integer",
-                            "format": "int64"
+                            "pattern": "^[a-zA-Z0-9]{16}$"
                         }
                     },
                     {
@@ -12777,7 +13671,7 @@
                 ],
                 "responses": {
                     "200": {
-                        "description": "Row returned",
+                        "description": "Row created",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -12797,7 +13691,7 @@
                                                     "$ref": "#/components/schemas/OCSMeta"
                                                 },
                                                 "data": {
-                                                    "$ref": "#/components/schemas/Row"
+                                                    "$ref": "#/components/schemas/PublicRow"
                                                 }
                                             }
                                         }
@@ -12957,9 +13851,81 @@
                                 }
                             }
                         }
+                    }
+                }
+            }
+        },
+        "/ocs/v2.php/apps/tables/api/2/public/{token}/rows/count": {
+            "get": {
+                "operationId": "public_rowocs-count-rows",
+                "summary": "[api v2] Count rows from a link share",
+                "tags": [
+                    "public_rowocs"
+                ],
+                "security": [
+                    {},
+                    {
+                        "bearer_auth": []
                     },
-                    "401": {
-                        "description": "Current user is not logged in",
+                    {
+                        "basic_auth": []
+                    }
+                ],
+                "parameters": [
+                    {
+                        "name": "token",
+                        "in": "path",
+                        "description": "The share token",
+                        "required": true,
+                        "schema": {
+                            "type": "string",
+                            "pattern": "^[a-zA-Z0-9]{16}$"
+                        }
+                    },
+                    {
+                        "name": "filter",
+                        "in": "query",
+                        "description": "Optional: a JSON encoded filter parameter",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
+                        }
+                    },
+                    {
+                        "name": "sort",
+                        "in": "query",
+                        "description": "Optional: a JSON encoded sort parameter",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
+                        }
+                    },
+                    {
+                        "name": "search",
+                        "in": "query",
+                        "description": "Optional: a search string",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
+                        }
+                    },
+                    {
+                        "name": "OCS-APIRequest",
+                        "in": "header",
+                        "description": "Required to be true for the API request to pass",
+                        "required": true,
+                        "schema": {
+                            "type": "boolean",
+                            "default": true
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Count is returned",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -12978,7 +13944,170 @@
                                                 "meta": {
                                                     "$ref": "#/components/schemas/OCSMeta"
                                                 },
-                                                "data": {}
+                                                "data": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "count"
+                                                    ],
+                                                    "properties": {
+                                                        "count": {
+                                                            "type": "integer",
+                                                            "format": "int64"
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "403": {
+                        "description": "No permissions",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "Invalid request parameters",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "404": {
+                        "description": "Not found",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal error",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
+                                                }
                                             }
                                         }
                                     }
@@ -12989,14 +14118,15 @@
                 }
             }
         },
-        "/ocs/v2.php/apps/tables/api/2/config/table/{id}": {
+        "/ocs/v2.php/apps/tables/api/2/public/{token}/rows/export": {
             "get": {
-                "operationId": "config-get-table-config",
-                "summary": "Gets the config for a specific table",
+                "operationId": "public_rowocs-export-rows",
+                "summary": "[api v2] Export all rows from a link share as a CSV file",
                 "tags": [
-                    "config"
+                    "public_rowocs"
                 ],
                 "security": [
+                    {},
                     {
                         "bearer_auth": []
                     },
@@ -13006,13 +14136,53 @@
                 ],
                 "parameters": [
                     {
-                        "name": "id",
+                        "name": "token",
                         "in": "path",
-                        "description": "Table id",
+                        "description": "The share token",
                         "required": true,
                         "schema": {
-                            "type": "integer",
-                            "format": "int64"
+                            "type": "string",
+                            "pattern": "^[a-zA-Z0-9]{16}$"
+                        }
+                    },
+                    {
+                        "name": "filter",
+                        "in": "query",
+                        "description": "Optional: a JSON encoded filter parameter",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
+                        }
+                    },
+                    {
+                        "name": "sort",
+                        "in": "query",
+                        "description": "Optional: a JSON encoded sort parameter",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
+                        }
+                    },
+                    {
+                        "name": "search",
+                        "in": "query",
+                        "description": "Optional: a search string",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
+                        }
+                    },
+                    {
+                        "name": "rowIds",
+                        "in": "query",
+                        "description": "Optional: a JSON encoded list of row IDs to export",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
                         }
                     },
                     {
@@ -13028,7 +14198,18 @@
                 ],
                 "responses": {
                     "200": {
-                        "description": "Table config returned",
+                        "description": "CSV file is returned",
+                        "content": {
+                            "text/csv": {
+                                "schema": {
+                                    "type": "string",
+                                    "format": "binary"
+                                }
+                            }
+                        }
+                    },
+                    "403": {
+                        "description": "No permissions",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -13048,7 +14229,15 @@
                                                     "$ref": "#/components/schemas/OCSMeta"
                                                 },
                                                 "data": {
-                                                    "$ref": "#/components/schemas/NotifyConfig"
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
                                                 }
                                             }
                                         }
@@ -13057,8 +14246,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Current user is not logged in",
+                    "400": {
+                        "description": "Invalid request parameters",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -13077,57 +14266,26 @@
                                                 "meta": {
                                                     "$ref": "#/components/schemas/OCSMeta"
                                                 },
-                                                "data": {}
+                                                "data": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
+                                                }
                                             }
                                         }
                                     }
                                 }
                             }
                         }
-                    }
-                }
-            }
-        },
-        "/ocs/v2.php/apps/tables/api/2/config/view/{id}": {
-            "get": {
-                "operationId": "config-get-view-config",
-                "summary": "Gets the config for a specific view",
-                "tags": [
-                    "config"
-                ],
-                "security": [
-                    {
-                        "bearer_auth": []
-                    },
-                    {
-                        "basic_auth": []
-                    }
-                ],
-                "parameters": [
-                    {
-                        "name": "id",
-                        "in": "path",
-                        "description": "View id",
-                        "required": true,
-                        "schema": {
-                            "type": "integer",
-                            "format": "int64"
-                        }
                     },
-                    {
-                        "name": "OCS-APIRequest",
-                        "in": "header",
-                        "description": "Required to be true for the API request to pass",
-                        "required": true,
-                        "schema": {
-                            "type": "boolean",
-                            "default": true
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "View config returned",
+                    "404": {
+                        "description": "Not found",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -13147,7 +14305,15 @@
                                                     "$ref": "#/components/schemas/OCSMeta"
                                                 },
                                                 "data": {
-                                                    "$ref": "#/components/schemas/NotifyConfig"
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
                                                 }
                                             }
                                         }
@@ -13156,8 +14322,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Current user is not logged in",
+                    "500": {
+                        "description": "Internal error",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -13176,7 +14342,17 @@
                                                 "meta": {
                                                     "$ref": "#/components/schemas/OCSMeta"
                                                 },
-                                                "data": {}
+                                                "data": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
+                                                }
                                             }
                                         }
                                     }
@@ -13187,14 +14363,15 @@
                 }
             }
         },
-        "/ocs/v2.php/apps/tables/api/2/config/{key}": {
-            "post": {
-                "operationId": "config-set-value",
-                "summary": "Sets a config value for a specific key",
+        "/ocs/v2.php/apps/tables/api/2/public/{token}/rows/{rowId}": {
+            "put": {
+                "operationId": "public_rowocs-update-row",
+                "summary": "[api v2] Update a row in a link share",
                 "tags": [
-                    "config"
+                    "public_rowocs"
                 ],
                 "security": [
+                    {},
                     {
                         "bearer_auth": []
                     },
@@ -13209,12 +14386,22 @@
                             "schema": {
                                 "type": "object",
                                 "required": [
-                                    "value"
+                                    "data"
                                 ],
                                 "properties": {
-                                    "value": {
-                                        "type": "object",
-                                        "description": "Config value"
+                                    "data": {
+                                        "description": "An array containing the column identifiers and their values",
+                                        "oneOf": [
+                                            {
+                                                "type": "string"
+                                            },
+                                            {
+                                                "type": "object",
+                                                "additionalProperties": {
+                                                    "type": "object"
+                                                }
+                                            }
+                                        ]
                                     }
                                 }
                             }
@@ -13223,12 +14410,23 @@
                 },
                 "parameters": [
                     {
-                        "name": "key",
+                        "name": "token",
                         "in": "path",
-                        "description": "Config key",
+                        "description": "The share token",
                         "required": true,
                         "schema": {
-                            "type": "string"
+                            "type": "string",
+                            "pattern": "^[a-zA-Z0-9]{16}$"
+                        }
+                    },
+                    {
+                        "name": "rowId",
+                        "in": "path",
+                        "description": "The row identifier",
+                        "required": true,
+                        "schema": {
+                            "type": "integer",
+                            "format": "int64"
                         }
                     },
                     {
@@ -13244,7 +14442,7 @@
                 ],
                 "responses": {
                     "200": {
-                        "description": "Config updated",
+                        "description": "Row updated",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -13264,7 +14462,45 @@
                                                     "$ref": "#/components/schemas/OCSMeta"
                                                 },
                                                 "data": {
-                                                    "type": "boolean"
+                                                    "$ref": "#/components/schemas/PublicRow"
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "403": {
+                        "description": "No permissions",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
                                                 }
                                             }
                                         }
@@ -13274,7 +14510,7 @@
                         }
                     },
                     "400": {
-                        "description": "bad request",
+                        "description": "Invalid request parameters",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -13311,8 +14547,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "No permissions",
+                    "404": {
+                        "description": "Not found",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -13349,8 +14585,8 @@
                             }
                         }
                     },
-                    "401": {
-                        "description": "Current user is not logged in",
+                    "500": {
+                        "description": "Internal error",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -13369,7 +14605,17 @@
                                                 "meta": {
                                                     "$ref": "#/components/schemas/OCSMeta"
                                                 },
-                                                "data": {}
+                                                "data": {
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
+                                                }
                                             }
                                         }
                                     }
@@ -13378,15 +14624,12 @@
                         }
                     }
                 }
-            }
-        },
-        "/ocs/v2.php/apps/tables/api/2/public/{token}/columns": {
-            "get": {
-                "operationId": "api_public_columns-index-by-public-link",
-                "summary": "[api v2] Get all columns for a table or a view shared by link",
-                "description": "Return an empty array if no columns were found",
+            },
+            "delete": {
+                "operationId": "public_rowocs-delete-row",
+                "summary": "[api v2] Delete a row in a link share",
                 "tags": [
-                    "api_public_columns"
+                    "public_rowocs"
                 ],
                 "security": [
                     {},
@@ -13408,6 +14651,16 @@
                             "pattern": "^[a-zA-Z0-9]{16}$"
                         }
                     },
+                    {
+                        "name": "rowId",
+                        "in": "path",
+                        "description": "The row identifier",
+                        "required": true,
+                        "schema": {
+                            "type": "integer",
+                            "format": "int64"
+                        }
+                    },
                     {
                         "name": "OCS-APIRequest",
                         "in": "header",
@@ -13421,7 +14674,7 @@
                 ],
                 "responses": {
                     "200": {
-                        "description": "Columns are returned",
+                        "description": "Row deleted",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -13441,10 +14694,7 @@
                                                     "$ref": "#/components/schemas/OCSMeta"
                                                 },
                                                 "data": {
-                                                    "type": "array",
-                                                    "items": {
-                                                        "$ref": "#/components/schemas/PublicColumn"
-                                                    }
+                                                    "$ref": "#/components/schemas/PublicRow"
                                                 }
                                             }
                                         }
@@ -13491,44 +14741,6 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Invalid request parameters",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "type": "object",
-                                    "required": [
-                                        "ocs"
-                                    ],
-                                    "properties": {
-                                        "ocs": {
-                                            "type": "object",
-                                            "required": [
-                                                "meta",
-                                                "data"
-                                            ],
-                                            "properties": {
-                                                "meta": {
-                                                    "$ref": "#/components/schemas/OCSMeta"
-                                                },
-                                                "data": {
-                                                    "type": "object",
-                                                    "required": [
-                                                        "message"
-                                                    ],
-                                                    "properties": {
-                                                        "message": {
-                                                            "type": "string"
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    },
                     "404": {
                         "description": "Not found",
                         "content": {
@@ -13608,15 +14820,14 @@
                 }
             }
         },
-        "/ocs/v2.php/apps/tables/api/2/public/{token}/rows": {
-            "get": {
-                "operationId": "public_rowocs-get-rows",
-                "summary": "[api v2] Fetch all rows from a link share",
+        "/ocs/v2.php/apps/tables/api/2/{nodeCollection}/{nodeId}/rows": {
+            "post": {
+                "operationId": "rowocs-create-row",
+                "summary": "[api v2] Create a new row in a table or a view",
                 "tags": [
-                    "public_rowocs"
+                    "rowocs"
                 ],
                 "security": [
-                    {},
                     {
                         "bearer_auth": []
                     },
@@ -13624,35 +14835,58 @@
                         "basic_auth": []
                     }
                 ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "type": "object",
+                                "required": [
+                                    "data"
+                                ],
+                                "properties": {
+                                    "data": {
+                                        "description": "An array containing the column identifiers and their values",
+                                        "oneOf": [
+                                            {
+                                                "type": "string"
+                                            },
+                                            {
+                                                "type": "object",
+                                                "additionalProperties": {
+                                                    "type": "object"
+                                                }
+                                            }
+                                        ]
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
                 "parameters": [
                     {
-                        "name": "token",
+                        "name": "nodeCollection",
                         "in": "path",
-                        "description": "The share token",
+                        "description": "Indicates whether to create a row on a table or view",
                         "required": true,
                         "schema": {
                             "type": "string",
-                            "pattern": "^[a-zA-Z0-9]{16}$"
-                        }
-                    },
-                    {
-                        "name": "limit",
-                        "in": "query",
-                        "description": "Optional: maximum number of results, capped at 500",
-                        "schema": {
-                            "type": "integer",
-                            "format": "int64",
-                            "nullable": true
+                            "enum": [
+                                "tables",
+                                "views"
+                            ],
+                            "pattern": "^(tables|views)$"
                         }
                     },
                     {
-                        "name": "offset",
-                        "in": "query",
-                        "description": "Optional: the offset for this operation",
+                        "name": "nodeId",
+                        "in": "path",
+                        "description": "The identifier of the targeted table or view",
+                        "required": true,
                         "schema": {
                             "type": "integer",
-                            "format": "int64",
-                            "nullable": true
+                            "format": "int64"
                         }
                     },
                     {
@@ -13668,7 +14902,7 @@
                 ],
                 "responses": {
                     "200": {
-                        "description": "Rows are returned",
+                        "description": "Row returned",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -13688,10 +14922,7 @@
                                                     "$ref": "#/components/schemas/OCSMeta"
                                                 },
                                                 "data": {
-                                                    "type": "array",
-                                                    "items": {
-                                                        "$ref": "#/components/schemas/PublicRow"
-                                                    }
+                                                    "$ref": "#/components/schemas/Row"
                                                 }
                                             }
                                         }
@@ -13851,17 +15082,45 @@
                                 }
                             }
                         }
+                    },
+                    "401": {
+                        "description": "Current user is not logged in",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {}
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
             },
-            "post": {
-                "operationId": "public_rowocs-create-row",
-                "summary": "[api v2] Create a row in a link share",
+            "get": {
+                "operationId": "rowocs-get-rows",
+                "summary": "[api v2] Get a number of rows from a table or view",
+                "description": "Both `filter` and `sort` are passed as JSON encoded strings.\nThe filter is a list of filter groups, each group being a list of single filter definitions. Definitions within a group are AND-connected, while the groups themselves are OR-connected.\nWhen reading from a view, the provided filter is added to each of the view's existing filter groups, so the view's base rules are always enforced.\nA provided sort order overrides the view's default sort order. The view's default sort order is only used when no sort order is provided.",
                 "tags": [
-                    "public_rowocs"
+                    "rowocs"
                 ],
                 "security": [
-                    {},
                     {
                         "bearer_auth": []
                     },
@@ -13869,44 +15128,95 @@
                         "basic_auth": []
                     }
                 ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "type": "object",
-                                "required": [
-                                    "data"
-                                ],
-                                "properties": {
-                                    "data": {
-                                        "description": "An array containing the column identifiers and their values",
-                                        "oneOf": [
-                                            {
-                                                "type": "string"
-                                            },
-                                            {
-                                                "type": "object",
-                                                "additionalProperties": {
-                                                    "type": "object"
-                                                }
-                                            }
-                                        ]
-                                    }
-                                }
-                            }
+                "parameters": [
+                    {
+                        "name": "nodeCollection",
+                        "in": "path",
+                        "description": "Indicates whether to read from a table or a view",
+                        "required": true,
+                        "schema": {
+                            "type": "string",
+                            "enum": [
+                                "tables",
+                                "views"
+                            ],
+                            "pattern": "^(tables|views)$"
+                        }
+                    },
+                    {
+                        "name": "nodeId",
+                        "in": "path",
+                        "description": "The ID of the table or view",
+                        "required": true,
+                        "schema": {
+                            "type": "integer",
+                            "format": "int64",
+                            "minimum": 0
+                        }
+                    },
+                    {
+                        "name": "limit",
+                        "in": "query",
+                        "description": "Number of rows to return between 1 and 500, fetches all by default (optional)",
+                        "schema": {
+                            "type": "integer",
+                            "format": "int64",
+                            "nullable": true,
+                            "default": null,
+                            "minimum": 1,
+                            "maximum": 500
+                        }
+                    },
+                    {
+                        "name": "offset",
+                        "in": "query",
+                        "description": "Offset of the rows to be returned (optional)",
+                        "schema": {
+                            "type": "integer",
+                            "format": "int64",
+                            "nullable": true,
+                            "default": null,
+                            "minimum": 0
+                        }
+                    },
+                    {
+                        "name": "filter",
+                        "in": "query",
+                        "description": "JSON encoded list of filter groups. Definitions within a group are AND-connected, groups are OR-connected, e.g. `[[{\"columnId\":1,\"operator\":\"contains\",\"value\":\"foo\"}]]` (optional)",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
+                        }
+                    },
+                    {
+                        "name": "sort",
+                        "in": "query",
+                        "description": "JSON encoded list of sort rules, e.g. `[{\"columnId\":1,\"mode\":\"ASC\"}]` (optional)",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
                         }
-                    }
-                },
-                "parameters": [
+                    },
                     {
-                        "name": "token",
-                        "in": "path",
-                        "description": "The share token",
-                        "required": true,
+                        "name": "search",
+                        "in": "query",
+                        "description": "Search string (optional)",
                         "schema": {
                             "type": "string",
-                            "pattern": "^[a-zA-Z0-9]{16}$"
+                            "nullable": true,
+                            "default": null
+                        }
+                    },
+                    {
+                        "name": "rowIds",
+                        "in": "query",
+                        "description": "JSON encoded list of row IDs (optional)",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
                         }
                     },
                     {
@@ -13922,7 +15232,7 @@
                 ],
                 "responses": {
                     "200": {
-                        "description": "Row created",
+                        "description": "Rows returned",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -13942,7 +15252,10 @@
                                                     "$ref": "#/components/schemas/OCSMeta"
                                                 },
                                                 "data": {
-                                                    "$ref": "#/components/schemas/PublicRow"
+                                                    "type": "array",
+                                                    "items": {
+                                                        "$ref": "#/components/schemas/Row"
+                                                    }
                                                 }
                                             }
                                         }
@@ -14102,19 +15415,46 @@
                                 }
                             }
                         }
+                    },
+                    "401": {
+                        "description": "Current user is not logged in",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {}
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
             }
         },
-        "/ocs/v2.php/apps/tables/api/2/public/{token}/rows/{rowId}": {
-            "put": {
-                "operationId": "public_rowocs-update-row",
-                "summary": "[api v2] Update a row in a link share",
+        "/ocs/v2.php/apps/tables/api/2/{nodeCollection}/{nodeId}/rows/count": {
+            "get": {
+                "operationId": "rowocs-count-rows",
+                "summary": "[api v2] Count rows from a table or view",
                 "tags": [
-                    "public_rowocs"
+                    "rowocs"
                 ],
                 "security": [
-                    {},
                     {
                         "bearer_auth": []
                     },
@@ -14122,54 +15462,60 @@
                         "basic_auth": []
                     }
                 ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "type": "object",
-                                "required": [
-                                    "data"
-                                ],
-                                "properties": {
-                                    "data": {
-                                        "description": "An array containing the column identifiers and their values",
-                                        "oneOf": [
-                                            {
-                                                "type": "string"
-                                            },
-                                            {
-                                                "type": "object",
-                                                "additionalProperties": {
-                                                    "type": "object"
-                                                }
-                                            }
-                                        ]
-                                    }
-                                }
-                            }
-                        }
-                    }
-                },
                 "parameters": [
                     {
-                        "name": "token",
+                        "name": "nodeCollection",
                         "in": "path",
-                        "description": "The share token",
+                        "description": "Indicates whether to read from a table or a view",
                         "required": true,
                         "schema": {
                             "type": "string",
-                            "pattern": "^[a-zA-Z0-9]{16}$"
+                            "enum": [
+                                "tables",
+                                "views"
+                            ],
+                            "pattern": "^(tables|views)$"
                         }
                     },
                     {
-                        "name": "rowId",
+                        "name": "nodeId",
                         "in": "path",
-                        "description": "The row identifier",
+                        "description": "The ID of the table or view",
                         "required": true,
                         "schema": {
                             "type": "integer",
-                            "format": "int64"
+                            "format": "int64",
+                            "minimum": 0
+                        }
+                    },
+                    {
+                        "name": "filter",
+                        "in": "query",
+                        "description": "Optional: a JSON encoded filter parameter",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
+                        }
+                    },
+                    {
+                        "name": "sort",
+                        "in": "query",
+                        "description": "Optional: a JSON encoded sort parameter",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
+                        }
+                    },
+                    {
+                        "name": "search",
+                        "in": "query",
+                        "description": "Optional: a search string",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
                         }
                     },
                     {
@@ -14185,7 +15531,7 @@
                 ],
                 "responses": {
                     "200": {
-                        "description": "Row updated",
+                        "description": "Count is returned",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -14205,7 +15551,16 @@
                                                     "$ref": "#/components/schemas/OCSMeta"
                                                 },
                                                 "data": {
-                                                    "$ref": "#/components/schemas/PublicRow"
+                                                    "type": "object",
+                                                    "required": [
+                                                        "count"
+                                                    ],
+                                                    "properties": {
+                                                        "count": {
+                                                            "type": "integer",
+                                                            "format": "int64"
+                                                        }
+                                                    }
                                                 }
                                             }
                                         }
@@ -14365,17 +15720,46 @@
                                 }
                             }
                         }
+                    },
+                    "401": {
+                        "description": "Current user is not logged in",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {}
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
-            },
-            "delete": {
-                "operationId": "public_rowocs-delete-row",
-                "summary": "[api v2] Delete a row in a link share",
+            }
+        },
+        "/ocs/v2.php/apps/tables/api/2/{nodeCollection}/{nodeId}/rows/export": {
+            "get": {
+                "operationId": "rowocs-export-rows",
+                "summary": "[api v2] Export all rows from a table or view as a CSV file",
                 "tags": [
-                    "public_rowocs"
+                    "rowocs"
                 ],
                 "security": [
-                    {},
                     {
                         "bearer_auth": []
                     },
@@ -14385,25 +15769,65 @@
                 ],
                 "parameters": [
                     {
-                        "name": "token",
+                        "name": "nodeCollection",
                         "in": "path",
-                        "description": "The share token",
+                        "description": "'tables' or 'views'",
                         "required": true,
                         "schema": {
                             "type": "string",
-                            "pattern": "^[a-zA-Z0-9]{16}$"
+                            "pattern": "^(tables|views)$"
                         }
                     },
                     {
-                        "name": "rowId",
+                        "name": "nodeId",
                         "in": "path",
-                        "description": "The row identifier",
+                        "description": "The table or view ID",
                         "required": true,
                         "schema": {
                             "type": "integer",
                             "format": "int64"
                         }
                     },
+                    {
+                        "name": "filter",
+                        "in": "query",
+                        "description": "JSON encoded list of filter groups (optional)",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
+                        }
+                    },
+                    {
+                        "name": "sort",
+                        "in": "query",
+                        "description": "JSON encoded list of sort rules (optional)",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
+                        }
+                    },
+                    {
+                        "name": "search",
+                        "in": "query",
+                        "description": "Search string (optional)",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
+                        }
+                    },
+                    {
+                        "name": "rowIds",
+                        "in": "query",
+                        "description": "JSON encoded list of row IDs to export (optional)",
+                        "schema": {
+                            "type": "string",
+                            "nullable": true,
+                            "default": null
+                        }
+                    },
                     {
                         "name": "OCS-APIRequest",
                         "in": "header",
@@ -14417,7 +15841,18 @@
                 ],
                 "responses": {
                     "200": {
-                        "description": "Row deleted",
+                        "description": "CSV file is returned",
+                        "content": {
+                            "text/csv": {
+                                "schema": {
+                                    "type": "string",
+                                    "format": "binary"
+                                }
+                            }
+                        }
+                    },
+                    "403": {
+                        "description": "No permissions",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -14437,7 +15872,15 @@
                                                     "$ref": "#/components/schemas/OCSMeta"
                                                 },
                                                 "data": {
-                                                    "$ref": "#/components/schemas/PublicRow"
+                                                    "type": "object",
+                                                    "required": [
+                                                        "message"
+                                                    ],
+                                                    "properties": {
+                                                        "message": {
+                                                            "type": "string"
+                                                        }
+                                                    }
                                                 }
                                             }
                                         }
@@ -14446,8 +15889,8 @@
                             }
                         }
                     },
-                    "403": {
-                        "description": "No permissions",
+                    "400": {
+                        "description": "Invalid request parameters",
                         "content": {
                             "application/json": {
                                 "schema": {
@@ -14559,6 +16002,34 @@
                                 }
                             }
                         }
+                    },
+                    "401": {
+                        "description": "Current user is not logged in",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "required": [
+                                        "ocs"
+                                    ],
+                                    "properties": {
+                                        "ocs": {
+                                            "type": "object",
+                                            "required": [
+                                                "meta",
+                                                "data"
+                                            ],
+                                            "properties": {
+                                                "meta": {
+                                                    "$ref": "#/components/schemas/OCSMeta"
+                                                },
+                                                "data": {}
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
             }
diff --git a/src/modules/main/sections/PublicElement.vue b/src/modules/main/sections/PublicElement.vue
index 7aedb5a4ca..8248c2fac5 100644
--- a/src/modules/main/sections/PublicElement.vue
+++ b/src/modules/main/sections/PublicElement.vue
@@ -8,8 +8,7 @@
 		<TableDescription :description="element.description" :read-only="true" />
 		<div class="table-wrapper">
 			<EmptyView v-if="columns.length === 0" :view="element" />
-			<TableView v-else :rows="rows" :columns="columns" :element="element" :total-rows="totalRows" :view-setting="localViewSetting" @update:view-setting="onViewSettingUpdate"
-				:can-read-rows="element.onSharePermissions.read"
+			<TableView v-else :rows="rows" :columns="columns" :element="element" :total-rows="totalRows" :view-setting="localViewSetting" :can-read-rows="element.onSharePermissions.read"
 				:can-create-rows="element.onSharePermissions.create"
 				:can-edit-rows="element.onSharePermissions.update"
 				:can-delete-rows="element.onSharePermissions.delete"
@@ -18,6 +17,7 @@
 				:can-delete-columns="false"
 				:can-delete-table="false"
 				:is-form-mode="isFormMode"
+				@update:view-setting="onViewSettingUpdate"
 				@download-filtered-csv="rows => $emit('download-filtered-csv', rows)">
 				<template #actions="{ isFiltered, onExportFiltered }">
 					<NcActions :force-menu="true" type="tertiary">
@@ -131,18 +131,18 @@ export default {
 		}
 	},
 
-	watch: {
-		viewSetting() {
-			this.localViewSetting = this.viewSetting
-		},
-	},
-
 	computed: {
 		isFormMode() {
 			return this.element.onSharePermissions.create && !this.element.onSharePermissions.read
 		},
 	},
 
+	watch: {
+		viewSetting() {
+			this.localViewSetting = this.viewSetting
+		},
+	},
+
 	mounted() {
 		subscribe('tables:row:create', () => {
 			this.showCreateRow = true
diff --git a/src/modules/main/sections/PublicMainWrapper.vue b/src/modules/main/sections/PublicMainWrapper.vue
index 385cf72c97..eaebea70bd 100644
--- a/src/modules/main/sections/PublicMainWrapper.vue
+++ b/src/modules/main/sections/PublicMainWrapper.vue
@@ -87,20 +87,6 @@ export default {
 		}
 	},
 
-	beforeMount() {
-		this.setPublicToken(this.token)
-		this.applyUrlStateOnReload = true
-		this.reload()
-	},
-
-	mounted() {
-		subscribe('tables:pagination-changed', this.onPaginationChanged)
-	},
-
-	beforeUnmount() {
-		unsubscribe('tables:pagination-changed', this.onPaginationChanged)
-	},
-
 	watch: {
 		viewSetting: {
 			handler() {
@@ -122,6 +108,20 @@ export default {
 		},
 	},
 
+	beforeMount() {
+		this.setPublicToken(this.token)
+		this.applyUrlStateOnReload = true
+		this.reload()
+	},
+
+	mounted() {
+		subscribe('tables:pagination-changed', this.onPaginationChanged)
+	},
+
+	beforeUnmount() {
+		unsubscribe('tables:pagination-changed', this.onPaginationChanged)
+	},
+
 	methods: {
 		...mapActions(useDataStore, ['loadPublicColumnsFromBE', 'loadPublicRowsFromBE', 'loadPublicRowsCountFromBE', 'loadPublicRowsForExportFromBE', 'setPublicToken']),
 		...mapActions(useTablesStore, ['validatePublicExportAccess']),
diff --git a/src/shared/components/ncTable/NcTable.vue b/src/shared/components/ncTable/NcTable.vue
index 64d0d92aaf..769bdfb175 100644
--- a/src/shared/components/ncTable/NcTable.vue
+++ b/src/shared/components/ncTable/NcTable.vue
@@ -115,7 +115,6 @@ export default {
 
 	components: { CustomTable, Options, NcButton, NcEmptyContent, Plus, Cancel, FileDocumentEditOutline },
 
-
 	props: {
 		rows: {
 			type: Array,
diff --git a/src/shared/components/ncTable/sections/Options.vue b/src/shared/components/ncTable/sections/Options.vue
index e3bc559a4f..e8bee51be8 100644
--- a/src/shared/components/ncTable/sections/Options.vue
+++ b/src/shared/components/ncTable/sections/Options.vue
@@ -182,7 +182,7 @@ export default {
 		getSelectedRows() {
 			const rows = []
 			this.selectedRows.forEach(id => {
-				rows.push(this.getRowById(id))
+				rows.push(this.getRowById(id) || { id })
 			})
 			return rows
 		},
diff --git a/src/shared/utils/urlState.js b/src/shared/utils/urlState.js
index cea3f68f78..76702f10bc 100644
--- a/src/shared/utils/urlState.js
+++ b/src/shared/utils/urlState.js
@@ -22,7 +22,8 @@ const DEFAULT_ROWS_PER_PAGE = 100
  * @param {object} viewSetting The view setting object.
  * @param {number} pageNumber The current page number.
  * @param {number} rowsPerPage The current rows per page.
- * @returns {object} A query object to be used with Vue Router.
+ * @param rule
+ * @return {object} A query object to be used with Vue Router.
  */
 function serializeFilterRule(rule) {
 	return {
@@ -73,7 +74,7 @@ export function buildUrlQuery(viewSetting, pageNumber, rowsPerPage, rowIds = nul
  * Parse the current URL query into a view state object.
  *
  * @param {object} query The Vue Router query object.
- * @returns {object} The parsed state.
+ * @return {object} The parsed state.
  */
 export function parseUrlQuery(query) {
 	const state = {
diff --git a/src/types/openapi/openapi.ts b/src/types/openapi/openapi.ts
index 04c0714642..8b577af539 100644
--- a/src/types/openapi/openapi.ts
+++ b/src/types/openapi/openapi.ts
@@ -825,23 +825,6 @@ export type paths = {
         readonly patch?: never;
         readonly trace?: never;
     };
-    readonly "/ocs/v2.php/apps/tables/api/2/{nodeCollection}/{nodeId}/rows": {
-        readonly parameters: {
-            readonly query?: never;
-            readonly header?: never;
-            readonly path?: never;
-            readonly cookie?: never;
-        };
-        readonly get?: never;
-        readonly put?: never;
-        /** [api v2] Create a new row in a table or a view */
-        readonly post: operations["rowocs-create-row"];
-        readonly delete?: never;
-        readonly options?: never;
-        readonly head?: never;
-        readonly patch?: never;
-        readonly trace?: never;
-    };
     readonly "/ocs/v2.php/apps/tables/api/2/config/table/{id}": {
         readonly parameters: {
             readonly query?: never;
@@ -931,6 +914,40 @@ export type paths = {
         readonly patch?: never;
         readonly trace?: never;
     };
+    readonly "/ocs/v2.php/apps/tables/api/2/public/{token}/rows/count": {
+        readonly parameters: {
+            readonly query?: never;
+            readonly header?: never;
+            readonly path?: never;
+            readonly cookie?: never;
+        };
+        /** [api v2] Count rows from a link share */
+        readonly get: operations["public_rowocs-count-rows"];
+        readonly put?: never;
+        readonly post?: never;
+        readonly delete?: never;
+        readonly options?: never;
+        readonly head?: never;
+        readonly patch?: never;
+        readonly trace?: never;
+    };
+    readonly "/ocs/v2.php/apps/tables/api/2/public/{token}/rows/export": {
+        readonly parameters: {
+            readonly query?: never;
+            readonly header?: never;
+            readonly path?: never;
+            readonly cookie?: never;
+        };
+        /** [api v2] Export all rows from a link share as a CSV file */
+        readonly get: operations["public_rowocs-export-rows"];
+        readonly put?: never;
+        readonly post?: never;
+        readonly delete?: never;
+        readonly options?: never;
+        readonly head?: never;
+        readonly patch?: never;
+        readonly trace?: never;
+    };
     readonly "/ocs/v2.php/apps/tables/api/2/public/{token}/rows/{rowId}": {
         readonly parameters: {
             readonly query?: never;
@@ -949,6 +966,64 @@ export type paths = {
         readonly patch?: never;
         readonly trace?: never;
     };
+    readonly "/ocs/v2.php/apps/tables/api/2/{nodeCollection}/{nodeId}/rows": {
+        readonly parameters: {
+            readonly query?: never;
+            readonly header?: never;
+            readonly path?: never;
+            readonly cookie?: never;
+        };
+        /**
+         * [api v2] Get a number of rows from a table or view
+         * @description Both `filter` and `sort` are passed as JSON encoded strings.
+         *     The filter is a list of filter groups, each group being a list of single filter definitions. Definitions within a group are AND-connected, while the groups themselves are OR-connected.
+         *     When reading from a view, the provided filter is added to each of the view's existing filter groups, so the view's base rules are always enforced.
+         *     A provided sort order overrides the view's default sort order. The view's default sort order is only used when no sort order is provided.
+         */
+        readonly get: operations["rowocs-get-rows"];
+        readonly put?: never;
+        /** [api v2] Create a new row in a table or a view */
+        readonly post: operations["rowocs-create-row"];
+        readonly delete?: never;
+        readonly options?: never;
+        readonly head?: never;
+        readonly patch?: never;
+        readonly trace?: never;
+    };
+    readonly "/ocs/v2.php/apps/tables/api/2/{nodeCollection}/{nodeId}/rows/count": {
+        readonly parameters: {
+            readonly query?: never;
+            readonly header?: never;
+            readonly path?: never;
+            readonly cookie?: never;
+        };
+        /** [api v2] Count rows from a table or view */
+        readonly get: operations["rowocs-count-rows"];
+        readonly put?: never;
+        readonly post?: never;
+        readonly delete?: never;
+        readonly options?: never;
+        readonly head?: never;
+        readonly patch?: never;
+        readonly trace?: never;
+    };
+    readonly "/ocs/v2.php/apps/tables/api/2/{nodeCollection}/{nodeId}/rows/export": {
+        readonly parameters: {
+            readonly query?: never;
+            readonly header?: never;
+            readonly path?: never;
+            readonly cookie?: never;
+        };
+        /** [api v2] Export all rows from a table or view as a CSV file */
+        readonly get: operations["rowocs-export-rows"];
+        readonly put?: never;
+        readonly post?: never;
+        readonly delete?: never;
+        readonly options?: never;
+        readonly head?: never;
+        readonly patch?: never;
+        readonly trace?: never;
+    };
     readonly "/ocs/v2.php/apps/tables/api/2/{nodeCollection}/{nodeId}/share": {
         readonly parameters: {
             readonly query?: never;
@@ -7122,126 +7197,6 @@ export interface operations {
             };
         };
     };
-    readonly "rowocs-create-row": {
-        readonly parameters: {
-            readonly query?: never;
-            readonly header: {
-                /** @description Required to be true for the API request to pass */
-                readonly "OCS-APIRequest": boolean;
-            };
-            readonly path: {
-                /** @description Indicates whether to create a row on a table or view */
-                readonly nodeCollection: "tables" | "views";
-                /** @description The identifier of the targeted table or view */
-                readonly nodeId: number;
-            };
-            readonly cookie?: never;
-        };
-        readonly requestBody: {
-            readonly content: {
-                readonly "application/json": {
-                    /** @description An array containing the column identifiers and their values */
-                    readonly data: string | {
-                        readonly [key: string]: Record<string, never>;
-                    };
-                };
-            };
-        };
-        readonly responses: {
-            /** @description Row returned */
-            readonly 200: {
-                headers: {
-                    readonly [name: string]: unknown;
-                };
-                content: {
-                    readonly "application/json": {
-                        readonly ocs: {
-                            readonly meta: components["schemas"]["OCSMeta"];
-                            readonly data: components["schemas"]["Row"];
-                        };
-                    };
-                };
-            };
-            /** @description Invalid request parameters */
-            readonly 400: {
-                headers: {
-                    readonly [name: string]: unknown;
-                };
-                content: {
-                    readonly "application/json": {
-                        readonly ocs: {
-                            readonly meta: components["schemas"]["OCSMeta"];
-                            readonly data: {
-                                readonly message: string;
-                            };
-                        };
-                    };
-                };
-            };
-            /** @description Current user is not logged in */
-            readonly 401: {
-                headers: {
-                    readonly [name: string]: unknown;
-                };
-                content: {
-                    readonly "application/json": {
-                        readonly ocs: {
-                            readonly meta: components["schemas"]["OCSMeta"];
-                            readonly data: unknown;
-                        };
-                    };
-                };
-            };
-            /** @description No permissions */
-            readonly 403: {
-                headers: {
-                    readonly [name: string]: unknown;
-                };
-                content: {
-                    readonly "application/json": {
-                        readonly ocs: {
-                            readonly meta: components["schemas"]["OCSMeta"];
-                            readonly data: {
-                                readonly message: string;
-                            };
-                        };
-                    };
-                };
-            };
-            /** @description Not found */
-            readonly 404: {
-                headers: {
-                    readonly [name: string]: unknown;
-                };
-                content: {
-                    readonly "application/json": {
-                        readonly ocs: {
-                            readonly meta: components["schemas"]["OCSMeta"];
-                            readonly data: {
-                                readonly message: string;
-                            };
-                        };
-                    };
-                };
-            };
-            /** @description Internal error */
-            readonly 500: {
-                headers: {
-                    readonly [name: string]: unknown;
-                };
-                content: {
-                    readonly "application/json": {
-                        readonly ocs: {
-                            readonly meta: components["schemas"]["OCSMeta"];
-                            readonly data: {
-                                readonly message: string;
-                            };
-                        };
-                    };
-                };
-            };
-        };
-    };
     readonly "config-get-table-config": {
         readonly parameters: {
             readonly query?: never;
@@ -7514,10 +7469,18 @@ export interface operations {
     readonly "public_rowocs-get-rows": {
         readonly parameters: {
             readonly query?: {
-                /** @description Optional: maximum number of results, capped at 500 */
+                /** @description Number of rows to return between 1 and 500, fetches all by default (optional) */
                 readonly limit?: number | null;
-                /** @description Optional: the offset for this operation */
+                /** @description Offset of the rows to be returned (optional) */
                 readonly offset?: number | null;
+                /** @description Optional: a JSON encoded filter parameter */
+                readonly filter?: string | null;
+                /** @description Optional: a JSON encoded sort parameter */
+                readonly sort?: string | null;
+                /** @description Optional: a search string */
+                readonly search?: string | null;
+                /** @description Optional: a JSON encoded list of row IDs */
+                readonly rowIds?: string | null;
             };
             readonly header: {
                 /** @description Required to be true for the API request to pass */
@@ -7715,9 +7678,16 @@ export interface operations {
             };
         };
     };
-    readonly "public_rowocs-update-row": {
+    readonly "public_rowocs-count-rows": {
         readonly parameters: {
-            readonly query?: never;
+            readonly query?: {
+                /** @description Optional: a JSON encoded filter parameter */
+                readonly filter?: string | null;
+                /** @description Optional: a JSON encoded sort parameter */
+                readonly sort?: string | null;
+                /** @description Optional: a search string */
+                readonly search?: string | null;
+            };
             readonly header: {
                 /** @description Required to be true for the API request to pass */
                 readonly "OCS-APIRequest": boolean;
@@ -7725,23 +7695,12 @@ export interface operations {
             readonly path: {
                 /** @description The share token */
                 readonly token: string;
-                /** @description The row identifier */
-                readonly rowId: number;
             };
             readonly cookie?: never;
         };
-        readonly requestBody: {
-            readonly content: {
-                readonly "application/json": {
-                    /** @description An array containing the column identifiers and their values */
-                    readonly data: string | {
-                        readonly [key: string]: Record<string, never>;
-                    };
-                };
-            };
-        };
+        readonly requestBody?: never;
         readonly responses: {
-            /** @description Row updated */
+            /** @description Count is returned */
             readonly 200: {
                 headers: {
                     readonly [name: string]: unknown;
@@ -7750,7 +7709,10 @@ export interface operations {
                     readonly "application/json": {
                         readonly ocs: {
                             readonly meta: components["schemas"]["OCSMeta"];
-                            readonly data: components["schemas"]["PublicRow"];
+                            readonly data: {
+                                /** Format: int64 */
+                                readonly count: number;
+                            };
                         };
                     };
                 };
@@ -7821,9 +7783,18 @@ export interface operations {
             };
         };
     };
-    readonly "public_rowocs-delete-row": {
+    readonly "public_rowocs-export-rows": {
         readonly parameters: {
-            readonly query?: never;
+            readonly query?: {
+                /** @description Optional: a JSON encoded filter parameter */
+                readonly filter?: string | null;
+                /** @description Optional: a JSON encoded sort parameter */
+                readonly sort?: string | null;
+                /** @description Optional: a search string */
+                readonly search?: string | null;
+                /** @description Optional: a JSON encoded list of row IDs to export */
+                readonly rowIds?: string | null;
+            };
             readonly header: {
                 /** @description Required to be true for the API request to pass */
                 readonly "OCS-APIRequest": boolean;
@@ -7831,15 +7802,22 @@ export interface operations {
             readonly path: {
                 /** @description The share token */
                 readonly token: string;
-                /** @description The row identifier */
-                readonly rowId: number;
             };
             readonly cookie?: never;
         };
         readonly requestBody?: never;
         readonly responses: {
-            /** @description Row deleted */
+            /** @description CSV file is returned */
             readonly 200: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "text/csv": string;
+                };
+            };
+            /** @description Invalid request parameters */
+            readonly 400: {
                 headers: {
                     readonly [name: string]: unknown;
                 };
@@ -7847,7 +7825,676 @@ export interface operations {
                     readonly "application/json": {
                         readonly ocs: {
                             readonly meta: components["schemas"]["OCSMeta"];
-                            readonly data: components["schemas"]["PublicRow"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+            /** @description No permissions */
+            readonly 403: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+            /** @description Not found */
+            readonly 404: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+            /** @description Internal error */
+            readonly 500: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+        };
+    };
+    readonly "public_rowocs-update-row": {
+        readonly parameters: {
+            readonly query?: never;
+            readonly header: {
+                /** @description Required to be true for the API request to pass */
+                readonly "OCS-APIRequest": boolean;
+            };
+            readonly path: {
+                /** @description The share token */
+                readonly token: string;
+                /** @description The row identifier */
+                readonly rowId: number;
+            };
+            readonly cookie?: never;
+        };
+        readonly requestBody: {
+            readonly content: {
+                readonly "application/json": {
+                    /** @description An array containing the column identifiers and their values */
+                    readonly data: string | {
+                        readonly [key: string]: Record<string, never>;
+                    };
+                };
+            };
+        };
+        readonly responses: {
+            /** @description Row updated */
+            readonly 200: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: components["schemas"]["PublicRow"];
+                        };
+                    };
+                };
+            };
+            /** @description Invalid request parameters */
+            readonly 400: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+            /** @description No permissions */
+            readonly 403: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+            /** @description Not found */
+            readonly 404: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+            /** @description Internal error */
+            readonly 500: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+        };
+    };
+    readonly "public_rowocs-delete-row": {
+        readonly parameters: {
+            readonly query?: never;
+            readonly header: {
+                /** @description Required to be true for the API request to pass */
+                readonly "OCS-APIRequest": boolean;
+            };
+            readonly path: {
+                /** @description The share token */
+                readonly token: string;
+                /** @description The row identifier */
+                readonly rowId: number;
+            };
+            readonly cookie?: never;
+        };
+        readonly requestBody?: never;
+        readonly responses: {
+            /** @description Row deleted */
+            readonly 200: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: components["schemas"]["PublicRow"];
+                        };
+                    };
+                };
+            };
+            /** @description No permissions */
+            readonly 403: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+            /** @description Not found */
+            readonly 404: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+            /** @description Internal error */
+            readonly 500: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+        };
+    };
+    readonly "rowocs-get-rows": {
+        readonly parameters: {
+            readonly query?: {
+                /** @description Number of rows to return between 1 and 500, fetches all by default (optional) */
+                readonly limit?: number | null;
+                /** @description Offset of the rows to be returned (optional) */
+                readonly offset?: number | null;
+                /** @description JSON encoded list of filter groups. Definitions within a group are AND-connected, groups are OR-connected, e.g. `[[{"columnId":1,"operator":"contains","value":"foo"}]]` (optional) */
+                readonly filter?: string | null;
+                /** @description JSON encoded list of sort rules, e.g. `[{"columnId":1,"mode":"ASC"}]` (optional) */
+                readonly sort?: string | null;
+                /** @description Search string (optional) */
+                readonly search?: string | null;
+                /** @description JSON encoded list of row IDs (optional) */
+                readonly rowIds?: string | null;
+            };
+            readonly header: {
+                /** @description Required to be true for the API request to pass */
+                readonly "OCS-APIRequest": boolean;
+            };
+            readonly path: {
+                /** @description Indicates whether to read from a table or a view */
+                readonly nodeCollection: "tables" | "views";
+                /** @description The ID of the table or view */
+                readonly nodeId: number;
+            };
+            readonly cookie?: never;
+        };
+        readonly requestBody?: never;
+        readonly responses: {
+            /** @description Rows returned */
+            readonly 200: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: readonly components["schemas"]["Row"][];
+                        };
+                    };
+                };
+            };
+            /** @description Invalid request parameters */
+            readonly 400: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+            /** @description Current user is not logged in */
+            readonly 401: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: unknown;
+                        };
+                    };
+                };
+            };
+            /** @description No permissions */
+            readonly 403: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+            /** @description Not found */
+            readonly 404: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+            /** @description Internal error */
+            readonly 500: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+        };
+    };
+    readonly "rowocs-create-row": {
+        readonly parameters: {
+            readonly query?: never;
+            readonly header: {
+                /** @description Required to be true for the API request to pass */
+                readonly "OCS-APIRequest": boolean;
+            };
+            readonly path: {
+                /** @description Indicates whether to create a row on a table or view */
+                readonly nodeCollection: "tables" | "views";
+                /** @description The identifier of the targeted table or view */
+                readonly nodeId: number;
+            };
+            readonly cookie?: never;
+        };
+        readonly requestBody: {
+            readonly content: {
+                readonly "application/json": {
+                    /** @description An array containing the column identifiers and their values */
+                    readonly data: string | {
+                        readonly [key: string]: Record<string, never>;
+                    };
+                };
+            };
+        };
+        readonly responses: {
+            /** @description Row returned */
+            readonly 200: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: components["schemas"]["Row"];
+                        };
+                    };
+                };
+            };
+            /** @description Invalid request parameters */
+            readonly 400: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+            /** @description Current user is not logged in */
+            readonly 401: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: unknown;
+                        };
+                    };
+                };
+            };
+            /** @description No permissions */
+            readonly 403: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+            /** @description Not found */
+            readonly 404: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+            /** @description Internal error */
+            readonly 500: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+        };
+    };
+    readonly "rowocs-count-rows": {
+        readonly parameters: {
+            readonly query?: {
+                /** @description Optional: a JSON encoded filter parameter */
+                readonly filter?: string | null;
+                /** @description Optional: a JSON encoded sort parameter */
+                readonly sort?: string | null;
+                /** @description Optional: a search string */
+                readonly search?: string | null;
+            };
+            readonly header: {
+                /** @description Required to be true for the API request to pass */
+                readonly "OCS-APIRequest": boolean;
+            };
+            readonly path: {
+                /** @description Indicates whether to read from a table or a view */
+                readonly nodeCollection: "tables" | "views";
+                /** @description The ID of the table or view */
+                readonly nodeId: number;
+            };
+            readonly cookie?: never;
+        };
+        readonly requestBody?: never;
+        readonly responses: {
+            /** @description Count is returned */
+            readonly 200: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                /** Format: int64 */
+                                readonly count: number;
+                            };
+                        };
+                    };
+                };
+            };
+            /** @description Invalid request parameters */
+            readonly 400: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+            /** @description Current user is not logged in */
+            readonly 401: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: unknown;
+                        };
+                    };
+                };
+            };
+            /** @description No permissions */
+            readonly 403: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+            /** @description Not found */
+            readonly 404: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+            /** @description Internal error */
+            readonly 500: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+        };
+    };
+    readonly "rowocs-export-rows": {
+        readonly parameters: {
+            readonly query?: {
+                /** @description JSON encoded list of filter groups (optional) */
+                readonly filter?: string | null;
+                /** @description JSON encoded list of sort rules (optional) */
+                readonly sort?: string | null;
+                /** @description Search string (optional) */
+                readonly search?: string | null;
+                /** @description JSON encoded list of row IDs to export (optional) */
+                readonly rowIds?: string | null;
+            };
+            readonly header: {
+                /** @description Required to be true for the API request to pass */
+                readonly "OCS-APIRequest": boolean;
+            };
+            readonly path: {
+                /** @description 'tables' or 'views' */
+                readonly nodeCollection: string;
+                /** @description The table or view ID */
+                readonly nodeId: number;
+            };
+            readonly cookie?: never;
+        };
+        readonly requestBody?: never;
+        readonly responses: {
+            /** @description CSV file is returned */
+            readonly 200: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "text/csv": string;
+                };
+            };
+            /** @description Invalid request parameters */
+            readonly 400: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: {
+                                readonly message: string;
+                            };
+                        };
+                    };
+                };
+            };
+            /** @description Current user is not logged in */
+            readonly 401: {
+                headers: {
+                    readonly [name: string]: unknown;
+                };
+                content: {
+                    readonly "application/json": {
+                        readonly ocs: {
+                            readonly meta: components["schemas"]["OCSMeta"];
+                            readonly data: unknown;
                         };
                     };
                 };
diff --git a/vendor-bin/rector/composer.json b/vendor-bin/rector/composer.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/vendor-bin/rector/composer.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/vendor-bin/rector/composer.lock b/vendor-bin/rector/composer.lock
deleted file mode 100644
index ba8d41762c..0000000000
--- a/vendor-bin/rector/composer.lock
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "d751713988987e9331980363e24189ce",
-    "packages": [],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": {},
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {},
-    "platform-dev": {},
-    "plugin-api-version": "2.9.0"
-}

From c373c766442843851562b2cad6c229a7492647fe Mon Sep 17 00:00:00 2001
From: Kostiantyn Miakshyn <molodchick@gmail.com>
Date: Mon, 24 Aug 2026 02:29:11 +0200
Subject: [PATCH 08/11] fix bugs

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>
---
 src/modules/main/sections/DataTable.vue    | 17 ++++++++++++++++-
 src/modules/main/sections/ElementTitle.vue | 17 ++++++++++++++++-
 src/modules/main/sections/View.vue         | 17 ++++++++++++++++-
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/src/modules/main/sections/DataTable.vue b/src/modules/main/sections/DataTable.vue
index 3fa20da62e..47f749bcf1 100644
--- a/src/modules/main/sections/DataTable.vue
+++ b/src/modules/main/sections/DataTable.vue
@@ -255,7 +255,22 @@ export default {
 			return this.views.some(v => v.tableId === this.table.id)
 		},
 		isViewSettingSet() {
-			return !(!this.localViewSetting || ((!this.localViewSetting.hiddenColumns || this.localViewSetting.hiddenColumns.length === 0) && (!this.localViewSetting.sorting) && (!this.localViewSetting.filter || this.localViewSetting.filter.length === 0)))
+			if (!this.localViewSetting) {
+				return false
+			}
+			if (this.localViewSetting.hiddenColumns?.length > 0) {
+				return true
+			}
+			if (this.localViewSetting.searchString) {
+				return true
+			}
+			if (this.localViewSetting.sorting?.some(rule => rule?.columnId)) {
+				return true
+			}
+			if (this.localViewSetting.filter?.some(rule => rule?.columnId)) {
+				return true
+			}
+			return false
 		},
 	},
 
diff --git a/src/modules/main/sections/ElementTitle.vue b/src/modules/main/sections/ElementTitle.vue
index e8c30e9334..62f67391a7 100644
--- a/src/modules/main/sections/ElementTitle.vue
+++ b/src/modules/main/sections/ElementTitle.vue
@@ -74,7 +74,22 @@ export default {
 		},
 
 		isViewSettingSet() {
-			return !(!this.viewSetting || ((!this.viewSetting.hiddenColumns || this.viewSetting.hiddenColumns.length === 0) && (!this.viewSetting.sorting) && (!this.viewSetting.filter || this.viewSetting.filter.length === 0)))
+			if (!this.viewSetting) {
+				return false
+			}
+			if (this.viewSetting.hiddenColumns?.length > 0) {
+				return true
+			}
+			if (this.viewSetting.searchString) {
+				return true
+			}
+			if (this.viewSetting.sorting?.some(rule => rule?.columnId)) {
+				return true
+			}
+			if (this.viewSetting.filter?.some(rule => rule?.columnId)) {
+				return true
+			}
+			return false
 		},
 	},
 
diff --git a/src/modules/main/sections/View.vue b/src/modules/main/sections/View.vue
index 8654ff37eb..68386b8d6f 100644
--- a/src/modules/main/sections/View.vue
+++ b/src/modules/main/sections/View.vue
@@ -163,7 +163,22 @@ export default {
 	},
 	computed: {
 		isViewSettingSet() {
-			return !(!this.localViewSetting || ((!this.localViewSetting.hiddenColumns || this.localViewSetting.hiddenColumns.length === 0) && (!this.localViewSetting.sorting) && (!this.localViewSetting.filter || this.localViewSetting.filter.length === 0)))
+			if (!this.localViewSetting) {
+				return false
+			}
+			if (this.localViewSetting.hiddenColumns?.length > 0) {
+				return true
+			}
+			if (this.localViewSetting.searchString) {
+				return true
+			}
+			if (this.localViewSetting.sorting?.some(rule => rule?.columnId)) {
+				return true
+			}
+			if (this.localViewSetting.filter?.some(rule => rule?.columnId)) {
+				return true
+			}
+			return false
 		},
 	},
 	watch: {

From 9c4e7212964605a8c0024d8b56372880a4c42acb Mon Sep 17 00:00:00 2001
From: Kostiantyn Miakshyn <molodchick@gmail.com>
Date: Mon, 24 Aug 2026 02:34:31 +0200
Subject: [PATCH 09/11] fix bugs

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>
---
 src/modules/main/sections/MainWrapper.vue              | 2 +-
 src/shared/components/ncTable/NcTable.vue              | 2 +-
 src/shared/components/ncTable/sections/CustomTable.vue | 7 ++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/modules/main/sections/MainWrapper.vue b/src/modules/main/sections/MainWrapper.vue
index fc3db8524c..1de73e1834 100644
--- a/src/modules/main/sections/MainWrapper.vue
+++ b/src/modules/main/sections/MainWrapper.vue
@@ -246,7 +246,7 @@ export default {
 				// Since we show one page at a time, no need keep other tables in the store
 				this.clearState()
 
-				if (this.applyUrlStateOnReload) {
+				if (this.applyUrlStateOnReload || isLastElementSameAndView) {
 					this.applyUrlStateOnReload = false
 					this.applyUrlState()
 				} else {
diff --git a/src/shared/components/ncTable/NcTable.vue b/src/shared/components/ncTable/NcTable.vue
index 769bdfb175..65fb8e7710 100644
--- a/src/shared/components/ncTable/NcTable.vue
+++ b/src/shared/components/ncTable/NcTable.vue
@@ -122,7 +122,7 @@ export default {
 		},
 		totalRows: {
 			type: Number,
-			default: null,
+			default: 0,
 		},
 		columns: {
 			type: Array,
diff --git a/src/shared/components/ncTable/sections/CustomTable.vue b/src/shared/components/ncTable/sections/CustomTable.vue
index 9852ecd96c..0b2fe0432d 100644
--- a/src/shared/components/ncTable/sections/CustomTable.vue
+++ b/src/shared/components/ncTable/sections/CustomTable.vue
@@ -74,7 +74,7 @@ export default {
 		},
 		totalRows: {
 			type: Number,
-			default: null,
+			default: 0,
 		},
 		columns: {
 			type: Array,
@@ -125,10 +125,7 @@ export default {
 
 	computed: {
 		currentPageRows() {
-			if (this.totalRows !== null) {
-				return this.rows
-			}
-			return this.rows.slice((this.pageNumber - 1) * this.rowsPerPage, ((this.pageNumber - 1) * this.rowsPerPage) + this.rowsPerPage)
+			return this.rows
 		},
 	},
 

From c2e7efb6aea43e5b61006b9e2647923ac3ea59a6 Mon Sep 17 00:00:00 2001
From: Kostiantyn Miakshyn <molodchick@gmail.com>
Date: Mon, 24 Aug 2026 02:40:57 +0200
Subject: [PATCH 10/11] unify naming

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>
---
 src/modules/main/partials/TableView.vue                |  4 ++--
 src/modules/main/sections/DataTable.vue                |  4 ++--
 src/modules/main/sections/MainWrapper.vue              | 10 +++++-----
 src/modules/main/sections/PublicElement.vue            |  4 ++--
 src/modules/main/sections/PublicMainWrapper.vue        |  8 ++++----
 src/modules/main/sections/Table.vue                    |  4 ++--
 src/modules/main/sections/View.vue                     |  4 ++--
 src/shared/components/ncTable/NcTable.vue              |  6 +++---
 src/shared/components/ncTable/sections/CustomTable.vue |  2 +-
 src/shared/components/ncTable/sections/Options.vue     |  4 ++--
 .../components/ncTable/sections/PaginationBlock.vue    |  6 +++---
 src/store/data.js                                      |  2 +-
 12 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/modules/main/partials/TableView.vue b/src/modules/main/partials/TableView.vue
index 533cf00f61..87fe886a8e 100644
--- a/src/modules/main/partials/TableView.vue
+++ b/src/modules/main/partials/TableView.vue
@@ -6,7 +6,7 @@
 	<NcTable v-if="columns.length > 0"
 		v-model:view-setting="localViewSetting"
 		:rows="rows"
-		:total-rows="totalRows"
+		:rows-count="rowsCount"
 		:columns="columns"
 		:element-id="element.id"
 		:is-view="isView"
@@ -56,7 +56,7 @@ export default {
 			type: Array,
 			default: () => [],
 		},
-		totalRows: {
+		rowsCount: {
 			type: Number,
 			default: null,
 		},
diff --git a/src/modules/main/sections/DataTable.vue b/src/modules/main/sections/DataTable.vue
index 47f749bcf1..57db538f9b 100644
--- a/src/modules/main/sections/DataTable.vue
+++ b/src/modules/main/sections/DataTable.vue
@@ -77,7 +77,7 @@
 				v-model:view-setting="localViewSetting"
 				v-model:selected-rows="localSelectedRows"
 				:rows="rows"
-				:total-rows="totalRows"
+				:rows-count="rowsCount"
 				:columns="columns"
 				:element="table"
 				:is-view="false"
@@ -213,7 +213,7 @@ export default {
 			type: Array,
 			default: null,
 		},
-		totalRows: {
+		rowsCount: {
 			type: Number,
 			default: null,
 		},
diff --git a/src/modules/main/sections/MainWrapper.vue b/src/modules/main/sections/MainWrapper.vue
index 1de73e1834..f91eeb75f2 100644
--- a/src/modules/main/sections/MainWrapper.vue
+++ b/src/modules/main/sections/MainWrapper.vue
@@ -11,7 +11,7 @@
 				:view="element"
 				:columns="columns"
 				:rows="rows"
-				:total-rows="totalRows"
+				:rows-count="rowsCount"
 				:view-setting="viewSetting"
 				@update:viewSetting="viewSetting = $event"
 				@create-column="createColumn"
@@ -24,7 +24,7 @@
 				:table="element"
 				:columns="columns"
 				:rows="rows"
-				:total-rows="totalRows"
+				:rows-count="rowsCount"
 				:view-setting="viewSetting"
 				@update:viewSetting="viewSetting = $event"
 				@create-column="createColumn"
@@ -73,13 +73,13 @@ export default {
 	},
 	setup(props) {
 		const store = useDataStore()
-		const { getColumns, getRows, getTotalRows } = storeToRefs(store)
+		const { getColumns, getRows, getRowsCount } = storeToRefs(store)
 		// When using storeToRefs, only the top-level state is made reactive.
 		// To make nested dynamic keys reactive, you need to use a computed property or watch for changes.
 		const rows = computed(() => getRows.value(props.isView, props.element.id))
 		const columns = computed(() => getColumns.value(props.isView, props.element.id))
-		const totalRows = computed(() => getTotalRows.value(props.isView, props.element.id))
-		return { rows, columns, totalRows, dataStore: store }
+		const rowsCount = computed(() => getRowsCount.value(props.isView, props.element.id))
+		return { rows, columns, rowsCount, dataStore: store }
 	},
 
 	data() {
diff --git a/src/modules/main/sections/PublicElement.vue b/src/modules/main/sections/PublicElement.vue
index 8248c2fac5..23b3718f0c 100644
--- a/src/modules/main/sections/PublicElement.vue
+++ b/src/modules/main/sections/PublicElement.vue
@@ -8,7 +8,7 @@
 		<TableDescription :description="element.description" :read-only="true" />
 		<div class="table-wrapper">
 			<EmptyView v-if="columns.length === 0" :view="element" />
-			<TableView v-else :rows="rows" :columns="columns" :element="element" :total-rows="totalRows" :view-setting="localViewSetting" :can-read-rows="element.onSharePermissions.read"
+			<TableView v-else :rows="rows" :columns="columns" :element="element" :rows-count="rowsCount" :view-setting="localViewSetting" :can-read-rows="element.onSharePermissions.read"
 				:can-create-rows="element.onSharePermissions.create"
 				:can-edit-rows="element.onSharePermissions.update"
 				:can-delete-rows="element.onSharePermissions.delete"
@@ -106,7 +106,7 @@ export default {
 			type: Array,
 			default: () => [],
 		},
-		totalRows: {
+		rowsCount: {
 			type: Number,
 			default: null,
 		},
diff --git a/src/modules/main/sections/PublicMainWrapper.vue b/src/modules/main/sections/PublicMainWrapper.vue
index eaebea70bd..b930d543b4 100644
--- a/src/modules/main/sections/PublicMainWrapper.vue
+++ b/src/modules/main/sections/PublicMainWrapper.vue
@@ -7,7 +7,7 @@
 		<div v-if="loading" class="icon-loading" />
 
 		<div v-else>
-			<PublicElement :element="publicElement" :columns="columns" :rows="rows" :total-rows="totalRows" :view-setting="viewSetting" @update:viewSetting="viewSetting = $event" @download-csv="downloadCSV" @download-filtered-csv="downloadFilteredCSV" />
+			<PublicElement :element="publicElement" :columns="columns" :rows="rows" :rows-count="rowsCount" :view-setting="viewSetting" @update:viewSetting="viewSetting = $event" @download-csv="downloadCSV" @download-filtered-csv="downloadFilteredCSV" />
 		</div>
 	</div>
 </template>
@@ -46,14 +46,14 @@ export default {
 
 	setup(props) {
 		const store = useDataStore()
-		const { getColumns, getRows, getTotalRows } = storeToRefs(store)
+		const { getColumns, getRows, getRowsCount } = storeToRefs(store)
 
 		const stateKey = 'public-' + props.token
 		const rows = computed(() => getRows.value(false, stateKey))
 		const columns = computed(() => getColumns.value(false, stateKey))
-		const totalRows = computed(() => getTotalRows.value(false, stateKey))
+		const rowsCount = computed(() => getRowsCount.value(false, stateKey))
 
-		return { rows, columns, totalRows, dataStore: store }
+		return { rows, columns, rowsCount, dataStore: store }
 	},
 
 	data() {
diff --git a/src/modules/main/sections/Table.vue b/src/modules/main/sections/Table.vue
index e9778ccba0..061a5f5099 100644
--- a/src/modules/main/sections/Table.vue
+++ b/src/modules/main/sections/Table.vue
@@ -13,7 +13,7 @@
 			@toggle-share="$emit('toggle-share')"
 			@show-integration="$emit('show-integration')"
 			@create-view="createView" />
-		<DataTable v-model:view-setting="localViewSetting" :table="table" :columns="columns" :rows="rows" :total-rows="totalRows"
+		<DataTable v-model:view-setting="localViewSetting" :table="table" :columns="columns" :rows="rows" :rows-count="rowsCount"
 			@create-column="$emit('create-column')"
 			@import="$emit('import')"
 			@download-csv="$emit('download-csv')"
@@ -54,7 +54,7 @@ export default {
 			type: Array,
 			default: null,
 		},
-		totalRows: {
+		rowsCount: {
 			type: Number,
 			default: null,
 		},
diff --git a/src/modules/main/sections/View.vue b/src/modules/main/sections/View.vue
index 68386b8d6f..e5f7f78f99 100644
--- a/src/modules/main/sections/View.vue
+++ b/src/modules/main/sections/View.vue
@@ -11,7 +11,7 @@
 			<TableView v-else
 				v-model:view-setting="localViewSetting"
 				:rows="rows"
-				:total-rows="totalRows"
+				:rows-count="rowsCount"
 				:columns="columns"
 				:element="view"
 				:is-view="true"
@@ -134,7 +134,7 @@ export default {
 			type: Array,
 			default: null,
 		},
-		totalRows: {
+		rowsCount: {
 			type: Number,
 			default: null,
 		},
diff --git a/src/shared/components/ncTable/NcTable.vue b/src/shared/components/ncTable/NcTable.vue
index 65fb8e7710..5dcfdda1a6 100644
--- a/src/shared/components/ncTable/NcTable.vue
+++ b/src/shared/components/ncTable/NcTable.vue
@@ -43,7 +43,7 @@ deselect-all-rows        -> unselect all rows, e.g. after deleting selected rows
 <template>
 	<div ref="table" class="NcTable" data-cy="ncTable">
 		<div class="options row" style="padding-right: calc(var(--default-grid-baseline) * 2);">
-			<Options v-model:view-setting="localViewSetting" :rows="getSearchedAndFilteredAndSortedRows" :all-rows="rows" :total="totalRows" :columns="parsedColumns" :element-id="elementId"
+			<Options v-model:view-setting="localViewSetting" :rows="getSearchedAndFilteredAndSortedRows" :all-rows="rows" :rows-count="rowsCount" :columns="parsedColumns" :element-id="elementId"
 				:is-view="isView"
 				:selected-rows="localSelectedRows"
 				:show-options="parsedColumns.length !== 0" :config="config" @create-row="$emit('create-row')"
@@ -53,7 +53,7 @@ deselect-all-rows        -> unselect all rows, e.g. after deleting selected rows
 		</div>
 		<div class="custom-table row">
 			<CustomTable v-if="config.canReadRows || (config.canCreateRows && rows.length > 0)" v-model:view-setting="localViewSetting"
-				:columns="parsedColumns" :rows="getSearchedAndFilteredAndSortedRows" :total-rows="totalRows" :is-view="isView" :element-id="elementId"
+				:columns="parsedColumns" :rows="getSearchedAndFilteredAndSortedRows" :rows-count="rowsCount" :is-view="isView" :element-id="elementId"
 				:config="config" @create-row="$emit('create-row')"
 				@edit-row="rowId => $emit('edit-row', rowId)"
 				@copy-row="rowId => $emit('copy-row', rowId)"
@@ -120,7 +120,7 @@ export default {
 			type: Array,
 			default: () => [],
 		},
-		totalRows: {
+		rowsCount: {
 			type: Number,
 			default: 0,
 		},
diff --git a/src/shared/components/ncTable/sections/CustomTable.vue b/src/shared/components/ncTable/sections/CustomTable.vue
index 0b2fe0432d..de60910e3e 100644
--- a/src/shared/components/ncTable/sections/CustomTable.vue
+++ b/src/shared/components/ncTable/sections/CustomTable.vue
@@ -72,7 +72,7 @@ export default {
 			type: Array,
 			default: () => [],
 		},
-		totalRows: {
+		rowsCount: {
 			type: Number,
 			default: 0,
 		},
diff --git a/src/shared/components/ncTable/sections/Options.vue b/src/shared/components/ncTable/sections/Options.vue
index e8bee51be8..5502166b68 100644
--- a/src/shared/components/ncTable/sections/Options.vue
+++ b/src/shared/components/ncTable/sections/Options.vue
@@ -30,7 +30,7 @@
 						<Refresh v-else :size="20" />
 					</template>
 				</NcButton>
-				<PaginationBlock :total="total" />
+				<PaginationBlock :rows-count="rowsCount" />
 			</div>
 
 			<div v-if="selectedRows.length > 0" class="selected-rows-option">
@@ -129,7 +129,7 @@ export default {
 			type: Array,
 			default: () => [],
 		},
-		total: {
+		rowsCount: {
 			type: Number,
 			default: null,
 		},
diff --git a/src/shared/components/ncTable/sections/PaginationBlock.vue b/src/shared/components/ncTable/sections/PaginationBlock.vue
index ff3a62543c..36b1c06b7a 100644
--- a/src/shared/components/ncTable/sections/PaginationBlock.vue
+++ b/src/shared/components/ncTable/sections/PaginationBlock.vue
@@ -68,7 +68,7 @@ export default {
 	},
 
 	props: {
-		total: {
+		rowsCount: {
 			type: Number,
 			default: null,
 		},
@@ -83,8 +83,8 @@ export default {
 
 	computed: {
 		totalPages() {
-			const total = this.total ?? 0
-			return Math.max(1, Math.ceil(total / this.rowsPerPage))
+			const rowsCount = this.rowsCount ?? 0
+			return Math.max(1, Math.ceil(rowsCount / this.rowsPerPage))
 		},
 	},
 
diff --git a/src/store/data.js b/src/store/data.js
index 2e5c8b1bdd..4f22fa5f13 100644
--- a/src/store/data.js
+++ b/src/store/data.js
@@ -36,7 +36,7 @@ export const useDataStore = defineStore('data', {
 			const stateId = typeof elementId === 'string' && elementId.startsWith('public-') ? elementId : genStateKey(isView, elementId)
 			return state.rows[stateId] ?? []
 		},
-		getTotalRows: (state) => (isView, elementId) => {
+		getRowsCount: (state) => (isView, elementId) => {
 			const stateId = typeof elementId === 'string' && elementId.startsWith('public-') ? elementId : genStateKey(isView, elementId)
 			return state.rowCounts[stateId] ?? 0
 		},

From 7e19d0cd482a70d5f66e839f5a9bfe6d0f87b281 Mon Sep 17 00:00:00 2001
From: Kostiantyn Miakshyn <molodchick@gmail.com>
Date: Mon, 24 Aug 2026 03:35:25 +0200
Subject: [PATCH 11/11] move pagination to a better place

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>
---
 lib/Controller/PublicRowOCSController.php     |  3 ---
 lib/Controller/RowOCSController.php           |  6 ++---
 lib/Db/RowQuery.php                           |  2 +-
 .../components/ncTable/sections/Options.vue   | 24 +++----------------
 .../ncTable/sections/PaginationBlock.vue      | 24 ++++++++++++++++++-
 5 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/lib/Controller/PublicRowOCSController.php b/lib/Controller/PublicRowOCSController.php
index ace1fd3e02..1ebca70b8f 100644
--- a/lib/Controller/PublicRowOCSController.php
+++ b/lib/Controller/PublicRowOCSController.php
@@ -83,7 +83,6 @@ public function getRows(string $token, ?int $limit, ?int $offset, ?string $filte
 			$queryData = RowQuery::buildFromInput(
 				nodeType: $share->getNodeType(),
 				nodeId: $share->getNodeId(),
-				userId: '',
 				limit: $limit,
 				offset: $offset,
 				filter: $filter,
@@ -139,7 +138,6 @@ public function countRows(string $token, ?string $filter = null, ?string $sort =
 			$queryData = RowQuery::buildFromInput(
 				nodeType: $share->getNodeType(),
 				nodeId: $share->getNodeId(),
-				userId: '',
 				filter: $filter,
 				sort: $sort,
 				search: $search,
@@ -191,7 +189,6 @@ public function exportRows(string $token, ?string $filter = null, ?string $sort
 			$queryData = RowQuery::buildFromInput(
 				nodeType: $share->getNodeType(),
 				nodeId: $share->getNodeId(),
-				userId: '',
 				filter: $filter,
 				sort: $sort,
 				search: $search,
diff --git a/lib/Controller/RowOCSController.php b/lib/Controller/RowOCSController.php
index 92decc4c2c..7a8be067c6 100644
--- a/lib/Controller/RowOCSController.php
+++ b/lib/Controller/RowOCSController.php
@@ -147,7 +147,6 @@ public function getRows(string $nodeCollection, int $nodeId, ?int $limit = null,
 			$queryData = RowQuery::buildFromInput(
 				nodeType: $nodeCollection,
 				nodeId: $nodeId,
-				userId: $this->userId,
 				limit: $limit,
 				offset: $offset,
 				filter: $filter,
@@ -155,6 +154,7 @@ public function getRows(string $nodeCollection, int $nodeId, ?int $limit = null,
 				search: $search,
 				rowIds: $rowIds,
 				normalizePagination: true,
+				userId: $this->userId,
 			);
 
 			$rows = $this->rowService->findAllByQuery($queryData);
@@ -196,10 +196,10 @@ public function countRows(string $nodeCollection, int $nodeId, ?string $filter =
 			$queryData = RowQuery::buildFromInput(
 				nodeType: $nodeCollection,
 				nodeId: $nodeId,
-				userId: $this->userId,
 				filter: $filter,
 				sort: $sort,
 				search: $search,
+				userId: $this->userId,
 			);
 
 			$count = $this->rowService->countByQuery($queryData);
@@ -242,11 +242,11 @@ public function exportRows(string $nodeCollection, int $nodeId, ?string $filter
 			$queryData = RowQuery::buildFromInput(
 				nodeType: $nodeCollection,
 				nodeId: $nodeId,
-				userId: $this->userId,
 				filter: $filter,
 				sort: $sort,
 				search: $search,
 				rowIds: $rowIds,
+				userId: $this->userId,
 			);
 
 			$csv = $this->rowService->exportCsv($queryData);
diff --git a/lib/Db/RowQuery.php b/lib/Db/RowQuery.php
index f2a549a3fa..4fe3f73474 100644
--- a/lib/Db/RowQuery.php
+++ b/lib/Db/RowQuery.php
@@ -107,7 +107,7 @@ public function setRowIds(?array $rowIds): self {
 	 * @return self
 	 * @throws InvalidArgumentException
 	 */
-	public static function buildFromInput(string $nodeType, int $nodeId, string $userId, ?int $limit = null, ?int $offset = null, ?string $filter = null, ?string $sort = null, ?string $search = null, ?string $rowIds = null, bool $normalizePagination = false): self {
+	public static function buildFromInput(string $nodeType, int $nodeId, ?int $limit = null, ?int $offset = null, ?string $filter = null, ?string $sort = null, ?string $search = null, ?string $rowIds = null, bool $normalizePagination = false, string $userId = ''): self {
 		if ($normalizePagination) {
 			$limit = $limit !== null ? max(0, min(500, $limit)) : null;
 			$offset = $offset !== null ? max(0, $offset) : null;
diff --git a/src/shared/components/ncTable/sections/Options.vue b/src/shared/components/ncTable/sections/Options.vue
index 5502166b68..0142a2d60f 100644
--- a/src/shared/components/ncTable/sections/Options.vue
+++ b/src/shared/components/ncTable/sections/Options.vue
@@ -24,13 +24,7 @@
 					<SearchForm :columns="columns" :search-string="getSearchString"
 						@set-search-string="str => $emit('set-search-string', str)" />
 				</div>
-				<NcButton v-if="config.canReadRows" :aria-label="t('tables', 'Reload rows')" type="tertiary" @click="onReload">
-					<template #icon>
-						<NcLoadingIcon v-if="rowsLoading" :size="20" />
-						<Refresh v-else :size="20" />
-					</template>
-				</NcButton>
-				<PaginationBlock :rows-count="rowsCount" />
+				<PaginationBlock :rows-count="rowsCount" :can-read-rows="config.canReadRows" />
 			</div>
 
 			<div v-if="selectedRows.length > 0" class="selected-rows-option">
@@ -82,13 +76,12 @@
 </template>
 
 <script>
-import { NcButton, NcActions, NcActionButton, NcLoadingIcon } from '@nextcloud/vue'
-import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
+import { NcButton, NcActions, NcActionButton } from '@nextcloud/vue'
+import { emit } from '@nextcloud/event-bus'
 import Plus from 'vue-material-design-icons/Plus.vue'
 import Check from 'vue-material-design-icons/CheckboxBlankOutline.vue'
 import Delete from 'vue-material-design-icons/TrashCanOutline.vue'
 import TrayArrowDown from 'vue-material-design-icons/TrayArrowDown.vue'
-import Refresh from 'vue-material-design-icons/Refresh.vue'
 import ShareVariantOutline from 'vue-material-design-icons/ShareVariantOutline.vue'
 import OpenInNew from 'vue-material-design-icons/OpenInNew.vue'
 import { generateUrl, getBaseUrl } from '@nextcloud/router'
@@ -107,12 +100,10 @@ export default {
 		NcActionButton,
 		SearchForm,
 		NcButton,
-		NcLoadingIcon,
 		Plus,
 		Check,
 		Delete,
 		TrayArrowDown,
-		Refresh,
 		ShareVariantOutline,
 		OpenInNew,
 		PaginationBlock,
@@ -172,7 +163,6 @@ export default {
 	data() {
 		return {
 			optionsDivWidth: null,
-			rowsLoading: false,
 			sharedLinkUrl: null,
 			openLinkTimeout: null,
 		}
@@ -200,12 +190,10 @@ export default {
 	mounted() {
 		this.updateOptionsDivWidth()
 		window.addEventListener('resize', this.updateOptionsDivWidth)
-		subscribe('tables:rows-loading', this.setRowsLoading)
 	},
 
 	beforeUnmount() {
 		window.removeEventListener('resize', this.updateOptionsDivWidth)
-		unsubscribe('tables:rows-loading', this.setRowsLoading)
 		this.clearOpenLink()
 	},
 
@@ -218,12 +206,6 @@ export default {
 		exportFiltered() {
 			this.$emit('download-filtered-csv', this.rows)
 		},
-		onReload() {
-			emit('tables:reload')
-		},
-		setRowsLoading(loading) {
-			this.rowsLoading = loading
-		},
 		exportSelected() {
 			this.$emit('download-filtered-csv', this.getSelectedRows)
 		},
diff --git a/src/shared/components/ncTable/sections/PaginationBlock.vue b/src/shared/components/ncTable/sections/PaginationBlock.vue
index 36b1c06b7a..441272add5 100644
--- a/src/shared/components/ncTable/sections/PaginationBlock.vue
+++ b/src/shared/components/ncTable/sections/PaginationBlock.vue
@@ -5,6 +5,12 @@
 <template>
 	<div class="pagination-block">
 		<div class="pagination-items">
+			<NcButton v-if="canReadRows" :aria-label="t('tables', 'Reload rows')" type="tertiary" @click="onReload">
+				<template #icon>
+					<NcLoadingIcon v-if="rowsLoading" :size="20" />
+					<Refresh v-else :size="20" />
+				</template>
+			</NcButton>
 			<NcButton type="tertiary" :disabled="totalPages === 1 || pageNumber <= 1" :aria-label="t('tables', 'Go to first page')" @click="pageNumber = 1">
 				<template #icon>
 					<PageFirstIcon :size="20" />
@@ -50,7 +56,8 @@ import PageLastIcon from 'vue-material-design-icons/PageLast.vue'
 import PageFirstIcon from 'vue-material-design-icons/PageFirst.vue'
 import ChevronRightIcon from 'vue-material-design-icons/ChevronRight.vue'
 import ChevronLeftIcon from 'vue-material-design-icons/ChevronLeft.vue'
-import { NcButton, NcSelect, NcTextField } from '@nextcloud/vue'
+import Refresh from 'vue-material-design-icons/Refresh.vue'
+import { NcButton, NcLoadingIcon, NcSelect, NcTextField } from '@nextcloud/vue'
 import { translate as t } from '@nextcloud/l10n'
 import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 
@@ -59,12 +66,14 @@ export default {
 
 	components: {
 		NcButton,
+		NcLoadingIcon,
 		PageLastIcon,
 		PageFirstIcon,
 		ChevronLeftIcon,
 		ChevronRightIcon,
 		NcSelect,
 		NcTextField,
+		Refresh,
 	},
 
 	props: {
@@ -72,12 +81,17 @@ export default {
 			type: Number,
 			default: null,
 		},
+		canReadRows: {
+			type: Boolean,
+			default: false,
+		},
 	},
 
 	data() {
 		return {
 			pageNumber: 1,
 			rowsPerPage: 100,
+			rowsLoading: false,
 		}
 	},
 
@@ -101,14 +115,22 @@ export default {
 
 	mounted() {
 		subscribe('tables:pagination-changed', this.handlePaginationChanged)
+		subscribe('tables:rows-loading', this.setRowsLoading)
 	},
 
 	beforeUnmount() {
 		unsubscribe('tables:pagination-changed', this.handlePaginationChanged)
+		unsubscribe('tables:rows-loading', this.setRowsLoading)
 	},
 
 	methods: {
 		t,
+		onReload() {
+			emit('tables:reload')
+		},
+		setRowsLoading(loading) {
+			this.rowsLoading = loading
+		},
 		handlePaginationChanged({ pageNumber, rowsPerPage }) {
 			this.pageNumber = pageNumber
 			if (rowsPerPage) {