feat(contexts): data model for grid pages

appinfo/info.xml

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

lib/Controller/ContextController.php

@@ -15,6 +15,7 @@
 use OCA\Tables\Errors\InternalError;
 use OCA\Tables\Errors\NotFoundError;
 use OCA\Tables\Errors\PermissionError;
+use OCA\Tables\Helper\IconHelper;
 use OCA\Tables\Middleware\Attribute\RequirePermission;
 use OCA\Tables\ResponseDefinitions;
 use OCA\Tables\Service\ColumnService;
@@ -386,11 +387,7 @@ public function importScheme(int $contextId, string $name, string $iconName, str
 	}
 
 	protected function isValidIcon(string $iconName): bool {
-		if ($iconName === '' || !preg_match('/^[a-zA-Z0-9-]+$/', $iconName)) {
-			return false;
-		}
-		$iconPath = dirname(__DIR__, 2) . '/img/material/' . $iconName . '.svg';
-		return file_exists($iconPath);
+		return IconHelper::isValid($iconName);
 	}
 
 	/**

lib/Db/Page.php

@@ -15,22 +15,49 @@
  * @method setContextId(int $value): void
  * @method getPageType(): string
  * @method setPageType(string $value): void
+ * @method getTechnicalName(): string
+ * @method setTechnicalName(string $value): void
+ * @method getTitle(): ?string
+ * @method setTitle(?string $value): void
+ * @method getIcon(): ?string
+ * @method setIcon(?string $value): void
+ * @method getDescription(): ?string
+ * @method setDescription(?string $value): void
  */
 class Page extends Entity implements \JsonSerializable {
 	public const TYPE_STARTPAGE = 'startpage';
+	public const TYPE_GRID = 'grid';
+	public const START_PAGE_NAME = 'dashboard';
+	public const DEFAULT_NAME_PREFIX = 'page_';
 
 	protected ?int $contextId = null;
 	protected ?string $pageType = null;
+	protected ?string $technicalName = null;
+	protected ?string $title = null;
+	protected ?string $icon = null;
+	protected ?string $description = null;
 
 	public function __construct() {
 		$this->addType('id', 'integer');
 	}
 
+	/**
+	 * Whether a technical name has the form of the automatic `page_<id>`. Such names are
+	 * reserved, so a given name never collides with the name a later page gets.
+	 */
+	public static function isDefaultName(string $technicalName): bool {
+		return preg_match('/^' . self::DEFAULT_NAME_PREFIX . '[0-9]+$/', $technicalName) === 1;
+	}
+
 	public function jsonSerialize(): array {
 		return [
 			'id' => $this->getId(),
 			'contextId' => $this->getContextId(),
 			'pageType' => $this->getPageType(),
+			'technicalName' => $this->getTechnicalName(),
+			'title' => $this->getTitle(),
+			'icon' => $this->getIcon(),
+			'description' => $this->getDescription(),
 		];
 	}
 }

lib/Db/PageMapper.php

@@ -8,17 +8,34 @@
 namespace OCA\Tables\Db;
 
 use OCP\AppFramework\Db\QBMapper;
+use OCP\AppFramework\Db\TTransactional;
+use OCP\DB\Exception;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
 /** @template-extends QBMapper<Page> */
 class PageMapper extends QBMapper {
+	use TTransactional;
+
 	protected string $table = 'tables_contexts_page';
 
 	public function __construct(IDBConnection $db) {
 		parent::__construct($db, $this->table, Page::class);
 	}
 
+	/**
+	 * Inserts a page under the default technical name `page_<id>`.
+	 *
+	 * @throws Exception
+	 */
+	public function insertWithDefaultName(Page $page): Page {
+		return $this->atomic(function () use ($page): Page {
+			$page = $this->insert($page);
+			$page->setTechnicalName(Page::DEFAULT_NAME_PREFIX . $page->getId());
+			return $this->update($page);
+		}, $this->db);
+	}
+
 	/**
 	 * @return int[]
 	 */

lib/Db/Widget.php

@@ -0,0 +1,107 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Tables\Db;
+
+use OCP\AppFramework\Db\Entity;
+
+/**
+ * A widget on a grid page: its type, optional title, icon and description, its place
+ * on the grid and its settings, stored as one JSON object.
+ *
+ * @psalm-type TablesWidgetSettingValue = string|int|float|bool|null
+ *
+ * @method getPageId(): int
+ * @method setPageId(int $value): void
+ * @method getType(): string
+ * @method setType(string $value): void
+ * @method getTitle(): ?string
+ * @method setTitle(?string $value): void
+ * @method getIcon(): ?string
+ * @method setIcon(?string $value): void
+ * @method getDescription(): ?string
+ * @method setDescription(?string $value): void
+ * @method getGridX(): int
+ * @method setGridX(int $value): void
+ * @method getGridY(): int
+ * @method setGridY(int $value): void
+ * @method getGridWidth(): int
+ * @method setGridWidth(int $value): void
+ * @method getGridHeight(): int
+ * @method setGridHeight(int $value): void
+ * @method getSettings(): ?string
+ * @method setSettings(?string $value): void
+ */
+class Widget extends Entity implements \JsonSerializable {
+	protected ?int $pageId = null;
+	protected ?string $type = null;
+	protected ?string $title = null;
+	protected ?string $icon = null;
+	protected ?string $description = null;
+	protected ?int $gridX = null;
+	protected ?int $gridY = null;
+	protected ?int $gridWidth = null;
+	protected ?int $gridHeight = null;
+	protected ?string $settings = null;
+
+	public function __construct() {
+		$this->addType('id', 'integer');
+		$this->addType('pageId', 'integer');
+		$this->addType('gridX', 'integer');
+		$this->addType('gridY', 'integer');
+		$this->addType('gridWidth', 'integer');
+		$this->addType('gridHeight', 'integer');
+	}
+
+	/**
+	 * @return array<string, TablesWidgetSettingValue>
+	 */
+	public function getSettingsArray(): array {
+		$settings = $this->getSettings();
+		if ($settings === null || $settings === '') {
+			return [];
+		}
+		$decoded = json_decode($settings, true);
+		/** @var array<string, TablesWidgetSettingValue> */
+		return is_array($decoded) ? $decoded : [];
+	}
+
+	/**
+	 * Stores the settings as one JSON object, `{}` when there are none.
+	 *
+	 * @param array<string, TablesWidgetSettingValue> $settings
+	 * @throws \JsonException
+	 */
+	public function setSettingsArray(array $settings): void {
+		$this->setSettings(json_encode((object)$settings, JSON_THROW_ON_ERROR));
+	}
+
+	/**
+	 * The settings as an object, so they serialise as a JSON object also when empty.
+	 */
+	public function getSettingsObject(): \stdClass {
+		return (object)$this->getSettingsArray();
+	}
+
+	public function jsonSerialize(): array {
+		return [
+			'id' => $this->getId(),
+			'pageId' => $this->getPageId(),
+			'type' => $this->getType(),
+			'title' => $this->getTitle(),
+			'icon' => $this->getIcon(),
+			'description' => $this->getDescription(),
+			'gridX' => $this->getGridX(),
+			'gridY' => $this->getGridY(),
+			'gridWidth' => $this->getGridWidth(),
+			'gridHeight' => $this->getGridHeight(),
+			'settings' => $this->getSettingsObject(),
+		];
+	}
+}

lib/Db/WidgetMapper.php

@@ -0,0 +1,78 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Tables\Db;
+
+use OCP\AppFramework\Db\QBMapper;
+use OCP\DB\Exception;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
+
+/** @template-extends QBMapper<Widget> */
+class WidgetMapper extends QBMapper {
+	protected string $table = 'tables_contexts_widget';
+
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, $this->table, Widget::class);
+	}
+
+	/**
+	 * @param int[] $pageIds
+	 * @return Widget[] ordered by page and grid position
+	 * @throws Exception
+	 */
+	public function findByPageIds(array $pageIds): array {
+		if ($pageIds === []) {
+			return [];
+		}
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from($this->table)
+			->where($qb->expr()->in('page_id', $qb->createNamedParameter($pageIds, IQueryBuilder::PARAM_INT_ARRAY)))
+			->orderBy('page_id', 'ASC')
+			->addOrderBy('grid_y', 'ASC')
+			->addOrderBy('grid_x', 'ASC')
+			->addOrderBy('id', 'ASC');
+
+		return $this->findEntities($qb);
+	}
+
+	/**
+	 * @return int[]
+	 * @throws Exception
+	 */
+	public function findIdsByPageId(int $pageId): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('id')
+			->from($this->table)
+			->where($qb->expr()->eq('page_id', $qb->createNamedParameter($pageId, IQueryBuilder::PARAM_INT)));
+
+		$result = $qb->executeQuery();
+		$ids = [];
+		while ($row = $result->fetchAssociative()) {
+			$ids[] = (int)$row['id'];
+		}
+		$result->closeCursor();
+		return $ids;
+	}
+
+	/**
+	 * @param int[] $widgetIds
+	 * @throws Exception
+	 */
+	public function deleteByIds(array $widgetIds): void {
+		if ($widgetIds === []) {
+			return;
+		}
+		$qb = $this->db->getQueryBuilder();
+		$qb->delete($this->table)
+			->where($qb->expr()->in('id', $qb->createNamedParameter($widgetIds, IQueryBuilder::PARAM_INT_ARRAY)))
+			->executeStatement();
+	}
+}

lib/Db/WidgetSource.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Tables\Db;
+
+use OCP\AppFramework\Db\Entity;
+
+/**
+ * The node of its application a data widget shows. The widget id is the key;
+ * the inherited id is not used.
+ *
+ * @method getWidgetId(): int
+ * @method setWidgetId(int $value): void
+ * @method getNodeRelId(): int
+ * @method setNodeRelId(int $value): void
+ */
+class WidgetSource extends Entity {
+	protected ?int $widgetId = null;
+	protected ?int $nodeRelId = null;
+
+	public function __construct() {
+		$this->addType('widgetId', 'integer');
+		$this->addType('nodeRelId', 'integer');
+	}
+}