diff --git a/plugins/task-resources/src/components/kanban/KanbanView.svelte b/plugins/task-resources/src/components/kanban/KanbanView.svelte index 1bdafc6bec..328272e39c 100644 --- a/plugins/task-resources/src/components/kanban/KanbanView.svelte +++ b/plugins/task-resources/src/components/kanban/KanbanView.svelte @@ -87,7 +87,9 @@ resultQuery = mergeQueries(p, query) }) - $: queryNoLookup = getCategoryQueryNoLookup(resultQuery) + $: queryNoLookup = getCategoryQueryNoLookup( + mergeQueries(resultQuery, activeSpaces.length > 0 ? { space: { $in: activeSpaces } } : {}) + ) const lookup: Lookup = { ...(options?.lookup ?? {}), space: task.class.Project, @@ -119,9 +121,10 @@ let fastDocs: DocWithRank[] = [] let slowDocs: DocWithRank[] = [] - + let activeSpaces: Ref[] = [] const docsQuery = createQuery() const docsQuerySlow = createQuery() + const activeSpaceQuery = createQuery() let fastQueryIds = new Set>() @@ -136,7 +139,16 @@ ...getCategoryQueryProjection(client.getHierarchy(), _class, queryNoLookup, viewOptions.groupBy) } } - + $: activeSpaceQuery.query( + task.class.Project, + { + archived: false + }, + (res) => { + activeSpaces = res.map((r: Project) => r._id) + }, + { projection: { _id: 1 } } + ) $: docsQuery.query( _class, queryNoLookup,