π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-2625] chore: workspace favorite and draft improvement (#5855)
Anmol Singh Bhatiaa7b58e4a938d
diff --git a/apiserver/plane/app/serializers/workspace.py b/apiserver/plane/app/serializers/workspace.pyindex abfbd001e5..1a2b89bba6 100644--- a/apiserver/plane/app/serializers/workspace.py+++ b/apiserver/plane/app/serializers/workspace.py@@ -65,6 +65,7 @@ class WorkSpaceMemberSerializer(DynamicBaseSerializer):class WorkspaceMemberMeSerializer(BaseSerializer):+ draft_issue_count = serializers.IntegerField(read_only=True)class Meta:model = WorkspaceMemberfields = "__all__"diff --git a/apiserver/plane/app/views/workspace/member.py b/apiserver/plane/app/views/workspace/member.pyindex 0a2f1539f4..c71df21ac4 100644--- a/apiserver/plane/app/views/workspace/member.py+++ b/apiserver/plane/app/views/workspace/member.py@@ -3,7 +3,11 @@ from django.db.models import (CharField,Count,Q,+ OuterRef,+ Subquery,+ IntegerField,)+from django.db.models.functions import Coalescefrom django.db.models.functions import Cast# Third party modules@@ -34,6 +38,7 @@ from plane.db.models import (User,Workspace,WorkspaceMember,+ DraftIssue,)from plane.utils.cache import cache_response, invalidate_cache@@ -283,10 +288,26 @@ class WorkspaceMemberUserViewsEndpoint(BaseAPIView):class WorkspaceMemberUserEndpoint(BaseAPIView):def get(self, request, slug):- workspace_member = WorkspaceMember.objects.get(- member=request.user,- workspace__slug=slug,- is_active=True,+ draft_issue_count = (+ DraftIssue.objects.filter(+ created_by=request.user,+ workspace_id=OuterRef("workspace_id"),+ )+ .values("workspace_id")+ .annotate(count=Count("id"))+ .values("count")+ )++ workspace_member = (+ WorkspaceMember.objects.filter(+ member=request.user, workspace__slug=slug, is_active=True+ )+ .annotate(+ draft_issue_count=Coalesce(+ Subquery(draft_issue_count, output_field=IntegerField()), 0+ )+ )+ .first())serializer = WorkspaceMemberMeSerializer(workspace_member)return Response(serializer.data, status=status.HTTP_200_OK)diff --git a/packages/types/src/workspace.d.ts b/packages/types/src/workspace.d.tsindex fb466e3c62..412083c428 100644--- a/packages/types/src/workspace.d.ts+++ b/packages/types/src/workspace.d.ts@@ -91,6 +91,7 @@ export interface IWorkspaceMemberMe {updated_by: string;view_props: IWorkspaceViewProps;workspace: string;+ draft_issue_count: number;}export interface ILastActiveWorkspaceDetails {diff --git a/web/app/[workspaceSlug]/(projects)/sidebar.tsx b/web/app/[workspaceSlug]/(projects)/sidebar.tsxindex f4ee6e91f7..18451d4bbd 100644--- a/web/app/[workspaceSlug]/(projects)/sidebar.tsx+++ b/web/app/[workspaceSlug]/(projects)/sidebar.tsx@@ -1,4 +1,5 @@import { FC, useEffect, useRef } from "react";+import isEmpty from "lodash/isEmpty";import { observer } from "mobx-react";// plane helpersimport { useOutsideClickDetector } from "@plane/helpers";@@ -16,8 +17,9 @@ import { SidebarFavoritesMenu } from "@/components/workspace/sidebar/favorites/fimport { cn } from "@/helpers/common.helper";// hooksimport { useAppTheme, useUserPermissions } from "@/hooks/store";-// plane web components+import { useFavorite } from "@/hooks/store/use-favorite";import useSize from "@/hooks/use-window-size";+// plane web componentsimport { SidebarAppSwitcher } from "@/plane-web/components/sidebar";import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/user-permissions";@@ -25,6 +27,7 @@ export const AppSidebar: FC = observer(() => {// store hooksconst { allowPermissions } = useUserPermissions();const { toggleSidebar, sidebarCollapsed } = useAppTheme();+ const { groupedFavorites } = useFavorite();const windowSize = useSize();// refsconst ref = useRef<HTMLDivElement>(null);@@ -48,6 +51,8 @@ export const AppSidebar: FC = observer(() => {// eslint-disable-next-line react-hooks/exhaustive-deps}, [windowSize]);+ const isFavoriteEmpty = isEmpty(groupedFavorites);+return (<divclassName={cn(@@ -91,7 +96,7 @@ export const AppSidebar: FC = observer(() => {"opacity-0": !sidebarCollapsed,})}/>- {canPerformWorkspaceMemberActions && <SidebarFavoritesMenu />}+ {canPerformWorkspaceMemberActions && !isFavoriteEmpty && <SidebarFavoritesMenu />}<SidebarProjectsList /></div>diff --git a/web/core/components/workspace/sidebar/user-menu.tsx b/web/core/components/workspace/sidebar/user-menu.tsxindex d9716a805b..4ca6a7e860 100644--- a/web/core/components/workspace/sidebar/user-menu.tsx+++ b/web/core/components/workspace/sidebar/user-menu.tsx@@ -24,7 +24,7 @@ export const SidebarUserMenu = observer(() => {const { captureEvent } = useEventTracker();const { isMobile } = usePlatformOS();const { data: currentUser } = useUser();- const { allowPermissions } = useUserPermissions();+ const { allowPermissions, workspaceUserInfo } = useUserPermissions();// router paramsconst { workspaceSlug } = useParams();// pathname@@ -50,14 +50,17 @@ export const SidebarUserMenu = observer(() => {/>);+ const draftIssueCount = workspaceUserInfo[workspaceSlug.toString()]?.draft_issue_count;+return (<divclassName={cn("flex flex-col gap-0.5", {"space-y-0": sidebarCollapsed,})}>- {SIDEBAR_USER_MENU_ITEMS.map(- (link) =>+ {SIDEBAR_USER_MENU_ITEMS.map((link) => {+ if (link.key === "drafts" && draftIssueCount === 0) return null;+ return (allowPermissions(link.access, EUserPermissionsLevel.WORKSPACE, workspaceSlug.toString()) && (<Tooltipkey={link.key}@@ -81,7 +84,8 @@ export const SidebarUserMenu = observer(() => {</Link></Tooltip>)- )}+ );+ })}</div>);});diff --git a/web/core/store/issue/workspace-draft/issue.store.ts b/web/core/store/issue/workspace-draft/issue.store.tsindex 188ff70f94..aef03d3411 100644--- a/web/core/store/issue/workspace-draft/issue.store.ts+++ b/web/core/store/issue/workspace-draft/issue.store.ts@@ -139,6 +139,13 @@ export class WorkspaceDraftIssues implements IWorkspaceDraftIssues {});}+ private updateWorkspaceUserDraftIssueCount(workspaceSlug: string, increment: number) {+ const workspaceUserInfo = this.issueStore.rootStore.user.permission.workspaceUserInfo;+ const currentCount = workspaceUserInfo[workspaceSlug]?.draft_issue_count ?? 0;++ set(workspaceUserInfo, [workspaceSlug, "draft_issue_count"], currentCount + increment);+ }+// computedget issueIds() {const workspaceSlug = this.issueStore.workspaceSlug;@@ -259,6 +266,8 @@ export class WorkspaceDraftIssues implements IWorkspaceDraftIssues {total_count: this.paginationInfo.total_count + 1,});}+ // Update draft issue count in workspaceUserInfo+ this.updateWorkspaceUserDraftIssueCount(workspaceSlug, 1);});}@@ -310,6 +319,8 @@ export class WorkspaceDraftIssues implements IWorkspaceDraftIssues {total_count: this.paginationInfo.total_count - 1,});}+ // Update draft issue count in workspaceUserInfo+ this.updateWorkspaceUserDraftIssueCount(workspaceSlug, -1);});this.loader = undefined;@@ -337,6 +348,8 @@ export class WorkspaceDraftIssues implements IWorkspaceDraftIssues {total_count: this.paginationInfo.total_count - 1,});}+ // Update draft issue count in workspaceUserInfo+ this.updateWorkspaceUserDraftIssueCount(workspaceSlug, -1);});this.loader = undefined;