diff --git a/apiserver/plane/graphql/queries/issue.py b/apiserver/plane/graphql/queries/issue.py index b45e0ce3fb..61fce55438 100644 --- a/apiserver/plane/graphql/queries/issue.py +++ b/apiserver/plane/graphql/queries/issue.py @@ -162,6 +162,7 @@ class IssueQuery: .prefetch_related("assignees", "labels") .order_by(orderBy, "-created_at") .filter(**filters) + .distinct() ) return paginate(results_object=issues, cursor=cursor) diff --git a/apiserver/plane/graphql/utils/issue_filters.py b/apiserver/plane/graphql/utils/issue_filters.py index b5aeeead81..e7e00ca4b8 100644 --- a/apiserver/plane/graphql/utils/issue_filters.py +++ b/apiserver/plane/graphql/utils/issue_filters.py @@ -201,6 +201,7 @@ def filter_labels(params, filter, method, prefix=""): and params.get("labels") != "null" ): filter[f"{prefix}labels__in"] = params.get("labels") + filter[f"{prefix}label_issue__deleted_at__isnull"] = True return filter @@ -223,6 +224,7 @@ def filter_assignees(params, filter, method, prefix=""): and params.get("assignees") != "null" ): filter[f"{prefix}assignees__in"] = params.get("assignees") + filter[f"{prefix}issue_assignee__deleted_at__isnull"] = True return filter @@ -426,6 +428,7 @@ def filter_module(params, filter, method, prefix=""): filter[f"{prefix}issue_module__module_id__in"] = params.get( "module" ) + filter[f"{prefix}issue_module__deleted_at__isnull"] = True return filter