+
state.showCardCover,
}),
- ...mapState(useCardStore, ['cardById']),
+ ...mapState(useCardStore, ['cardById', 'cards']),
+ ...mapState(useStackStore, ['stacksByBoard']),
+ cardCreators() {
+ if (!this.board) {
+ return []
+ }
+ const stackIds = new Set(this.stacksByBoard(this.board.id).map((stack) => stack.id))
+ const boardCards = this.cards.filter((card) => stackIds.has(card.stackId))
+ return cardCreatorUsers(boardCards, this.board.users)
+ },
+
...mapWritableState(useSettingsStore, ['searchQuery']),
pageTitle() {
if (!this.board?.title) {
diff --git a/src/helpers/cardFilters.js b/src/helpers/cardFilters.js
index ca628813cd..b6dcc2bf20 100644
--- a/src/helpers/cardFilters.js
+++ b/src/helpers/cardFilters.js
@@ -15,3 +15,23 @@ export function cardCreatedByAny(card, uids) {
const ownerUid = card.owner?.uid ?? card.owner
return uids.includes(ownerUid)
}
+
+/**
+ * Collect the users that can be picked in the "Filter by creator" list:
+ * the creators of the given cards merged with the given board users,
+ * de-duplicated by uid and sorted by display name. Users without a
+ * display name (e.g. removed accounts) are skipped.
+ *
+ * @param {object[]} cards the cards of the board
+ * @param {object[]} boardUsers the users the board is shared with
+ * @return {object[]}
+ */
+export function cardCreatorUsers(cards, boardUsers = []) {
+ const users = new Map()
+ for (const user of [...boardUsers, ...cards.map((card) => card.owner)]) {
+ if (user?.uid && user.displayname && !users.has(user.uid)) {
+ users.set(user.uid, user)
+ }
+ }
+ return [...users.values()].sort((a, b) => a.displayname.localeCompare(b.displayname))
+}
diff --git a/src/helpers/cardFilters.spec.js b/src/helpers/cardFilters.spec.js
index f8c760056a..777ddf0a4a 100644
--- a/src/helpers/cardFilters.spec.js
+++ b/src/helpers/cardFilters.spec.js
@@ -4,7 +4,7 @@
*/
import { describe, expect, it } from '@jest/globals'
-import { cardCreatedByAny } from './cardFilters.js'
+import { cardCreatedByAny, cardCreatorUsers } from './cardFilters.js'
describe('cardCreatedByAny', () => {
it('matches an owner given as user id', () => {
@@ -34,3 +34,34 @@ describe('cardCreatedByAny', () => {
expect(cardCreatedByAny({ owner: 'alice' }, [])).toBe(false)
})
})
+
+describe('cardCreatorUsers', () => {
+ const alice = { uid: 'alice', displayname: 'Alice' }
+ const bob = { uid: 'bob', displayname: 'Bob' }
+ const carol = { uid: 'carol', displayname: 'Carol' }
+
+ it('includes creators that are no longer board users', () => {
+ const cards = [{ owner: carol }, { owner: alice }]
+ expect(cardCreatorUsers(cards, [alice, bob])).toEqual([alice, bob, carol])
+ })
+
+ it('de-duplicates users by uid', () => {
+ const cards = [{ owner: { ...alice } }, { owner: alice }, { owner: bob }]
+ expect(cardCreatorUsers(cards, [alice])).toEqual([alice, bob])
+ })
+
+ it('sorts users by display name', () => {
+ const cards = [{ owner: carol }, { owner: bob }, { owner: alice }]
+ expect(cardCreatorUsers(cards).map((user) => user.uid)).toEqual(['alice', 'bob', 'carol'])
+ })
+
+ it('skips removed users without display name', () => {
+ const cards = [{ owner: { uid: 'removed', displayname: null } }, { owner: alice }]
+ expect(cardCreatorUsers(cards, [])).toEqual([alice])
+ })
+
+ it('skips cards without owner object', () => {
+ const cards = [{ owner: null }, {}, { owner: 'bob' }]
+ expect(cardCreatorUsers(cards, [alice])).toEqual([alice])
+ })
+})
From 9b7d03f3c9243b912d5c9d78cfd7c8aa0c118212 Mon Sep 17 00:00:00 2001
From: Simon Kern <14980558+skjerns@users.noreply.github.com>
Date: Tue, 10 Nov 2026 17:18:04 +0100
Subject: [PATCH 4/4] feat(filter): group deleted accounts as "Deleted users"
in creator filter
Assisted-by: ClaudeCode:claude-opus-5-5
Signed-off-by: Simon Kern <14980558+skjerns@users.noreply.github.com>
---
src/components/Controls.vue | 34 +++++++++++++++++++++++----
src/helpers/cardFilters.js | 40 ++++++++++++++++++++++++++++----
src/helpers/cardFilters.spec.js | 41 ++++++++++++++++++++++++++++++++-
src/stores/card.js | 2 +-
4 files changed, 107 insertions(+), 10 deletions(-)
diff --git a/src/components/Controls.vue b/src/components/Controls.vue
index 570f02996d..829bb64c83 100644
--- a/src/components/Controls.vue
+++ b/src/components/Controls.vue
@@ -161,6 +161,16 @@
:disableMenu="true"
:hideStatus="true" /> {{ user.displayname }}
+
+
+
+
{{ t('deck', 'Filter by status') }}
@@ -335,6 +345,7 @@ import { subscribe, unsubscribe } from '@nextcloud/event-bus'
import { NcActionButton, NcActions, NcActionSeparator, NcAvatar, NcButton, NcModal, NcPopover, NcTextField } from '@nextcloud/vue'
import { vOnClickOutside } from '@vueuse/components'
import { mapActions, mapState, mapWritableState } from 'pinia'
+import AccountOffIcon from 'vue-material-design-icons/AccountOffOutline.vue'
import ArchiveIcon from 'vue-material-design-icons/ArchiveOutline.vue'
import ArrowCollapseVerticalIcon from 'vue-material-design-icons/ArrowCollapseVertical.vue'
import ArrowExpandVerticalIcon from 'vue-material-design-icons/ArrowExpandVertical.vue'
@@ -346,7 +357,7 @@ import TableColumnPlusAfter from 'vue-material-design-icons/TableColumnPlusAfter
import ViewColumnIcon from 'vue-material-design-icons/ViewColumn.vue'
import CreateNewCardCustomPicker from '../views/CreateNewCardCustomPicker.vue'
import SessionList from './SessionList.vue'
-import { cardCreatorUsers } from '../helpers/cardFilters.js'
+import { cardCreatorUsers, DELETED_CREATORS, isCreatorDeleted } from '../helpers/cardFilters.js'
import labelStyle from '../mixins/labelStyle.js'
import { isNotifyPushEnabled } from '../sessions.js'
import { useBoardStore } from '../stores/board.js'
@@ -358,6 +369,7 @@ export default {
name: 'Controls',
components: {
CreateNewCardCustomPicker,
+ AccountOffIcon,
NcModal,
NcActions,
NcActionButton,
@@ -415,6 +427,7 @@ export default {
data() {
return {
+ DELETED_CREATORS,
newStackTitle: '',
stack: '',
isAddStackVisible: false,
@@ -442,13 +455,20 @@ export default {
...mapState(useCardStore, ['cardById', 'cards']),
...mapState(useStackStore, ['stacksByBoard']),
- cardCreators() {
+ boardCards() {
if (!this.board) {
return []
}
const stackIds = new Set(this.stacksByBoard(this.board.id).map((stack) => stack.id))
- const boardCards = this.cards.filter((card) => stackIds.has(card.stackId))
- return cardCreatorUsers(boardCards, this.board.users)
+ return this.cards.filter((card) => stackIds.has(card.stackId))
+ },
+
+ cardCreators() {
+ return cardCreatorUsers(this.boardCards, this.board?.users)
+ },
+
+ hasDeletedCreators() {
+ return this.boardCards.some((card) => isCreatorDeleted(card, this.board.users))
},
...mapWritableState(useSettingsStore, ['searchQuery']),
@@ -753,6 +773,12 @@ export default {
margin-bottom: 2px;
margin-inline-end: 3px;
}
+ .filter--deleted-icon {
+ display: inline-flex;
+ vertical-align: middle;
+ margin-bottom: 2px;
+ margin-inline-end: 3px;
+ }
.label {
padding: 5px;
border-radius: 3px;
diff --git a/src/helpers/cardFilters.js b/src/helpers/cardFilters.js
index b6dcc2bf20..9247f0e3de 100644
--- a/src/helpers/cardFilters.js
+++ b/src/helpers/cardFilters.js
@@ -3,15 +3,47 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
+/**
+ * Filter value standing for all cards created by deleted accounts.
+ * Contains a colon, which is not allowed in Nextcloud user ids.
+ */
+export const DELETED_CREATORS = 'deck:deleted-users'
+
+/**
+ * Check whether a card was created by an account that no longer exists.
+ * The server sends the owner as a user object only for existing accounts,
+ * deleted ones come as plain uid. A plain uid of a board user (e.g. a card
+ * just created in this session) does not count as deleted.
+ *
+ * @param {object} card the card to check
+ * @param {object[]} boardUsers the users with access to the board
+ * @return {boolean}
+ */
+export function isCreatorDeleted(card, boardUsers = []) {
+ const owner = card.owner
+ if (!owner) {
+ return false
+ }
+ if (typeof owner === 'string') {
+ return !boardUsers.some((user) => user.uid === owner)
+ }
+ return !owner.displayname
+}
+
/**
* Check whether a card was created by one of the given users.
- * The card owner is either a user id or a user object.
+ * The card owner is either a user id or a user object. The value
+ * DELETED_CREATORS matches cards of all deleted accounts.
*
* @param {object} card the card to check
* @param {string[]} uids the user ids to match against
+ * @param {object[]} boardUsers the users with access to the board, needed for DELETED_CREATORS
* @return {boolean}
*/
-export function cardCreatedByAny(card, uids) {
+export function cardCreatedByAny(card, uids, boardUsers = []) {
+ if (uids.includes(DELETED_CREATORS) && isCreatorDeleted(card, boardUsers)) {
+ return true
+ }
const ownerUid = card.owner?.uid ?? card.owner
return uids.includes(ownerUid)
}
@@ -19,8 +51,8 @@ export function cardCreatedByAny(card, uids) {
/**
* Collect the users that can be picked in the "Filter by creator" list:
* the creators of the given cards merged with the given board users,
- * de-duplicated by uid and sorted by display name. Users without a
- * display name (e.g. removed accounts) are skipped.
+ * de-duplicated by uid and sorted by display name. Deleted accounts are
+ * not listed, see isCreatorDeleted() for grouping them.
*
* @param {object[]} cards the cards of the board
* @param {object[]} boardUsers the users the board is shared with
diff --git a/src/helpers/cardFilters.spec.js b/src/helpers/cardFilters.spec.js
index 777ddf0a4a..e7cae3aa3b 100644
--- a/src/helpers/cardFilters.spec.js
+++ b/src/helpers/cardFilters.spec.js
@@ -4,7 +4,7 @@
*/
import { describe, expect, it } from '@jest/globals'
-import { cardCreatedByAny, cardCreatorUsers } from './cardFilters.js'
+import { cardCreatedByAny, cardCreatorUsers, DELETED_CREATORS, isCreatorDeleted } from './cardFilters.js'
describe('cardCreatedByAny', () => {
it('matches an owner given as user id', () => {
@@ -65,3 +65,42 @@ describe('cardCreatorUsers', () => {
expect(cardCreatorUsers(cards, [alice])).toEqual([alice])
})
})
+
+describe('deleted creators', () => {
+ const boardUsers = [{ uid: 'alice', displayname: 'Alice' }]
+
+ it('treats a plain uid owner outside the board users as deleted', () => {
+ expect(isCreatorDeleted({ owner: 'gone' }, boardUsers)).toBe(true)
+ })
+
+ it('does not treat a plain uid owner of a board user as deleted', () => {
+ expect(isCreatorDeleted({ owner: 'alice' }, boardUsers)).toBe(false)
+ })
+
+ it('does not treat resolved owners as deleted, even without board access', () => {
+ expect(isCreatorDeleted({ owner: { uid: 'bob', displayname: 'Bob' } }, boardUsers)).toBe(false)
+ })
+
+ it('treats a resolved owner without display name as deleted', () => {
+ expect(isCreatorDeleted({ owner: { uid: 'gone', displayname: null } }, boardUsers)).toBe(true)
+ })
+
+ it('does not treat cards without owner as deleted', () => {
+ expect(isCreatorDeleted({ owner: null }, boardUsers)).toBe(false)
+ expect(isCreatorDeleted({}, boardUsers)).toBe(false)
+ })
+
+ it('matches all deleted creators with the DELETED_CREATORS value', () => {
+ expect(cardCreatedByAny({ owner: 'gone' }, [DELETED_CREATORS], boardUsers)).toBe(true)
+ expect(cardCreatedByAny({ owner: 'other-gone' }, [DELETED_CREATORS], boardUsers)).toBe(true)
+ expect(cardCreatedByAny({ owner: 'alice' }, [DELETED_CREATORS], boardUsers)).toBe(false)
+ expect(cardCreatedByAny({ owner: { uid: 'bob', displayname: 'Bob' } }, [DELETED_CREATORS], boardUsers)).toBe(false)
+ })
+
+ it('combines DELETED_CREATORS with selected users', () => {
+ const uids = [DELETED_CREATORS, 'bob']
+ expect(cardCreatedByAny({ owner: 'gone' }, uids, boardUsers)).toBe(true)
+ expect(cardCreatedByAny({ owner: { uid: 'bob', displayname: 'Bob' } }, uids, boardUsers)).toBe(true)
+ expect(cardCreatedByAny({ owner: 'alice' }, uids, boardUsers)).toBe(false)
+ })
+})
diff --git a/src/stores/card.js b/src/stores/card.js
index 38a090e766..3c16e14bf5 100644
--- a/src/stores/card.js
+++ b/src/stores/card.js
@@ -50,7 +50,7 @@ export const useCardStore = defineStore('card', {
}
}
- if (creators.length > 0 && !cardCreatedByAny(card, creators)) {
+ if (creators.length > 0 && !cardCreatedByAny(card, creators, useBoardStore().currentBoard?.users)) {
return false
}