Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

[WEB-402] chore: project issues count (#3911)

Anmol Singh Bhatia01702e9f66f5
diff --git a/apiserver/plane/app/serializers/module.py b/apiserver/plane/app/serializers/module.py
index 3b2468aee5..100b6314a8 100644
--- a/apiserver/plane/app/serializers/module.py
+++ b/apiserver/plane/app/serializers/module.py
@@ -215,9 +215,10 @@ class ModuleSerializer(DynamicBaseSerializer):
class ModuleDetailSerializer(ModuleSerializer):
link_module = ModuleLinkSerializer(read_only=True, many=True)
+ sub_issues = serializers.IntegerField(read_only=True)
class Meta(ModuleSerializer.Meta):
- fields = ModuleSerializer.Meta.fields + ["link_module"]
+ fields = ModuleSerializer.Meta.fields + ["link_module", "sub_issues"]
class ModuleFavoriteSerializer(BaseSerializer):
diff --git a/apiserver/plane/app/serializers/project.py b/apiserver/plane/app/serializers/project.py
index 6840fa8f79..a0c2318e38 100644
--- a/apiserver/plane/app/serializers/project.py
+++ b/apiserver/plane/app/serializers/project.py
@@ -102,6 +102,12 @@ class ProjectLiteSerializer(BaseSerializer):
class ProjectListSerializer(DynamicBaseSerializer):
+ total_issues = serializers.IntegerField(read_only=True)
+ archived_issues = serializers.IntegerField(read_only=True)
+ archived_sub_issues = serializers.IntegerField(read_only=True)
+ draft_issues = serializers.IntegerField(read_only=True)
+ draft_sub_issues = serializers.IntegerField(read_only=True)
+ sub_issues = serializers.IntegerField(read_only=True)
is_favorite = serializers.BooleanField(read_only=True)
total_members = serializers.IntegerField(read_only=True)
total_cycles = serializers.IntegerField(read_only=True)
diff --git a/apiserver/plane/app/views/cycle/base.py b/apiserver/plane/app/views/cycle/base.py
index 9dc25474ff..42904a8fce 100644
--- a/apiserver/plane/app/views/cycle/base.py
+++ b/apiserver/plane/app/views/cycle/base.py
@@ -106,15 +106,6 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
)
)
.annotate(is_favorite=Exists(favorite_subquery))
- .annotate(
- total_issues=Count(
- "issue_cycle",
- filter=Q(
- issue_cycle__issue__archived_at__isnull=True,
- issue_cycle__issue__is_draft=False,
- ),
- )
- )
.annotate(
completed_issues=Count(
"issue_cycle__issue__state__group",
@@ -232,7 +223,6 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
"progress_snapshot",
# meta fields
"is_favorite",
- "total_issues",
"cancelled_issues",
"completed_issues",
"started_issues",
@@ -327,13 +317,13 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
}
if data[0]["start_date"] and data[0]["end_date"]:
- data[0]["distribution"][
- "completion_chart"
- ] = burndown_plot(
- queryset=queryset.first(),
- slug=slug,
- project_id=project_id,
- cycle_id=data[0]["id"],
+ data[0]["distribution"]["completion_chart"] = (
+ burndown_plot(
+ queryset=queryset.first(),
+ slug=slug,
+ project_id=project_id,
+ cycle_id=data[0]["id"],
+ )
)
return Response(data, status=status.HTTP_200_OK)
@@ -356,7 +346,6 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
"progress_snapshot",
# meta fields
"is_favorite",
- "total_issues",
"cancelled_issues",
"completed_issues",
"started_issues",
@@ -402,7 +391,6 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
"progress_snapshot",
# meta fields
"is_favorite",
- "total_issues",
"cancelled_issues",
"completed_issues",
"started_issues",
@@ -474,7 +462,6 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
"progress_snapshot",
# meta fields
"is_favorite",
- "total_issues",
"cancelled_issues",
"completed_issues",
"started_issues",
@@ -487,10 +474,42 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
def retrieve(self, request, slug, project_id, pk):
- queryset = self.get_queryset().filter(pk=pk)
+ queryset = (
+ self.get_queryset()
+ .filter(pk=pk)
+ .annotate(
+ total_issues=Count(
+ "issue_cycle",
+ filter=Q(
+ issue_cycle__issue__archived_at__isnull=True,
+ issue_cycle__issue__is_draft=False,
+ ),
+ )
+ )
+ )
data = (
self.get_queryset()
.filter(pk=pk)
+ .annotate(
+ total_issues=Issue.issue_objects.filter(
+ project_id=self.kwargs.get("project_id"),
+ parent__isnull=True,
+ issue_cycle__cycle_id=pk,
+ )
+ .order_by()
+ .annotate(count=Func(F("id"), function="Count"))
+ .values("count")
+ )
+ .annotate(
+ sub_issues=Issue.issue_objects.filter(
+ project_id=self.kwargs.get("project_id"),
+ parent__isnull=False,
+ issue_cycle__cycle_id=pk,
+ )
+ .order_by()
+ .annotate(count=Func(F("id"), function="Count"))
+ .values("count")
+ )
.values(
# necessary fields
"id",
@@ -507,6 +526,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
"external_source",
"external_id",
"progress_snapshot",
+ "sub_issues",
# meta fields
"is_favorite",
"total_issues",
diff --git a/apiserver/plane/app/views/module/base.py b/apiserver/plane/app/views/module/base.py
index cd87442d2f..ee9718b59c 100644
--- a/apiserver/plane/app/views/module/base.py
+++ b/apiserver/plane/app/views/module/base.py
@@ -3,7 +3,7 @@ import json
# Django Imports
from django.utils import timezone
-from django.db.models import Prefetch, F, OuterRef, Exists, Count, Q
+from django.db.models import Prefetch, F, OuterRef, Exists, Count, Q, Func
from django.contrib.postgres.aggregates import ArrayAgg
from django.contrib.postgres.fields import ArrayField
from django.db.models import Value, UUIDField
@@ -79,15 +79,6 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
),
)
)
- .annotate(
- total_issues=Count(
- "issue_module",
- filter=Q(
- issue_module__issue__archived_at__isnull=True,
- issue_module__issue__is_draft=False,
- ),
- ),
- )
.annotate(
completed_issues=Count(
"issue_module__issue__state__group",
@@ -183,7 +174,6 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
"external_id",
# computed fields
"is_favorite",
- "total_issues",
"cancelled_issues",
"completed_issues",
"started_issues",
@@ -225,7 +215,6 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
"external_id",
# computed fields
"is_favorite",
- "total_issues",
"cancelled_issues",
"completed_issues",
"started_issues",
@@ -237,7 +226,30 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
return Response(modules, status=status.HTTP_200_OK)
def retrieve(self, request, slug, project_id, pk):
- queryset = self.get_queryset().filter(pk=pk)
+ queryset = (
+ self.get_queryset()
+ .filter(pk=pk)
+ .annotate(
+ total_issues=Issue.issue_objects.filter(
+ project_id=self.kwargs.get("project_id"),
+ parent__isnull=True,
+ issue_module__module_id=pk,
+ )
+ .order_by()
+ .annotate(count=Func(F("id"), function="Count"))
+ .values("count")
+ )
+ .annotate(
+ sub_issues=Issue.issue_objects.filter(
+ project_id=self.kwargs.get("project_id"),
+ parent__isnull=False,
+ issue_module__module_id=pk,
+ )
+ .order_by()
+ .annotate(count=Func(F("id"), function="Count"))
+ .values("count")
+ )
+ )
assignee_distribution = (
Issue.objects.filter(
@@ -380,7 +392,6 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
"external_id",
# computed fields
"is_favorite",
- "total_issues",
"cancelled_issues",
"completed_issues",
"started_issues",
diff --git a/apiserver/plane/app/views/project/base.py b/apiserver/plane/app/views/project/base.py
index 6deeea1447..74d4e3466e 100644
--- a/apiserver/plane/app/views/project/base.py
+++ b/apiserver/plane/app/views/project/base.py
@@ -46,9 +46,11 @@ from plane.db.models import (
Inbox,
ProjectDeployBoard,
IssueProperty,
+ Issue,
)
from plane.utils.cache import cache_response
+
class ProjectViewSet(WebhookMixin, BaseViewSet):
serializer_class = ProjectListSerializer
model = Project
@@ -171,6 +173,73 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
).data
return Response(projects, status=status.HTTP_200_OK)
+ def retrieve(self, request, slug, pk):
+ project = (
+ self.get_queryset()
+ .filter(pk=pk)
+ .annotate(
+ total_issues=Issue.issue_objects.filter(
+ project_id=self.kwargs.get("pk"),
+ parent__isnull=True,
+ )
+ .order_by()
+ .annotate(count=Func(F("id"), function="Count"))
+ .values("count")
+ )
+ .annotate(
+ sub_issues=Issue.issue_objects.filter(
+ project_id=self.kwargs.get("pk"),
+ parent__isnull=False,
+ )
+ .order_by()
+ .annotate(count=Func(F("id"), function="Count"))
+ .values("count")
+ )
+ .annotate(
+ archived_issues=Issue.objects.filter(
+ project_id=self.kwargs.get("pk"),
+ archived_at__isnull=False,
+ parent__isnull=True,
+ )
+ .order_by()
+ .annotate(count=Func(F("id"), function="Count"))
+ .values("count")
+ )
+ .annotate(
+ archived_sub_issues=Issue.objects.filter(
+ project_id=self.kwargs.get("pk"),
+ archived_at__isnull=False,
+ parent__isnull=False,
+ )
+ .order_by()
+ .annotate(count=Func(F("id"), function="Count"))
+ .values("count")
+ )
+ .annotate(
+ draft_issues=Issue.objects.filter(
+ project_id=self.kwargs.get("pk"),
+ is_draft=True,
+ parent__isnull=True,
+ )
+ .order_by()
+ .annotate(count=Func(F("id"), function="Count"))
+ .values("count")
+ )
+ .annotate(
+ draft_sub_issues=Issue.objects.filter(
+ project_id=self.kwargs.get("pk"),
+ is_draft=True,
+ parent__isnull=False,
+ )
+ .order_by()
+ .annotate(count=Func(F("id"), function="Count"))
+ .values("count")
+ )
+ ).first()
+
+ serializer = ProjectListSerializer(project)
+ return Response(serializer.data, status=status.HTTP_200_OK)
+
def create(self, request, slug):
try:
workspace = Workspace.objects.get(slug=slug)
@@ -471,6 +540,7 @@ class ProjectPublicCoverImagesEndpoint(BaseAPIView):
permission_classes = [
AllowAny,
]
+
# Cache the below api for 24 hours
@cache_response(60 * 60 * 24, user=False)
def get(self, request):
diff --git a/packages/types/src/cycle/cycle.d.ts b/packages/types/src/cycle/cycle.d.ts
index 6d21e05b88..c41ab279b9 100644
--- a/packages/types/src/cycle/cycle.d.ts
+++ b/packages/types/src/cycle/cycle.d.ts
@@ -26,6 +26,7 @@ export interface ICycle {
sort_order: number;
start_date: string | null;
started_issues: number;
+ sub_issues: number;
total_issues: number;
unstarted_issues: number;
updated_at: Date;
diff --git a/packages/types/src/modules.d.ts b/packages/types/src/modules.d.ts
index c532a467c7..0af293e507 100644
--- a/packages/types/src/modules.d.ts
+++ b/packages/types/src/modules.d.ts
@@ -30,6 +30,7 @@ export interface IModule {
name: string;
project_id: string;
sort_order: number;
+ sub_issues: number;
start_date: string | null;
started_issues: number;
status: TModuleStatus;
diff --git a/packages/types/src/projects.d.ts b/packages/types/src/projects.d.ts
index a6da364b9b..afae5199f0 100644
--- a/packages/types/src/projects.d.ts
+++ b/packages/types/src/projects.d.ts
@@ -23,6 +23,8 @@ export type TProjectLogoProps = {
export interface IProject {
archive_in: number;
+ archived_issues: number;
+ archived_sub_issues: number;
close_in: number;
created_at: Date;
created_by: string;
@@ -35,6 +37,8 @@ export interface IProject {
default_assignee: IUser | string | null;
default_state: string | null;
description: string;
+ draft_issues: number;
+ draft_sub_issues: number;
estimate: string | null;
id: string;
identifier: string;
@@ -48,7 +52,9 @@ export interface IProject {
network: number;
project_lead: IUserLite | string | null;
sort_order: number | null;
+ sub_issues: number;
total_cycles: number;
+ total_issues: number;
total_members: number;
total_modules: number;
updated_at: Date;
diff --git a/web/components/headers/cycle-issues.tsx b/web/components/headers/cycle-issues.tsx
index 5ef1ebf2c0..6f9c615453 100644
--- a/web/components/headers/cycle-issues.tsx
+++ b/web/components/headers/cycle-issues.tsx
@@ -4,7 +4,7 @@ import Link from "next/link";
import { useRouter } from "next/router";
// hooks
import { ArrowRight, Plus, PanelRight } from "lucide-react";
-import { Breadcrumbs, Button, ContrastIcon, CustomMenu } from "@plane/ui";
+import { Breadcrumbs, Button, ContrastIcon, CustomMenu, Tooltip } from "@plane/ui";
import { ProjectAnalyticsModal } from "components/analytics";
import { BreadcrumbLink } from "components/common";
import { SidebarHamburgerToggle } from "components/core/sidebar/sidebar-menu-hamburger-toggle";
@@ -142,6 +142,12 @@ export const CycleIssuesHeader: React.FC = observer(() => {
const canUserCreateIssue =
currentProjectRole && [EUserProjectRoles.ADMIN, EUserProjectRoles.MEMBER].includes(currentProjectRole);
+ const issueCount = cycleDetails
+ ? issueFilters?.displayFilters?.sub_issue
+ ? cycleDetails.total_issues + cycleDetails?.sub_issues
+ : cycleDetails.total_issues
+ : undefined;
+
return (
<>
<ProjectAnalyticsModal
@@ -197,15 +203,29 @@ export const CycleIssuesHeader: React.FC = observer(() => {
label={
<>
<ContrastIcon className="h-3 w-3" />
- <div className=" w-auto max-w-[70px] sm:max-w-[200px] inline-block truncate line-clamp-1 overflow-hidden whitespace-nowrap">
- {cycleDetails?.name && cycleDetails.name}
+ <div className="flex items-center gap-2 w-auto max-w-[70px] sm:max-w-[200px] truncate">
+ <p className="truncate">{cycleDetails?.name && cycleDetails.name}</p>
+ {issueCount && issueCount > 0 ? (
+ <Tooltip
+ tooltipContent={`There are ${issueCount} ${
+ issueCount > 1 ? "issues" : "issue"
+ } in this cycle`}
+ position="bottom"
+ >
+ <span className="cursor-default flex items-center text-center justify-center px-2 flex-shrink-0 bg-custom-primary-100/20 text-custom-primary-100 text-xs font-semibold rounded-xl">
+ {issueCount}
+ </span>
+ </Tooltip>
+ ) : null}
</div>
</>
}
- className="ml-1.5 flex-shrink-0"
+ className="ml-1.5 flex-shrink-0 truncate"
placement="bottom-start"
>
- {currentProjectCycleIds?.map((cycleId) => <CycleDropdownOption key={cycleId} cycleId={cycleId} />)}
+ {currentProjectCycleIds?.map((cycleId) => (
+ <CycleDropdownOption key={cycleId} cycleId={cycleId} />
+ ))}
</CustomMenu>
}
/>
diff --git a/web/components/headers/module-issues.tsx b/web/components/headers/module-issues.tsx
index 10717ecc39..9505d71459 100644
--- a/web/components/headers/module-issues.tsx
+++ b/web/components/headers/module-issues.tsx
@@ -4,7 +4,7 @@ import Link from "next/link";
import { useRouter } from "next/router";
// hooks
import { ArrowRight, PanelRight, Plus } from "lucide-react";
-import { Breadcrumbs, Button, CustomMenu, DiceIcon } from "@plane/ui";
+import { Breadcrumbs, Button, CustomMenu, DiceIcon, Tooltip } from "@plane/ui";
import { ProjectAnalyticsModal } from "components/analytics";
import { BreadcrumbLink } from "components/common";
import { SidebarHamburgerToggle } from "components/core/sidebar/sidebar-menu-hamburger-toggle";
@@ -143,6 +143,12 @@ export const ModuleIssuesHeader: React.FC = observer(() => {
const canUserCreateIssue =
currentProjectRole && [EUserProjectRoles.ADMIN, EUserProjectRoles.MEMBER].includes(currentProjectRole);
+ const issueCount = moduleDetails
+ ? issueFilters?.displayFilters?.sub_issue
+ ? moduleDetails.total_issues + moduleDetails.sub_issues
+ : moduleDetails.total_issues
+ : undefined;
+
return (
<>
<ProjectAnalyticsModal
@@ -198,15 +204,29 @@ export const ModuleIssuesHeader: React.FC = observer(() => {
label={
<>
<DiceIcon className="h-3 w-3" />
- <div className="w-auto max-w-[70px] sm:max-w-[200px] inline-block truncate line-clamp-1 overflow-hidden whitespace-nowrap">
- {moduleDetails?.name && moduleDetails.name}
+ <div className="flex items-center gap-2 w-auto max-w-[70px] sm:max-w-[200px] truncate">
+ <p className="truncate">{moduleDetails?.name && moduleDetails.name}</p>
+ {issueCount && issueCount > 0 ? (
+ <Tooltip
+ tooltipContent={`There are ${issueCount} ${
+ issueCount > 1 ? "issues" : "issue"
+ } in this module`}
+ position="bottom"
+ >
+ <span className="cursor-default flex items-center text-center justify-center px-2 flex-shrink-0 bg-custom-primary-100/20 text-custom-primary-100 text-xs font-semibold rounded-xl">
+ {issueCount}
+ </span>
+ </Tooltip>
+ ) : null}
</div>
</>
}
className="ml-1.5 flex-shrink-0"
placement="bottom-start"
>
- {projectModuleIds?.map((moduleId) => <ModuleDropdownOption key={moduleId} moduleId={moduleId} />)}
+ {projectModuleIds?.map((moduleId) => (
+ <ModuleDropdownOption key={moduleId} moduleId={moduleId} />
+ ))}
</CustomMenu>
}
/>
diff --git a/web/components/headers/project-archived-issues.tsx b/web/components/headers/project-archived-issues.tsx
index db208aa21c..ce226b58ea 100644
--- a/web/components/headers/project-archived-issues.tsx
+++ b/web/components/headers/project-archived-issues.tsx
@@ -5,7 +5,7 @@ import { ArrowLeft } from "lucide-react";
// hooks
// constants
// ui
-import { Breadcrumbs, LayersIcon } from "@plane/ui";
+import { Breadcrumbs, LayersIcon, Tooltip } from "@plane/ui";
// components
import { BreadcrumbLink } from "components/common";
import { SidebarHamburgerToggle } from "components/core/sidebar/sidebar-menu-hamburger-toggle";
@@ -69,6 +69,12 @@ export const ProjectArchivedIssuesHeader: FC = observer(() => {
updateFilters(workspaceSlug.toString(), projectId.toString(), EIssueFilterType.DISPLAY_PROPERTIES, property);
};
+ const issueCount = currentProjectDetails
+ ? issueFilters?.displayFilters?.sub_issue
+ ? currentProjectDetails.archived_issues + currentProjectDetails.archived_sub_issues
+ : currentProjectDetails.archived_issues
+ : undefined;
+
return (
<div className="relative z-10 flex h-14 w-full flex-shrink-0 flex-row items-center justify-between gap-x-2 gap-y-4 border-b border-custom-border-200 bg-custom-sidebar-background-100 p-4">
<div className="flex w-full flex-grow items-center gap-2 overflow-ellipsis whitespace-nowrap">
@@ -82,7 +88,7 @@ export const ProjectArchivedIssuesHeader: FC = observer(() => {
<ArrowLeft fontSize={14} strokeWidth={2} />
</button>
</div>
- <div>
+ <div className="flex items-center gap-2.5">
<Breadcrumbs>
<Breadcrumbs.BreadcrumbItem
type="text"
@@ -111,6 +117,16 @@ export const ProjectArchivedIssuesHeader: FC = observer(() => {
}
/>
</Breadcrumbs>
+ {issueCount && issueCount > 0 ? (
+ <Tooltip
+ tooltipContent={`There are ${issueCount} ${issueCount > 1 ? "issues" : "issue"} in project's archived`}
+ position="bottom"
+ >
+ <span className="cursor-default flex items-center text-center justify-center px-2.5 py-0.5 flex-shrink-0 bg-custom-primary-100/20 text-custom-primary-100 text-xs font-semibold rounded-xl">
+ {issueCount}
+ </span>
+ </Tooltip>
+ ) : null}
</div>
</div>
diff --git a/web/components/headers/project-draft-issues.tsx b/web/components/headers/project-draft-issues.tsx
index 4f29296211..789c3f60fb 100644
--- a/web/components/headers/project-draft-issues.tsx
+++ b/web/components/headers/project-draft-issues.tsx
@@ -3,7 +3,7 @@ import { observer } from "mobx-react-lite";
import { useRouter } from "next/router";
// hooks
// components
-import { Breadcrumbs, LayersIcon } from "@plane/ui";
+import { Breadcrumbs, LayersIcon, Tooltip } from "@plane/ui";
import { BreadcrumbLink } from "components/common";
import { SidebarHamburgerToggle } from "components/core/sidebar/sidebar-menu-hamburger-toggle";
import { DisplayFiltersSelection, FiltersDropdown, FilterSelection, LayoutSelection } from "components/issues";
@@ -73,11 +73,18 @@ export const ProjectDraftIssueHeader: FC = observer(() => {
},
[workspaceSlug, projectId, updateFilters]
);
+
+ const issueCount = currentProjectDetails
+ ? issueFilters?.displayFilters?.sub_issue
+ ? currentProjectDetails.draft_issues + currentProjectDetails.draft_sub_issues
+ : currentProjectDetails.draft_issues
+ : undefined;
+
return (
<div className="relative z-10 flex h-[3.75rem] w-full flex-shrink-0 flex-row items-center justify-between gap-x-2 gap-y-4 border-b border-custom-border-200 bg-custom-sidebar-background-100 p-4">
<div className="flex w-full flex-grow items-center gap-2 overflow-ellipsis whitespace-nowrap">
<SidebarHamburgerToggle />
- <div>
+ <div className="flex items-center gap-2.5">
<Breadcrumbs>
<Breadcrumbs.BreadcrumbItem
type="text"
@@ -103,6 +110,16 @@ export const ProjectDraftIssueHeader: FC = observer(() => {
}
/>
</Breadcrumbs>
+ {issueCount && issueCount > 0 ? (
+ <Tooltip
+ tooltipContent={`There are ${issueCount} ${issueCount > 1 ? "issues" : "issue"} in project's draft`}
+ position="bottom"
+ >
+ <span className="cursor-default flex items-center text-center justify-center px-2.5 py-0.5 flex-shrink-0 bg-custom-primary-100/20 text-custom-primary-100 text-xs font-semibold rounded-xl">
+ {issueCount}
+ </span>
+ </Tooltip>
+ ) : null}
</div>
<div className="ml-auto flex items-center gap-2">
diff --git a/web/components/headers/project-issues.tsx b/web/components/headers/project-issues.tsx
index 19eaf4f4fb..9739e78321 100644
--- a/web/components/headers/project-issues.tsx
+++ b/web/components/headers/project-issues.tsx
@@ -3,7 +3,7 @@ import { observer } from "mobx-react-lite";
import { useRouter } from "next/router";
import { Briefcase, Circle, ExternalLink, Plus } from "lucide-react";
// hooks
-import { Breadcrumbs, Button, LayersIcon } from "@plane/ui";
+import { Breadcrumbs, Button, LayersIcon, Tooltip } from "@plane/ui";
import { ProjectAnalyticsModal } from "components/analytics";
import { BreadcrumbLink } from "components/common";
import { SidebarHamburgerToggle } from "components/core/sidebar/sidebar-menu-hamburger-toggle";
@@ -102,6 +102,12 @@ export const ProjectIssuesHeader: React.FC = observer(() => {
const canUserCreateIssue =
currentProjectRole && [EUserProjectRoles.ADMIN, EUserProjectRoles.MEMBER].includes(currentProjectRole);
+ const issueCount = currentProjectDetails
+ ? issueFilters?.displayFilters?.sub_issue
+ ? currentProjectDetails?.total_issues + currentProjectDetails?.sub_issues
+ : currentProjectDetails?.total_issues
+ : undefined;
+
return (
<>
<ProjectAnalyticsModal
@@ -113,7 +119,7 @@ export const ProjectIssuesHeader: React.FC = observer(() => {
<div className="flex items-center gap-2 p-4 border-b border-custom-border-200 bg-custom-sidebar-background-100">
<div className="flex w-full flex-grow items-center gap-2 overflow-ellipsis whitespace-nowrap">
<SidebarHamburgerToggle />
- <div>
+ <div className="flex items-center gap-2.5">
<Breadcrumbs onBack={() => router.back()}>
<Breadcrumbs.BreadcrumbItem
type="text"
@@ -145,6 +151,16 @@ export const ProjectIssuesHeader: React.FC = observer(() => {
}
/>
</Breadcrumbs>
+ {issueCount && issueCount > 0 ? (
+ <Tooltip
+ tooltipContent={`There are ${issueCount} ${issueCount > 1 ? "issues" : "issue"} in this project`}
+ position="bottom"
+ >
+ <span className="cursor-default flex items-center text-center justify-center px-2.5 py-0.5 flex-shrink-0 bg-custom-primary-100/20 text-custom-primary-100 text-xs font-semibold rounded-xl">
+ {issueCount}
+ </span>
+ </Tooltip>
+ ) : null}
</div>
{currentProjectDetails?.is_deployed && deployUrl && (
<a