π₯π₯π₯ 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-1900] chore: mentions mutation, ui fix on app sidebar notification badge, and back button inbox issue notification embed (#5083)
guru_sainathf61793754279
diff --git a/apiserver/plane/app/serializers/notification.py b/apiserver/plane/app/serializers/notification.pyindex 248441bc83..a99b63e0db 100644--- a/apiserver/plane/app/serializers/notification.py+++ b/apiserver/plane/app/serializers/notification.py@@ -12,6 +12,7 @@ class NotificationSerializer(BaseSerializer):read_only=True, source="triggered_by")is_inbox_issue = serializers.BooleanField(read_only=True)+ is_mentioned_notification = serializers.BooleanField(read_only=True)class Meta:model = Notificationdiff --git a/apiserver/plane/app/views/notification/base.py b/apiserver/plane/app/views/notification/base.pyindex c67dec5575..6cae9d02a7 100644--- a/apiserver/plane/app/views/notification/base.py+++ b/apiserver/plane/app/views/notification/base.py@@ -1,5 +1,5 @@# Django imports-from django.db.models import Exists, OuterRef, Q+from django.db.models import Exists, OuterRef, Q, Case, When, BooleanFieldfrom django.utils import timezone# Third party imports@@ -60,6 +60,13 @@ class NotificationViewSet(BaseViewSet, BasePaginator):).filter(entity_name="issue").annotate(is_inbox_issue=Exists(inbox_issue))+ .annotate(+ is_mentioned_notification=Case(+ When(sender__icontains="mentioned", then=True),+ default=False,+ output_field=BooleanField(),+ )+ ).select_related("workspace", "project", "triggered_by", "receiver").order_by("snoozed_till", "-created_at"))diff --git a/packages/types/src/workspace-notifications.d.ts b/packages/types/src/workspace-notifications.d.tsindex 718387f326..2b32a45cbf 100644--- a/packages/types/src/workspace-notifications.d.ts+++ b/packages/types/src/workspace-notifications.d.ts@@ -51,6 +51,7 @@ export type TNotification = {archived_at: string | undefined;snoozed_till: string | undefined;is_inbox_issue: boolean | undefined;+ is_mentioned_notification: boolean | undefined;workspace: string | undefined;project: string | undefined;created_at: string | undefined;diff --git a/web/app/[workspaceSlug]/(projects)/notifications/page.tsx b/web/app/[workspaceSlug]/(projects)/notifications/page.tsxindex 8361b15f0b..5fa81a8e1e 100644--- a/web/app/[workspaceSlug]/(projects)/notifications/page.tsx+++ b/web/app/[workspaceSlug]/(projects)/notifications/page.tsx@@ -1,5 +1,6 @@"use client";+import { useEffect } from "react";import { observer } from "mobx-react";import useSWR from "swr";// components@@ -10,7 +11,7 @@ import { IssuePeekOverview } from "@/components/issues";// constantsimport { ENotificationLoader, ENotificationQueryParamType } from "@/constants/notification";// hooks-import { useUser, useWorkspace, useWorkspaceNotifications } from "@/hooks/store";+import { useIssueDetail, useUser, useWorkspace, useWorkspaceNotifications } from "@/hooks/store";const WorkspaceDashboardPage = observer(() => {// hooks@@ -25,6 +26,7 @@ const WorkspaceDashboardPage = observer(() => {const {membership: { fetchUserProjectInfo },} = useUser();+ const { setPeekIssue } = useIssueDetail();// derived valuesconst pageTitle = currentWorkspace?.name ? `${currentWorkspace?.name} - Notifications` : undefined;const { workspace_slug, project_id, issue_id, is_inbox_issue } =@@ -54,6 +56,15 @@ const WorkspaceDashboardPage = observer(() => {workspace_slug && project_id && is_inbox_issue ? () => fetchUserProjectInfo(workspace_slug, project_id) : null);+ // clearing up the selected notifications when unmounting the page+ useEffect(+ () => () => {+ setCurrentSelectedNotificationId(undefined);+ setPeekIssue(undefined);+ },+ []+ );+return (<><PageHead title={pageTitle} />diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/header.tsxindex 9fccc44883..3ff1592447 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/header.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/header.tsx@@ -11,7 +11,7 @@ import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOptionimport { Breadcrumbs, Button, LayersIcon, Tooltip } from "@plane/ui";// componentsimport { ProjectAnalyticsModal } from "@/components/analytics";-import { BreadcrumbLink, Logo } from "@/components/common";+import { BreadcrumbLink, CountChip, Logo } from "@/components/common";import { DisplayFiltersSelection, FiltersDropdown, FilterSelection, LayoutSelection } from "@/components/issues";// constantsimport {@@ -161,9 +161,7 @@ export const ProjectIssuesHeader = observer(() => {tooltipContent={`There are ${issuesCount} ${issuesCount > 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">- {issuesCount}- </span>+ <CountChip count={issuesCount} /></Tooltip>) : null}</div>diff --git a/web/core/components/common/count-chip.tsx b/web/core/components/common/count-chip.tsxnew file mode 100644index 0000000000..0b5820d75a--- /dev/null+++ b/web/core/components/common/count-chip.tsx@@ -0,0 +1,25 @@+"use client";++import { FC } from "react";+//+import { cn } from "@/helpers/common.helper";++type TCountChip = {+ count: string | number;+ className?: string;+};++export const CountChip: FC<TCountChip> = (props) => {+ const { count, className = "" } = props;++ return (+ <div+ className={cn(+ "relative flex justify-center items-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",+ className+ )}+ >+ {count}+ </div>+ );+};diff --git a/web/core/components/common/index.ts b/web/core/components/common/index.tsindex 1ca40f8106..12f4dd6481 100644--- a/web/core/components/common/index.ts+++ b/web/core/components/common/index.ts@@ -4,3 +4,4 @@ export * from "./latest-feature-block";export * from "./breadcrumb-link";export * from "./logo-spinner";export * from "./logo";+export * from "./count-chip";diff --git a/web/core/components/inbox/content/inbox-issue-header.tsx b/web/core/components/inbox/content/inbox-issue-header.tsxindex a7aa569203..1b18f063ab 100644--- a/web/core/components/inbox/content/inbox-issue-header.tsx+++ b/web/core/components/inbox/content/inbox-issue-header.tsx@@ -387,6 +387,8 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((pworkspaceSlug={workspaceSlug}isMobileSidebar={isMobileSidebar}setIsMobileSidebar={setIsMobileSidebar}+ isNotificationEmbed={isNotificationEmbed}+ embedRemoveCurrentNotification={embedRemoveCurrentNotification}/></div></>diff --git a/web/core/components/inbox/content/inbox-issue-mobile-header.tsx b/web/core/components/inbox/content/inbox-issue-mobile-header.tsxindex f44d21d626..dd63c3bf95 100644--- a/web/core/components/inbox/content/inbox-issue-mobile-header.tsx+++ b/web/core/components/inbox/content/inbox-issue-mobile-header.tsx@@ -13,6 +13,7 @@ import {Link,Trash2,PanelLeft,+ MoveRight,} from "lucide-react";import { CustomMenu } from "@plane/ui";// components@@ -44,6 +45,8 @@ type Props = {handleCopyIssueLink: () => void;isMobileSidebar: boolean;setIsMobileSidebar: (value: boolean) => void;+ isNotificationEmbed: boolean;+ embedRemoveCurrentNotification?: () => void;};export const InboxIssueActionsMobileHeader: React.FC<Props> = observer((props) => {@@ -65,6 +68,8 @@ export const InboxIssueActionsMobileHeader: React.FC<Props> = observer((props) =handleCopyIssueLink,isMobileSidebar,setIsMobileSidebar,+ isNotificationEmbed,+ embedRemoveCurrentNotification,} = props;const router = useAppRouter();const issue = inboxIssue?.issue;@@ -76,6 +81,11 @@ export const InboxIssueActionsMobileHeader: React.FC<Props> = observer((props) =return (<div className="h-12 relative flex border-custom-border-200 w-full items-center gap-2 px-4">+ {isNotificationEmbed && (+ <button onClick={embedRemoveCurrentNotification}>+ <MoveRight className="h-4 w-4 text-custom-text-300 hover:text-custom-text-200" />+ </button>+ )}<PanelLeftonClick={() => setIsMobileSidebar(!isMobileSidebar)}className={cn(diff --git a/web/core/components/workspace-notifications/notification-app-sidebar-option.tsx b/web/core/components/workspace-notifications/notification-app-sidebar-option.tsxindex 109cfcde5e..3d33bdd72b 100644--- a/web/core/components/workspace-notifications/notification-app-sidebar-option.tsx+++ b/web/core/components/workspace-notifications/notification-app-sidebar-option.tsx@@ -3,6 +3,8 @@import { FC } from "react";import { observer } from "mobx-react";import useSWR from "swr";+// components+import { CountChip } from "@/components/common";// helpersimport { getNumberCount } from "@/helpers/string.helper";// hooks@@ -35,8 +37,8 @@ export const NotificationAppSidebarOption: FC<TNotificationAppSidebarOption> = oreturn <div className="absolute right-3.5 top-2 h-2 w-2 rounded-full bg-custom-primary-300" />;return (- <div className="text-[8px] ml-auto bg-custom-primary-100 text-white p-1 py-0.5 rounded-full">- {`${isMentionsEnabled ? `@` : ``}${getNumberCount(totalNotifications)}`}+ <div className="ml-auto">+ <CountChip count={`${isMentionsEnabled ? `@` : ``}${getNumberCount(totalNotifications)}`} /></div>);});diff --git a/web/core/components/workspace-notifications/sidebar/notification-card/item.tsx b/web/core/components/workspace-notifications/sidebar/notification-card/item.tsxindex 25fc4bfefb..cd0a0d888b 100644--- a/web/core/components/workspace-notifications/sidebar/notification-card/item.tsx+++ b/web/core/components/workspace-notifications/sidebar/notification-card/item.tsx@@ -38,6 +38,7 @@ export const NotificationItem: FC<TNotificationItem> = observer((props) => {const handleNotificationIssuePeekOverview = async () => {if (workspaceSlug && projectId && issueId && !isSnoozeStateModalOpen && !customSnoozeModal) {+ setPeekIssue(undefined);setCurrentSelectedNotificationId(notificationId);// make the notification as read@@ -51,7 +52,6 @@ export const NotificationItem: FC<TNotificationItem> = observer((props) => {if (notification?.is_inbox_issue === false) {!getIsIssuePeeked(issueId) && setPeekIssue({ workspaceSlug, projectId, issueId });- } else {}}};diff --git a/web/core/components/workspace-notifications/sidebar/root.tsx b/web/core/components/workspace-notifications/sidebar/root.tsxindex 0cdaede738..679df0b319 100644--- a/web/core/components/workspace-notifications/sidebar/root.tsx+++ b/web/core/components/workspace-notifications/sidebar/root.tsx@@ -4,6 +4,7 @@ import { FC } from "react";import { observer } from "mobx-react";import { useParams } from "next/navigation";// components+import { CountChip } from "@/components/common";import {NotificationsLoader,NotificationEmptyState,@@ -65,14 +66,12 @@ export const NotificationsSidebar: FC = observer(() => {)}><div className="font-medium">{tab.label}</div>- <div- className={cn(- `rounded-full text-xs px-1.5 py-0.5`,+ <CountChip+ count={getNumberCount(tab.count(unreadNotificationsCount))}+ className={currentNotificationTab === tab.value ? `bg-custom-primary-100/20` : `bg-custom-background-80/50`- )}- >- {getNumberCount(tab.count(unreadNotificationsCount))}- </div>+ }+ /></div>{currentNotificationTab === tab.value && (<div className="border absolute bottom-0 right-0 left-0 rounded-t-md border-custom-primary-100" />diff --git a/web/core/store/notifications/notification.ts b/web/core/store/notifications/notification.tsindex ae31c985ee..dff2755fdc 100644--- a/web/core/store/notifications/notification.ts+++ b/web/core/store/notifications/notification.ts@@ -42,6 +42,7 @@ export class Notification implements INotification {archived_at: string | undefined = undefined;snoozed_till: string | undefined = undefined;is_inbox_issue: boolean | undefined = undefined;+ is_mentioned_notification: boolean | undefined = undefined;workspace: string | undefined = undefined;project: string | undefined = undefined;created_at: string | undefined = undefined;@@ -70,6 +71,8 @@ export class Notification implements INotification {read_at: observable.ref,archived_at: observable.ref,snoozed_till: observable.ref,+ is_inbox_issue: observable.ref,+ is_mentioned_notification: observable.ref,workspace: observable.ref,project: observable.ref,created_at: observable.ref,@@ -102,8 +105,9 @@ export class Notification implements INotification {this.read_at = this.notification.read_at;this.archived_at = this.notification.archived_at;this.snoozed_till = this.notification.snoozed_till;- this.workspace = this.notification.workspace;this.is_inbox_issue = this.notification.is_inbox_issue;+ this.is_mentioned_notification = this.notification.is_mentioned_notification;+ this.workspace = this.notification.workspace;this.project = this.notification.project;this.created_at = this.notification.created_at;this.updated_at = this.notification.updated_at;@@ -132,8 +136,9 @@ export class Notification implements INotification {read_at: this.read_at,archived_at: this.archived_at,snoozed_till: this.snoozed_till,- workspace: this.workspace,is_inbox_issue: this.is_inbox_issue,+ is_mentioned_notification: this.is_mentioned_notification,+ workspace: this.workspace,project: this.project,created_at: this.created_at,updated_at: this.updated_at,diff --git a/web/core/store/notifications/workspace-notifications.store.ts b/web/core/store/notifications/workspace-notifications.store.tsindex 5b990df3a0..12791a7dfe 100644--- a/web/core/store/notifications/workspace-notifications.store.ts+++ b/web/core/store/notifications/workspace-notifications.store.ts@@ -125,6 +125,11 @@ export class WorkspaceNotificationStore implements IWorkspaceNotificationStore {);const workspaceNotificationIds = workspaceNotifications.filter((n) => n.workspace === workspaceId)+ .filter((n) =>+ this.currentNotificationTab === ENotificationTab.MENTIONS+ ? n.is_mentioned_notification+ : !n.is_mentioned_notification+ ).filter((n) => {if (!this.filters.archived && !this.filters.snoozed) {if (n.archived_at) {