Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion apps/api/plane/app/views/workspace/module.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
# See the LICENSE file for details.

# Django imports
from django.db.models import Prefetch, Q, Count
from django.contrib.postgres.aggregates import ArrayAgg
from django.contrib.postgres.fields import ArrayField
from django.db.models import Prefetch, Q, Count, UUIDField, Value
from django.db.models.functions import Coalesce

# Third party modules
from rest_framework import status
Expand Down Expand Up @@ -109,6 +112,19 @@ def get(self, request, slug):
distinct=True,
)
)
.annotate(
member_ids=Coalesce(
ArrayAgg(
"members__id",
distinct=True,
filter=Q(
members__id__isnull=False,
modulemember__deleted_at__isnull=True,
),
),
Value([], output_field=ArrayField(UUIDField())),
)
)
.order_by(self.kwargs.get("order_by", "-created_at"))
)

Expand Down
6 changes: 3 additions & 3 deletions packages/utils/src/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ export const orderModules = (modules: IModule[], orderByKey: TModuleOrderByOptio
let orderedModules: IModule[] = [];
if (modules.length === 0 || !orderByKey) return [];

if (orderByKey === "name") orderedModules = [...modules].sort((a, b) => naturalSort(a.name, b.name));
if (orderByKey === "-name") orderedModules = [...modules].sort((a, b) => naturalSort(b.name, a.name));
if (orderByKey === "name") orderedModules = [...modules].toSorted((a, b) => naturalSort(a.name, b.name));
if (orderByKey === "-name") orderedModules = [...modules].toSorted((a, b) => naturalSort(b.name, a.name));
if (["progress", "-progress"].includes(orderByKey))
orderedModules = sortBy(modules, [
(m) => {
Expand Down Expand Up @@ -71,7 +71,7 @@ export const shouldFilterModule = (
if (filterKey === "lead" && filters.lead && filters.lead.length > 0)
fallsInFilters = fallsInFilters && filters.lead.includes(`${module.lead_id}`);
if (filterKey === "members" && filters.members && filters.members.length > 0) {
const memberIds = module.member_ids;
const memberIds = module.member_ids ?? [];
fallsInFilters = fallsInFilters && filters.members.some((memberId) => memberIds.includes(memberId));
}
if (filterKey === "start_date" && filters.start_date && filters.start_date.length > 0) {
Expand Down
Loading