admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature/IO-3096-GlobalNotifications - add Dayjs, minor packages on backend

Browse Source
This commit is contained in:
Dave Richer
2025-02-28 12:05:40 -05:00
parent 9b871149ac
commit f6acc1107c
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/components/notification-center/notification-center.container.jsx
View File

@@ -79,7 +79,7 @@ export function NotificationCenterContainer({ visible, onClose, bodyshop }) {
__typename: notif.__typename
};
})
.sort((a, b) => day(b.created_at).diff(day(a.created_at)));
.sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
setNotifications(processedNotifications);
setError(null);
}
@@ -115,7 +115,7 @@ export function NotificationCenterContainer({ visible, onClose, bodyshop }) {
const handleMarkAllRead = useCallback(() => {
markAllNotificationsRead()
.then(() => {
const timestamp = day().toISOString();
const timestamp = new Date().toISOString();
setNotifications((prev) => {
const updatedNotifications = prev.map((notif) =>
notif.read === null && notif.associationid === userAssociationId
@@ -137,7 +137,7 @@ export function NotificationCenterContainer({ visible, onClose, bodyshop }) {
variables: { id: notificationId }
})
.then(() => {
const timestamp = day().toISOString();
const timestamp = new Date().toISOString();
setNotifications((prev) => {
return prev.map((notif) =>
notif.id === notificationId && !notif.read ? { ...notif, read: timestamp } : notif

11
client/src/contexts/SocketIO/socketContext.jsx
View File

@@ -12,7 +12,6 @@ import {
MARK_NOTIFICATION_READ
} from "../../graphql/notifications.queries.js";
import { gql, useMutation } from "@apollo/client";
import day from "../../utils/day.js";
const SocketContext = createContext(null);
@@ -27,7 +26,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
const [markNotificationRead] = useMutation(MARK_NOTIFICATION_READ, {
update: (cache, { data: { update_notifications } }) => {
const timestamp = day().toISOString();
const timestamp = new Date().toISOString();
const updatedNotification = update_notifications.returning[0];
cache.modify({
@@ -80,7 +79,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
const [markAllNotificationsRead] = useMutation(MARK_ALL_NOTIFICATIONS_READ, {
variables: { associationid: userAssociationId },
update: (cache) => {
const timestamp = day().toISOString();
const timestamp = new Date().toISOString();
cache.modify({
fields: {
notifications(existing = [], { readField }) {
@@ -203,7 +202,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
scenario_text: JSON.stringify(notifications.map((notif) => notif.body)),
fcm_text: notifications.map((notif) => notif.body).join(". ") + ".",
scenario_meta: JSON.stringify(notifications.map((notif) => notif.variables || {})),
created_at: day(notifications[0].timestamp).toISOString(),
created_at: new Date(notifications[0].timestamp).toISOString(),
read: null,
job: { ro_number: jobRoNumber }
};
@@ -225,8 +224,8 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
query: GET_NOTIFICATIONS,
variables: baseVariables,
data: {
notifications: [newNotification, ...existingNotifications].sort((a, b) =>
day(b.created_at).diff(day(a.created_at))
notifications: [newNotification, ...existingNotifications].sort(
(a, b) => new Date(b.created_at) - new Date(a.created_at)
)
},
broadcast: true