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-2382]chore:notification snooze modal (#6164)

Vamsi Krishna666ddf73b638
diff --git a/web/app/[workspaceSlug]/(projects)/notifications/layout.tsx b/web/app/[workspaceSlug]/(projects)/notifications/layout.tsx
index b69da040a0..7d71948d83 100644
--- a/web/app/[workspaceSlug]/(projects)/notifications/layout.tsx
+++ b/web/app/[workspaceSlug]/(projects)/notifications/layout.tsx
@@ -1,12 +1,12 @@
"use client";
// components
-import { NotificationsSidebar } from "@/plane-web/components/workspace-notifications";
+import { NotificationsSidebarRoot } from "@/plane-web/components/workspace-notifications";
export default function ProjectInboxIssuesLayout({ children }: { children: React.ReactNode }) {
return (
<div className="relative w-full h-full overflow-hidden flex items-center">
- <NotificationsSidebar />
+ <NotificationsSidebarRoot />
<div className="w-full h-full overflow-hidden overflow-y-auto">{children}</div>
</div>
);
diff --git a/web/ce/components/workspace-notifications/root.tsx b/web/ce/components/workspace-notifications/root.tsx
index 97083d8cb1..35c61263df 100644
--- a/web/ce/components/workspace-notifications/root.tsx
+++ b/web/ce/components/workspace-notifications/root.tsx
@@ -21,7 +21,7 @@ import { getNumberCount } from "@/helpers/string.helper";
// hooks
import { useWorkspace, useWorkspaceNotifications } from "@/hooks/store";
-export const NotificationsSidebar: FC = observer(() => {
+export const NotificationsSidebarRoot: FC = observer(() => {
const { workspaceSlug } = useParams();
// hooks
const { getWorkspaceBySlug } = useWorkspace();
@@ -65,7 +65,7 @@ export const NotificationsSidebar: FC = observer(() => {
<div
key={tab.value}
className="h-full px-3 relative cursor-pointer"
- onClick={()=>handleTabClick(tab.value)}
+ onClick={() => handleTabClick(tab.value)}
>
<div
className={cn(
diff --git a/web/core/components/workspace-notifications/sidebar/notification-card/options/snooze/modal.tsx b/web/core/components/workspace-notifications/sidebar/notification-card/options/snooze/modal.tsx
index 1ca19a5ef5..36302aa5f0 100644
--- a/web/core/components/workspace-notifications/sidebar/notification-card/options/snooze/modal.tsx
+++ b/web/core/components/workspace-notifications/sidebar/notification-card/options/snooze/modal.tsx
@@ -17,7 +17,7 @@ import { getDate } from "@/helpers/date-time.helper";
type TNotificationSnoozeModal = {
isOpen: boolean;
onClose: () => void;
- onSubmit: (dateTime?: Date | undefined) => Promise<TNotification | undefined>;
+ onSubmit: (dateTime?: Date | undefined) => Promise<void>;
};
type FormValues = {
diff --git a/web/core/components/workspace-notifications/sidebar/notification-card/options/snooze/root.tsx b/web/core/components/workspace-notifications/sidebar/notification-card/options/snooze/root.tsx
index 003175500c..86e22049cc 100644
--- a/web/core/components/workspace-notifications/sidebar/notification-card/options/snooze/root.tsx
+++ b/web/core/components/workspace-notifications/sidebar/notification-card/options/snooze/root.tsx
@@ -34,25 +34,23 @@ export const NotificationItemSnoozeOption: FC<TNotificationItemSnoozeOption> = o
const handleNotificationSnoozeDate = async (snoozeTill: Date | undefined) => {
if (snoozeTill) {
try {
- const response = await snoozeNotification(workspaceSlug, snoozeTill);
+ await snoozeNotification(workspaceSlug, snoozeTill);
setToast({
title: "Success!",
message: "Notification snoozed successfully",
type: TOAST_TYPE.SUCCESS,
});
- return response;
} catch (e) {
console.error(e);
}
} else {
try {
- const response = await unSnoozeNotification(workspaceSlug);
+ await unSnoozeNotification(workspaceSlug);
setToast({
title: "Success!",
message: "Notification un snoozed successfully",
type: TOAST_TYPE.SUCCESS,
});
- return response;
} catch (e) {
console.error(e);
}
diff --git a/web/core/store/notifications/workspace-notifications.store.ts b/web/core/store/notifications/workspace-notifications.store.ts
index 59f0dbc033..b3ba882035 100644
--- a/web/core/store/notifications/workspace-notifications.store.ts
+++ b/web/core/store/notifications/workspace-notifications.store.ts
@@ -62,7 +62,7 @@ export interface IWorkspaceNotificationStore {
export class WorkspaceNotificationStore implements IWorkspaceNotificationStore {
// constants
- paginatedCount = 30;
+ paginatedCount = 300;
// observables
loader: TNotificationLoader = undefined;
unreadNotificationsCount: TUnreadNotificationsCount = {
@@ -84,7 +84,7 @@ export class WorkspaceNotificationStore implements IWorkspaceNotificationStore {
read: false,
};
- constructor(private store: CoreRootStore) {
+ constructor(protected store: CoreRootStore) {
makeObservable(this, {
// observables
loader: observable.ref,
diff --git a/web/ee/components/workspace-notifications/index.ts b/web/ee/components/workspace-notifications/index.ts
new file mode 100644
index 0000000000..fb22da3e81
--- /dev/null
+++ b/web/ee/components/workspace-notifications/index.ts
@@ -0,0 +1 @@
+export * from "ce/components/workspace-notifications";
diff --git a/web/ee/components/workspace-notifications/root.tsx b/web/ee/components/workspace-notifications/root.tsx
deleted file mode 100644
index d4a704bd2a..0000000000
--- a/web/ee/components/workspace-notifications/root.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export {NotificationsSidebar} from 'ce/components/workspace-notifications'
\ No newline at end of file