diff --git a/plugins/view-resources/src/viewOptions.ts b/plugins/view-resources/src/viewOptions.ts index 334733fb7d..2148a329eb 100644 --- a/plugins/view-resources/src/viewOptions.ts +++ b/plugins/view-resources/src/viewOptions.ts @@ -136,8 +136,17 @@ export async function showEmptyGroups ( }) if (query !== undefined) { const { [key]: st, space } = query - const resQuery: DocumentQuery = { - space + const resQuery: DocumentQuery = {} + if (space !== undefined) { + resQuery.space = space + } else { + const spaceRefs = Array.from(new Set(statusList.map((p) => p.space))) + const spaces = await client.findAll( + core.class.Space, + { _id: { $in: spaceRefs }, archived: false }, + { projection: { _id: 1 } } + ) + resQuery.space = { $in: spaces.map((p) => p._id) } } if (st !== undefined) { resQuery._id = st