Merge pull request #107 from bhagatsaurabh/feature/prototyping

bugfixes

Author: bhagatsaurabh

src/store/notifications.ts

@@ -14,8 +14,8 @@ import {
   storePersistentNotification,
 } from "@/utils/driver";
 import { auth } from "@/config/firebase";
-import { persistentNtfnsTypes } from "@/utils/constants";
 import { getDetails } from "@/services/user";
+import { isNotificationPersistent } from "@/utils";
 
 type NotificationsState = {
   pending: UserNotificationPayload[];
@@ -156,7 +156,7 @@ export const notify = createAsyncThunk<void, InternalNotificationPayload | UserN
 const process = createAsyncThunk<UserNotificationPayload, UserNotificationPayload>(
   "notifications/process",
   async (notification) => {
-    if (persistentNtfnsTypes.includes(notification.type)) {
+    if (isNotificationPersistent(notification)) {
       notification.isPersistent = true;
     }
     if (notification.type === "workspace-invite") {

src/utils/constants.ts

@@ -62,6 +62,6 @@ export const errorMap: Record<string, UserError> = {
   },
 };
 
-export const persistentNtfnsTypes: NotificationType[] = ["workspace-invite", "workspace-access-code"];
+export const persistentNtfnTypes: NotificationType[] = ["workspace-invite", "workspace-access-code"];
 
 export const fsIgnoreList = ["lost+found"];

src/utils/index.ts

@@ -3,6 +3,8 @@ import { Location } from "react-router";
 import iconMapping from "@/assets/icon-map.json";
 import { FNode } from "@/models/filesystem";
 import { Area } from "react-easy-crop";
+import { NotificationType, UserNotificationPayload, WorkspaceAccessRequest } from "@/models/notification";
+import { persistentNtfnTypes } from "./constants";
 
 type IconMap = {
   fileNames: Record<string, string>;
@@ -267,3 +269,12 @@ export const getCroppedImg = async (
     }, "image/png");
   });
 };
+
+export const persistentNtfnTypesChecks: Partial<
+  Record<NotificationType, (ntfn: UserNotificationPayload) => boolean>
+> = {
+  "workspace-access-code": (ntfn: UserNotificationPayload) => (ntfn as WorkspaceAccessRequest).success,
+};
+export const isNotificationPersistent = (ntfn: UserNotificationPayload) => {
+  return persistentNtfnTypes.includes(ntfn.type) && (persistentNtfnTypesChecks[ntfn.type]?.(ntfn) ?? true);
+};