= observer((props) => {
diff --git a/web/core/components/workspace-notifications/sidebar/notification-card/options/archive.tsx b/web/core/components/workspace-notifications/sidebar/notification-card/options/archive.tsx
index 395f0a75f..651404a2f 100644
--- a/web/core/components/workspace-notifications/sidebar/notification-card/options/archive.tsx
+++ b/web/core/components/workspace-notifications/sidebar/notification-card/options/archive.tsx
@@ -45,7 +45,7 @@ export const NotificationItemArchiveOption: FC =
return (
{data.archived_at ? (
diff --git a/web/core/components/workspace-notifications/sidebar/root.tsx b/web/core/components/workspace-notifications/sidebar/root.tsx
index 3fab32300..50c52c8e0 100644
--- a/web/core/components/workspace-notifications/sidebar/root.tsx
+++ b/web/core/components/workspace-notifications/sidebar/root.tsx
@@ -21,7 +21,7 @@ export const NotificationsSidebar: FC = observer(() => {
const { workspaceSlug } = useParams();
// hooks
const { getWorkspaceBySlug } = useWorkspace();
- const { paginationInfo, loader, notificationIdsByWorkspaceId } = useWorkspaceNotifications();
+ const { unreadNotificationsCount, loader, notificationIdsByWorkspaceId } = useWorkspaceNotifications();
// derived values
const workspace = workspaceSlug ? getWorkspaceBySlug(workspaceSlug.toString()) : undefined;
const notificationIds = workspace ? notificationIdsByWorkspaceId(workspace.id) : undefined;
@@ -30,7 +30,7 @@ export const NotificationsSidebar: FC = observer(() => {
const currentTabEmptyState = ENotificationTab.ALL
? EmptyStateType.NOTIFICATION_ALL_EMPTY_STATE
: EmptyStateType.NOTIFICATION_MENTIONS_EMPTY_STATE;
- const totalNotificationCount = paginationInfo?.total_count || 0;
+ const totalNotificationCount = unreadNotificationsCount.total_unread_notifications_count;
if (!workspaceSlug || !workspace) return <>;
return (
diff --git a/web/core/store/notifications/notification.ts b/web/core/store/notifications/notification.ts
index dabb25d97..ae31c985e 100644
--- a/web/core/store/notifications/notification.ts
+++ b/web/core/store/notifications/notification.ts
@@ -41,6 +41,7 @@ export class Notification implements INotification {
read_at: string | undefined = undefined;
archived_at: string | undefined = undefined;
snoozed_till: string | undefined = undefined;
+ is_inbox_issue: boolean | undefined = undefined;
workspace: string | undefined = undefined;
project: string | undefined = undefined;
created_at: string | undefined = undefined;
@@ -102,6 +103,7 @@ export class Notification implements INotification {
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.project = this.notification.project;
this.created_at = this.notification.created_at;
this.updated_at = this.notification.updated_at;
@@ -131,6 +133,7 @@ export class Notification implements INotification {
archived_at: this.archived_at,
snoozed_till: this.snoozed_till,
workspace: this.workspace,
+ is_inbox_issue: this.is_inbox_issue,
project: this.project,
created_at: this.created_at,
updated_at: this.updated_at,
@@ -187,6 +190,7 @@ export class Notification implements INotification {
const payload: Partial = {
read_at: new Date().toISOString(),
};
+ this.store.workspaceNotification.setUnreadNotificationsCount("decrement");
runInAction(() => this.mutateNotification(payload));
const notification = await workspaceNotificationService.markNotificationAsRead(workspaceSlug, this.id);
if (notification) {
@@ -195,6 +199,7 @@ export class Notification implements INotification {
return notification;
} catch (error) {
runInAction(() => this.mutateNotification({ read_at: currentNotificationReadAt }));
+ this.store.workspaceNotification.setUnreadNotificationsCount("increment");
throw error;
}
};
@@ -212,6 +217,7 @@ export class Notification implements INotification {
const payload: Partial = {
read_at: undefined,
};
+ this.store.workspaceNotification.setUnreadNotificationsCount("increment");
runInAction(() => this.mutateNotification(payload));
const notification = await workspaceNotificationService.markNotificationAsUnread(workspaceSlug, this.id);
if (notification) {
@@ -219,6 +225,7 @@ export class Notification implements INotification {
}
return notification;
} catch (error) {
+ this.store.workspaceNotification.setUnreadNotificationsCount("decrement");
runInAction(() => this.mutateNotification({ read_at: currentNotificationReadAt }));
throw error;
}
diff --git a/web/core/store/notifications/workspace-notifications.store.ts b/web/core/store/notifications/workspace-notifications.store.ts
index 1bdc30451..2cfe37990 100644
--- a/web/core/store/notifications/workspace-notifications.store.ts
+++ b/web/core/store/notifications/workspace-notifications.store.ts
@@ -1,8 +1,10 @@
import isEmpty from "lodash/isEmpty";
import set from "lodash/set";
-import { action, computed, makeObservable, observable, runInAction } from "mobx";
+import update from "lodash/update";
+import { action, makeObservable, observable, runInAction } from "mobx";
import { computedFn } from "mobx-utils";
import {
+ TCurrentSelectedNotification,
TNotification,
TNotificationFilter,
TNotificationPaginatedInfo,
@@ -28,13 +30,13 @@ type TNotificationQueryParamType = ENotificationQueryParamType;
export interface IWorkspaceNotificationStore {
// observables
loader: TNotificationLoader;
- unreadNotificationsCount: TUnreadNotificationsCount | undefined;
+ unreadNotificationsCount: TUnreadNotificationsCount;
notifications: Record; // notification_id -> notification
currentNotificationTab: TNotificationTab;
+ currentSelectedNotification: TCurrentSelectedNotification;
paginationInfo: Omit | undefined;
filters: TNotificationFilter;
// computed
- totalUnreadNotificationsCount: number;
// computed functions
notificationIdsByWorkspaceId: (workspaceId: string) => string[] | undefined;
// helper actions
@@ -43,6 +45,8 @@ export interface IWorkspaceNotificationStore {
updateBulkFilters: (filters: Partial) => void;
// actions
setCurrentNotificationTab: (tab: TNotificationTab) => void;
+ setCurrentSelectedNotification: (notification: TCurrentSelectedNotification) => void;
+ setUnreadNotificationsCount: (type: "increment" | "decrement") => void;
getUnreadNotificationsCount: (workspaceSlug: string) => Promise;
getNotifications: (
workspaceSlug: string,
@@ -57,9 +61,18 @@ export class WorkspaceNotificationStore implements IWorkspaceNotificationStore {
paginatedCount = 30;
// observables
loader: TNotificationLoader = undefined;
- unreadNotificationsCount: TUnreadNotificationsCount | undefined = undefined;
+ unreadNotificationsCount: TUnreadNotificationsCount = {
+ total_unread_notifications_count: 0,
+ };
notifications: Record = {};
currentNotificationTab: TNotificationTab = ENotificationTab.ALL;
+ currentSelectedNotification: TCurrentSelectedNotification = {
+ workspace_slug: undefined,
+ project_id: undefined,
+ notification_id: undefined,
+ issue_id: undefined,
+ is_inbox_issue: false,
+ };
paginationInfo: Omit | undefined = undefined;
filters: TNotificationFilter = {
type: {
@@ -76,15 +89,17 @@ export class WorkspaceNotificationStore implements IWorkspaceNotificationStore {
makeObservable(this, {
// observables
loader: observable.ref,
- unreadNotificationsCount: observable.ref,
+ unreadNotificationsCount: observable,
notifications: observable,
currentNotificationTab: observable.ref,
+ currentSelectedNotification: observable,
paginationInfo: observable,
filters: observable,
// computed
- totalUnreadNotificationsCount: computed,
// helper actions
setCurrentNotificationTab: action,
+ setCurrentSelectedNotification: action,
+ setUnreadNotificationsCount: action,
mutateNotifications: action,
updateFilters: action,
updateBulkFilters: action,
@@ -96,15 +111,6 @@ export class WorkspaceNotificationStore implements IWorkspaceNotificationStore {
}
// computed
- get totalUnreadNotificationsCount() {
- let count: number = 0;
- if (!this.unreadNotificationsCount) return count;
-
- Object.values(this.unreadNotificationsCount).forEach((value) => {
- count += value || 0;
- });
- return count;
- }
// computed functions
/**
@@ -151,16 +157,14 @@ export class WorkspaceNotificationStore implements IWorkspaceNotificationStore {
.map(([key]) => key)
.join(",") || undefined;
- const currentPage = this.paginationInfo ? Number(this.paginationInfo?.prev_cursor?.split(":")[1] || 0) + 1 : 0;
-
const queryCursorNext =
paramType === ENotificationQueryParamType.INIT
? `${this.paginatedCount}:0:0`
: paramType === ENotificationQueryParamType.CURRENT
- ? `${this.paginatedCount}:${currentPage}:0`
+ ? `${this.paginatedCount}:${0}:0`
: paramType === ENotificationQueryParamType.NEXT && this.paginationInfo
? this.paginationInfo?.next_cursor
- : `${this.paginatedCount}:${currentPage}:0`;
+ : `${this.paginatedCount}:${0}:0`;
const queryParams: TNotificationPaginatedInfoQueryParams = {
type: queryParamsType,
@@ -232,6 +236,27 @@ export class WorkspaceNotificationStore implements IWorkspaceNotificationStore {
set(this, "currentNotificationTab", tab);
};
+ /**
+ * @description set current selected notification
+ * @param { TCurrentSelectedNotification } notification
+ * @returns { void }
+ */
+ setCurrentSelectedNotification = (notification: TCurrentSelectedNotification): void => {
+ set(this, "currentSelectedNotification", notification);
+ };
+
+ /**
+ * @description set unread notifications count
+ * @param { "increment" | "decrement" } type
+ * @returns { void }
+ */
+ setUnreadNotificationsCount = (type: "increment" | "decrement"): void =>
+ runInAction(() => {
+ update(this.unreadNotificationsCount, "total_unread_notifications_count", (count: 0) =>
+ type === "increment" ? count + 1 : count - 1
+ );
+ });
+
/**
* @description get unread notifications count
* @param { string } workspaceSlug,
diff --git a/web/core/store/user/user-membership.store.ts b/web/core/store/user/user-membership.store.ts
index f9e9e6468..86f8c442b 100644
--- a/web/core/store/user/user-membership.store.ts
+++ b/web/core/store/user/user-membership.store.ts
@@ -34,6 +34,9 @@ export interface IUserMembershipStore {
currentWorkspaceRole: EUserWorkspaceRoles | undefined;
currentWorkspaceAllProjectsRole: IUserProjectsRole | undefined;
+ // computed functions
+ currentProjectRoleByProjectId: (projectId: string) => EUserProjectRoles | undefined;
+
hasPermissionToCurrentWorkspace: boolean | undefined;
hasPermissionToCurrentProject: boolean | undefined;
// fetch actions
@@ -156,6 +159,14 @@ export class UserMembershipStore implements IUserMembershipStore {
return this.hasPermissionToProject[this.router.projectId];
}
+ // computed functions
+ /**
+ * Returns the current project role by project id
+ * @param projectId
+ * @returns EUserProjectRoles
+ */
+ currentProjectRoleByProjectId = (projectId: string) => this.projectMemberInfo[projectId]?.role || undefined;
+
/**
* Fetches the current user workspace info
* @param workspaceSlug