From 0ebcebeb7df1b13d8883050c4bc42219931db9bc Mon Sep 17 00:00:00 2001
From: Heinrich Toews <ht@twx-software.de>
Date: Tue, 27 Oct 2026 16:34:14 +0100
Subject: [PATCH 1/3] feat(filter): add saved board views

Allow saving the active card filter as a named view per board and
re-apply it from the filter popover.

Signed-off-by: Heinrich Toews <ht@twx-software.de>
---
 appinfo/routes.php                            |   5 +
 lib/Controller/BoardViewApiController.php     |  48 ++++++++
 lib/Db/BoardView.php                          |  34 ++++++
 lib/Db/BoardViewMapper.php                    |  43 +++++++
 .../Version11003Date20260821120000.php        |  58 ++++++++++
 lib/Service/BoardViewService.php              |  75 +++++++++++++
 src/components/Controls.vue                   | 104 ++++++++++++++++-
 src/services/BoardApi.js                      |  62 ++++++++++
 src/stores/board.js                           |  31 +++++
 tests/unit/Service/BoardViewServiceTest.php   | 106 ++++++++++++++++++
 10 files changed, 564 insertions(+), 2 deletions(-)
 create mode 100644 lib/Controller/BoardViewApiController.php
 create mode 100644 lib/Db/BoardView.php
 create mode 100644 lib/Db/BoardViewMapper.php
 create mode 100644 lib/Migration/Version11003Date20260821120000.php
 create mode 100644 lib/Service/BoardViewService.php
 create mode 100644 tests/unit/Service/BoardViewServiceTest.php

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 8a2b9be5fe..4297058a09 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -144,6 +144,11 @@
 		['name' => 'board_ocs#createForTeam', 'url' => '/api/v{apiVersion}/boards/team', 'verb' => 'POST'],
 		['name' => 'board_ocs#addAcl', 'url' => '/api/v{apiVersion}/boards/{boardId}/acl', 'verb' => 'POST'],
 
+		['name' => 'board_view_api#index', 'url' => '/api/v{apiVersion}/boards/{boardId}/views', 'verb' => 'GET'],
+		['name' => 'board_view_api#create', 'url' => '/api/v{apiVersion}/boards/{boardId}/views', 'verb' => 'POST'],
+		['name' => 'board_view_api#update', 'url' => '/api/v{apiVersion}/boards/{boardId}/views/{viewId}', 'verb' => 'PUT'],
+		['name' => 'board_view_api#delete', 'url' => '/api/v{apiVersion}/boards/{boardId}/views/{viewId}', 'verb' => 'DELETE'],
+
 		['name' => 'card_ocs#create', 'url' => '/api/v{apiVersion}/cards', 'verb' => 'POST'],
 		['name' => 'card_ocs#update', 'url' => '/api/v{apiVersion}/cards/{cardId}', 'verb' => 'PUT'],
 		['name' => 'card_ocs#assignLabel', 'url' => '/api/v{apiVersion}/cards/{cardId}/label/{labelId}', 'verb' => 'POST'],
diff --git a/lib/Controller/BoardViewApiController.php b/lib/Controller/BoardViewApiController.php
new file mode 100644
index 0000000000..f5f1fcca42
--- /dev/null
+++ b/lib/Controller/BoardViewApiController.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Deck\Controller;
+
+use OCA\Deck\Service\BoardViewService;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\OCSController;
+use OCP\IRequest;
+
+class BoardViewApiController extends OCSController {
+	public function __construct(
+		string $appName,
+		IRequest $request,
+		private BoardViewService $boardViewService,
+		private $userId,
+	) {
+		parent::__construct($appName, $request);
+	}
+
+	#[NoAdminRequired]
+	public function index(int $boardId): DataResponse {
+		return new DataResponse($this->boardViewService->findAll($boardId));
+	}
+
+	#[NoAdminRequired]
+	public function create(int $boardId, string $name, array $filters): DataResponse {
+		return new DataResponse($this->boardViewService->create($boardId, $name, $filters));
+	}
+
+	#[NoAdminRequired]
+	public function update(int $boardId, int $viewId, string $name, array $filters): DataResponse {
+		return new DataResponse($this->boardViewService->update($boardId, $viewId, $name, $filters));
+	}
+
+	#[NoAdminRequired]
+	public function delete(int $boardId, int $viewId): DataResponse {
+		$this->boardViewService->delete($boardId, $viewId);
+		return new DataResponse([]);
+	}
+}
diff --git a/lib/Db/BoardView.php b/lib/Db/BoardView.php
new file mode 100644
index 0000000000..76e21b36c6
--- /dev/null
+++ b/lib/Db/BoardView.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Deck\Db;
+
+class BoardView extends RelationalEntity implements \JsonSerializable {
+	protected $boardId;
+	protected $name;
+	protected $filters;
+	protected $owner;
+	protected $createdAt;
+	protected $lastModifiedAt;
+
+	public function __construct() {
+		$this->addType('id', 'integer');
+		$this->addType('boardId', 'integer');
+		$this->addType('createdAt', 'integer');
+		$this->addType('lastModifiedAt', 'integer');
+	}
+
+	public function jsonSerialize(): array {
+		$json = parent::jsonSerialize();
+		if (isset($json['filters']) && is_string($json['filters'])) {
+			$json['filters'] = json_decode($json['filters'], true) ?? [];
+		}
+		return $json;
+	}
+}
diff --git a/lib/Db/BoardViewMapper.php b/lib/Db/BoardViewMapper.php
new file mode 100644
index 0000000000..f1c65d90cf
--- /dev/null
+++ b/lib/Db/BoardViewMapper.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Deck\Db;
+
+use OCP\AppFramework\Db\QBMapper;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
+
+/** @template-extends QBMapper<BoardView> */
+class BoardViewMapper extends QBMapper {
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, 'deck_board_views', BoardView::class);
+	}
+
+	/**
+	 * @return BoardView[]
+	 */
+	public function findAll(int $boardId, string $userId): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from($this->getTableName())
+			->where($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
+			->andWhere($qb->expr()->eq('owner', $qb->createNamedParameter($userId)))
+			->orderBy('name', 'ASC');
+		return $this->findEntities($qb);
+	}
+
+	public function find(int $id, string $userId): BoardView {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from($this->getTableName())
+			->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)))
+			->andWhere($qb->expr()->eq('owner', $qb->createNamedParameter($userId)));
+		return $this->findEntity($qb);
+	}
+}
diff --git a/lib/Migration/Version11003Date20260821120000.php b/lib/Migration/Version11003Date20260821120000.php
new file mode 100644
index 0000000000..f523cbfaed
--- /dev/null
+++ b/lib/Migration/Version11003Date20260821120000.php
@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Deck\Migration;
+
+use Closure;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version11003Date20260821120000 extends SimpleMigrationStep {
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+		$schema = $schemaClosure();
+
+		if (!$schema->hasTable('deck_board_views')) {
+			$table = $schema->createTable('deck_board_views');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 4,
+			]);
+			$table->addColumn('board_id', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('name', 'string', [
+				'notnull' => true,
+				'length' => 255,
+			]);
+			$table->addColumn('filters', 'text', [
+				'notnull' => true,
+			]);
+			$table->addColumn('owner', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('created_at', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('last_modified_at', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addIndex(['board_id', 'owner'], 'deck_board_views_idx_board_owner');
+		}
+		return $schema;
+	}
+}
diff --git a/lib/Service/BoardViewService.php b/lib/Service/BoardViewService.php
new file mode 100644
index 0000000000..557ae52083
--- /dev/null
+++ b/lib/Service/BoardViewService.php
@@ -0,0 +1,75 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Deck\Service;
+
+use OCA\Deck\BadRequestException;
+use OCA\Deck\Db\BoardView;
+use OCA\Deck\Db\BoardViewMapper;
+use OCP\AppFramework\Db\DoesNotExistException;
+
+class BoardViewService {
+	public function __construct(
+		private BoardViewMapper $boardViewMapper,
+		private BoardService $boardService,
+		private ?string $userId,
+	) {
+	}
+
+	/**
+	 * @return BoardView[]
+	 */
+	public function findAll(int $boardId): array {
+		$this->boardService->find($boardId);
+		return $this->boardViewMapper->findAll($boardId, $this->userId ?? '');
+	}
+
+	public function create(int $boardId, string $name, array $filters): BoardView {
+		$this->boardService->find($boardId);
+		if ($name === '') {
+			throw new BadRequestException('The name must not be empty');
+		}
+
+		$view = new BoardView();
+		$view->setBoardId($boardId);
+		$view->setName($name);
+		$view->setFilters(json_encode($filters));
+		$view->setOwner($this->userId ?? '');
+		$view->setCreatedAt(time());
+		$view->setLastModifiedAt(time());
+		return $this->boardViewMapper->insert($view);
+	}
+
+	public function update(int $boardId, int $viewId, string $name, array $filters): BoardView {
+		$this->boardService->find($boardId);
+		$view = $this->boardViewMapper->find($viewId, $this->userId ?? '');
+		if ($view->getBoardId() !== $boardId) {
+			throw new BadRequestException('The view does not belong to the given board');
+		}
+
+		if ($name !== '') {
+			$view->setName($name);
+		}
+		$view->setFilters(json_encode($filters));
+		$view->setLastModifiedAt(time());
+		return $this->boardViewMapper->update($view);
+	}
+
+	/**
+	 * @throws DoesNotExistException
+	 */
+	public function delete(int $boardId, int $viewId): void {
+		$this->boardService->find($boardId);
+		$view = $this->boardViewMapper->find($viewId, $this->userId ?? '');
+		if ($view->getBoardId() !== $boardId) {
+			throw new BadRequestException('The view does not belong to the given board');
+		}
+		$this->boardViewMapper->delete($view);
+	}
+}
diff --git a/src/components/Controls.vue b/src/components/Controls.vue
index 2c09e1fbe7..3829c9b272 100644
--- a/src/components/Controls.vue
+++ b/src/components/Controls.vue
@@ -107,6 +107,28 @@
 
 						<template #default>
 							<div class="filter">
+								<div v-if="boardViews.length" class="filter--saved-views">
+									<h3>{{ t('deck', 'Saved views') }}</h3>
+									<div v-for="view in boardViews" :key="view.id" class="filter--saved-view">
+										<NcButton type="tertiary"
+											class="filter--saved-view-name"
+											:title="t('deck', 'Apply view {name}', { name: view.name })"
+											@click="applyView(view)">
+											<template #icon>
+												<BookmarkOutline :size="18" decorative />
+											</template>
+											{{ view.name }}
+										</NcButton>
+										<NcButton type="tertiary"
+											:aria-label="t('deck', 'Delete view {name}', { name: view.name })"
+											@click="removeView(view)">
+											<template #icon>
+												<TrashCanOutline :size="18" decorative />
+											</template>
+										</NcButton>
+									</div>
+								</div>
+
 								<h3>{{ t('deck', 'Filter by tag') }}</h3>
 								<div v-for="label in labelsSorted" :key="label.id" class="filter--item">
 									<input
@@ -243,6 +265,21 @@
 									<label for="noDue">{{ t('deck', 'No due date') }}</label>
 								</div>
 
+								<div class="filter--save-view">
+									<NcTextField v-model="newViewName"
+										:label="t('deck', 'View name')"
+										:placeholder="t('deck', 'Name for the saved view')"
+										@keyup.enter="saveView" />
+									<NcButton :disabled="!isFilterActive || newViewName.trim() === ''"
+										:wide="true"
+										@click="saveView">
+										<template #icon>
+											<ContentSave :size="20" decorative />
+										</template>
+										{{ t('deck', 'Save view') }}
+									</NcButton>
+								</div>
+
 								<NcButton :disabled="!isFilterActive" :wide="true" @click="clearFilter">
 									{{ t('deck', 'Clear filter') }}
 								</NcButton>
@@ -320,6 +357,9 @@ import { NcActionButton, NcActions, NcActionSeparator, NcAvatar, NcButton, NcMod
 import { vOnClickOutside } from '@vueuse/components'
 import { mapActions, mapState, mapWritableState } from 'pinia'
 import ArchiveIcon from 'vue-material-design-icons/ArchiveOutline.vue'
+import BookmarkOutline from 'vue-material-design-icons/BookmarkOutline.vue'
+import ContentSave from 'vue-material-design-icons/ContentSave.vue'
+import TrashCanOutline from 'vue-material-design-icons/TrashCanOutline.vue'
 import ArrowCollapseVerticalIcon from 'vue-material-design-icons/ArrowCollapseVertical.vue'
 import ArrowExpandVerticalIcon from 'vue-material-design-icons/ArrowExpandVertical.vue'
 import ChartGanttIcon from 'vue-material-design-icons/ChartGantt.vue'
@@ -352,6 +392,9 @@ export default {
 		ImageIcon,
 		FilterIcon,
 		FilterOffIcon,
+		BookmarkOutline,
+		ContentSave,
+		TrashCanOutline,
 		ArrowCollapseVerticalIcon,
 		ArrowExpandVerticalIcon,
 		ViewColumnIcon,
@@ -402,6 +445,7 @@ export default {
 			stack: '',
 			isAddStackVisible: false,
 			filter: { tags: [], users: [], due: '', unassigned: false, completed: 'both' },
+			newViewName: '',
 			showAddCardModal: false,
 			defaultPageTitle: false,
 			isNotifyPushEnabled: isNotifyPushEnabled(),
@@ -414,6 +458,7 @@ export default {
 			'canManage',
 			'viewMode',
 			'showArchived',
+			'boardViews',
 		]),
 
 		...mapState(useSettingsStore, {
@@ -462,6 +507,10 @@ export default {
 		// traversing labels, acl and users on every unrelated board mutation.
 		'board.id': function() {
 			this.clearFilter()
+			this.newViewName = ''
+			if (this.board?.id) {
+				this.loadBoardViews(this.board.id)
+			}
 		},
 
 		pageTitle: {
@@ -490,7 +539,15 @@ export default {
 	},
 
 	methods: {
-		...mapActions(useBoardStore, { setViewMode: 'setViewMode', toggleShowArchived: 'toggleShowArchived', setFilterInStore: 'setFilterInStore' }),
+		...mapActions(useBoardStore, {
+			setViewMode: 'setViewMode',
+			toggleShowArchived: 'toggleShowArchived',
+			setFilterInStore: 'setFilterInStore',
+			loadBoardViews: 'loadBoardViews',
+			createBoardView: 'createBoardView',
+			deleteBoardView: 'deleteBoardView',
+			applyBoardView: 'applyBoardView',
+		}),
 		...mapActions(useStackStore, ['createStack']),
 		...mapActions(useSettingsStore, {
 			setSearchQuery: 'setSearchQuery',
@@ -571,7 +628,26 @@ export default {
 			this.setFilterInStore({ ...filterReset })
 			this.filter = filterReset
 		},
-
+		applyView(view) {
+			this.applyBoardView(view)
+			this.filter = {
+				tags: [...(view.filters?.tags || [])],
+				users: [...(view.filters?.users || [])],
+				due: view.filters?.due || '',
+				unassigned: view.filters?.unassigned || false,
+				completed: view.filters?.completed || 'both',
+			}
+		},
+		async removeView(view) {
+			await this.deleteBoardView(view.boardId, view.id)
+		},
+		async saveView() {
+			if (!this.isFilterActive || this.newViewName.trim() === '' || !this.board) {
+				return
+			}
+			await this.createBoardView(this.board.id, this.newViewName.trim())
+			this.newViewName = ''
+		},
 		clickShowAddCardModel() {
 			this.showAddCardModal = true
 		},
@@ -746,6 +822,30 @@ export default {
 		margin-bottom: 5px;
 	}
 
+	.filter--saved-views {
+		border-bottom: 1px solid var(--color-border);
+		margin-bottom: 8px;
+		padding-bottom: 4px;
+
+		.filter--saved-view {
+			display: flex;
+			align-items: center;
+			gap: 4px;
+
+			.filter--saved-view-name {
+				flex-grow: 1;
+				justify-content: flex-start;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+		}
+	}
+
+	.filter--save-view {
+		margin-top: 8px;
+	}
+
 	.filter-button {
 		padding: 0;
 		border-radius: 50%;
diff --git a/src/services/BoardApi.js b/src/services/BoardApi.js
index b1e7e879d5..939d5f8a7d 100644
--- a/src/services/BoardApi.js
+++ b/src/services/BoardApi.js
@@ -366,4 +366,66 @@ export class BoardApi {
 				return Promise.reject(err)
 			})
 	}
+	// Board view API calls
+
+	loadBoardViews(boardId) {
+		return axios.get(this.ocsUrl(`/boards/${boardId}/views`))
+			.then(
+				(response) => {
+					return Promise.resolve(response.data.ocs.data)
+				},
+				(err) => {
+					return Promise.reject(err)
+				},
+			)
+			.catch((err) => {
+				return Promise.reject(err)
+			})
+	}
+
+	createBoardView(boardId, name, filters) {
+		return axios.post(this.ocsUrl(`/boards/${boardId}/views`), { name, filters })
+			.then(
+				(response) => {
+					return Promise.resolve(response.data.ocs.data)
+				},
+				(err) => {
+					return Promise.reject(err)
+				},
+			)
+			.catch((err) => {
+				return Promise.reject(err)
+			})
+	}
+
+	updateBoardView(boardId, view) {
+		return axios.put(this.ocsUrl(`/boards/${boardId}/views/${view.id}`), view)
+			.then(
+				(response) => {
+					return Promise.resolve(response.data.ocs.data)
+				},
+				(err) => {
+					return Promise.reject(err)
+				},
+			)
+			.catch((err) => {
+				return Promise.reject(err)
+			})
+	}
+
+	deleteBoardView(boardId, viewId) {
+		return axios.delete(this.ocsUrl(`/boards/${boardId}/views/${viewId}`))
+			.then(
+				(response) => {
+					return Promise.resolve(response.data.ocs.data)
+				},
+				(err) => {
+					return Promise.reject(err)
+				},
+			)
+			.catch((err) => {
+				return Promise.reject(err)
+			})
+	}
+
 }
diff --git a/src/stores/board.js b/src/stores/board.js
index d0f2d2b25e..da886f0f35 100644
--- a/src/stores/board.js
+++ b/src/stores/board.js
@@ -27,6 +27,7 @@ export const useBoardStore = defineStore('board', {
 		assignableUsers: [],
 		filter: { tags: [], users: [], due: '', unassigned: false, completed: 'both' },
 		boardFilter: BOARD_FILTERS.ALL,
+		boardViews: [],
 		boards: loadState('deck', 'initialBoards', {}),
 	}),
 	getters: {
@@ -146,10 +147,40 @@ export const useBoardStore = defineStore('board', {
 		},
 		async loadBoardById(boardId) {
 			this.filter = { tags: [], users: [], due: '', unassigned: false, completed: 'both' }
+			this.boardViews = []
 			this.setCurrentBoard(null)
 			const board = await apiClient.loadById(boardId)
 			this.setCurrentBoard(board)
 			this.setAssignableUsers(board.users)
+			await this.loadBoardViews(boardId)
+		},
+		async loadBoardViews(boardId) {
+			this.boardViews = await apiClient.loadBoardViews(boardId)
+			return this.boardViews
+		},
+		async createBoardView(boardId, name) {
+			const view = await apiClient.createBoardView(boardId, name, this.filter)
+			this.boardViews.push(view)
+			return view
+		},
+		async updateBoardView(view) {
+			const updated = await apiClient.updateBoardView(view.boardId, view)
+			const index = this.boardViews.findIndex((v) => v.id === updated.id)
+			if (index > -1) {
+				Vue.set(this.boardViews, index, updated)
+			}
+			return updated
+		},
+		async deleteBoardView(boardId, viewId) {
+			await apiClient.deleteBoardView(boardId, viewId)
+			this.boardViews = this.boardViews.filter((v) => v.id !== viewId)
+		},
+		applyBoardView(view) {
+			this.setFilterInStore(this.normalizeFilter(view.filters))
+		},
+		normalizeFilter(filter) {
+			const defaults = { tags: [], users: [], due: '', unassigned: false, completed: 'both' }
+			return { ...defaults, ...(filter || {}) }
 		},
 		async refreshBoard(boardId) {
 			const board = await apiClient.loadById(boardId)
diff --git a/tests/unit/Service/BoardViewServiceTest.php b/tests/unit/Service/BoardViewServiceTest.php
new file mode 100644
index 0000000000..58be3a0209
--- /dev/null
+++ b/tests/unit/Service/BoardViewServiceTest.php
@@ -0,0 +1,106 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Deck\Service;
+
+use OCA\Deck\BadRequestException;
+use OCA\Deck\Db\BoardView;
+use OCA\Deck\Db\BoardViewMapper;
+use PHPUnit\Framework\MockObject\MockObject;
+use Test\TestCase;
+
+class BoardViewServiceTest extends TestCase {
+	/** @var BoardViewMapper|MockObject */
+	private $boardViewMapper;
+	/** @var BoardService|MockObject */
+	private $boardService;
+	private BoardViewService $boardViewService;
+
+	public function setUp(): void {
+		parent::setUp();
+		$this->boardViewMapper = $this->createMock(BoardViewMapper::class);
+		$this->boardService = $this->createMock(BoardService::class);
+		$this->boardViewService = new BoardViewService(
+			$this->boardViewMapper,
+			$this->boardService,
+			'user123',
+		);
+	}
+
+	public function testFindAll() {
+		$view = new BoardView();
+		$this->boardService->expects($this->once())->method('find')->with(123);
+		$this->boardViewMapper->expects($this->once())->method('findAll')->with(123, 'user123')->willReturn([$view]);
+		$this->assertEquals([$view], $this->boardViewService->findAll(123));
+	}
+
+	public function testCreate() {
+		$filters = ['tags' => [1], 'users' => [], 'due' => 'overdue', 'unassigned' => false, 'completed' => 'open'];
+
+		$this->boardService->expects($this->once())->method('find')->with(123);
+		$this->boardViewMapper->expects($this->once())->method('insert')->willReturnCallback(function (BoardView $view) {
+			return $view;
+		});
+
+		$view = $this->boardViewService->create(123, 'My view', $filters);
+		$this->assertEquals(123, $view->getBoardId());
+		$this->assertEquals('My view', $view->getName());
+		$this->assertEquals('user123', $view->getOwner());
+		$this->assertEquals(json_encode($filters), $view->getFilters());
+		$this->assertNotNull($view->getCreatedAt());
+		$this->assertNotNull($view->getLastModifiedAt());
+	}
+
+	public function testCreateEmptyName() {
+		$this->expectException(BadRequestException::class);
+		$this->boardViewService->create(123, '', []);
+	}
+
+	public function testUpdate() {
+		$view = new BoardView();
+		$view->setId(1);
+		$view->setBoardId(123);
+		$view->setName('Old name');
+		$view->setFilters(json_encode(['tags' => []]));
+
+		$this->boardService->expects($this->once())->method('find')->with(123);
+		$this->boardViewMapper->expects($this->once())->method('find')->with(1, 'user123')->willReturn($view);
+		$this->boardViewMapper->expects($this->once())->method('update')->willReturnCallback(function (BoardView $view) {
+			return $view;
+		});
+
+		$updated = $this->boardViewService->update(123, 1, 'New name', ['tags' => [2]]);
+		$this->assertEquals('New name', $updated->getName());
+		$this->assertEquals(json_encode(['tags' => [2]]), $updated->getFilters());
+	}
+
+	public function testUpdateViewOfOtherBoard() {
+		$view = new BoardView();
+		$view->setId(1);
+		$view->setBoardId(456);
+
+		$this->boardService->expects($this->once())->method('find')->with(123);
+		$this->boardViewMapper->expects($this->once())->method('find')->with(1, 'user123')->willReturn($view);
+
+		$this->expectException(BadRequestException::class);
+		$this->boardViewService->update(123, 1, 'New name', []);
+	}
+
+	public function testDelete() {
+		$view = new BoardView();
+		$view->setId(1);
+		$view->setBoardId(123);
+
+		$this->boardService->expects($this->once())->method('find')->with(123);
+		$this->boardViewMapper->expects($this->once())->method('find')->with(1, 'user123')->willReturn($view);
+		$this->boardViewMapper->expects($this->once())->method('delete')->with($view);
+
+		$this->boardViewService->delete(123, 1);
+	}
+}

From b0f4560ba9ab3dc5c16adb9ea20fb15c65677140 Mon Sep 17 00:00:00 2001
From: Heinrich Toews <ht@twx-software.de>
Date: Tue, 27 Oct 2026 16:34:14 +0100
Subject: [PATCH 2/3] feat(filter): add default view for all boards

Let users pick one of their saved views as the default view in the Deck
settings. It is applied automatically when opening any board; tags are
only applied where they match the current board.

Signed-off-by: Heinrich Toews <ht@twx-software.de>
---
 appinfo/routes.php                        |  1 +
 lib/Controller/BoardViewApiController.php |  5 ++
 lib/Db/BoardViewMapper.php                | 12 ++++
 lib/Service/BoardViewService.php          |  7 ++
 lib/Service/ConfigService.php             | 20 +++++-
 src/components/Controls.vue               | 88 +++++++++++++++++++----
 src/components/DeckAppSettings.vue        | 47 +++++++++++-
 src/services/BoardApi.js                  | 15 ++++
 src/stores/board.js                       | 13 +++-
 9 files changed, 187 insertions(+), 21 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 4297058a09..0df5b22449 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -144,6 +144,7 @@
 		['name' => 'board_ocs#createForTeam', 'url' => '/api/v{apiVersion}/boards/team', 'verb' => 'POST'],
 		['name' => 'board_ocs#addAcl', 'url' => '/api/v{apiVersion}/boards/{boardId}/acl', 'verb' => 'POST'],
 
+		['name' => 'board_view_api#all', 'url' => '/api/v{apiVersion}/views', 'verb' => 'GET'],
 		['name' => 'board_view_api#index', 'url' => '/api/v{apiVersion}/boards/{boardId}/views', 'verb' => 'GET'],
 		['name' => 'board_view_api#create', 'url' => '/api/v{apiVersion}/boards/{boardId}/views', 'verb' => 'POST'],
 		['name' => 'board_view_api#update', 'url' => '/api/v{apiVersion}/boards/{boardId}/views/{viewId}', 'verb' => 'PUT'],
diff --git a/lib/Controller/BoardViewApiController.php b/lib/Controller/BoardViewApiController.php
index f5f1fcca42..024fd7ac4e 100644
--- a/lib/Controller/BoardViewApiController.php
+++ b/lib/Controller/BoardViewApiController.php
@@ -30,6 +30,11 @@ public function index(int $boardId): DataResponse {
 		return new DataResponse($this->boardViewService->findAll($boardId));
 	}
 
+	#[NoAdminRequired]
+	public function all(): DataResponse {
+		return new DataResponse($this->boardViewService->findAllForUser());
+	}
+
 	#[NoAdminRequired]
 	public function create(int $boardId, string $name, array $filters): DataResponse {
 		return new DataResponse($this->boardViewService->create($boardId, $name, $filters));
diff --git a/lib/Db/BoardViewMapper.php b/lib/Db/BoardViewMapper.php
index f1c65d90cf..fbe1648e4c 100644
--- a/lib/Db/BoardViewMapper.php
+++ b/lib/Db/BoardViewMapper.php
@@ -32,6 +32,18 @@ public function findAll(int $boardId, string $userId): array {
 		return $this->findEntities($qb);
 	}
 
+	/**
+	 * @return BoardView[]
+	 */
+	public function findAllForUser(string $userId): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from($this->getTableName())
+			->where($qb->expr()->eq('owner', $qb->createNamedParameter($userId)))
+			->orderBy('name', 'ASC');
+		return $this->findEntities($qb);
+	}
+
 	public function find(int $id, string $userId): BoardView {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
diff --git a/lib/Service/BoardViewService.php b/lib/Service/BoardViewService.php
index 557ae52083..4f503b5cfd 100644
--- a/lib/Service/BoardViewService.php
+++ b/lib/Service/BoardViewService.php
@@ -30,6 +30,13 @@ public function findAll(int $boardId): array {
 		return $this->boardViewMapper->findAll($boardId, $this->userId ?? '');
 	}
 
+	/**
+	 * @return BoardView[]
+	 */
+	public function findAllForUser(): array {
+		return $this->boardViewMapper->findAllForUser($this->userId ?? '');
+	}
+
 	public function create(int $boardId, string $name, array $filters): BoardView {
 		$this->boardService->find($boardId);
 		if ($name === '') {
diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php
index 5e579c07f8..ec0527c801 100644
--- a/lib/Service/ConfigService.php
+++ b/lib/Service/ConfigService.php
@@ -57,7 +57,8 @@ public function getAll(): array {
 			'calendar' => $this->isCalendarEnabled(),
 			'cardDetailsInModal' => $this->isCardDetailsInModal(),
 			'cardIdBadge' => $this->isCardIdBadgeEnabled(),
-			'stackAddCardAtTop' => $this->isStackAddCardAtTopEnabled()
+			'stackAddCardAtTop' => $this->isStackAddCardAtTopEnabled(),
+			'defaultBoardView' => $this->getDefaultBoardView(),
 		];
 		if ($this->groupManager->isAdmin($userId)) {
 			$data['groupLimit'] = $this->get('groupLimit');
@@ -67,7 +68,7 @@ public function getAll(): array {
 	}
 
 	/**
-	 * @return bool|array{id: string, displayname: string}[]
+	 * @return bool|int|null|array{id: string, displayname: string}[]
 	 * @throws NoPermissionException
 	 */
 	public function get(string $key) {
@@ -95,10 +96,21 @@ public function get(string $key) {
 					return false;
 				}
 				return (bool)$this->config->getUserValue($this->getUserId(), Application::APP_ID, 'cardIdBadge', false);
+			case 'defaultBoardView':
+				return $this->getDefaultBoardView();
 		}
 		return false;
 	}
 
+	public function getDefaultBoardView(): ?int {
+		$userId = $this->getUserId();
+		if ($userId === null) {
+			return null;
+		}
+		$value = $this->config->getUserValue($userId, Application::APP_ID, 'defaultBoardView', '');
+		return $value === '' ? null : (int)$value;
+	}
+
 	public function isCalendarEnabled(?int $boardId = null): bool {
 		$userId = $this->getUserId();
 		if ($userId === null) {
@@ -211,6 +223,10 @@ public function set($key, $value) {
 				$this->config->setUserValue($userId, Application::APP_ID, 'stackAddCardAtTop', (string)$value);
 				$result = $value;
 				break;
+			case 'defaultBoardView':
+				$this->config->setUserValue($userId, Application::APP_ID, 'defaultBoardView', $value === null ? '' : (string)(int)$value);
+				$result = $value === null ? '' : $value;
+				break;
 			case 'board':
 				// extra check that user only send one of the allowed board settings and not something random
 				$parts = explode(':', $key, 3);
diff --git a/src/components/Controls.vue b/src/components/Controls.vue
index 3829c9b272..2b8fae73e3 100644
--- a/src/components/Controls.vue
+++ b/src/components/Controls.vue
@@ -107,19 +107,32 @@
 
 						<template #default>
 							<div class="filter">
-								<div v-if="boardViews.length" class="filter--saved-views">
+								<div v-if="displayViews.length" class="filter--saved-views">
 									<h3>{{ t('deck', 'Saved views') }}</h3>
-									<div v-for="view in boardViews" :key="view.id" class="filter--saved-view">
+									<div v-for="view in displayViews" :key="view.id" class="filter--saved-view">
 										<NcButton type="tertiary"
 											class="filter--saved-view-name"
-											:title="t('deck', 'Apply view {name}', { name: view.name })"
-											@click="applyView(view)">
+											:title="view.isDefault
+												? t('deck', 'Apply default view {name}', { name: view.name })
+												: t('deck', 'Apply view {name}', { name: view.name })"
+											@click="view.isDefault ? applyDefaultView() : applyView(view)">
 											<template #icon>
-												<BookmarkOutline :size="18" decorative />
+												<StarIcon v-if="view.isDefault" :size="18" decorative />
+												<BookmarkOutline v-else :size="18" decorative />
 											</template>
 											{{ view.name }}
 										</NcButton>
-										<NcButton type="tertiary"
+										<NcButton v-if="view.isDefault"
+											type="tertiary"
+											:aria-label="t('deck', 'Remove default view')"
+											:title="t('deck', 'Remove default view')"
+											@click="removeDefaultView">
+											<template #icon>
+												<BookmarkOffOutline :size="18" decorative />
+											</template>
+										</NcButton>
+										<NcButton v-if="!view.isDefault || view.isLocal"
+											type="tertiary"
 											:aria-label="t('deck', 'Delete view {name}', { name: view.name })"
 											@click="removeView(view)">
 											<template #icon>
@@ -358,7 +371,9 @@ import { vOnClickOutside } from '@vueuse/components'
 import { mapActions, mapState, mapWritableState } from 'pinia'
 import ArchiveIcon from 'vue-material-design-icons/ArchiveOutline.vue'
 import BookmarkOutline from 'vue-material-design-icons/BookmarkOutline.vue'
+import BookmarkOffOutline from 'vue-material-design-icons/BookmarkOffOutline.vue'
 import ContentSave from 'vue-material-design-icons/ContentSave.vue'
+import StarIcon from 'vue-material-design-icons/Star.vue'
 import TrashCanOutline from 'vue-material-design-icons/TrashCanOutline.vue'
 import ArrowCollapseVerticalIcon from 'vue-material-design-icons/ArrowCollapseVertical.vue'
 import ArrowExpandVerticalIcon from 'vue-material-design-icons/ArrowExpandVertical.vue'
@@ -393,7 +408,9 @@ export default {
 		FilterIcon,
 		FilterOffIcon,
 		BookmarkOutline,
+		BookmarkOffOutline,
 		ContentSave,
+		StarIcon,
 		TrashCanOutline,
 		ArrowCollapseVerticalIcon,
 		ArrowExpandVerticalIcon,
@@ -459,6 +476,7 @@ export default {
 			'viewMode',
 			'showArchived',
 			'boardViews',
+			'allBoardViews',
 		]),
 
 		...mapState(useSettingsStore, {
@@ -492,6 +510,20 @@ export default {
 			return [...this.board.labels].sort((a, b) => (a.title < b.title) ? -1 : 1)
 		},
 
+		displayViews() {
+			const defaultId = useSettingsStore().configByKey('defaultBoardView')
+			const defaultView = defaultId ? this.allBoardViews.find((view) => view.id === defaultId) : null
+			const isLocalDefault = defaultView && this.boardViews.some((view) => view.id === defaultView.id)
+			const localViews = this.boardViews.filter((view) => !defaultView || view.id !== defaultView.id)
+			if (!defaultView) {
+				return localViews.map((view) => ({ ...view, isDefault: false, isLocal: true }))
+			}
+			return [
+				{ ...defaultView, isDefault: true, isLocal: isLocalDefault },
+				...localViews.map((view) => ({ ...view, isDefault: false, isLocal: true })),
+			]
+		},
+
 		presentUsers() {
 			if (!this.board) {
 				return []
@@ -509,7 +541,7 @@ export default {
 			this.clearFilter()
 			this.newViewName = ''
 			if (this.board?.id) {
-				this.loadBoardViews(this.board.id)
+				this.loadAllBoardViews().then(() => this.applyDefaultView())
 			}
 		},
 
@@ -544,6 +576,7 @@ export default {
 			toggleShowArchived: 'toggleShowArchived',
 			setFilterInStore: 'setFilterInStore',
 			loadBoardViews: 'loadBoardViews',
+			loadAllBoardViews: 'loadAllBoardViews',
 			createBoardView: 'createBoardView',
 			deleteBoardView: 'deleteBoardView',
 			applyBoardView: 'applyBoardView',
@@ -630,22 +663,49 @@ export default {
 		},
 		applyView(view) {
 			this.applyBoardView(view)
-			this.filter = {
-				tags: [...(view.filters?.tags || [])],
-				users: [...(view.filters?.users || [])],
-				due: view.filters?.due || '',
-				unassigned: view.filters?.unassigned || false,
-				completed: view.filters?.completed || 'both',
+			this.filter = this.filterFromView(view)
+		},
+		applyDefaultView() {
+			if (!this.board) {
+				return
 			}
+			const defaultId = useSettingsStore().configByKey('defaultBoardView')
+			if (!defaultId) {
+				return
+			}
+			const view = this.allBoardViews.find((candidate) => candidate.id === defaultId)
+			if (!view) {
+				return
+			}
+			const boardLabelIds = this.board.labels?.map((label) => label.id) || []
+			const matchingTags = (view.filters?.tags || []).filter((tag) => boardLabelIds.includes(tag))
+			this.filter = this.filterFromView(view, matchingTags)
+			this.setFilterInStore({ ...this.filter })
+		},
+		filterFromView(view, tags = null) {
+			const filters = view.filters || {}
+			return {
+				tags: [...(tags ?? filters.tags ?? [])],
+				users: [...(filters.users || [])],
+				due: filters.due || '',
+				unassigned: filters.unassigned || false,
+				completed: filters.completed || 'both',
+			}
+		},
+		async removeDefaultView() {
+			await useSettingsStore().setConfig({ defaultBoardView: null })
 		},
 		async removeView(view) {
 			await this.deleteBoardView(view.boardId, view.id)
+			if (useSettingsStore().configByKey('defaultBoardView') === view.id) {
+				await useSettingsStore().setConfig({ defaultBoardView: null })
+			}
 		},
 		async saveView() {
 			if (!this.isFilterActive || this.newViewName.trim() === '' || !this.board) {
 				return
 			}
-			await this.createBoardView(this.board.id, this.newViewName.trim())
+			await this.createBoardView(this.board.id, this.newViewName.trim(), { ...this.filter })
 			this.newViewName = ''
 		},
 		clickShowAddCardModel() {
diff --git a/src/components/DeckAppSettings.vue b/src/components/DeckAppSettings.vue
index ba3d24d1ba..2b70b710a6 100644
--- a/src/components/DeckAppSettings.vue
+++ b/src/components/DeckAppSettings.vue
@@ -19,6 +19,18 @@
 					data-cy="setting:add-card-at-top"
 					:label="t('deck', 'Add new cards at the top of a list')" />
 			</NcFormBox>
+			<NcFormBox>
+				<NcSelect v-model="defaultBoardView"
+					open-direction="bottom"
+					:options="boardViewOptions"
+					:input-label="t('deck', 'Default view for all boards')"
+					label="label"
+					track-by="id"
+					clearable />
+				<p class="settings-hint">
+					{{ t('deck', 'The selected view is applied automatically when you open any board.') }}
+				</p>
+			</NcFormBox>
 		</NcAppSettingsSection>
 
 		<NcAppSettingsSection id="appearance-settings" :name="t('deck', 'Appearance')">
@@ -92,6 +104,8 @@ import logger from '../logger.js'
 import { useSettingsStore } from '../stores/settings.js'
 
 import '@nextcloud/password-confirmation/style.css' // Required for dialog styles
+import { mapActions, mapState } from 'pinia'
+import { useBoardStore } from '../stores/board.js'
 
 export default {
 	name: 'DeckAppSettings',
@@ -123,10 +137,20 @@ export default {
 	},
 
 	computed: {
+		...mapState(useBoardStore, ['allBoardViews', 'boards']),
 		isAdmin() {
 			return !!getCurrentUser()?.isAdmin
 		},
-
+		boardViewOptions() {
+			return this.allBoardViews.map((view) => {
+				const board = this.boards.find((candidate) => candidate.id === view.boardId)
+				const boardTitle = board?.title || `#${view.boardId}`
+				return {
+					id: view.id,
+					label: `${view.name} (${boardTitle})`,
+				}
+			})
+		},
 		cardDetailsInModal: {
 			get() {
 				return useSettingsStore().configByKey('cardDetailsInModal')
@@ -156,7 +180,18 @@ export default {
 				useSettingsStore().setConfig({ cardIdBadge: newValue })
 			},
 		},
-
+		defaultBoardView: {
+			get() {
+				const id = useSettingsStore().configByKey('defaultBoardView')
+				if (!id) {
+					return null
+				}
+				return this.boardViewOptions.find((view) => view.id === id) || null
+			},
+			set(view) {
+				useSettingsStore().setConfig({ defaultBoardView: view ? view.id : null })
+			},
+		},
 		federationEnabled: {
 			get() {
 				const value = useSettingsStore().configByKey('federationEnabled')
@@ -182,6 +217,7 @@ export default {
 	},
 
 	beforeMount() {
+		this.loadAllBoardViews()
 		if (this.isAdmin) {
 			this.groupLimit = useSettingsStore().configByKey('groupLimit')
 			axios.get(generateOcsUrl('cloud/groups')).then((response) => {
@@ -207,6 +243,7 @@ export default {
 	},
 
 	methods: {
+		...mapActions(useBoardStore, ['loadAllBoardViews']),
 		onClose() {
 			this.$emit('close')
 		},
@@ -233,5 +270,11 @@ export default {
 	&#settings-section_admin-settings p {
 		margin-bottom: 20px;
 	}
+
+	.settings-hint {
+		margin: 0;
+		padding-inline-start: calc(var(--default-clickable-area) * 0.5);
+		color: var(--color-text-maxcontrast);
+	}
 }
 </style>
diff --git a/src/services/BoardApi.js b/src/services/BoardApi.js
index 939d5f8a7d..45d05f7b5d 100644
--- a/src/services/BoardApi.js
+++ b/src/services/BoardApi.js
@@ -383,6 +383,21 @@ export class BoardApi {
 			})
 	}
 
+	loadAllBoardViews() {
+		return axios.get(this.ocsUrl('/views'))
+			.then(
+				(response) => {
+					return Promise.resolve(response.data.ocs.data)
+				},
+				(err) => {
+					return Promise.reject(err)
+				},
+			)
+			.catch((err) => {
+				return Promise.reject(err)
+			})
+	}
+
 	createBoardView(boardId, name, filters) {
 		return axios.post(this.ocsUrl(`/boards/${boardId}/views`), { name, filters })
 			.then(
diff --git a/src/stores/board.js b/src/stores/board.js
index da886f0f35..4304a2c8f6 100644
--- a/src/stores/board.js
+++ b/src/stores/board.js
@@ -28,6 +28,7 @@ export const useBoardStore = defineStore('board', {
 		filter: { tags: [], users: [], due: '', unassigned: false, completed: 'both' },
 		boardFilter: BOARD_FILTERS.ALL,
 		boardViews: [],
+		allBoardViews: [],
 		boards: loadState('deck', 'initialBoards', {}),
 	}),
 	getters: {
@@ -158,22 +159,28 @@ export const useBoardStore = defineStore('board', {
 			this.boardViews = await apiClient.loadBoardViews(boardId)
 			return this.boardViews
 		},
-		async createBoardView(boardId, name) {
-			const view = await apiClient.createBoardView(boardId, name, this.filter)
+		async loadAllBoardViews() {
+			this.allBoardViews = await apiClient.loadAllBoardViews()
+			return this.allBoardViews
+		},
+		async createBoardView(boardId, name, filters = this.filter) {
+			const view = await apiClient.createBoardView(boardId, name, filters)
 			this.boardViews.push(view)
+			this.allBoardViews.push(view)
 			return view
 		},
 		async updateBoardView(view) {
 			const updated = await apiClient.updateBoardView(view.boardId, view)
 			const index = this.boardViews.findIndex((v) => v.id === updated.id)
 			if (index > -1) {
-				Vue.set(this.boardViews, index, updated)
+				this.boardViews[index] = updated
 			}
 			return updated
 		},
 		async deleteBoardView(boardId, viewId) {
 			await apiClient.deleteBoardView(boardId, viewId)
 			this.boardViews = this.boardViews.filter((v) => v.id !== viewId)
+			this.allBoardViews = this.allBoardViews.filter((v) => v.id !== viewId)
 		},
 		applyBoardView(view) {
 			this.setFilterInStore(this.normalizeFilter(view.filters))

From 55380e5c69538d83b4392d6b497ae2b6d7cc6961 Mon Sep 17 00:00:00 2001
From: Heinrich Toews <ht@twx-software.de>
Date: Tue, 27 Oct 2026 16:34:14 +0100
Subject: [PATCH 3/3] fix(filter): port saved views to current main and harden
 the API

- use the Pinia settings store and drop the removed Vue.set helper
- validate saved-view names and filters and limit views per board
- index the owner column used by the cross-board query
- clear the default view when its view is deleted
- cover validation and cleanup with unit tests

Signed-off-by: Heinrich Toews <ht@twx-software.de>
---
 lib/Controller/BoardViewApiController.php     |  1 -
 .../Version11003Date20260821120000.php        |  1 +
 lib/Service/BoardViewService.php              | 54 +++++++++++--
 src/components/Controls.vue                   | 38 ++++++---
 src/components/DeckAppSettings.vue            | 18 +++--
 src/services/BoardApi.js                      |  1 -
 src/stores/board.js                           |  4 +
 tests/unit/Service/BoardViewServiceTest.php   | 81 +++++++++++++++++--
 tests/unit/Service/ConfigServiceTest.php      | 40 ++++++++-
 9 files changed, 202 insertions(+), 36 deletions(-)

diff --git a/lib/Controller/BoardViewApiController.php b/lib/Controller/BoardViewApiController.php
index 024fd7ac4e..13cc7e7000 100644
--- a/lib/Controller/BoardViewApiController.php
+++ b/lib/Controller/BoardViewApiController.php
@@ -20,7 +20,6 @@ public function __construct(
 		string $appName,
 		IRequest $request,
 		private BoardViewService $boardViewService,
-		private $userId,
 	) {
 		parent::__construct($appName, $request);
 	}
diff --git a/lib/Migration/Version11003Date20260821120000.php b/lib/Migration/Version11003Date20260821120000.php
index f523cbfaed..f41e08a162 100644
--- a/lib/Migration/Version11003Date20260821120000.php
+++ b/lib/Migration/Version11003Date20260821120000.php
@@ -52,6 +52,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			]);
 			$table->setPrimaryKey(['id']);
 			$table->addIndex(['board_id', 'owner'], 'deck_board_views_idx_board_owner');
+			$table->addIndex(['owner'], 'deck_board_views_idx_owner');
 		}
 		return $schema;
 	}
diff --git a/lib/Service/BoardViewService.php b/lib/Service/BoardViewService.php
index 4f503b5cfd..3166dc0ff9 100644
--- a/lib/Service/BoardViewService.php
+++ b/lib/Service/BoardViewService.php
@@ -9,15 +9,21 @@
 
 namespace OCA\Deck\Service;
 
+use JsonException;
 use OCA\Deck\BadRequestException;
 use OCA\Deck\Db\BoardView;
 use OCA\Deck\Db\BoardViewMapper;
 use OCP\AppFramework\Db\DoesNotExistException;
 
 class BoardViewService {
+	private const MAX_VIEWS_PER_BOARD = 50;
+	private const MAX_NAME_LENGTH = 255;
+	private const MAX_FILTERS_SIZE = 60000;
+
 	public function __construct(
 		private BoardViewMapper $boardViewMapper,
 		private BoardService $boardService,
+		private ConfigService $configService,
 		private ?string $userId,
 	) {
 	}
@@ -26,7 +32,7 @@ public function __construct(
 	 * @return BoardView[]
 	 */
 	public function findAll(int $boardId): array {
-		$this->boardService->find($boardId);
+		$this->boardService->find($boardId, false);
 		return $this->boardViewMapper->findAll($boardId, $this->userId ?? '');
 	}
 
@@ -38,15 +44,16 @@ public function findAllForUser(): array {
 	}
 
 	public function create(int $boardId, string $name, array $filters): BoardView {
-		$this->boardService->find($boardId);
-		if ($name === '') {
-			throw new BadRequestException('The name must not be empty');
+		$this->boardService->find($boardId, false);
+		$name = $this->validateName($name, true);
+		if (count($this->boardViewMapper->findAll($boardId, $this->userId ?? '')) >= self::MAX_VIEWS_PER_BOARD) {
+			throw new BadRequestException('You have reached the maximum number of saved views for this board');
 		}
 
 		$view = new BoardView();
 		$view->setBoardId($boardId);
 		$view->setName($name);
-		$view->setFilters(json_encode($filters));
+		$view->setFilters($this->encodeFilters($filters));
 		$view->setOwner($this->userId ?? '');
 		$view->setCreatedAt(time());
 		$view->setLastModifiedAt(time());
@@ -54,16 +61,17 @@ public function create(int $boardId, string $name, array $filters): BoardView {
 	}
 
 	public function update(int $boardId, int $viewId, string $name, array $filters): BoardView {
-		$this->boardService->find($boardId);
+		$this->boardService->find($boardId, false);
 		$view = $this->boardViewMapper->find($viewId, $this->userId ?? '');
 		if ($view->getBoardId() !== $boardId) {
 			throw new BadRequestException('The view does not belong to the given board');
 		}
 
+		$name = $this->validateName($name, false);
 		if ($name !== '') {
 			$view->setName($name);
 		}
-		$view->setFilters(json_encode($filters));
+		$view->setFilters($this->encodeFilters($filters));
 		$view->setLastModifiedAt(time());
 		return $this->boardViewMapper->update($view);
 	}
@@ -72,11 +80,41 @@ public function update(int $boardId, int $viewId, string $name, array $filters):
 	 * @throws DoesNotExistException
 	 */
 	public function delete(int $boardId, int $viewId): void {
-		$this->boardService->find($boardId);
+		$this->boardService->find($boardId, false);
 		$view = $this->boardViewMapper->find($viewId, $this->userId ?? '');
 		if ($view->getBoardId() !== $boardId) {
 			throw new BadRequestException('The view does not belong to the given board');
 		}
 		$this->boardViewMapper->delete($view);
+
+		if ($this->configService->getDefaultBoardView() === $viewId) {
+			$this->configService->set('defaultBoardView', null);
+		}
+	}
+
+	private function validateName(string $name, bool $required): string {
+		$name = trim($name);
+		if ($name === '') {
+			if ($required) {
+				throw new BadRequestException('The name must not be empty');
+			}
+			return '';
+		}
+		if (mb_strlen($name) > self::MAX_NAME_LENGTH) {
+			throw new BadRequestException('The name must not be longer than ' . self::MAX_NAME_LENGTH . ' characters');
+		}
+		return $name;
+	}
+
+	private function encodeFilters(array $filters): string {
+		try {
+			$encoded = json_encode($filters, JSON_THROW_ON_ERROR);
+		} catch (JsonException $e) {
+			throw new BadRequestException('The filters are not valid JSON');
+		}
+		if (strlen($encoded) > self::MAX_FILTERS_SIZE) {
+			throw new BadRequestException('The filters are too large');
+		}
+		return $encoded;
 	}
 }
diff --git a/src/components/Controls.vue b/src/components/Controls.vue
index 2b8fae73e3..1103023c57 100644
--- a/src/components/Controls.vue
+++ b/src/components/Controls.vue
@@ -110,7 +110,8 @@
 								<div v-if="displayViews.length" class="filter--saved-views">
 									<h3>{{ t('deck', 'Saved views') }}</h3>
 									<div v-for="view in displayViews" :key="view.id" class="filter--saved-view">
-										<NcButton type="tertiary"
+										<NcButton
+											variant="tertiary"
 											class="filter--saved-view-name"
 											:title="view.isDefault
 												? t('deck', 'Apply default view {name}', { name: view.name })
@@ -122,8 +123,9 @@
 											</template>
 											{{ view.name }}
 										</NcButton>
-										<NcButton v-if="view.isDefault"
-											type="tertiary"
+										<NcButton
+											v-if="view.isDefault"
+											variant="tertiary"
 											:aria-label="t('deck', 'Remove default view')"
 											:title="t('deck', 'Remove default view')"
 											@click="removeDefaultView">
@@ -131,8 +133,9 @@
 												<BookmarkOffOutline :size="18" decorative />
 											</template>
 										</NcButton>
-										<NcButton v-if="!view.isDefault || view.isLocal"
-											type="tertiary"
+										<NcButton
+											v-if="!view.isDefault || view.isLocal"
+											variant="tertiary"
 											:aria-label="t('deck', 'Delete view {name}', { name: view.name })"
 											@click="removeView(view)">
 											<template #icon>
@@ -279,11 +282,13 @@
 								</div>
 
 								<div class="filter--save-view">
-									<NcTextField v-model="newViewName"
+									<NcTextField
+										v-model="newViewName"
 										:label="t('deck', 'View name')"
 										:placeholder="t('deck', 'Name for the saved view')"
 										@keyup.enter="saveView" />
-									<NcButton :disabled="!isFilterActive || newViewName.trim() === ''"
+									<NcButton
+										:disabled="!isFilterActive || newViewName.trim() === ''"
 										:wide="true"
 										@click="saveView">
 										<template #icon>
@@ -370,18 +375,18 @@ import { NcActionButton, NcActions, NcActionSeparator, NcAvatar, NcButton, NcMod
 import { vOnClickOutside } from '@vueuse/components'
 import { mapActions, mapState, mapWritableState } from 'pinia'
 import ArchiveIcon from 'vue-material-design-icons/ArchiveOutline.vue'
-import BookmarkOutline from 'vue-material-design-icons/BookmarkOutline.vue'
-import BookmarkOffOutline from 'vue-material-design-icons/BookmarkOffOutline.vue'
-import ContentSave from 'vue-material-design-icons/ContentSave.vue'
-import StarIcon from 'vue-material-design-icons/Star.vue'
-import TrashCanOutline from 'vue-material-design-icons/TrashCanOutline.vue'
 import ArrowCollapseVerticalIcon from 'vue-material-design-icons/ArrowCollapseVertical.vue'
 import ArrowExpandVerticalIcon from 'vue-material-design-icons/ArrowExpandVertical.vue'
+import BookmarkOffOutline from 'vue-material-design-icons/BookmarkOffOutline.vue'
+import BookmarkOutline from 'vue-material-design-icons/BookmarkOutline.vue'
 import ChartGanttIcon from 'vue-material-design-icons/ChartGantt.vue'
+import ContentSave from 'vue-material-design-icons/ContentSave.vue'
 import FilterOffIcon from 'vue-material-design-icons/FilterOffOutline.vue'
 import FilterIcon from 'vue-material-design-icons/FilterOutline.vue'
 import ImageIcon from 'vue-material-design-icons/ImageMultipleOutline.vue'
+import StarIcon from 'vue-material-design-icons/Star.vue'
 import TableColumnPlusAfter from 'vue-material-design-icons/TableColumnPlusAfter.vue'
+import TrashCanOutline from 'vue-material-design-icons/TrashCanOutline.vue'
 import ViewColumnIcon from 'vue-material-design-icons/ViewColumn.vue'
 import CreateNewCardCustomPicker from '../views/CreateNewCardCustomPicker.vue'
 import SessionList from './SessionList.vue'
@@ -575,12 +580,12 @@ export default {
 			setViewMode: 'setViewMode',
 			toggleShowArchived: 'toggleShowArchived',
 			setFilterInStore: 'setFilterInStore',
-			loadBoardViews: 'loadBoardViews',
 			loadAllBoardViews: 'loadAllBoardViews',
 			createBoardView: 'createBoardView',
 			deleteBoardView: 'deleteBoardView',
 			applyBoardView: 'applyBoardView',
 		}),
+
 		...mapActions(useStackStore, ['createStack']),
 		...mapActions(useSettingsStore, {
 			setSearchQuery: 'setSearchQuery',
@@ -661,10 +666,12 @@ export default {
 			this.setFilterInStore({ ...filterReset })
 			this.filter = filterReset
 		},
+
 		applyView(view) {
 			this.applyBoardView(view)
 			this.filter = this.filterFromView(view)
 		},
+
 		applyDefaultView() {
 			if (!this.board) {
 				return
@@ -682,6 +689,7 @@ export default {
 			this.filter = this.filterFromView(view, matchingTags)
 			this.setFilterInStore({ ...this.filter })
 		},
+
 		filterFromView(view, tags = null) {
 			const filters = view.filters || {}
 			return {
@@ -692,15 +700,18 @@ export default {
 				completed: filters.completed || 'both',
 			}
 		},
+
 		async removeDefaultView() {
 			await useSettingsStore().setConfig({ defaultBoardView: null })
 		},
+
 		async removeView(view) {
 			await this.deleteBoardView(view.boardId, view.id)
 			if (useSettingsStore().configByKey('defaultBoardView') === view.id) {
 				await useSettingsStore().setConfig({ defaultBoardView: null })
 			}
 		},
+
 		async saveView() {
 			if (!this.isFilterActive || this.newViewName.trim() === '' || !this.board) {
 				return
@@ -708,6 +719,7 @@ export default {
 			await this.createBoardView(this.board.id, this.newViewName.trim(), { ...this.filter })
 			this.newViewName = ''
 		},
+
 		clickShowAddCardModel() {
 			this.showAddCardModal = true
 		},
diff --git a/src/components/DeckAppSettings.vue b/src/components/DeckAppSettings.vue
index 2b70b710a6..3ad9c464e5 100644
--- a/src/components/DeckAppSettings.vue
+++ b/src/components/DeckAppSettings.vue
@@ -20,12 +20,13 @@
 					:label="t('deck', 'Add new cards at the top of a list')" />
 			</NcFormBox>
 			<NcFormBox>
-				<NcSelect v-model="defaultBoardView"
-					open-direction="bottom"
+				<NcSelect
+					v-model="defaultBoardView"
+					openDirection="bottom"
 					:options="boardViewOptions"
-					:input-label="t('deck', 'Default view for all boards')"
+					:inputLabel="t('deck', 'Default view for all boards')"
 					label="label"
-					track-by="id"
+					trackBy="id"
 					clearable />
 				<p class="settings-hint">
 					{{ t('deck', 'The selected view is applied automatically when you open any board.') }}
@@ -93,6 +94,7 @@ import { confirmPassword } from '@nextcloud/password-confirmation'
 import { generateOcsUrl } from '@nextcloud/router'
 import { NcSelect } from '@nextcloud/vue'
 import { useHotKey } from '@nextcloud/vue/composables/useHotKey'
+import { mapActions, mapState } from 'pinia'
 import NcAppSettingsDialog from '@nextcloud/vue/components/NcAppSettingsDialog'
 import NcAppSettingsSection from '@nextcloud/vue/components/NcAppSettingsSection'
 import NcAppSettingsShortcutsSection from '@nextcloud/vue/components/NcAppSettingsShortcutsSection'
@@ -101,11 +103,10 @@ import NcFormBoxSwitch from '@nextcloud/vue/components/NcFormBoxSwitch'
 import NcHotkey from '@nextcloud/vue/components/NcHotkey'
 import NcHotkeyList from '@nextcloud/vue/components/NcHotkeyList'
 import logger from '../logger.js'
+import { useBoardStore } from '../stores/board.js'
 import { useSettingsStore } from '../stores/settings.js'
 
 import '@nextcloud/password-confirmation/style.css' // Required for dialog styles
-import { mapActions, mapState } from 'pinia'
-import { useBoardStore } from '../stores/board.js'
 
 export default {
 	name: 'DeckAppSettings',
@@ -141,6 +142,7 @@ export default {
 		isAdmin() {
 			return !!getCurrentUser()?.isAdmin
 		},
+
 		boardViewOptions() {
 			return this.allBoardViews.map((view) => {
 				const board = this.boards.find((candidate) => candidate.id === view.boardId)
@@ -151,6 +153,7 @@ export default {
 				}
 			})
 		},
+
 		cardDetailsInModal: {
 			get() {
 				return useSettingsStore().configByKey('cardDetailsInModal')
@@ -180,6 +183,7 @@ export default {
 				useSettingsStore().setConfig({ cardIdBadge: newValue })
 			},
 		},
+
 		defaultBoardView: {
 			get() {
 				const id = useSettingsStore().configByKey('defaultBoardView')
@@ -188,10 +192,12 @@ export default {
 				}
 				return this.boardViewOptions.find((view) => view.id === id) || null
 			},
+
 			set(view) {
 				useSettingsStore().setConfig({ defaultBoardView: view ? view.id : null })
 			},
 		},
+
 		federationEnabled: {
 			get() {
 				const value = useSettingsStore().configByKey('federationEnabled')
diff --git a/src/services/BoardApi.js b/src/services/BoardApi.js
index 45d05f7b5d..f30bd9aae0 100644
--- a/src/services/BoardApi.js
+++ b/src/services/BoardApi.js
@@ -442,5 +442,4 @@ export class BoardApi {
 				return Promise.reject(err)
 			})
 	}
-
 }
diff --git a/src/stores/board.js b/src/stores/board.js
index 4304a2c8f6..521c5feafc 100644
--- a/src/stores/board.js
+++ b/src/stores/board.js
@@ -175,6 +175,10 @@ export const useBoardStore = defineStore('board', {
 			if (index > -1) {
 				this.boardViews[index] = updated
 			}
+			const allIndex = this.allBoardViews.findIndex((v) => v.id === updated.id)
+			if (allIndex > -1) {
+				this.allBoardViews[allIndex] = updated
+			}
 			return updated
 		},
 		async deleteBoardView(boardId, viewId) {
diff --git a/tests/unit/Service/BoardViewServiceTest.php b/tests/unit/Service/BoardViewServiceTest.php
index 58be3a0209..4efc1a8c58 100644
--- a/tests/unit/Service/BoardViewServiceTest.php
+++ b/tests/unit/Service/BoardViewServiceTest.php
@@ -20,22 +20,26 @@ class BoardViewServiceTest extends TestCase {
 	private $boardViewMapper;
 	/** @var BoardService|MockObject */
 	private $boardService;
+	/** @var ConfigService|MockObject */
+	private $configService;
 	private BoardViewService $boardViewService;
 
 	public function setUp(): void {
 		parent::setUp();
 		$this->boardViewMapper = $this->createMock(BoardViewMapper::class);
 		$this->boardService = $this->createMock(BoardService::class);
+		$this->configService = $this->createMock(ConfigService::class);
 		$this->boardViewService = new BoardViewService(
 			$this->boardViewMapper,
 			$this->boardService,
+			$this->configService,
 			'user123',
 		);
 	}
 
 	public function testFindAll() {
 		$view = new BoardView();
-		$this->boardService->expects($this->once())->method('find')->with(123);
+		$this->boardService->expects($this->once())->method('find')->with(123, false);
 		$this->boardViewMapper->expects($this->once())->method('findAll')->with(123, 'user123')->willReturn([$view]);
 		$this->assertEquals([$view], $this->boardViewService->findAll(123));
 	}
@@ -43,7 +47,8 @@ public function testFindAll() {
 	public function testCreate() {
 		$filters = ['tags' => [1], 'users' => [], 'due' => 'overdue', 'unassigned' => false, 'completed' => 'open'];
 
-		$this->boardService->expects($this->once())->method('find')->with(123);
+		$this->boardService->expects($this->once())->method('find')->with(123, false);
+		$this->boardViewMapper->expects($this->once())->method('findAll')->with(123, 'user123')->willReturn([]);
 		$this->boardViewMapper->expects($this->once())->method('insert')->willReturnCallback(function (BoardView $view) {
 			return $view;
 		});
@@ -57,9 +62,41 @@ public function testCreate() {
 		$this->assertNotNull($view->getLastModifiedAt());
 	}
 
+	public function testCreateTrimsName() {
+		$this->boardService->expects($this->once())->method('find')->with(123, false);
+		$this->boardViewMapper->expects($this->once())->method('findAll')->with(123, 'user123')->willReturn([]);
+		$this->boardViewMapper->expects($this->once())->method('insert')->willReturnCallback(function (BoardView $view) {
+			return $view;
+		});
+
+		$view = $this->boardViewService->create(123, '  My view  ', []);
+		$this->assertEquals('My view', $view->getName());
+	}
+
 	public function testCreateEmptyName() {
 		$this->expectException(BadRequestException::class);
-		$this->boardViewService->create(123, '', []);
+		$this->boardViewService->create(123, '   ', []);
+	}
+
+	public function testCreateNameTooLong() {
+		$this->expectException(BadRequestException::class);
+		$this->boardViewService->create(123, str_repeat('a', 256), []);
+	}
+
+	public function testCreateTooManyViews() {
+		$this->boardService->expects($this->once())->method('find')->with(123, false);
+		$this->boardViewMapper->expects($this->once())->method('findAll')->with(123, 'user123')->willReturn(array_fill(0, 50, new BoardView()));
+
+		$this->expectException(BadRequestException::class);
+		$this->boardViewService->create(123, 'My view', []);
+	}
+
+	public function testCreateFiltersTooLarge() {
+		$this->boardService->expects($this->once())->method('find')->with(123, false);
+		$this->boardViewMapper->expects($this->once())->method('findAll')->with(123, 'user123')->willReturn([]);
+
+		$this->expectException(BadRequestException::class);
+		$this->boardViewService->create(123, 'My view', ['description' => str_repeat('a', 60000)]);
 	}
 
 	public function testUpdate() {
@@ -69,7 +106,7 @@ public function testUpdate() {
 		$view->setName('Old name');
 		$view->setFilters(json_encode(['tags' => []]));
 
-		$this->boardService->expects($this->once())->method('find')->with(123);
+		$this->boardService->expects($this->once())->method('find')->with(123, false);
 		$this->boardViewMapper->expects($this->once())->method('find')->with(1, 'user123')->willReturn($view);
 		$this->boardViewMapper->expects($this->once())->method('update')->willReturnCallback(function (BoardView $view) {
 			return $view;
@@ -80,12 +117,29 @@ public function testUpdate() {
 		$this->assertEquals(json_encode(['tags' => [2]]), $updated->getFilters());
 	}
 
+	public function testUpdateEmptyNameKeepsOldName() {
+		$view = new BoardView();
+		$view->setId(1);
+		$view->setBoardId(123);
+		$view->setName('Old name');
+		$view->setFilters(json_encode(['tags' => []]));
+
+		$this->boardService->expects($this->once())->method('find')->with(123, false);
+		$this->boardViewMapper->expects($this->once())->method('find')->with(1, 'user123')->willReturn($view);
+		$this->boardViewMapper->expects($this->once())->method('update')->willReturnCallback(function (BoardView $view) {
+			return $view;
+		});
+
+		$updated = $this->boardViewService->update(123, 1, '', ['tags' => [2]]);
+		$this->assertEquals('Old name', $updated->getName());
+	}
+
 	public function testUpdateViewOfOtherBoard() {
 		$view = new BoardView();
 		$view->setId(1);
 		$view->setBoardId(456);
 
-		$this->boardService->expects($this->once())->method('find')->with(123);
+		$this->boardService->expects($this->once())->method('find')->with(123, false);
 		$this->boardViewMapper->expects($this->once())->method('find')->with(1, 'user123')->willReturn($view);
 
 		$this->expectException(BadRequestException::class);
@@ -97,9 +151,24 @@ public function testDelete() {
 		$view->setId(1);
 		$view->setBoardId(123);
 
-		$this->boardService->expects($this->once())->method('find')->with(123);
+		$this->boardService->expects($this->once())->method('find')->with(123, false);
+		$this->boardViewMapper->expects($this->once())->method('find')->with(1, 'user123')->willReturn($view);
+		$this->boardViewMapper->expects($this->once())->method('delete')->with($view);
+		$this->configService->expects($this->once())->method('getDefaultBoardView')->willReturn(null);
+
+		$this->boardViewService->delete(123, 1);
+	}
+
+	public function testDeleteClearsDefaultView() {
+		$view = new BoardView();
+		$view->setId(1);
+		$view->setBoardId(123);
+
+		$this->boardService->expects($this->once())->method('find')->with(123, false);
 		$this->boardViewMapper->expects($this->once())->method('find')->with(1, 'user123')->willReturn($view);
 		$this->boardViewMapper->expects($this->once())->method('delete')->with($view);
+		$this->configService->expects($this->once())->method('getDefaultBoardView')->willReturn(1);
+		$this->configService->expects($this->once())->method('set')->with('defaultBoardView', null);
 
 		$this->boardViewService->delete(123, 1);
 	}
diff --git a/tests/unit/Service/ConfigServiceTest.php b/tests/unit/Service/ConfigServiceTest.php
index a5e2aa22b0..05c676d576 100644
--- a/tests/unit/Service/ConfigServiceTest.php
+++ b/tests/unit/Service/ConfigServiceTest.php
@@ -16,6 +16,7 @@
 use Test\TestCase;
 
 class ConfigServiceTest extends TestCase {
+	private IConfig&MockObject $config;
 	private IGroupManager&MockObject $groupManager;
 	private IEventDispatcher&MockObject $eventDispatcher;
 	private ConfigService $service;
@@ -23,10 +24,11 @@ class ConfigServiceTest extends TestCase {
 	public function setUp(): void {
 		parent::setUp();
 
+		$this->config = $this->createMock(IConfig::class);
 		$this->groupManager = $this->createMock(IGroupManager::class);
 		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
 		$this->service = new ConfigService(
-			$this->createMock(IConfig::class),
+			$this->config,
 			$this->groupManager,
 			$this->eventDispatcher,
 		);
@@ -57,4 +59,40 @@ public function testPersonalSettingIsNotLogged(): void {
 
 		$this->service->set('calendar', true);
 	}
+
+	public function testGetDefaultBoardView(): void {
+		$this->config->expects($this->once())
+			->method('getUserValue')
+			->with('admin', 'deck', 'defaultBoardView', '')
+			->willReturn('7');
+
+		self::assertSame(7, $this->service->getDefaultBoardView());
+	}
+
+	public function testGetDefaultBoardViewNotSet(): void {
+		$this->config->expects($this->once())
+			->method('getUserValue')
+			->with('admin', 'deck', 'defaultBoardView', '')
+			->willReturn('');
+
+		self::assertNull($this->service->getDefaultBoardView());
+	}
+
+	public function testSetDefaultBoardView(): void {
+		$this->eventDispatcher->expects($this->never())->method('dispatchTyped');
+		$this->config->expects($this->once())
+			->method('setUserValue')
+			->with('admin', 'deck', 'defaultBoardView', '7');
+
+		$this->service->set('defaultBoardView', 7);
+	}
+
+	public function testSetDefaultBoardViewToNull(): void {
+		$this->eventDispatcher->expects($this->never())->method('dispatchTyped');
+		$this->config->expects($this->once())
+			->method('setUserValue')
+			->with('admin', 'deck', 'defaultBoardView', '');
+
+		$this->service->set('defaultBoardView', null);
+	}
 }