π₯π₯π₯ 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-4094]chore: workspace notifications refactor (#7061)
Vamsi Krishna07e937cd8ec1
diff --git a/packages/types/src/issues/issue.d.ts b/packages/types/src/issues/issue.d.tsindex a9d8970f90..01c0b2f3a5 100644--- a/packages/types/src/issues/issue.d.ts+++ b/packages/types/src/issues/issue.d.ts@@ -1,4 +1,4 @@-import { EIssueServiceType } from "@plane/constants";+import { EIssueServiceType, EIssuesStoreType } from "@plane/constants";import { TIssuePriorities } from "../issues";import { TIssueAttachment } from "./issue_attachment";import { TIssueLink } from "./issue_link";@@ -181,3 +181,10 @@ export type TPublicIssuesResponse = {extra_stats: null;results: TPublicIssueResponseResults;};++export interface IWorkItemPeekOverview {+ embedIssue?: boolean;+ embedRemoveCurrentNotification?: () => void;+ is_draft?: boolean;+ storeType?: EIssuesStoreType;+}\ No newline at end of filediff --git a/web/app/(all)/[workspaceSlug]/(projects)/notifications/page.tsx b/web/app/(all)/[workspaceSlug]/(projects)/notifications/page.tsxindex 8afe768d80..415ea8fbf7 100644--- a/web/app/(all)/[workspaceSlug]/(projects)/notifications/page.tsx+++ b/web/app/(all)/[workspaceSlug]/(projects)/notifications/page.tsx@@ -1,22 +1,14 @@"use client";-import { useCallback, useEffect } from "react";import { observer } from "mobx-react";import { useParams } from "next/navigation";-import useSWR from "swr";// plane imports-import { ENotificationLoader, ENotificationQueryParamType } from "@plane/constants";import { useTranslation } from "@plane/i18n";// components-import { LogoSpinner } from "@/components/common";import { PageHead } from "@/components/core";-import { SimpleEmptyState } from "@/components/empty-state";-import { InboxContentRoot } from "@/components/inbox";-import { IssuePeekOverview } from "@/components/issues";+import { NotificationsRoot } from "@/components/workspace-notifications";// hooks-import { useIssueDetail, useUserPermissions, useWorkspace, useWorkspaceNotifications } from "@/hooks/store";-import { useResolvedAssetPath } from "@/hooks/use-resolved-asset-path";-import { useWorkspaceIssueProperties } from "@/hooks/use-workspace-issue-properties";+import { useWorkspace } from "@/hooks/store";const WorkspaceDashboardPage = observer(() => {const { workspaceSlug } = useParams();@@ -24,98 +16,15 @@ const WorkspaceDashboardPage = observer(() => {const { t } = useTranslation();// hooksconst { currentWorkspace } = useWorkspace();- const {- currentSelectedNotificationId,- setCurrentSelectedNotificationId,- notificationLiteByNotificationId,- notificationIdsByWorkspaceId,- getNotifications,- } = useWorkspaceNotifications();- const { fetchUserProjectInfo } = useUserPermissions();- const { setPeekIssue } = useIssueDetail();// derived valuesconst pageTitle = currentWorkspace?.name? t("notification.page_label", { workspace: currentWorkspace?.name }): undefined;- const { workspace_slug, project_id, issue_id, is_inbox_issue } =- notificationLiteByNotificationId(currentSelectedNotificationId);- const resolvedPath = useResolvedAssetPath({ basePath: "/empty-state/intake/issue-detail" });-- // fetching workspace work item properties- useWorkspaceIssueProperties(workspaceSlug);-- // fetch workspace notifications- const notificationMutation =- currentWorkspace && notificationIdsByWorkspaceId(currentWorkspace.id)- ? ENotificationLoader.MUTATION_LOADER- : ENotificationLoader.INIT_LOADER;- const notificationLoader =- currentWorkspace && notificationIdsByWorkspaceId(currentWorkspace.id)- ? ENotificationQueryParamType.CURRENT- : ENotificationQueryParamType.INIT;- useSWR(- currentWorkspace?.slug ? `WORKSPACE_NOTIFICATION` : null,- currentWorkspace?.slug- ? () => getNotifications(currentWorkspace?.slug, notificationMutation, notificationLoader)- : null- );-- // fetching user project member info- const { isLoading: projectMemberInfoLoader } = useSWR(- workspace_slug && project_id && is_inbox_issue- ? `PROJECT_MEMBER_PERMISSION_INFO_${workspace_slug}_${project_id}`- : null,- workspace_slug && project_id && is_inbox_issue ? () => fetchUserProjectInfo(workspace_slug, project_id) : null- );-- const embedRemoveCurrentNotification = useCallback(- () => setCurrentSelectedNotificationId(undefined),- [setCurrentSelectedNotificationId]- );-- // clearing up the selected notifications when unmounting the page- useEffect(- () => () => {- setCurrentSelectedNotificationId(undefined);- setPeekIssue(undefined);- },- [setCurrentSelectedNotificationId, setPeekIssue]- );return (<><PageHead title={pageTitle} />- <div className="w-full h-full overflow-hidden overflow-y-auto">- {!currentSelectedNotificationId ? (- <div className="w-full h-screen flex justify-center items-center">- <SimpleEmptyState title={t("notification.empty_state.detail.title")} assetPath={resolvedPath} />- </div>- ) : (- <>- {is_inbox_issue === true && workspace_slug && project_id && issue_id ? (- <>- {projectMemberInfoLoader ? (- <div className="w-full h-full flex justify-center items-center">- <LogoSpinner />- </div>- ) : (- <InboxContentRoot- setIsMobileSidebar={() => {}}- isMobileSidebar={false}- workspaceSlug={workspace_slug}- projectId={project_id}- inboxIssueId={issue_id}- isNotificationEmbed- embedRemoveCurrentNotification={embedRemoveCurrentNotification}- />- )}- </>- ) : (- <IssuePeekOverview embedIssue embedRemoveCurrentNotification={embedRemoveCurrentNotification} />- )}- </>- )}- </div>+ <NotificationsRoot workspaceSlug={workspaceSlug?.toString()} /></>);});diff --git a/web/ce/components/workspace-notifications/index.ts b/web/ce/components/workspace-notifications/index.tsindex 18c4afa968..c12683ce61 100644--- a/web/ce/components/workspace-notifications/index.ts+++ b/web/ce/components/workspace-notifications/index.ts@@ -1 +1,2 @@export * from "./notification-card/root";+export * from "./list-root";diff --git a/web/ce/components/workspace-notifications/list-root.tsx b/web/ce/components/workspace-notifications/list-root.tsxnew file mode 100644index 0000000000..55fd68c3ff--- /dev/null+++ b/web/ce/components/workspace-notifications/list-root.tsx@@ -0,0 +1,8 @@+import { NotificationCardListRoot } from "./notification-card/root";++export type TNotificationListRoot = {+ workspaceSlug: string;+ workspaceId: string;+};++export const NotificationListRoot = (props: TNotificationListRoot) => <NotificationCardListRoot {...props} />;diff --git a/web/ce/hooks/use-notification-preview.tsx b/web/ce/hooks/use-notification-preview.tsxnew file mode 100644index 0000000000..b0c18d5542--- /dev/null+++ b/web/ce/hooks/use-notification-preview.tsx@@ -0,0 +1,25 @@+import { EIssueServiceType } from "@plane/constants";+import { IWorkItemPeekOverview } from "@plane/types";+import { IssuePeekOverview } from "@/components/issues";+import { useIssueDetail } from "@/hooks/store";+import { TPeekIssue } from "@/store/issue/issue-details/root.store";++export type TNotificationPreview = {+ isWorkItem: boolean;+ PeekOverviewComponent: React.ComponentType<IWorkItemPeekOverview>;+ setPeekWorkItem: (peekIssue: TPeekIssue | undefined) => void;+};++/**+ * This function returns if the current active notification is related to work item or an epic.+ * @returns isWorkItem: boolean, peekOverviewComponent: IWorkItemPeekOverview, setPeekWorkItem+ */+export const useNotificationPreview = (): TNotificationPreview => {+ const { peekIssue, setPeekIssue } = useIssueDetail(EIssueServiceType.ISSUES);++ return {+ isWorkItem: Boolean(peekIssue),+ PeekOverviewComponent: IssuePeekOverview,+ setPeekWorkItem: setPeekIssue,+ };+};diff --git a/web/core/components/issues/issue-detail/subscription.tsx b/web/core/components/issues/issue-detail/subscription.tsxindex e19e787f39..8239d08ac0 100644--- a/web/core/components/issues/issue-detail/subscription.tsx+++ b/web/core/components/issues/issue-detail/subscription.tsx@@ -5,7 +5,7 @@ import isNil from "lodash/isNil";import { observer } from "mobx-react";import { Bell, BellOff } from "lucide-react";// plane-i18n-import { EUserPermissions, EUserPermissionsLevel } from "@plane/constants";+import { EUserPermissions, EUserPermissionsLevel, EIssueServiceType } from "@plane/constants";import { useTranslation } from "@plane/i18n";// UIimport { Button, Loader, TOAST_TYPE, setToast } from "@plane/ui";@@ -16,17 +16,18 @@ export type TIssueSubscription = {workspaceSlug: string;projectId: string;issueId: string;+ serviceType?: EIssueServiceType;};export const IssueSubscription: FC<TIssueSubscription> = observer((props) => {- const { workspaceSlug, projectId, issueId } = props;+ const { workspaceSlug, projectId, issueId, serviceType = EIssueServiceType.ISSUES } = props;const { t } = useTranslation();// hooksconst {subscription: { getSubscriptionByIssueId },createSubscription,removeSubscription,- } = useIssueDetail();+ } = useIssueDetail(serviceType);// stateconst [loading, setLoading] = useState(false);// hooks@@ -53,12 +54,12 @@ export const IssueSubscription: FC<TIssueSubscription> = observer((props) => {: t("issue.subscription.actions.subscribed"),});setLoading(false);- } catch (error) {+ } catch {setLoading(false);setToast({type: TOAST_TYPE.ERROR,title: t("toast.error"),- message: t("commons.error.message"),+ message: t("common.error.message"),});}};@@ -78,7 +79,7 @@ export const IssueSubscription: FC<TIssueSubscription> = observer((props) => {variant="outline-primary"className="hover:!bg-custom-primary-100/20"onClick={handleSubscription}- disabled={!isEditable}+ disabled={!isEditable || loading}>{loading ? (<span>diff --git a/web/core/components/issues/peek-overview/root.tsx b/web/core/components/issues/peek-overview/root.tsxindex 5ed6403bcb..9d6653440e 100644--- a/web/core/components/issues/peek-overview/root.tsx+++ b/web/core/components/issues/peek-overview/root.tsx@@ -14,7 +14,7 @@ import {EUserPermissionsLevel,} from "@plane/constants";import { useTranslation } from "@plane/i18n";-import { TIssue } from "@plane/types";+import { TIssue, IWorkItemPeekOverview } from "@plane/types";// plane uiimport { TOAST_TYPE, setPromiseToast, setToast } from "@plane/ui";// components@@ -24,14 +24,8 @@ import { IssueView, TIssueOperations } from "@/components/issues";import { useEventTracker, useIssueDetail, useIssues, useUserPermissions } from "@/hooks/store";import { useIssueStoreType } from "@/hooks/use-issue-layout-store";-interface IIssuePeekOverview {- embedIssue?: boolean;- embedRemoveCurrentNotification?: () => void;- is_draft?: boolean;- storeType?: EIssuesStoreType;-}-export const IssuePeekOverview: FC<IIssuePeekOverview> = observer((props) => {+export const IssuePeekOverview: FC<IWorkItemPeekOverview> = observer((props) => {const {embedIssue = false,embedRemoveCurrentNotification,diff --git a/web/core/components/workspace-notifications/root.tsx b/web/core/components/workspace-notifications/root.tsxindex 37623a6137..6b41a9cea3 100644--- a/web/core/components/workspace-notifications/root.tsx+++ b/web/core/components/workspace-notifications/root.tsx@@ -1,116 +1,116 @@"use client";-import { FC, useCallback } from "react";+import { useCallback, useEffect } from "react";import { observer } from "mobx-react";-import { useParams } from "next/navigation";+import useSWR from "swr";// plane imports-import { NOTIFICATION_TABS, TNotificationTab } from "@plane/constants";+import { ENotificationLoader, ENotificationQueryParamType } from "@plane/constants";import { useTranslation } from "@plane/i18n";// components-import { Header, Row, ERowVariant, EHeaderVariant, ContentWrapper } from "@plane/ui";-import { CountChip } from "@/components/common";-import {- NotificationsLoader,- NotificationEmptyState,- NotificationSidebarHeader,- AppliedFilters,-} from "@/components/workspace-notifications";-// helpers-import { cn } from "@/helpers/common.helper";-import { getNumberCount } from "@/helpers/string.helper";+import { cn } from "@plane/utils";+import { LogoSpinner } from "@/components/common";+import { SimpleEmptyState } from "@/components/empty-state";+import { InboxContentRoot } from "@/components/inbox";// hooks-import { useWorkspace, useWorkspaceNotifications } from "@/hooks/store";-import { NotificationCardListRoot } from "@/plane-web/components/workspace-notifications";-export const NotificationsSidebarRoot: FC = observer(() => {- const { workspaceSlug } = useParams();+import { useUserPermissions, useWorkspace, useWorkspaceNotifications } from "@/hooks/store";+import { useResolvedAssetPath } from "@/hooks/use-resolved-asset-path";+import { useWorkspaceIssueProperties } from "@/hooks/use-workspace-issue-properties";+import { useNotificationPreview } from "@/plane-web/hooks/use-notification-preview";++type NotificationsRootProps = {+ workspaceSlug?: string;+};++export const NotificationsRoot = observer(({ workspaceSlug }: NotificationsRootProps) => {+ // plane hooks+ const { t } = useTranslation();// hooks- const { getWorkspaceBySlug } = useWorkspace();+ const { currentWorkspace } = useWorkspace();const {currentSelectedNotificationId,- unreadNotificationsCount,- loader,+ setCurrentSelectedNotificationId,+ notificationLiteByNotificationId,notificationIdsByWorkspaceId,- currentNotificationTab,- setCurrentNotificationTab,+ getNotifications,} = useWorkspaceNotifications();-- const { t } = useTranslation();+ const { fetchUserProjectInfo } = useUserPermissions();+ const { isWorkItem, PeekOverviewComponent, setPeekWorkItem } = useNotificationPreview();// derived values- const workspace = workspaceSlug ? getWorkspaceBySlug(workspaceSlug.toString()) : undefined;- const notificationIds = workspace ? notificationIdsByWorkspaceId(workspace.id) : undefined;+ const { workspace_slug, project_id, issue_id, is_inbox_issue } =+ notificationLiteByNotificationId(currentSelectedNotificationId);+ const resolvedPath = useResolvedAssetPath({ basePath: "/empty-state/intake/issue-detail" });- const handleTabClick = useCallback(- (tabValue: TNotificationTab) => {- if (currentNotificationTab !== tabValue) {- setCurrentNotificationTab(tabValue);- }- },- [currentNotificationTab, setCurrentNotificationTab]- );+ // fetching workspace work item properties+ useWorkspaceIssueProperties(workspaceSlug);- if (!workspaceSlug || !workspace) return <></>;+ // fetch workspace notifications+ const notificationMutation =+ currentWorkspace && notificationIdsByWorkspaceId(currentWorkspace.id)+ ? ENotificationLoader.MUTATION_LOADER+ : ENotificationLoader.INIT_LOADER;+ const notificationLoader =+ currentWorkspace && notificationIdsByWorkspaceId(currentWorkspace.id)+ ? ENotificationQueryParamType.CURRENT+ : ENotificationQueryParamType.INIT;+ useSWR(+ currentWorkspace?.slug ? `WORKSPACE_NOTIFICATION_${currentWorkspace?.slug}` : null,+ currentWorkspace?.slug+ ? () => getNotifications(currentWorkspace?.slug, notificationMutation, notificationLoader)+ : null+ );- return (- <div- className={cn(- "relative border-0 md:border-r border-custom-border-200 z-[10] flex-shrink-0 bg-custom-background-100 h-full transition-all overflow-hidden",- currentSelectedNotificationId ? "w-0 md:w-2/6" : "w-full md:w-2/6"- )}- >- <div className="relative w-full h-full overflow-hidden flex flex-col">- <Row className="h-[3.75rem] border-b border-custom-border-200 flex">- <NotificationSidebarHeader workspaceSlug={workspaceSlug.toString()} />- </Row>+ // fetching user project member info+ const { isLoading: projectMemberInfoLoader } = useSWR(+ workspace_slug && project_id && is_inbox_issue+ ? `PROJECT_MEMBER_PERMISSION_INFO_${workspace_slug}_${project_id}`+ : null,+ workspace_slug && project_id && is_inbox_issue ? () => fetchUserProjectInfo(workspace_slug, project_id) : null+ );- <Header variant={EHeaderVariant.SECONDARY} className="justify-start">- {NOTIFICATION_TABS.map((tab) => (- <div- key={tab.value}- className="h-full px-3 relative cursor-pointer"- onClick={() => handleTabClick(tab.value)}- >- <div- className={cn(- `relative h-full flex justify-center items-center gap-1 text-sm transition-all`,- currentNotificationTab === tab.value- ? "text-custom-primary-100"- : "text-custom-text-100 hover:text-custom-text-200"- )}- >- <div className="font-medium">{t(tab.i18n_label)}</div>- {tab.count(unreadNotificationsCount) > 0 && (- <CountChip count={getNumberCount(tab.count(unreadNotificationsCount))} />- )}- </div>- {currentNotificationTab === tab.value && (- <div className="border absolute bottom-0 right-0 left-0 rounded-t-md border-custom-primary-100" />- )}- </div>- ))}- </Header>+ const embedRemoveCurrentNotification = useCallback(+ () => setCurrentSelectedNotificationId(undefined),+ [setCurrentSelectedNotificationId]+ );- {/* applied filters */}- <AppliedFilters workspaceSlug={workspaceSlug.toString()} />+ // clearing up the selected notifications when unmounting the page+ useEffect(+ () => () => {+ setPeekWorkItem(undefined);+ },+ [setCurrentSelectedNotificationId, setPeekWorkItem]+ );- {/* rendering notifications */}- {loader === "init-loader" ? (- <div className="relative w-full h-full overflow-hidden">- <NotificationsLoader />- </div>- ) : (- <>- {notificationIds && notificationIds.length > 0 ? (- <ContentWrapper variant={ERowVariant.HUGGING}>- <NotificationCardListRoot workspaceSlug={workspaceSlug.toString()} workspaceId={workspace?.id} />- </ContentWrapper>- ) : (- <div className="relative w-full h-full flex justify-center items-center">- <NotificationEmptyState />- </div>- )}- </>- )}- </div>+ return (+ <div className={cn("w-full h-full overflow-hidden ", isWorkItem && "overflow-y-auto")}>+ {!currentSelectedNotificationId ? (+ <div className="w-full h-screen flex justify-center items-center">+ <SimpleEmptyState title={t("notification.empty_state.detail.title")} assetPath={resolvedPath} />+ </div>+ ) : (+ <>+ {is_inbox_issue === true && workspace_slug && project_id && issue_id ? (+ <>+ {projectMemberInfoLoader ? (+ <div className="w-full h-full flex justify-center items-center">+ <LogoSpinner />+ </div>+ ) : (+ <InboxContentRoot+ setIsMobileSidebar={() => {}}+ isMobileSidebar={false}+ workspaceSlug={workspace_slug}+ projectId={project_id}+ inboxIssueId={issue_id}+ isNotificationEmbed+ embedRemoveCurrentNotification={embedRemoveCurrentNotification}+ />+ )}+ </>+ ) : (+ <PeekOverviewComponent embedIssue embedRemoveCurrentNotification={embedRemoveCurrentNotification} />+ )}+ </>+ )}</div>);});diff --git a/web/core/components/workspace-notifications/sidebar/header/root.tsx b/web/core/components/workspace-notifications/sidebar/header/root.tsxindex c641bde199..cdda51fbfa 100644--- a/web/core/components/workspace-notifications/sidebar/header/root.tsx+++ b/web/core/components/workspace-notifications/sidebar/header/root.tsx@@ -20,7 +20,7 @@ export const NotificationSidebarHeader: FC<TNotificationSidebarHeader> = observeif (!workspaceSlug) return <></>;return (- <Header className="my-auto">+ <Header className="my-auto bg-custom-background-100"><Header.LeftItem><div className="block bg-custom-sidebar-background-100 md:hidden"><SidebarHamburgerToggle />diff --git a/web/core/components/workspace-notifications/sidebar/index.ts b/web/core/components/workspace-notifications/sidebar/index.tsindex 9e46ed0e63..4713a9b3c2 100644--- a/web/core/components/workspace-notifications/sidebar/index.ts+++ b/web/core/components/workspace-notifications/sidebar/index.ts@@ -6,3 +6,5 @@ export * from "./header";export * from "./filters";export * from "./notification-card";++export * from "./root";diff --git a/web/core/components/workspace-notifications/sidebar/root.tsx b/web/core/components/workspace-notifications/sidebar/root.tsxnew file mode 100644index 0000000000..48b94bb1a0--- /dev/null+++ b/web/core/components/workspace-notifications/sidebar/root.tsx@@ -0,0 +1,118 @@+"use client";+import { FC, useCallback } from "react";++import { observer } from "mobx-react";+import { useParams } from "next/navigation";+// plane imports+import { NOTIFICATION_TABS, TNotificationTab } from "@plane/constants";+import { useTranslation } from "@plane/i18n";+// components+import { Header, Row, ERowVariant, EHeaderVariant, ContentWrapper } from "@plane/ui";+import { CountChip } from "@/components/common";+import {+ NotificationsLoader,+ NotificationEmptyState,+ NotificationSidebarHeader,+ AppliedFilters,+} from "@/components/workspace-notifications";+// helpers+import { cn } from "@/helpers/common.helper";+import { getNumberCount } from "@/helpers/string.helper";+// hooks+import { useWorkspace, useWorkspaceNotifications } from "@/hooks/store";++import { NotificationListRoot } from "@/plane-web/components/workspace-notifications/list-root";++export const NotificationsSidebarRoot: FC = observer(() => {+ const { workspaceSlug } = useParams();+ // hooks+ const { getWorkspaceBySlug } = useWorkspace();+ const {+ currentSelectedNotificationId,+ unreadNotificationsCount,+ loader,+ notificationIdsByWorkspaceId,+ currentNotificationTab,+ setCurrentNotificationTab,+ } = useWorkspaceNotifications();++ const { t } = useTranslation();+ // derived values+ const workspace = workspaceSlug ? getWorkspaceBySlug(workspaceSlug.toString()) : undefined;+ const notificationIds = workspace ? notificationIdsByWorkspaceId(workspace.id) : undefined;++ const handleTabClick = useCallback(+ (tabValue: TNotificationTab) => {+ if (currentNotificationTab !== tabValue) {+ setCurrentNotificationTab(tabValue);+ }+ },+ [currentNotificationTab, setCurrentNotificationTab]+ );++ if (!workspaceSlug || !workspace) return <></>;++ return (+ <div+ className={cn(+ "relative border-0 md:border-r border-custom-border-200 z-[10] flex-shrink-0 bg-custom-background-100 h-full transition-all max-md:overflow-hidden",+ currentSelectedNotificationId ? "w-0 md:w-2/6" : "w-full md:w-2/6"+ )}+ >+ <div className="relative w-full h-full flex flex-col">+ <Row className="h-[3.75rem] border-b border-custom-border-200 flex">+ <NotificationSidebarHeader workspaceSlug={workspaceSlug.toString()} />+ </Row>++ <Header variant={EHeaderVariant.SECONDARY} className="justify-start">+ {NOTIFICATION_TABS.map((tab) => (+ <div+ key={tab.value}+ className="h-full px-3 relative cursor-pointer"+ onClick={() => handleTabClick(tab.value)}+ >+ <div+ className={cn(+ `relative h-full flex justify-center items-center gap-1 text-sm transition-all`,+ currentNotificationTab === tab.value+ ? "text-custom-primary-100"+ : "text-custom-text-100 hover:text-custom-text-200"+ )}+ >+ <div className="font-medium">{t(tab.i18n_label)}</div>+ {tab.count(unreadNotificationsCount) > 0 && (+ <CountChip count={getNumberCount(tab.count(unreadNotificationsCount))} />+ )}+ </div>+ {currentNotificationTab === tab.value && (+ <div className="border absolute bottom-0 right-0 left-0 rounded-t-md border-custom-primary-100" />+ )}+ </div>+ ))}+ </Header>++ {/* applied filters */}+ <AppliedFilters workspaceSlug={workspaceSlug.toString()} />++ {/* rendering notifications */}+ {loader === "init-loader" ? (+ <div className="relative w-full h-full overflow-hidden">+ <NotificationsLoader />+ </div>+ ) : (+ <>+ {notificationIds && notificationIds.length > 0 ? (+ <ContentWrapper variant={ERowVariant.HUGGING}>+ <NotificationListRoot workspaceSlug={workspaceSlug.toString()} workspaceId={workspace?.id} />+ </ContentWrapper>+ ) : (+ <div className="relative w-full h-full flex justify-center items-center">+ <NotificationEmptyState />+ </div>+ )}+ </>+ )}+ </div>+ </div>+ );+});diff --git a/web/core/store/issue/issue-details/root.store.ts b/web/core/store/issue/issue-details/root.store.tsindex 5a3b394b04..1d795dd940 100644--- a/web/core/store/issue/issue-details/root.store.ts+++ b/web/core/store/issue/issue-details/root.store.ts@@ -204,7 +204,7 @@ export class IssueDetail implements IIssueDetail {this.commentReaction = new IssueCommentReactionStore(this);this.subIssues = new IssueSubIssuesStore(this, serviceType);this.link = new IssueLinkStore(this, serviceType);- this.subscription = new IssueSubscriptionStore(this);+ this.subscription = new IssueSubscriptionStore(this, serviceType);this.relation = new IssueRelationStore(this);}diff --git a/web/core/store/issue/issue-details/subscription.store.ts b/web/core/store/issue/issue-details/subscription.store.tsindex 69b685c231..da3b2e6bfa 100644--- a/web/core/store/issue/issue-details/subscription.store.ts+++ b/web/core/store/issue/issue-details/subscription.store.ts@@ -1,10 +1,10 @@import set from "lodash/set";import { action, makeObservable, observable, runInAction } from "mobx";// services+import { EIssueServiceType } from "@plane/constants";import { IssueService } from "@/services/issue/issue.service";// typesimport { IIssueDetail } from "./root.store";-export interface IIssueSubscriptionStoreActions {addSubscription: (issueId: string, isSubscribed: boolean | undefined | null) => void;fetchSubscriptions: (workspaceSlug: string, projectId: string, issueId: string) => Promise<boolean>;@@ -27,7 +27,7 @@ export class IssueSubscriptionStore implements IIssueSubscriptionStore {// servicesissueService;- constructor(rootStore: IIssueDetail) {+ constructor(rootStore: IIssueDetail, serviceType: EIssueServiceType) {makeObservable(this, {// observablessubscriptionMap: observable,@@ -40,7 +40,7 @@ export class IssueSubscriptionStore implements IIssueSubscriptionStore {// root storethis.rootIssueDetail = rootStore;// services- this.issueService = new IssueService();+ this.issueService = new IssueService(serviceType);}// helper methods