Refactor/tabviewenabled

lib/Controller/ContextController.php

@@ -100,6 +100,7 @@ public function show(int $contextId): DataResponse {
 	 * @param string $iconName Material design icon name of the context
 	 * @param string $description Descriptive text of the context
 	 * @psalm-param list<array{id: int, type: int, permissions?: int}> $nodes optional nodes to be connected to this context
+	 * @param bool $tabViewEnabled Show the resources of the context as tabs instead of stacked
 	 *
 	 * @return DataResponse<Http::STATUS_OK, TablesContext, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR|Http::STATUS_BAD_REQUEST|Http::STATUS_FORBIDDEN, array{message: string}, array{}>
 	 *
@@ -108,7 +109,7 @@ public function show(int $contextId): DataResponse {
 	 * 403: lacking permissions on a resource
 	 */
 	#[NoAdminRequired]
-	public function create(string $name, string $iconName, string $description = '', array $nodes = []): DataResponse {
+	public function create(string $name, string $iconName, string $description = '', array $nodes = [], bool $tabViewEnabled = false): DataResponse {
 		try {
 			if (!$this->isValidIcon($iconName)) {
 				return new DataResponse(['message' => 'Invalid icon name'], Http::STATUS_BAD_REQUEST);
@@ -120,6 +121,7 @@ public function create(string $name, string $iconName, string $description = '',
 				$this->sanitizeInputNodes($nodes),
 				$this->userId,
 				0,
+				$tabViewEnabled,
 			)->jsonSerialize());
 		} catch (Exception $e) {
 			return $this->handleError($e);
@@ -138,6 +140,7 @@ public function create(string $name, string $iconName, string $description = '',
 	 * @param ?string $iconName provide this parameter to set a new icon
 	 * @param ?string $description provide this parameter to set a new description
 	 * @param ?array{id: int, type: int, permissions: int, order: int} $nodes provide this parameter to set a new list of nodes.
+	 * @param ?bool $tabViewEnabled provide this parameter to show (or stop showing) the resources as tabs
 	 *
 	 * @return DataResponse<Http::STATUS_OK, TablesContext, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR|Http::STATUS_NOT_FOUND|Http::STATUS_FORBIDDEN|Http::STATUS_BAD_REQUEST, array{message: string}, array{}>
 	 *
@@ -149,7 +152,7 @@ public function create(string $name, string $iconName, string $description = '',
 	 * @CanManageContext
 	 */
 	#[NoAdminRequired]
-	public function update(int $contextId, ?string $name, ?string $iconName, ?string $description, ?array $nodes): DataResponse {
+	public function update(int $contextId, ?string $name, ?string $iconName, ?string $description, ?array $nodes, ?bool $tabViewEnabled = null): DataResponse {
 		try {
 			if ($iconName !== null && !$this->isValidIcon($iconName)) {
 				return new DataResponse(['message' => 'Invalid icon name'], Http::STATUS_BAD_REQUEST);
@@ -162,6 +165,7 @@ public function update(int $contextId, ?string $name, ?string $iconName, ?string
 				$iconName,
 				$description,
 				$nodes,
+				$tabViewEnabled,
 			)->jsonSerialize());
 		} catch (Exception|MultipleObjectsReturnedException $e) {
 			return $this->handleError($e);

lib/Db/Context.php

@@ -21,6 +21,8 @@
  * @method setOwnerId(string $value): void
  * @method getOwnerType(): int
  * @method setOwnerType(int $value): void
+ * @method getTabViewEnabled(): ?bool
+ * @method setTabViewEnabled(?bool $value): void
  *
  * @method getSharing(): array
  * @method setSharing(array $value): void
@@ -35,6 +37,7 @@ class Context extends EntitySuper implements JsonSerializable {
 	protected ?string $description = null;
 	protected ?string $ownerId = null;
 	protected ?int $ownerType = null;
+	protected ?bool $tabViewEnabled = null;
 
 	// virtual properties
 	protected ?array $sharing = null;
@@ -46,6 +49,7 @@ class Context extends EntitySuper implements JsonSerializable {
 	public function __construct() {
 		$this->addType('id', 'integer');
 		$this->addType('owner_type', 'integer');
+		$this->addType('tabViewEnabled', 'boolean');
 	}
 
 	public function jsonSerialize(): array {
@@ -56,7 +60,8 @@ public function jsonSerialize(): array {
 			'iconName' => $this->getIcon(),
 			'description' => $this->getDescription(),
 			'owner' => $this->getOwnerId(),
-			'ownerType' => $this->getOwnerType()
+			'ownerType' => $this->getOwnerType(),
+			'tabViewEnabled' => (bool)$this->getTabViewEnabled(),
 		];
 
 		// extended data

lib/Db/ContextMapper.php

@@ -84,6 +84,7 @@ protected function formatResultRows(array $rows, ?string $userId) {
 			'description' => $rows[0]['description'],
 			'owner_id' => $rows[0]['owner_id'],
 			'owner_type' => $rows[0]['owner_type'],
+			'tab_view_enabled' => $rows[0]['tab_view_enabled'] ?? null,
 		];
 
 		$formatted['sharing'] = array_reduce($rows, function (array $carry, array $item) use ($userId) {
@@ -103,7 +104,9 @@ protected function formatResultRows(array $rows, ?string $userId) {
 				'display_mode_default' => (int)$item['display_mode_default'],
 			];
 			if ($userId !== null) {
-				$item['display_mode'] ??= $item['display_mode_default'];
+				if ($item['display_mode'] === null) {
+					$item['display_mode'] = $item['display_mode_default'];
+				}
 				$carry[$item['share_id']]['display_mode'] = (int)$item['display_mode'];
 			}
 			return $carry;
@@ -128,7 +131,9 @@ protected function formatResultRows(array $rows, ?string $userId) {
 				// empty Context
 				return $carry;
 			}
-			$carry[$item['page_id']] ??= ['content' => []];
+			if (!isset($carry[$item['page_id']])) {
+				$carry[$item['page_id']] = ['content' => []];
+			}
 			$carry[$item['page_id']]['id'] = (int)$item['page_id'];
 			$carry[$item['page_id']]['page_type'] = $item['page_type'];
 			if ($item['node_rel_id'] !== null) {

lib/Migration/Version2301Date20260930000000.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Tables\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\DB\Types;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+use Override;
+
+class Version2301Date20260930000000 extends SimpleMigrationStep {
+
+	#[Override]
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		if (!$schema->hasTable('tables_contexts_context')) {
+			return null;
+		}
+
+		$contexts = $schema->getTable('tables_contexts_context');
+
+		if (!$contexts->hasColumn('tab_view_enabled')) {
+			$contexts->addColumn('tab_view_enabled', Types::BOOLEAN, [
+				'notnull' => false,
+				'default' => false,
+				'comment' => 'Show the application resources as tabs instead of stacked',
+			]);
+		}
+
+		return $schema;
+	}
+}

lib/ResponseDefinitions.php

@@ -233,6 +233,7 @@
  *   description: string,
  *   owner: string,
  *   ownerType: int,
+ *   tabViewEnabled: bool,
  * }
  *
  * @psalm-type TablesContextNavigation = array{

lib/Service/ContextService.php

@@ -132,13 +132,14 @@ public function findById(int $id, ?string $userId): Context {
 	 * @psalm-param list<array{id: int, type: int, permissions?: int, order?: int}> $nodes
 	 * @throws Exception|PermissionError|InvalidArgumentException
 	 */
-	public function create(string $name, string $iconName, string $description, array $nodes, string $ownerId, int $ownerType): Context {
+	public function create(string $name, string $iconName, string $description, array $nodes, string $ownerId, int $ownerType, bool $tabViewEnabled = false): Context {
 		$context = new Context();
 		$context->setName(trim($name));
 		$context->setIcon(trim($iconName));
 		$context->setDescription(trim($description));
 		$context->setOwnerId($ownerId);
 		$context->setOwnerType($ownerType);
+		$context->setTabViewEnabled($tabViewEnabled);
 
 		$this->atomic(function () use ($context, $nodes): void {
 			$this->contextMapper->insert($context);
@@ -159,7 +160,7 @@ public function create(string $name, string $iconName, string $description, arra
 	 * @throws DoesNotExistException
 	 * @throws PermissionError|MultipleObjectsReturnedException
 	 */
-	public function update(int $contextId, string $userId, ?string $name, ?string $iconName, ?string $description, ?array $nodes): Context {
+	public function update(int $contextId, string $userId, ?string $name, ?string $iconName, ?string $description, ?array $nodes, ?bool $tabViewEnabled = null): Context {
 		$context = $this->contextMapper->findById($contextId, $userId);
 
 		if ($name !== null) {
@@ -171,6 +172,9 @@ public function update(int $contextId, string $userId, ?string $name, ?string $i
 		if ($description !== null) {
 			$context->setDescription(trim($description));
 		}
+		if ($tabViewEnabled !== null) {
+			$context->setTabViewEnabled($tabViewEnabled);
+		}
 
 		$hasUpdatedNodeInformation = false;
 		if ($nodes !== null) {