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-3251] improvement: optimize projects API (#6542)

Prateek Shourya10b5c625efa8
diff --git a/apiserver/plane/app/serializers/project.py b/apiserver/plane/app/serializers/project.py
index cc7b7fbcb2..0cf9c86793 100644
--- a/apiserver/plane/app/serializers/project.py
+++ b/apiserver/plane/app/serializers/project.py
@@ -90,16 +90,7 @@ 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)
- total_modules = serializers.IntegerField(read_only=True)
is_member = serializers.BooleanField(read_only=True)
sort_order = serializers.FloatField(read_only=True)
member_role = serializers.IntegerField(read_only=True)
@@ -113,14 +104,9 @@ class ProjectListSerializer(DynamicBaseSerializer):
if project_members is not None:
# Filter members by the project ID
return [
- {
- "id": member.id,
- "member_id": member.member_id,
- "member__display_name": member.member.display_name,
- "member__avatar": member.member.avatar,
- "member__avatar_url": member.member.avatar_url,
- }
+ member.member_id
for member in project_members
+ if member.is_active and not member.member.is_bot
]
return []
@@ -134,9 +120,6 @@ class ProjectDetailSerializer(BaseSerializer):
default_assignee = UserLiteSerializer(read_only=True)
project_lead = UserLiteSerializer(read_only=True)
is_favorite = serializers.BooleanField(read_only=True)
- total_members = serializers.IntegerField(read_only=True)
- total_cycles = serializers.IntegerField(read_only=True)
- total_modules = serializers.IntegerField(read_only=True)
is_member = serializers.BooleanField(read_only=True)
sort_order = serializers.FloatField(read_only=True)
member_role = serializers.IntegerField(read_only=True)
diff --git a/apiserver/plane/app/urls/analytic.py b/apiserver/plane/app/urls/analytic.py
index 668268350b..abe18f2adf 100644
--- a/apiserver/plane/app/urls/analytic.py
+++ b/apiserver/plane/app/urls/analytic.py
@@ -7,6 +7,7 @@ from plane.app.views import (
SavedAnalyticEndpoint,
ExportAnalyticsEndpoint,
DefaultAnalyticsEndpoint,
+ ProjectStatsEndpoint,
)
@@ -43,4 +44,9 @@ urlpatterns = [
DefaultAnalyticsEndpoint.as_view(),
name="default-analytics",
),
+ path(
+ "workspaces/<str:slug>/project-stats/",
+ ProjectStatsEndpoint.as_view(),
+ name="project-analytics",
+ ),
]
diff --git a/apiserver/plane/app/urls/project.py b/apiserver/plane/app/urls/project.py
index 4037402abf..d673d191e8 100644
--- a/apiserver/plane/app/urls/project.py
+++ b/apiserver/plane/app/urls/project.py
@@ -23,6 +23,11 @@ urlpatterns = [
ProjectViewSet.as_view({"get": "list", "post": "create"}),
name="project",
),
+ path(
+ "workspaces/<str:slug>/projects/details/",
+ ProjectViewSet.as_view({"get": "list_detail"}),
+ name="project",
+ ),
path(
"workspaces/<str:slug>/projects/<uuid:pk>/",
ProjectViewSet.as_view(
diff --git a/apiserver/plane/app/views/__init__.py b/apiserver/plane/app/views/__init__.py
index cb10c879f4..04162efd9b 100644
--- a/apiserver/plane/app/views/__init__.py
+++ b/apiserver/plane/app/views/__init__.py
@@ -190,6 +190,7 @@ from .analytic.base import (
SavedAnalyticEndpoint,
ExportAnalyticsEndpoint,
DefaultAnalyticsEndpoint,
+ ProjectStatsEndpoint,
)
from .notification.base import (
diff --git a/apiserver/plane/app/views/analytic/base.py b/apiserver/plane/app/views/analytic/base.py
index a36458406a..d4e2357c3e 100644
--- a/apiserver/plane/app/views/analytic/base.py
+++ b/apiserver/plane/app/views/analytic/base.py
@@ -3,7 +3,7 @@ from django.db.models import Count, F, Sum, Q
from django.db.models.functions import ExtractMonth
from django.utils import timezone
from django.db.models.functions import Concat
-from django.db.models import Case, When, Value
+from django.db.models import Case, When, Value, OuterRef, Func
from django.db import models
# Third party imports
@@ -15,7 +15,16 @@ from plane.app.permissions import WorkSpaceAdminPermission
from plane.app.serializers import AnalyticViewSerializer
from plane.app.views.base import BaseAPIView, BaseViewSet
from plane.bgtasks.analytic_plot_export import analytic_export_task
-from plane.db.models import AnalyticView, Issue, Workspace
+from plane.db.models import (
+ AnalyticView,
+ Issue,
+ Workspace,
+ Project,
+ ProjectMember,
+ Cycle,
+ Module,
+)
+
from plane.utils.analytics_plot import build_graph_plot
from plane.utils.issue_filters import issue_filters
from plane.app.permissions import allow_permission, ROLE
@@ -441,3 +450,75 @@ class DefaultAnalyticsEndpoint(BaseAPIView):
},
status=status.HTTP_200_OK,
)
+
+
+class ProjectStatsEndpoint(BaseAPIView):
+ @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
+ def get(self, request, slug):
+ fields = request.GET.get("fields", "").split(",")
+ project_ids = request.GET.get("project_ids", "").split(",")
+
+ valid_fields = {
+ "total_issues",
+ "completed_issues",
+ "total_members",
+ "total_cycles",
+ "total_modules",
+ }
+ requested_fields = set(filter(None, fields)) & valid_fields
+
+ if not requested_fields:
+ requested_fields = valid_fields
+
+ projects = Project.objects.filter(workspace__slug=slug)
+
+ if project_ids:
+ projects = projects.filter(id__in=project_ids)
+
+ annotations = {}
+ if "total_issues" in requested_fields:
+ annotations["total_issues"] = (
+ Issue.issue_objects.filter(project_id=OuterRef("pk"))
+ .order_by()
+ .annotate(count=Func(F("id"), function="Count"))
+ .values("count")
+ )
+
+ if "completed_issues" in requested_fields:
+ annotations["completed_issues"] = (
+ Issue.issue_objects.filter(
+ project_id=OuterRef("pk"), state__group="completed"
+ )
+ .order_by()
+ .annotate(count=Func(F("id"), function="Count"))
+ .values("count")
+ )
+
+ if "total_cycles" in requested_fields:
+ annotations["total_cycles"] = (
+ Cycle.objects.filter(project_id=OuterRef("id"))
+ .order_by()
+ .annotate(count=Func(F("id"), function="Count"))
+ .values("count")
+ )
+
+ if "total_modules" in requested_fields:
+ annotations["total_modules"] = (
+ Module.objects.filter(project_id=OuterRef("id"))
+ .order_by()
+ .annotate(count=Func(F("id"), function="Count"))
+ .values("count")
+ )
+
+ if "total_members" in requested_fields:
+ annotations["total_members"] = (
+ ProjectMember.objects.filter(
+ project_id=OuterRef("id"), member__is_bot=False, is_active=True
+ )
+ .order_by()
+ .annotate(count=Func(F("id"), function="Count"))
+ .values("count")
+ )
+
+ projects = projects.annotate(**annotations).values("id", *requested_fields)
+ return Response(projects, status=status.HTTP_200_OK)
diff --git a/apiserver/plane/app/views/project/base.py b/apiserver/plane/app/views/project/base.py
index 8988fc3ee4..d92922d035 100644
--- a/apiserver/plane/app/views/project/base.py
+++ b/apiserver/plane/app/views/project/base.py
@@ -6,7 +6,7 @@ import json
# Django imports
from django.db import IntegrityError
-from django.db.models import Exists, F, Func, OuterRef, Prefetch, Q, Subquery
+from django.db.models import Exists, F, OuterRef, Prefetch, Q, Subquery
from django.core.serializers.json import DjangoJSONEncoder
# Third Party imports
@@ -25,12 +25,9 @@ from plane.app.serializers import (
from plane.app.permissions import ProjectMemberPermission, allow_permission, ROLE
from plane.db.models import (
UserFavorite,
- Cycle,
Intake,
DeployBoard,
IssueUserProperty,
- Issue,
- Module,
Project,
ProjectIdentifier,
ProjectMember,
@@ -83,26 +80,6 @@ class ProjectViewSet(BaseViewSet):
)
)
)
- .annotate(
- total_members=ProjectMember.objects.filter(
- project_id=OuterRef("id"), member__is_bot=False, is_active=True
- )
- .order_by()
- .annotate(count=Func(F("id"), function="Count"))
- .values("count")
- )
- .annotate(
- total_cycles=Cycle.objects.filter(project_id=OuterRef("id"))
- .order_by()
- .annotate(count=Func(F("id"), function="Count"))
- .values("count")
- )
- .annotate(
- total_modules=Module.objects.filter(project_id=OuterRef("id"))
- .order_by()
- .annotate(count=Func(F("id"), function="Count"))
- .values("count")
- )
.annotate(
member_role=ProjectMember.objects.filter(
project_id=OuterRef("pk"),
@@ -133,7 +110,7 @@ class ProjectViewSet(BaseViewSet):
@allow_permission(
allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
)
- def list(self, request, slug):
+ def list_detail(self, request, slug):
fields = [field for field in request.GET.get("fields", "").split(",") if field]
projects = self.get_queryset().order_by("sort_order", "name")
if WorkspaceMember.objects.filter(
@@ -170,6 +147,76 @@ class ProjectViewSet(BaseViewSet):
).data
return Response(projects, status=status.HTTP_200_OK)
+ @allow_permission(
+ allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
+ )
+ def list(self, request, slug):
+ sort_order = ProjectMember.objects.filter(
+ member=self.request.user,
+ project_id=OuterRef("pk"),
+ workspace__slug=self.kwargs.get("slug"),
+ is_active=True,
+ ).values("sort_order")
+
+ projects = (
+ Project.objects.filter(workspace__slug=self.kwargs.get("slug"))
+ .select_related(
+ "workspace", "workspace__owner", "default_assignee", "project_lead"
+ )
+ .annotate(
+ is_member=Exists(
+ ProjectMember.objects.filter(
+ member=self.request.user,
+ project_id=OuterRef("pk"),
+ workspace__slug=self.kwargs.get("slug"),
+ is_active=True,
+ )
+ )
+ )
+ .annotate(inbox_view=F("intake_view"))
+ .annotate(sort_order=Subquery(sort_order))
+ .distinct()
+ ).values(
+ "id",
+ "name",
+ "identifier",
+ "sort_order",
+ "logo_props",
+ "is_member",
+ "archived_at",
+ "workspace",
+ "cycle_view",
+ "issue_views_view",
+ "module_view",
+ "page_view",
+ "inbox_view",
+ "project_lead",
+ "created_at",
+ "updated_at",
+ "created_by",
+ "updated_by",
+ )
+
+ if WorkspaceMember.objects.filter(
+ member=request.user, workspace__slug=slug, is_active=True, role=5
+ ).exists():
+ projects = projects.filter(
+ project_projectmember__member=self.request.user,
+ project_projectmember__is_active=True,
+ )
+
+ if WorkspaceMember.objects.filter(
+ member=request.user, workspace__slug=slug, is_active=True, role=15
+ ).exists():
+ projects = projects.filter(
+ Q(
+ project_projectmember__member=self.request.user,
+ project_projectmember__is_active=True,
+ )
+ | Q(network=2)
+ )
+ return Response(projects, status=status.HTTP_200_OK)
+
@allow_permission(
allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
)
@@ -182,58 +229,6 @@ class ProjectViewSet(BaseViewSet):
)
.filter(archived_at__isnull=True)
.filter(pk=pk)
- .annotate(
- total_issues=Issue.issue_objects.filter(
- project_id=self.kwargs.get("pk")
- )
- .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
- )
- .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
- )
- .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()
if project is None:
diff --git a/packages/types/src/common.d.ts b/packages/types/src/common.d.ts
index 7e755fcc28..c45236a9fa 100644
--- a/packages/types/src/common.d.ts
+++ b/packages/types/src/common.d.ts
@@ -24,3 +24,5 @@ export type TLogoProps = {
};
export type TNameDescriptionLoader = "submitting" | "submitted" | "saved";
+
+export type TFetchStatus = "partial" | "complete" | undefined;
diff --git a/packages/types/src/project/projects.d.ts b/packages/types/src/project/projects.d.ts
index d992bc7105..269e1477a5 100644
--- a/packages/types/src/project/projects.d.ts
+++ b/packages/types/src/project/projects.d.ts
@@ -10,58 +10,65 @@ import type {
} from "..";
import { TUserPermissions } from "../enums";
-export interface IProject {
- archive_in: number;
+export interface IPartialProject {
+ id: string;
+ name: string;
+ identifier: string;
+ sort_order: number | null;
+ logo_props: TLogoProps;
+ is_member: boolean;
archived_at: string | null;
- archived_issues: number;
- archived_sub_issues: number;
- completed_issues: number;
- close_in: number;
- created_at: Date;
- created_by: string;
- // only for uploading the cover image
- cover_image_asset?: null;
- cover_image?: string;
- // only for rendering the cover image
- cover_image_url: readonly string;
+ workspace: IWorkspace | string;
cycle_view: boolean;
issue_views_view: boolean;
module_view: boolean;
page_view: boolean;
inbox_view: boolean;
- default_assignee: IUser | string | null;
- default_state: string | null;
- description: string;
- draft_issues: number;
- draft_sub_issues: number;
- estimate: string | null;
- guest_view_all_features: boolean;
- id: string;
- identifier: string;
- anchor: string | null;
- is_favorite: boolean;
- is_issue_type_enabled: boolean;
- is_member: boolean;
- is_time_tracking_enabled: boolean;
- logo_props: TLogoProps;
- member_role: TUserPermissions | null;
- members: IProjectMemberLite[];
- name: string;
- 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;
- updated_by: string;
- workspace: IWorkspace | string;
- workspace_detail: IWorkspaceLite;
- timezone: string;
+ project_lead?: IUserLite | string | null;
+ // Timestamps
+ created_at?: Date;
+ updated_at?: Date;
+ // actor
+ created_by?: string;
+ updated_by?: string;
+}
+
+export interface IProject extends IPartialProject {
+ archive_in?: number;
+ close_in?: number;
+ // only for uploading the cover image
+ cover_image_asset?: null;
+ cover_image?: string;
+ // only for rendering the cover image
+ readonly cover_image_url?: string;
+ default_assignee?: IUser | string | null;
+ default_state?: string | null;
+ description?: string;
+ estimate?: string | null;
+ guest_view_all_features?: boolean;
+ anchor?: string | null;
+ is_favorite?: boolean;
+ is_issue_type_enabled?: boolean;
+ is_time_tracking_enabled?: boolean;
+ member_role?: TUserPermissions | null;
+ members?: string[];
+ network?: number;
+ timezone?: string;
}
+export type TProjectAnalyticsCountParams = {
+ project_ids?: string;
+ fields?: string;
+};
+
+export type TProjectAnalyticsCount = Pick<IProject, "id"> & {
+ total_issues?: number;
+ completed_issues?: number;
+ total_cycles?: number;
+ total_members?: number;
+ total_modules?: number;
+};
+
export interface IProjectLite {
id: string;
name: string;
diff --git a/web/app/[workspaceSlug]/(projects)/analytics/page.tsx b/web/app/[workspaceSlug]/(projects)/analytics/page.tsx
index 3193efa030..5b5a365308 100644
--- a/web/app/[workspaceSlug]/(projects)/analytics/page.tsx
+++ b/web/app/[workspaceSlug]/(projects)/analytics/page.tsx
@@ -33,7 +33,7 @@ const AnalyticsPage = observer(() => {
<PageHead title={pageTitle} />
{workspaceProjectIds && (
<>
- {workspaceProjectIds.length > 0 || loader ? (
+ {workspaceProjectIds.length > 0 || loader === "init-loader" ? (
<div className="flex h-full flex-col overflow-hidden bg-custom-background-100">
<Tab.Group as={Fragment} defaultIndex={analytics_tab === "custom" ? 1 : 0}>
<Header variant={EHeaderVariant.SECONDARY}>
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/header.tsx
index 639da9a961..8ad2198e6b 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/header.tsx
@@ -65,7 +65,7 @@ export const ProjectArchivesHeader: FC<TProps> = observer((props: TProps) => {
<Header>
<Header.LeftItem>
<div className="flex items-center gap-2.5">
- <Breadcrumbs onBack={router.back} isLoading={loader}>
+ <Breadcrumbs onBack={router.back} isLoading={loader === "init-loader"}>
<ProjectBreadcrumb />
<Breadcrumbs.BreadcrumbItem
type="text"
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/issues/(detail)/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/issues/(detail)/header.tsx
index 57b12d6326..c68185676f 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/issues/(detail)/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/issues/(detail)/header.tsx
@@ -35,7 +35,7 @@ export const ProjectArchivedIssueDetailsHeader = observer(() => {
return (
<Header>
<Header.LeftItem>
- <Breadcrumbs isLoading={loader}>
+ <Breadcrumbs isLoading={loader === "init-loader"}>
<ProjectBreadcrumb />
<Breadcrumbs.BreadcrumbItem
type="text"
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx
index 8a11bbe7f0..e93965a3c9 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx
@@ -163,7 +163,7 @@ export const CycleIssuesHeader: React.FC = observer(() => {
<Header>
<Header.LeftItem>
<div className="flex items-center gap-2">
- <Breadcrumbs onBack={router.back} isLoading={loader}>
+ <Breadcrumbs onBack={router.back} isLoading={loader === "init-loader"}>
<Breadcrumbs.BreadcrumbItem
type="text"
link={
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(list)/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(list)/header.tsx
index b8e16c8e0a..7954023831 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(list)/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(list)/header.tsx
@@ -32,7 +32,7 @@ export const CyclesListHeader: FC = observer(() => {
return (
<Header>
<Header.LeftItem>
- <Breadcrumbs onBack={router.back} isLoading={loader}>
+ <Breadcrumbs onBack={router.back} isLoading={loader === "init-loader"}>
<ProjectBreadcrumb />
<Breadcrumbs.BreadcrumbItem
type="text"
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/header.tsx
index 3c996a8d14..c4cdb3bdcb 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/header.tsx
@@ -22,6 +22,7 @@ import { usePlatformOS } from "@/hooks/use-platform-os";
// plane web
import { ProjectBreadcrumb } from "@/plane-web/components/breadcrumbs";
+// FIXME: Deprecated. Remove it
export const ProjectDraftIssueHeader: FC = observer(() => {
// router
const { workspaceSlug, projectId } = useParams() as { workspaceSlug: string; projectId: string };
@@ -83,17 +84,13 @@ export const ProjectDraftIssueHeader: FC = observer(() => {
[workspaceSlug, projectId, updateFilters]
);
- const issueCount = currentProjectDetails
- ? !issueFilters?.displayFilters?.sub_issue && currentProjectDetails.draft_sub_issues
- ? currentProjectDetails.draft_issues - currentProjectDetails.draft_sub_issues
- : currentProjectDetails.draft_issues
- : undefined;
+ const issueCount = 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 bg-custom-sidebar-background-100 p-4">
<div className="flex w-full flex-grow items-center gap-2 overflow-ellipsis whitespace-nowrap">
<div className="flex items-center gap-2.5">
- <Breadcrumbs isLoading={loader}>
+ <Breadcrumbs isLoading={loader === "init-loader"}>
<ProjectBreadcrumb />
<Breadcrumbs.BreadcrumbItem
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(detail)/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(detail)/header.tsx
index 44239006ee..699c9865ff 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(detail)/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(detail)/header.tsx
@@ -29,7 +29,7 @@ export const ProjectIssueDetailsHeader = observer(() => {
<Header>
<Header.LeftItem>
<div>
- <Breadcrumbs onBack={router.back} isLoading={loader}>
+ <Breadcrumbs onBack={router.back} isLoading={loader === "init-loader"}>
<ProjectBreadcrumb />
<Breadcrumbs.BreadcrumbItem
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx
index e167509f22..0107d7bfa9 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx
@@ -162,7 +162,7 @@ export const ModuleIssuesHeader: React.FC = observer(() => {
/>
<Header>
<Header.LeftItem>
- <Breadcrumbs onBack={router.back} isLoading={loader}>
+ <Breadcrumbs onBack={router.back} isLoading={loader === "init-loader"}>
<Breadcrumbs.BreadcrumbItem
type="text"
link={
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(list)/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(list)/header.tsx
index 4d320b24c8..268ea5253f 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(list)/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(list)/header.tsx
@@ -22,7 +22,7 @@ export const ModulesListHeader: React.FC = observer(() => {
const { setTrackElement } = useEventTracker();
const { allowPermissions } = useUserPermissions();
- const { loader } = useProject();
+ const { loader } = useProject();
// auth
const canUserCreateModule = allowPermissions(
@@ -34,8 +34,8 @@ export const ModulesListHeader: React.FC = observer(() => {
<Header>
<Header.LeftItem>
<div>
- <Breadcrumbs onBack={router.back} isLoading={loader}>
- <ProjectBreadcrumb />
+ <Breadcrumbs onBack={router.back} isLoading={loader === "init-loader"}>
+ <ProjectBreadcrumb />
<Breadcrumbs.BreadcrumbItem
type="text"
link={<BreadcrumbLink label="Modules" icon={<DiceIcon className="h-4 w-4 text-custom-text-300" />} />}
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(detail)/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(detail)/header.tsx
index ebb4af3bd1..3ca5ba4b8c 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(detail)/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(detail)/header.tsx
@@ -63,7 +63,7 @@ export const PageDetailsHeader = observer(() => {
<Header>
<Header.LeftItem>
<div>
- <Breadcrumbs isLoading={loader}>
+ <Breadcrumbs isLoading={loader === "init-loader"}>
<Breadcrumbs.BreadcrumbItem
type="text"
link={
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(list)/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(list)/header.tsx
index 41af33a74d..1588e69de8 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(list)/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/pages/(list)/header.tsx
@@ -57,7 +57,7 @@ export const PagesListHeader = observer(() => {
<Header>
<Header.LeftItem>
<div>
- <Breadcrumbs isLoading={loader}>
+ <Breadcrumbs isLoading={loader === "init-loader"}>
<ProjectBreadcrumb />
<Breadcrumbs.BreadcrumbItem
type="text"
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/header.tsx
index 2dfd24ea05..ecc7146ba9 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/header.tsx
@@ -29,7 +29,7 @@ export const ProjectSettingHeader: FC = observer(() => {
<Header.LeftItem>
<div>
<div className="z-50">
- <Breadcrumbs onBack={router.back} isLoading={loader}>
+ <Breadcrumbs onBack={router.back} isLoading={loader === "init-loader"}>
<ProjectBreadcrumb />
<div className="hidden sm:hidden md:block lg:block">
<Breadcrumbs.BreadcrumbItem
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/header.tsx
index aaaf5012d9..b4de9b6404 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/header.tsx
@@ -141,7 +141,7 @@ export const ProjectViewIssuesHeader: React.FC = observer(() => {
return (
<Header>
<Header.LeftItem>
- <Breadcrumbs isLoading={loader}>
+ <Breadcrumbs isLoading={loader === "init-loader"}>
<ProjectBreadcrumb />
<Breadcrumbs.BreadcrumbItem
type="text"
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/header.tsx
index f9f59d96ac..ea9a6ac8a0 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(list)/header.tsx
@@ -21,7 +21,7 @@ export const ProjectViewsHeader = observer(() => {
<>
<Header>
<Header.LeftItem>
- <Breadcrumbs isLoading={loader}>
+ <Breadcrumbs isLoading={loader === "init-loader"}>
<ProjectBreadcrumb />
<Breadcrumbs.BreadcrumbItem
type="text"
diff --git a/web/ce/components/issues/header.tsx b/web/ce/components/issues/header.tsx
index f9e82b095a..e231096ce6 100644
--- a/web/ce/components/issues/header.tsx
+++ b/web/ce/components/issues/header.tsx
@@ -52,7 +52,7 @@ export const IssuesHeader = observer(() => {
<Header>
<Header.LeftItem>
<div className="flex items-center gap-2.5">
- <Breadcrumbs onBack={() => router.back()} isLoading={loader}>
+ <Breadcrumbs onBack={() => router.back()} isLoading={loader === "init-loader"}>
<ProjectBreadcrumb />
<Breadcrumbs.BreadcrumbItem
diff --git a/web/ce/components/projects/create/attributes.tsx b/web/ce/components/projects/create/attributes.tsx
index 38247188d9..4b3a2cbdd3 100644
--- a/web/ce/components/projects/create/attributes.tsx
+++ b/web/ce/components/projects/create/attributes.tsx
@@ -77,7 +77,7 @@ const ProjectAttributes: FC<Props> = (props) => {
return (
<div className="flex-shrink-0 h-7" tabIndex={getIndex("lead")}>
<MemberDropdown
- value={value}
+ value={value ?? null}
onChange={(lead) => onChange(lead === value ? null : lead)}
placeholder={t("lead")}
multiple={false}
diff --git a/web/ce/components/projects/settings/intake/header.tsx b/web/ce/components/projects/settings/intake/header.tsx
index 9ed39733bb..38270f3c91 100644
--- a/web/ce/components/projects/settings/intake/header.tsx
+++ b/web/ce/components/projects/settings/intake/header.tsx
@@ -36,7 +36,7 @@ export const ProjectInboxHeader: FC = observer(() => {
<Header>
<Header.LeftItem>
<div className="flex items-center gap-4">
- <Breadcrumbs isLoading={currentProjectDetailsLoader}>
+ <Breadcrumbs isLoading={currentProjectDetailsLoader === "init-loader"}>
<ProjectBreadcrumb />
<Breadcrumbs.BreadcrumbItem
diff --git a/web/ce/store/timeline/base-timeline.store.ts b/web/ce/store/timeline/base-timeline.store.ts
index 3e15d124db..81de55fc48 100644
--- a/web/ce/store/timeline/base-timeline.store.ts
+++ b/web/ce/store/timeline/base-timeline.store.ts
@@ -20,8 +20,8 @@ type BlockData = {
id: string;
name: string;
sort_order: number | null;
- start_date: string | undefined | null;
- target_date: string | undefined | null;
+ start_date?: string | undefined | null;
+ target_date?: string | undefined | null;
};
export interface IBaseTimelineStore {
diff --git a/web/ce/types/projects/projects.ts b/web/ce/types/projects/projects.ts
index 567c9488db..92c32b65d3 100644
--- a/web/ce/types/projects/projects.ts
+++ b/web/ce/types/projects/projects.ts
@@ -1,3 +1,5 @@
-import { IProject } from "@plane/types";
+import { IPartialProject, IProject } from "@plane/types";
-export type TProject = IProject;
+export type TPartialProject = IPartialProject;
+
+export type TProject = TPartialProject & IProject;
diff --git a/web/core/components/analytics/custom-analytics/sidebar/projects-list.tsx b/web/core/components/analytics/custom-analytics/sidebar/projects-list.tsx
index d708074676..ff6a11ce0b 100644
--- a/web/core/components/analytics/custom-analytics/sidebar/projects-list.tsx
+++ b/web/core/components/analytics/custom-analytics/sidebar/projects-list.tsx
@@ -1,6 +1,8 @@
import { observer } from "mobx-react";
// icons
-import { Contrast, LayoutGrid, Users } from "lucide-react";
+import { Contrast, LayoutGrid, Users, Loader as Spinner } from "lucide-react";
+// plane imports
+import { Loader } from "@plane/ui";
// components
import { Logo } from "@/components/common";
// helpers
@@ -10,19 +12,25 @@ import { useProject } from "@/hooks/store";
type Props = {
projectIds: string[];
+ isLoading: boolean;
+ isUpdating: boolean;
};
export const CustomAnalyticsSidebarProjectsList: React.FC<Props> = observer((props) => {
- const { projectIds } = props;
-
- const { getProjectById } = useProject();
+ const { projectIds, isLoading, isUpdating } = props;
+ // store hooks
+ const { getProjectById, getProjectAnalyticsCountById } = useProject();
return (
<div className="relative flex flex-col gap-4 h-full">
- <h4 className="font-medium">Selected Projects</h4>
+ <div className="flex gap-2 items-center">
+ <h4 className="font-medium">Selected Projects</h4>
+ {isUpdating && <Spinner className="animate-spin size-3" />}
+ </div>
<div className="relative space-y-6 overflow-hidden overflow-y-auto vertical-scrollbar scrollbar-md">
{projectIds.map((projectId) => {
const project = getProjectById(projectId);
+ const projectAnalyticsCount = getProjectAnalyticsCountById(projectId);
if (!project) return;
@@ -38,27 +46,37 @@ export const CustomAnalyticsSidebarProjectsList: React.FC<Props> = observer((pro
</h5>
</div>
<div className="mt-4 w-full space-y-3 px-2">
- <div className="flex items-center justify-between gap-2 text-xs">
- <div className="flex items-center gap-2">
- <Users className="text-custom-text-200" size={14} strokeWidth={2} />
- <h6>Total members</h6>
- </div>
- <span className="text-custom-text-200">{project.total_members}</span>
- </div>
- <div className="flex items-center justify-between gap-2 text-xs">
- <div className="flex items-center gap-2">
- <Contrast className="text-custom-text-200" size={14} strokeWidth={2} />
- <h6>Total cycles</h6>
- </div>
- <span className="text-custom-text-200">{project.total_cycles}</span>
- </div>
- <div className="flex items-center justify-between gap-2 text-xs">
- <div className="flex items-center gap-2">
- <LayoutGrid className="text-custom-text-200" size={14} strokeWidth={2} />
- <h6>Total modules</h6>
- </div>
- <span className="text-custom-text-200">{project.total_modules}</span>
- </div>
+ {isLoading ? (
+ <Loader className="space-y-3">
+ <Loader.Item height="16px" />
+ <Loader.Item height="16px" />
+ <Loader.Item height="16px" />
+ </Loader>
+ ) : (
+ <>
+ <div className="flex items-center justify-between gap-2 text-xs">
+ <div className="flex items-center gap-2">
+ <Users className="text-custom-text-200" size={14} strokeWidth={2} />
+ <h6>Total members</h6>
+ </div>
+ <span className="text-custom-text-200">{projectAnalyticsCount?.total_members}</span>
+ </div>
+ <div className="flex items-center justify-between gap-2 text-xs">
+ <div className="flex items-center gap-2">
+ <Contrast className="text-custom-text-200" size={14} strokeWidth={2} />
+ <h6>Total cycles</h6>
+ </div>
+ <span className="text-custom-text-200">{projectAnalyticsCount?.total_cycles}</span>
+ </div>
+ <div className="flex items-center justify-between gap-2 text-xs">
+ <div className="flex items-center gap-2">
+ <LayoutGrid className="text-custom-text-200" size={14} strokeWidth={2} />
+ <h6>Total modules</h6>
+ </div>
+ <span className="text-custom-text-200">{projectAnalyticsCount?.total_modules}</span>
+ </div>
+ </>
+ )}
</div>
</div>
);
diff --git a/web/core/components/analytics/custom-analytics/sidebar/sidebar.tsx b/web/core/components/analytics/custom-analytics/sidebar/sidebar.tsx
index 639a830cd5..170d3ed680 100644
--- a/web/core/components/analytics/custom-analytics/sidebar/sidebar.tsx
+++ b/web/core/components/analytics/custom-analytics/sidebar/sidebar.tsx
@@ -3,7 +3,7 @@
import { useEffect } from "react";
import { observer } from "mobx-react";
import { useParams } from "next/navigation";
-import { mutate } from "swr";
+import useSWR, { mutate } from "swr";
// icons
import { CalendarDays, Download, RefreshCw } from "lucide-react";
// types
@@ -30,19 +30,27 @@ type Props = {
const analyticsService = new AnalyticsService();
+const PROJECT_ANALYTICS_COUNT_PARAMS = {
+ fields: "total_members,total_cycles,total_modules",
+};
+
export const CustomAnalyticsSidebar: React.FC<Props> = observer((props) => {
const { analytics, params, isProjectLevel = false } = props;
// router
const { workspaceSlug, projectId, cycleId, moduleId } = useParams();
// store hooks
const { data: currentUser } = useUser();
- const { workspaceProjectIds, getProjectById } = useProject();
+ const { workspaceProjectIds, getProjectById, fetchProjectAnalyticsCount } = useProject();
const { getWorkspaceById } = useWorkspace();
-
const { fetchCycleDetails, getCycleById } = useCycle();
const { fetchModuleDetails, getModuleById } = useModule();
+ // fetch project analytics count
+ const { isLoading: isProjectAnalyticsLoading, isValidating: isProjectAnalyticsUpdating } = useSWR(
+ workspaceSlug ? ["projectAnalyticsCount", workspaceSlug] : null,
+ workspaceSlug ? () => fetchProjectAnalyticsCount(workspaceSlug.toString(), PROJECT_ANALYTICS_COUNT_PARAMS) : null
+ );
- const projectDetails = projectId ? getProjectById(projectId.toString()) ?? undefined : undefined;
+ const projectDetails = projectId ? (getProjectById(projectId.toString()) ?? undefined) : undefined;
const trackExportAnalytics = () => {
if (!currentUser) return;
@@ -171,7 +179,11 @@ export const CustomAnalyticsSidebar: React.FC<Props> = observer((props) => {
<div className={cn("h-full w-full overflow-hidden", isProjectLevel ? "hidden" : "block")}>
<>
{!isProjectLevel && selectedProjects && selectedProjects.length > 0 && (
- <CustomAnalyticsSidebarProjectsList projectIds={selectedProjects} />
+ <CustomAnalyticsSidebarProjectsList
+ projectIds={selectedProjects}
+ isLoading={isProjectAnalyticsLoading}
+ isUpdating={isProjectAnalyticsUpdating}
+ />
)}
<CustomAnalyticsSidebarHeader />
</>
diff --git a/web/core/components/auth-screens/project/join-project.tsx b/web/core/components/auth-screens/project/join-project.tsx
index 4ec94acab0..b815f8738e 100644
--- a/web/core/components/auth-screens/project/join-project.tsx
+++ b/web/core/components/auth-screens/project/join-project.tsx
@@ -16,7 +16,7 @@ export const JoinProject: React.FC = () => {
const [isJoiningProject, setIsJoiningProject] = useState(false);
// store hooks
const { joinProject } = useUserPermissions();
- const { fetchProjects } = useProject();
+ const { fetchProjectDetails } = useProject();
const { workspaceSlug, projectId } = useParams();
@@ -26,7 +26,7 @@ export const JoinProject: React.FC = () => {
setIsJoiningProject(true);
joinProject(workspaceSlug.toString(), projectId.toString())
- .then(() => fetchProjects(workspaceSlug.toString()))
+ .then(() => fetchProjectDetails(workspaceSlug.toString(), projectId.toString()))
.finally(() => setIsJoiningProject(false));
};
diff --git a/web/core/components/automation/auto-archive-automation.tsx b/web/core/components/automation/auto-archive-automation.tsx
index 8ef488da59..84544a1f86 100644
--- a/web/core/components/automation/auto-archive-automation.tsx
+++ b/web/core/components/automation/auto-archive-automation.tsx
@@ -2,6 +2,7 @@
import React, { useState } from "react";
import { observer } from "mobx-react";
+import { useParams } from "next/navigation";
import { ArchiveRestore } from "lucide-react";
// types
import { IProject } from "@plane/types";
@@ -23,6 +24,8 @@ const initialValues: Partial<IProject> = { archive_in: 1 };
export const AutoArchiveAutomation: React.FC<Props> = observer((props) => {
const { handleChange } = props;
+ // router
+ const { workspaceSlug } = useParams();
// states
const [monthModal, setmonthModal] = useState(false);
// store hooks
@@ -33,9 +36,9 @@ export const AutoArchiveAutomation: React.FC<Props> = observer((props) => {
const isAdmin = allowPermissions(
[EUserPermissions.ADMIN],
EUserPermissionsLevel.PROJECT,
- currentProjectDetails?.workspace_detail?.slug,
+ workspaceSlug?.toString(),
currentProjectDetails?.id
- );
+);
return (
<>
diff --git a/web/core/components/automation/auto-close-automation.tsx b/web/core/components/automation/auto-close-automation.tsx
index dce5764d42..4a5899bde6 100644
--- a/web/core/components/automation/auto-close-automation.tsx
+++ b/web/core/components/automation/auto-close-automation.tsx
@@ -2,6 +2,7 @@
import React, { useState } from "react";
import { observer } from "mobx-react";
+import { useParams } from "next/navigation";
// icons
import { ArchiveX } from "lucide-react";
// types
@@ -22,6 +23,8 @@ type Props = {
export const AutoCloseAutomation: React.FC<Props> = observer((props) => {
const { handleChange } = props;
+ // router
+ const { workspaceSlug } = useParams();
// states
const [monthModal, setmonthModal] = useState(false);
// store hooks
@@ -59,7 +62,7 @@ export const AutoCloseAutomation: React.FC<Props> = observer((props) => {
const isAdmin = allowPermissions(
[EUserPermissions.ADMIN],
EUserPermissionsLevel.PROJECT,
- currentProjectDetails?.workspace_detail?.slug,
+ workspaceSlug?.toString(),
currentProjectDetails?.id
);
diff --git a/web/core/components/automation/select-month-modal.tsx b/web/core/components/automation/select-month-modal.tsx
index 9a0ebb05ff..b35b9885ee 100644
--- a/web/core/components/automation/select-month-modal.tsx
+++ b/web/core/components/automation/select-month-modal.tsx
@@ -93,7 +93,7 @@ export const SelectMonthModal: React.FC<Props> = ({ type, initialValues, isOpen,
id="close_in"
name="close_in"
type="number"
- value={value.toString()}
+ value={value?.toString()}
onChange={onChange}
ref={ref}
hasError={Boolean(errors.close_in)}
@@ -127,7 +127,7 @@ export const SelectMonthModal: React.FC<Props> = ({ type, initialValues, isOpen,
id="archive_in"
name="archive_in"
type="number"
- value={value.toString()}
+ value={value?.toString()}
onChange={onChange}
ref={ref}
hasError={Boolean(errors.archive_in)}
diff --git a/web/core/components/dashboard/widgets/recent-projects.tsx b/web/core/components/dashboard/widgets/recent-projects.tsx
index 5255908717..6420d48280 100644
--- a/web/core/components/dashboard/widgets/recent-projects.tsx
+++ b/web/core/components/dashboard/widgets/recent-projects.tsx
@@ -16,7 +16,14 @@ import { PROJECT_BACKGROUND_COLORS } from "@/constants/dashboard";
// helpers
import { getFileURL } from "@/helpers/file.helper";
// hooks
-import { useEventTracker, useDashboard, useProject, useCommandPalette, useUserPermissions } from "@/hooks/store";
+import {
+ useEventTracker,
+ useDashboard,
+ useProject,
+ useCommandPalette,
+ useUserPermissions,
+ useMember,
+} from "@/hooks/store";
// plane web constants
import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/user-permissions";
@@ -31,6 +38,8 @@ const ProjectListItem: React.FC<ProjectListItemProps> = observer((props) => {
const { projectId, workspaceSlug } = props;
// store hooks
const { getProjectById } = useProject();
+ const { getUserDetails } = useMember();
+ // derived values
const projectDetails = getProjectById(projectId);
const randomBgColor = PROJECT_BACKGROUND_COLORS[Math.floor(Math.random() * PROJECT_BACKGROUND_COLORS.length)];
@@ -52,13 +61,13 @@ const ProjectListItem: React.FC<ProjectListItemProps> = observer((props) => {
</h6>
<div className="mt-2">
<AvatarGroup>
- {projectDetails.members?.map((member) => (
- <Avatar
- key={member.member_id}
- src={getFileURL(member.member__avatar_url)}
- name={member.member__display_name}
- />
- ))}
+ {projectDetails.members?.map((memberId) => {
+ const userDetails = getUserDetails(memberId);
+ if (!userDetails) return null;
+ return (
+ <Avatar key={userDetails.id} src={getFileURL(userDetails.avatar_url)} name={userDetails.display_name} />
+ );
+ })}
</AvatarGroup>
</div>
</div>
diff --git a/web/core/components/home/widgets/recents/index.tsx b/web/core/components/home/widgets/recents/index.tsx
index 83b3a4592b..cb43384801 100644
--- a/web/core/components/home/widgets/recents/index.tsx
+++ b/web/core/components/home/widgets/recents/index.tsx
@@ -79,7 +79,7 @@ export const RecentActivityWidget: React.FC<TRecentWidgetProps> = observer((prop
}
};
- if (!loader && !isWikiApp && joinedProjectIds?.length === 0) return <NoProjectsEmptyState />;
+ if (loader === "loaded" && !isWikiApp && joinedProjectIds?.length === 0) return <NoProjectsEmptyState />;
if (!isLoading && recents?.length === 0)
return (
diff --git a/web/core/components/page-views/workspace-dashboard.tsx b/web/core/components/page-views/workspace-dashboard.tsx
index f4df757cd8..8db841344d 100644
--- a/web/core/components/page-views/workspace-dashboard.tsx
+++ b/web/core/components/page-views/workspace-dashboard.tsx
@@ -19,15 +19,11 @@ import useSize from "@/hooks/use-window-size";
export const WorkspaceDashboardView = observer(() => {
// store hooks
- const {
- // captureEvent,
- setTrackElement,
- } = useEventTracker();
+ const { captureEvent, setTrackElement } = useEventTracker();
const { toggleCreateProjectModal } = useCommandPalette();
const { workspaceSlug } = useParams();
const { data: currentUser } = useUser();
const { data: currentUserProfile, updateTourCompleted } = useUserProfile();
- const { captureEvent } = useEventTracker();
const { homeDashboardId, fetchHomeDashboardWidgets } = useDashboard();
const { joinedProjectIds, loader } = useProject();
@@ -63,7 +59,7 @@ export const WorkspaceDashboardView = observer(() => {
)}
{homeDashboardId && joinedProjectIds && (
<>
- {joinedProjectIds.length > 0 || loader ? (
+ {joinedProjectIds.length > 0 || loader === "init-loader" ? (
<>
<IssuePeekOverview />
<ContentWrapper
diff --git a/web/core/components/project/card-list.tsx b/web/core/components/project/card-list.tsx
index ff98c188c5..83fbf0c87c 100644
--- a/web/core/components/project/card-list.tsx
+++ b/web/core/components/project/card-list.tsx
@@ -24,17 +24,19 @@ export const ProjectCardList = observer((props: TProjectCardListProps) => {
const { toggleCreateProjectModal } = useCommandPalette();
const { setTrackElement } = useEventTracker();
const {
+ loader,
+ fetchStatus,
workspaceProjectIds: storeWorkspaceProjectIds,
filteredProjectIds: storeFilteredProjectIds,
getProjectById,
- loader,
} = useProject();
const { searchQuery, currentWorkspaceDisplayFilters } = useProjectFilter();
// derived values
const workspaceProjectIds = totalProjectIdsProps ?? storeWorkspaceProjectIds;
const filteredProjectIds = filteredProjectIdsProps ?? storeFilteredProjectIds;
- if (!filteredProjectIds || !workspaceProjectIds || loader) return <ProjectsLoader />;
+ if (!filteredProjectIds || !workspaceProjectIds || loader === "init-loader" || fetchStatus !== "complete")
+ return <ProjectsLoader />;
if (workspaceProjectIds?.length === 0 && !currentWorkspaceDisplayFilters?.archived_projects)
return (
diff --git a/web/core/components/project/card.tsx b/web/core/components/project/card.tsx
index d755ce0074..341ddcf8f0 100644
--- a/web/core/components/project/card.tsx
+++ b/web/core/components/project/card.tsx
@@ -29,7 +29,7 @@ import { renderFormattedDate } from "@/helpers/date-time.helper";
import { getFileURL } from "@/helpers/file.helper";
import { copyUrlToClipboard } from "@/helpers/string.helper";
// hooks
-import { useProject, useUserPermissions } from "@/hooks/store";
+import { useMember, useProject, useUserPermissions } from "@/hooks/store";
import { useAppRouter } from "@/hooks/use-app-router";
import { usePlatformOS } from "@/hooks/use-platform-os";
// plane-web constants
@@ -51,12 +51,13 @@ export const ProjectCard: React.FC<Props> = observer((props) => {
const router = useAppRouter();
const { workspaceSlug } = useParams();
// store hooks
+ const { getUserDetails } = useMember();
const { addProjectToFavorites, removeProjectFromFavorites } = useProject();
const { allowPermissions } = useUserPermissions();
// hooks
const { isMobile } = usePlatformOS();
// derived values
- const projectMembersIds = project.members?.map((member) => member.member_id);
+ const projectMembersIds = project.members;
const shouldRenderFavorite = allowPermissions(
[EUserPermissions.ADMIN, EUserPermissions.MEMBER],
EUserPermissionsLevel.WORKSPACE
@@ -249,7 +250,7 @@ export const ProjectCard: React.FC<Props> = observer((props) => {
if (project.is_favorite) handleRemoveFromFavorites();
else handleAddToFavorites();
}}
- selected={project.is_favorite}
+ selected={!!project.is_favorite}
/>
)}
</div>
@@ -281,14 +282,10 @@ export const ProjectCard: React.FC<Props> = observer((props) => {
<div className="flex cursor-pointer items-center gap-2 text-custom-text-200">
<AvatarGroup showTooltip={false}>
{projectMembersIds.map((memberId) => {
- const member = project.members?.find((m) => m.member_id === memberId);
+ const member = getUserDetails(memberId);
if (!member) return null;
return (
- <Avatar
- key={member.id}
- name={member.member__display_name}
- src={getFileURL(member.member__avatar_url)}
- />
+ <Avatar key={member.id} name={member.display_name} src={getFileURL(member.avatar_url)} />
);
})}
</AvatarGroup>
diff --git a/web/core/components/project/create/header.tsx b/web/core/components/project/create/header.tsx
index 19142c729b..efe93e757d 100644
--- a/web/core/components/project/create/header.tsx
+++ b/web/core/components/project/create/header.tsx
@@ -53,7 +53,7 @@ const ProjectCreateHeader: React.FC<Props> = (props) => {
label={t("change_cover")}
onChange={onChange}
control={control}
- value={value}
+ value={value ?? null}
tabIndex={getIndex("cover_image")}
/>
)}
diff --git a/web/core/components/project/form.tsx b/web/core/components/project/form.tsx
index c5acb0b563..a7264ea7a5 100644
--- a/web/core/components/project/form.tsx
+++ b/web/core/components/project/form.tsx
@@ -222,7 +222,7 @@ export const ProjectDetailsForm: FC<IProjectDetailsForm> = (props) => {
label="Change cover"
control={control}
onChange={onChange}
- value={value}
+ value={value ?? null}
disabled={!isAdmin}
projectId={project.id}
/>
@@ -263,7 +263,7 @@ export const ProjectDetailsForm: FC<IProjectDetailsForm> = (props) => {
<span className="text-xs text-red-500">{errors?.name?.message}</span>
</div>
<div className="flex flex-col gap-1">
- <h4 className="text-sm">Description</h4>
+ <h4 className="text-sm">Summary</h4>
<Controller
name="description"
control={control}
@@ -272,7 +272,7 @@ export const ProjectDetailsForm: FC<IProjectDetailsForm> = (props) => {
id="description"
name="description"
value={value}
- placeholder="Enter project description"
+ placeholder="Enter project summary"
onChange={onChange}
className="min-h-[102px] text-sm font-medium"
hasError={Boolean(errors?.description)}
diff --git a/web/core/components/project/join-project-modal.tsx b/web/core/components/project/join-project-modal.tsx
index 2006c491c7..d46cf4d0bc 100644
--- a/web/core/components/project/join-project-modal.tsx
+++ b/web/core/components/project/join-project-modal.tsx
@@ -25,7 +25,7 @@ export const JoinProjectModal: React.FC<TJoinProjectModalProps> = (props) => {
const [isJoiningLoading, setIsJoiningLoading] = useState(false);
// store hooks
const { joinProject } = useUserPermissions();
- const { fetchProjects } = useProject();
+ const { fetchProjectDetails } = useProject();
// router
const router = useAppRouter();
@@ -35,7 +35,7 @@ export const JoinProjectModal: React.FC<TJoinProjectModalProps> = (props) => {
joinProject(workspaceSlug, project.id)
.then(() => {
router.push(`/${workspaceSlug}/projects/${project.id}/issues`);
- fetchProjects(workspaceSlug);
+ fetchProjectDetails(workspaceSlug, project.id);
handleClose();
})
.finally(() => {
diff --git a/web/core/components/project/member-list-item.tsx b/web/core/components/project/member-list-item.tsx
index 3b115c493c..a2dfea8242 100644
--- a/web/core/components/project/member-list-item.tsx
+++ b/web/core/components/project/member-list-item.tsx
@@ -27,7 +27,7 @@ export const ProjectMemberListItem: React.FC<Props> = observer((props) => {
// store hooks
const { leaveProject } = useUserPermissions();
const { data: currentUser } = useUser();
- const { fetchProjects } = useProject();
+ const { fetchProjectDetails } = useProject();
const {
project: { removeMemberFromProject },
} = useMember();
@@ -45,7 +45,7 @@ export const ProjectMemberListItem: React.FC<Props> = observer((props) => {
state: "SUCCESS",
element: "Project settings members page",
});
- await fetchProjects(workspaceSlug.toString());
+ await fetchProjectDetails(workspaceSlug.toString(), projectId.toString());
})
.catch((err) =>
setToast({
diff --git a/web/core/components/project/project-settings-member-defaults.tsx b/web/core/components/project/project-settings-member-defaults.tsx
index 4b6c3cd390..f4aeb63b58 100644
--- a/web/core/components/project/project-settings-member-defaults.tsx
+++ b/web/core/components/project/project-settings-member-defaults.tsx
@@ -34,7 +34,7 @@ export const ProjectSettingsMemberDefaults: React.FC = observer(() => {
const isAdmin = allowPermissions(
[EUserPermissions.ADMIN],
EUserPermissionsLevel.PROJECT,
- currentProjectDetails?.workspace_detail?.slug,
+ workspaceSlug?.toString(),
currentProjectDetails?.id
);
// form info
@@ -176,7 +176,7 @@ export const ProjectSettingsMemberDefaults: React.FC = observer(() => {
</p>
</div>
<ToggleSwitch
- value={currentProjectDetails?.guest_view_all_features}
+ value={!!currentProjectDetails?.guest_view_all_features}
onChange={() => toggleGuestViewAllIssues(!currentProjectDetails?.guest_view_all_features)}
disabled={!isAdmin}
size="md"
diff --git a/web/core/components/workspace/sidebar/project-navigation.tsx b/web/core/components/workspace/sidebar/project-navigation.tsx
index e248f27c81..9e7cde6a26 100644
--- a/web/core/components/workspace/sidebar/project-navigation.tsx
+++ b/web/core/components/workspace/sidebar/project-navigation.tsx
@@ -38,13 +38,13 @@ export const ProjectNavigation: FC<TProjectItemsProps> = observer((props) => {
// store hooks
const { t } = useTranslation();
const { sidebarCollapsed: isSidebarCollapsed, toggleSidebar } = useAppTheme();
- const { getProjectById } = useProject();
+ const { getPartialProjectById } = useProject();
const { isMobile } = usePlatformOS();
const { allowPermissions } = useUserPermissions();
// pathname
const pathname = usePathname();
// derived values
- const project = getProjectById(projectId);
+ const project = getPartialProjectById(projectId);
// handlers
const handleProjectClick = () => {
if (window.innerWidth < 768) {
diff --git a/web/core/components/workspace/sidebar/projects-list-item.tsx b/web/core/components/workspace/sidebar/projects-list-item.tsx
index d0f42daf40..f105fb72a5 100644
--- a/web/core/components/workspace/sidebar/projects-list-item.tsx
+++ b/web/core/components/workspace/sidebar/projects-list-item.tsx
@@ -52,7 +52,7 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
const { sidebarCollapsed: isSidebarCollapsed } = useAppTheme();
const { t } = useTranslation();
const { setTrackElement } = useEventTracker();
- const { addProjectToFavorites, removeProjectFromFavorites, getProjectById } = useProject();
+ const { addProjectToFavorites, removeProjectFromFavorites, getPartialProjectById } = useProject();
const { isMobile } = usePlatformOS();
const { allowPermissions } = useUserPermissions();
// states
@@ -70,7 +70,7 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
const router = useRouter();
const { workspaceSlug, projectId: URLProjectId } = useParams();
// derived values
- const project = getProjectById(projectId);
+ const project = getPartialProjectById(projectId);
// auth
const isAdmin = allowPermissions(
[EUserPermissions.ADMIN],
@@ -337,7 +337,8 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
placement="bottom-start"
useCaptureForOutsideClick
>
- {isAuthorized && (
+ {/* TODO: Removed is_favorite logic due to the optimization in projects API */}
+ {/* {isAuthorized && (
<CustomMenu.MenuItem
onClick={project.is_favorite ? handleRemoveFromFavorites : handleAddToFavorites}
>
@@ -350,7 +351,7 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
<span>{project.is_favorite ? t("remove_from_favorites") : t("add_to_favorites")}</span>
</span>
</CustomMenu.MenuItem>
- )}
+ )} */}
{/* publish project settings */}
{isAdmin && (
@@ -359,20 +360,10 @@ export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
<div className="flex h-4 w-4 cursor-pointer items-center justify-center rounded text-custom-sidebar-text-200 transition-all duration-300 hover:bg-custom-sidebar-background-80">
<Share2 className="h-3.5 w-3.5 stroke-[1.5]" />
</div>
- <div>{project.anchor ? t("publish_settings") : t("publish")}</div>
+ <div>{t("publish_settings")}</div>
</div>
</CustomMenu.MenuItem>
)}
- {/* {isAuthorized && (
- <CustomMenu.MenuItem>
- <Link href={`/${workspaceSlug}/projects/${project?.id}/draft-issues/`}>
- <div className="flex items-center justify-start gap-2">
- <PenSquare className="h-3.5 w-3.5 stroke-[1.5] text-custom-text-300" />
- <span>Draft issues</span>
- </div>
- </Link>
- </CustomMenu.MenuItem>
- )} */}
<CustomMenu.MenuItem onClick={handleCopyText}>
<span className="flex items-center justify-start gap-2">
<LinkIcon className="h-3.5 w-3.5 stroke-[1.5]" />
diff --git a/web/core/components/workspace/sidebar/projects-list.tsx b/web/core/components/workspace/sidebar/projects-list.tsx
index d5737fafbb..e929bccb05 100644
--- a/web/core/components/workspace/sidebar/projects-list.tsx
+++ b/web/core/components/workspace/sidebar/projects-list.tsx
@@ -9,7 +9,7 @@ import { Briefcase, ChevronRight, Plus } from "lucide-react";
import { Disclosure, Transition } from "@headlessui/react";
import { useTranslation } from "@plane/i18n";
// ui
-import { TOAST_TYPE, Tooltip, setToast } from "@plane/ui";
+import { Loader, TOAST_TYPE, Tooltip, setToast } from "@plane/ui";
// components
import { CreateProjectModal } from "@/components/project";
import { SidebarProjectsListItem } from "@/components/workspace";
@@ -41,7 +41,7 @@ export const SidebarProjectsList: FC = observer(() => {
const { setTrackElement } = useEventTracker();
const { allowPermissions } = useUserPermissions();
- const { getProjectById, joinedProjectIds: joinedProjects, updateProjectView } = useProject();
+ const { loader, getPartialProjectById, joinedProjectIds: joinedProjects, updateProjectView } = useProject();
// router params
const { workspaceSlug } = useParams();
const pathname = usePathname();
@@ -72,7 +72,7 @@ export const SidebarProjectsList: FC = observer(() => {
const joinedProjectsList: TProject[] = [];
joinedProjects.map((projectId) => {
- const projectDetails = getProjectById(projectId);
+ const projectDetails = getPartialProjectById(projectId);
if (projectDetails) joinedProjectsList.push(projectDetails);
});
@@ -232,6 +232,13 @@ export const SidebarProjectsList: FC = observer(() => {
leaveFrom="transform scale-100 opacity-100"
leaveTo="transform scale-95 opacity-0"
>
+ {loader === "init-loader" && (
+ <Loader className="w-full space-y-1.5">
+ {Array.from({ length: 4 }).map((_, index) => (
+ <Loader.Item key={index} height="28px" />
+ ))}
+ </Loader>
+ )}
{isAllProjectsListOpen && (
<Disclosure.Panel
as="div"
diff --git a/web/core/layouts/auth-layout/project-wrapper.tsx b/web/core/layouts/auth-layout/project-wrapper.tsx
index dcba2a8fef..8cf97f47a3 100644
--- a/web/core/layouts/auth-layout/project-wrapper.tsx
+++ b/web/core/layouts/auth-layout/project-wrapper.tsx
@@ -165,7 +165,7 @@ export const ProjectAuthWrapper: FC<IProjectAuthWrapper> = observer((props) => {
if (projectExists && projectId && hasPermissionToCurrentProject === false) return <JoinProject />;
// check if the project info is not found.
- if (!loader && !projectExists && projectId && !!hasPermissionToCurrentProject === false)
+ if (loader === "loaded" && !projectExists && projectId && !!hasPermissionToCurrentProject === false)
return (
<div className="grid h-screen place-items-center bg-custom-background-100">
<EmptyState
diff --git a/web/core/layouts/auth-layout/workspace-wrapper.tsx b/web/core/layouts/auth-layout/workspace-wrapper.tsx
index 87588008ea..15a48023ab 100644
--- a/web/core/layouts/auth-layout/workspace-wrapper.tsx
+++ b/web/core/layouts/auth-layout/workspace-wrapper.tsx
@@ -39,7 +39,7 @@ export const WorkspaceAuthWrapper: FC<IWorkspaceAuthWrapper> = observer((props)
const { resolvedTheme } = useTheme();
// store hooks
const { signOut, data: currentUser } = useUser();
- const { fetchProjects } = useProject();
+ const { fetchPartialProjects } = useProject();
const { fetchFavorite } = useFavorite();
const {
workspace: { fetchWorkspaceMembers },
@@ -74,8 +74,8 @@ export const WorkspaceAuthWrapper: FC<IWorkspaceAuthWrapper> = observer((props)
// fetching workspace projects
useSWR(
- workspaceSlug && currentWorkspace ? `WORKSPACE_PROJECTS_${workspaceSlug}` : null,
- workspaceSlug && currentWorkspace ? () => fetchProjects(workspaceSlug.toString()) : null,
+ workspaceSlug && currentWorkspace ? `WORKSPACE_PARTIAL_PROJECTS_${workspaceSlug}` : null,
+ workspaceSlug && currentWorkspace ? () => fetchPartialProjects(workspaceSlug.toString()) : null,
{ revalidateIfStale: false, revalidateOnFocus: false }
);
// fetch workspace members
diff --git a/web/core/services/project/project.service.ts b/web/core/services/project/project.service.ts
index f9c2af8b66..fc8ed94427 100644
--- a/web/core/services/project/project.service.ts
+++ b/web/core/services/project/project.service.ts
@@ -1,8 +1,14 @@
-import type { GithubRepositoriesResponse, ISearchIssueResponse, TProjectIssuesSearchParams } from "@plane/types";
+import type {
+ GithubRepositoriesResponse,
+ ISearchIssueResponse,
+ TProjectAnalyticsCount,
+ TProjectAnalyticsCountParams,
+ TProjectIssuesSearchParams,
+} from "@plane/types";
// helpers
import { API_BASE_URL } from "@/helpers/common.helper";
// plane web types
-import { TProject } from "@/plane-web/types";
+import { TProject, TPartialProject } from "@/plane-web/types";
// services
import { APIService } from "@/services/api.service";
@@ -31,7 +37,7 @@ export class ProjectService extends APIService {
});
}
- async getProjects(workspaceSlug: string): Promise<TProject[]> {
+ async getProjectsLite(workspaceSlug: string): Promise<TPartialProject[]> {
return this.get(`/api/workspaces/${workspaceSlug}/projects/`)
.then((response) => response?.data)
.catch((error) => {
@@ -39,6 +45,14 @@ export class ProjectService extends APIService {
});
}
+ async getProjects(workspaceSlug: string): Promise<TProject[]> {
+ return this.get(`/api/workspaces/${workspaceSlug}/projects/details/`)
+ .then((response) => response?.data)
+ .catch((error) => {
+ throw error?.response?.data;
+ });
+ }
+
async getProject(workspaceSlug: string, projectId: string): Promise<TProject> {
return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/`)
.then((response) => response?.data)
@@ -47,24 +61,29 @@ export class ProjectService extends APIService {
});
}
- async updateProject(workspaceSlug: string, projectId: string, data: Partial<TProject>): Promise<TProject> {
- return this.patch(`/api/workspaces/${workspaceSlug}/projects/${projectId}/`, data)
+ async getProjectAnalyticsCount(
+ workspaceSlug: string,
+ params?: TProjectAnalyticsCountParams
+ ): Promise<TProjectAnalyticsCount[]> {
+ return this.get(`/api/workspaces/${workspaceSlug}/project-stats/`, {
+ params,
+ })
.then((response) => response?.data)
.catch((error) => {
throw error?.response?.data;
});
}
- async deleteProject(workspaceSlug: string, projectId: string): Promise<any> {
- return this.delete(`/api/workspaces/${workspaceSlug}/projects/${projectId}/`)
+ async updateProject(workspaceSlug: string, projectId: string, data: Partial<TProject>): Promise<TProject> {
+ return this.patch(`/api/workspaces/${workspaceSlug}/projects/${projectId}/`, data)
.then((response) => response?.data)
.catch((error) => {
throw error?.response?.data;
});
}
- async fetchProjectEpicProperties(workspaceSlug: string, projectId: string): Promise<any> {
- return this.get(`/api/workspaces/${workspaceSlug}/projects/${projectId}/epic-properties/`)
+ async deleteProject(workspaceSlug: string, projectId: string): Promise<any> {
+ return this.delete(`/api/workspaces/${workspaceSlug}/projects/${projectId}/`)
.then((response) => response?.data)
.catch((error) => {
throw error?.response?.data;
diff --git a/web/core/store/member/project-member.store.ts b/web/core/store/member/project-member.store.ts
index 22a20ba7c9..e61516182f 100644
--- a/web/core/store/member/project-member.store.ts
+++ b/web/core/store/member/project-member.store.ts
@@ -1,15 +1,11 @@
import set from "lodash/set";
import sortBy from "lodash/sortBy";
+import uniq from "lodash/uniq";
+import update from "lodash/update";
import { action, computed, makeObservable, observable, runInAction } from "mobx";
import { computedFn } from "mobx-utils";
// types
-import {
- IProjectBulkAddFormData,
- IProjectMember,
- IProjectMemberLite,
- IProjectMembership,
- IUserLite,
-} from "@plane/types";
+import { IProjectBulkAddFormData, IProjectMember, IProjectMembership, IUserLite } from "@plane/types";
// plane-web constants
import { EUserPermissions } from "@/plane-web/constants/user-permissions";
// services
@@ -166,8 +162,11 @@ export class ProjectMemberStore implements IProjectMemberStore {
set(this.projectMemberMap, [projectId, member.member], member);
});
});
- this.projectRoot.projectMap[projectId].members = this.projectRoot.projectMap?.[projectId]?.members.concat(
- data.members as unknown as IProjectMemberLite[]
+ update(this.projectRoot.projectMap, [projectId, "members"], (memberIds) =>
+ uniq([...memberIds, ...data.members.map((m) => m.member_id)])
+ );
+ this.projectRoot.projectMap[projectId].members = this.projectRoot.projectMap?.[projectId]?.members?.concat(
+ data.members.map((m) => m.member_id)
);
return response;
@@ -218,8 +217,8 @@ export class ProjectMemberStore implements IProjectMemberStore {
runInAction(() => {
delete this.projectMemberMap?.[projectId]?.[userId];
});
- this.projectRoot.projectMap[projectId].members = this.projectRoot.projectMap?.[projectId]?.members.filter(
- (member) => member.id !== userId
+ this.projectRoot.projectMap[projectId].members = this.projectRoot.projectMap?.[projectId]?.members?.filter(
+ (memberId) => memberId !== userId
);
});
};
diff --git a/web/core/store/project/project.store.ts b/web/core/store/project/project.store.ts
index 119cb01b2b..33a3710043 100644
--- a/web/core/store/project/project.store.ts
+++ b/web/core/store/project/project.store.ts
@@ -1,11 +1,15 @@
+import cloneDeep from "lodash/cloneDeep";
import set from "lodash/set";
import sortBy from "lodash/sortBy";
+import update from "lodash/update";
import { observable, action, computed, makeObservable, runInAction } from "mobx";
import { computedFn } from "mobx-utils";
+// plane imports
+import { TFetchStatus, TLoader, TProjectAnalyticsCount, TProjectAnalyticsCountParams } from "@plane/types";
// helpers
import { orderProjects, shouldFilterProject } from "@/helpers/project.helper";
// services
-import { TProject } from "@/plane-web/types/projects";
+import { TProject, TPartialProject } from "@/plane-web/types/projects";
import { IssueLabelService, IssueService } from "@/services/issue";
import { ProjectService, ProjectStateService, ProjectArchiveService } from "@/services/project";
// store
@@ -16,10 +20,10 @@ type ProjectOverviewCollapsible = "links" | "attachments";
export interface IProjectStore {
// observables
isUpdatingProject: boolean;
- loader: boolean;
- projectMap: {
- [projectId: string]: TProject; // projectId: project Info
- };
+ loader: TLoader;
+ fetchStatus: TFetchStatus;
+ projectMap: Record<string, TProject>; // projectId: project info
+ projectAnalyticsCountMap: Record<string, TProjectAnalyticsCount>; // projectId: project analytics count
// computed
filteredProjectIds: string[] | undefined;
workspaceProjectIds: string[] | undefined;
@@ -30,7 +34,9 @@ export interface IProjectStore {
currentProjectDetails: TProject | undefined;
// actions
getProjectById: (projectId: string | undefined | null) => TProject | undefined;
+ getPartialProjectById: (projectId: string | undefined | null) => TPartialProject | undefined;
getProjectIdentifierById: (projectId: string | undefined | null) => string;
+ getProjectAnalyticsCountById: (projectId: string | undefined | null) => TProjectAnalyticsCount | undefined;
// collapsible
openCollapsibleSection: ProjectOverviewCollapsible[];
lastCollapsibleAction: ProjectOverviewCollapsible | null;
@@ -40,8 +46,13 @@ export interface IProjectStore {
toggleOpenCollapsibleSection: (section: ProjectOverviewCollapsible) => void;
// fetch actions
+ fetchPartialProjects: (workspaceSlug: string) => Promise<TPartialProject[]>;
fetchProjects: (workspaceSlug: string) => Promise<TProject[]>;
fetchProjectDetails: (workspaceSlug: string, projectId: string) => Promise<TProject>;
+ fetchProjectAnalyticsCount: (
+ workspaceSlug: string,
+ params?: TProjectAnalyticsCountParams
+ ) => Promise<TProjectAnalyticsCount[]>;
// favorites actions
addProjectToFavorites: (workspaceSlug: string, projectId: string) => Promise<any>;
removeProjectFromFavorites: (workspaceSlug: string, projectId: string) => Promise<any>;
@@ -59,10 +70,10 @@ export interface IProjectStore {
export class ProjectStore implements IProjectStore {
// observables
isUpdatingProject: boolean = false;
- loader: boolean = false;
- projectMap: {
- [projectId: string]: TProject; // projectId: project Info
- } = {};
+ loader: TLoader = "init-loader";
+ fetchStatus: TFetchStatus = undefined;
+ projectMap: Record<string, TProject> = {};
+ projectAnalyticsCountMap: Record<string, TProjectAnalyticsCount> = {};
openCollapsibleSection: ProjectOverviewCollapsible[] = [];
lastCollapsibleAction: ProjectOverviewCollapsible | null = null;
@@ -80,7 +91,9 @@ export class ProjectStore implements IProjectStore {
// observables
isUpdatingProject: observable,
loader: observable.ref,
+ fetchStatus: observable.ref,
projectMap: observable,
+ projectAnalyticsCountMap: observable,
openCollapsibleSection: observable.ref,
lastCollapsibleAction: observable.ref,
// computed
@@ -92,8 +105,10 @@ export class ProjectStore implements IProjectStore {
joinedProjectIds: computed,
favoriteProjectIds: computed,
// fetch actions
+ fetchPartialProjects: action,
fetchProjects: action,
fetchProjectDetails: action,
+ fetchProjectAnalyticsCount: action,
// favorites actions
addProjectToFavorites: action,
removeProjectFromFavorites: action,
@@ -241,6 +256,31 @@ export class ProjectStore implements IProjectStore {
}
};
+ /**
+ * get Workspace projects partial data using workspace slug
+ * @param workspaceSlug
+ * @returns Promise<TPartialProject[]>
+ *
+ */
+ fetchPartialProjects = async (workspaceSlug: string) => {
+ try {
+ this.loader = "init-loader";
+ const projectsResponse = await this.projectService.getProjectsLite(workspaceSlug);
+ runInAction(() => {
+ projectsResponse.forEach((project) => {
+ update(this.projectMap, [project.id], (p) => ({ ...p, ...project }));
+ });
+ this.loader = "loaded";
+ this.fetchStatus = "partial";
+ });
+ return projectsResponse;
+ } catch (error) {
+ console.log("Failed to fetch project from workspace store");
+ this.loader = "loaded";
+ throw error;
+ }
+ };
+
/**
* get Workspace projects using workspace slug
* @param workspaceSlug
@@ -249,18 +289,23 @@ export class ProjectStore implements IProjectStore {
*/
fetchProjects = async (workspaceSlug: string) => {
try {
- this.loader = true;
+ if (this.workspaceProjectIds && this.workspaceProjectIds.length > 0) {
+ this.loader = "mutation";
+ } else {
+ this.loader = "init-loader";
+ }
const projectsResponse = await this.projectService.getProjects(workspaceSlug);
runInAction(() => {
projectsResponse.forEach((project) => {
- set(this.projectMap, [project.id], project);
+ update(this.projectMap, [project.id], (p) => ({ ...p, ...project }));
});
- this.loader = false;
+ this.loader = "loaded";
+ this.fetchStatus = "complete";
});
return projectsResponse;
} catch (error) {
console.log("Failed to fetch project from workspace store");
- this.loader = false;
+ this.loader = "loaded";
throw error;
}
};
@@ -275,7 +320,7 @@ export class ProjectStore implements IProjectStore {
try {
const response = await this.projectService.getProject(workspaceSlug, projectId);
runInAction(() => {
- set(this.projectMap, [projectId], response);
+ update(this.projectMap, [projectId], (p) => ({ ...p, ...response }));
});
return response;
} catch (error) {
@@ -284,6 +329,30 @@ export class ProjectStore implements IProjectStore {
}
};
+ /**
+ * Fetches project analytics count using workspace slug and project id
+ * @param workspaceSlug
+ * @param params TProjectAnalyticsCountParams
+ * @returns Promise<TProjectAnalyticsCount[]>
+ */
+ fetchProjectAnalyticsCount = async (
+ workspaceSlug: string,
+ params?: TProjectAnalyticsCountParams
+ ): Promise<TProjectAnalyticsCount[]> => {
+ try {
+ const response = await this.projectService.getProjectAnalyticsCount(workspaceSlug, params);
+ runInAction(() => {
+ for (const analyticsData of response) {
+ set(this.projectAnalyticsCountMap, [analyticsData.id], analyticsData);
+ }
+ });
+ return response;
+ } catch (error) {
+ console.log("Failed to fetch project analytics count", error);
+ throw error;
+ }
+ };
+
/**
* Returns project details using project id
* @param projectId
@@ -294,6 +363,17 @@ export class ProjectStore implements IProjectStore {
return projectInfo;
});
+ /**
+ * Returns project lite using project id
+ * This method is used just for type safety
+ * @param projectId
+ * @returns TPartialProject | null
+ */
+ getPartialProjectById = computedFn((projectId: string | undefined | null) => {
+ const projectInfo = this.projectMap[projectId ?? ""] || undefined;
+ return projectInfo;
+ });
+
/**
* Returns project identifier using project id
* @param projectId
@@ -304,6 +384,16 @@ export class ProjectStore implements IProjectStore {
return projectInfo?.identifier;
});
+ /**
+ * Returns project analytics count using project id
+ * @param projectId
+ * @returns TProjectAnalyticsCount[]
+ */
+ getProjectAnalyticsCountById = computedFn((projectId: string | undefined | null) => {
+ if (!projectId) return undefined;
+ return this.projectAnalyticsCountMap?.[projectId];
+ });
+
/**
* Adds project to favorites and updates project favorite status in the store
* @param workspaceSlug
@@ -415,8 +505,8 @@ export class ProjectStore implements IProjectStore {
* @returns Promise<TProject>
*/
updateProject = async (workspaceSlug: string, projectId: string, data: Partial<TProject>) => {
+ const projectDetails = cloneDeep(this.getProjectById(projectId));
try {
- const projectDetails = this.getProjectById(projectId);
runInAction(() => {
set(this.projectMap, [projectId], { ...projectDetails, ...data });
this.isUpdatingProject = true;
@@ -428,9 +518,8 @@ export class ProjectStore implements IProjectStore {
return response;
} catch (error) {
console.log("Failed to create project from project store");
- this.fetchProjects(workspaceSlug);
- this.fetchProjectDetails(workspaceSlug, projectId);
runInAction(() => {
+ set(this.projectMap, [projectId], projectDetails);
this.isUpdatingProject = false;
});
throw error;
@@ -454,7 +543,6 @@ export class ProjectStore implements IProjectStore {
});
} catch (error) {
console.log("Failed to delete project from project store");
- this.fetchProjects(workspaceSlug);
throw error;
}
};
@@ -476,8 +564,6 @@ export class ProjectStore implements IProjectStore {
})
.catch((error) => {
console.log("Failed to archive project from project store");
- this.fetchProjects(workspaceSlug);
- this.fetchProjectDetails(workspaceSlug, projectId);
throw error;
});
};
@@ -498,8 +584,6 @@ export class ProjectStore implements IProjectStore {
})
.catch((error) => {
console.log("Failed to restore project from project store");
- this.fetchProjects(workspaceSlug);
- this.fetchProjectDetails(workspaceSlug, projectId);
throw error;
});
};
diff --git a/web/helpers/project.helper.ts b/web/helpers/project.helper.ts
index 9b370a217c..5f0312e842 100644
--- a/web/helpers/project.helper.ts
+++ b/web/helpers/project.helper.ts
@@ -77,8 +77,8 @@ export const shouldFilterProject = (
if (filterKey === "lead" && filters.lead && filters.lead.length > 0)
fallsInFilters = fallsInFilters && filters.lead.includes(`${project.project_lead}`);
if (filterKey === "members" && filters.members && filters.members.length > 0) {
- const memberIds = project.members.map((member) => member.member_id);
- fallsInFilters = fallsInFilters && filters.members.some((memberId) => memberIds.includes(memberId));
+ const memberIds = project.members;
+ fallsInFilters = fallsInFilters && filters.members.some((memberId) => memberIds?.includes(memberId));
}
if (filterKey === "created_at" && filters.created_at && filters.created_at.length > 0) {
const createdDate = getDate(project.created_at);
@@ -109,8 +109,8 @@ export const orderProjects = (projects: TProject[], orderByKey: TProjectOrderByO
if (orderByKey === "-name") orderedProjects = sortBy(projects, [(p) => p.name.toLowerCase()]).reverse();
if (orderByKey === "created_at") orderedProjects = sortBy(projects, [(p) => p.created_at]);
if (orderByKey === "-created_at") orderedProjects = sortBy(projects, [(p) => !p.created_at]);
- if (orderByKey === "members_length") orderedProjects = sortBy(projects, [(p) => p.members.length]);
- if (orderByKey === "-members_length") orderedProjects = sortBy(projects, [(p) => p.members.length]).reverse();
+ if (orderByKey === "members_length") orderedProjects = sortBy(projects, [(p) => p.members?.length]);
+ if (orderByKey === "-members_length") orderedProjects = sortBy(projects, [(p) => p.members?.length]).reverse();
return orderedProjects;
};