Skip to content

Commit

Permalink
Merge branch 'demo' of https://github.com/aelassas/movinin into demo
Browse files Browse the repository at this point in the history
  • Loading branch information
@aelassas
aelassas committed Feb 25, 2025
2 parents 2a81b07 + f2882ba commit a0d57ab
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 35 deletions.
28 changes: 13 additions & 15 deletions backend/src/components/NotificationList.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ const NotificationList = ({ user }: NotificationListProps) => {
</div>
</div>
<div ref={notificationsListRef} className="notifications-list">
{rows.map((row) => (
{rows.map((row, index) => (
<div key={row._id} className="notification-container">
<div className="notification-checkbox">
<Checkbox
Expand Down Expand Up @@ -244,8 +244,9 @@ const NotificationList = ({ user }: NotificationListProps) => {
const status = await NotificationService.markAsRead(user._id, [row._id])

if (status === 200) {
row.isRead = true
setRows(movininHelper.clone(rows))
const _rows = movininHelper.cloneArray(rows) as movininTypes.Notification[]
_rows[index].isRead = true
setRows(_rows)
setNotificationCount((prev) => prev - 1)
__navigate__()
} else {
Expand Down Expand Up @@ -276,8 +277,9 @@ const NotificationList = ({ user }: NotificationListProps) => {
const status = await NotificationService.markAsRead(user._id, [row._id])

if (status === 200) {
row.isRead = true
setRows(movininHelper.clone(rows))
const _rows = movininHelper.cloneArray(rows) as movininTypes.Notification[]
_rows[index].isRead = true
setRows(_rows)
setNotificationCount((prev) => prev - 1)
} else {
helper.error()
Expand All @@ -303,8 +305,9 @@ const NotificationList = ({ user }: NotificationListProps) => {
const status = await NotificationService.markAsUnread(user._id, [row._id])

if (status === 200) {
row.isRead = false
setRows(movininHelper.clone(rows))
const _rows = movininHelper.cloneArray(rows) as movininTypes.Notification[]
_rows[index].isRead = false
setRows(_rows)
setNotificationCount((prev) => prev + 1)
} else {
helper.error()
Expand Down Expand Up @@ -397,17 +400,12 @@ const NotificationList = ({ user }: NotificationListProps) => {
fetch()
}
} else {
selectedRows.forEach((row) => {
rows.splice(
rows.findIndex((_row) => _row._id === row._id),
1,
)
})
setRows(movininHelper.clone(rows))
const _rows = movininHelper.clone(rows) as movininTypes.Notification[]
setRows(_rows.filter((row) => !ids.includes(row._id)))
setRowCount(rowCount - selectedRows.length)
setTotalRecords(totalRecords - selectedRows.length)
}
setNotificationCount((prev) => prev - selectedRows.length)
setNotificationCount((prev) => prev - selectedRows.filter((row) => !row.isRead).length)
setOpenDeleteDialog(false)
} else {
helper.error()
Expand Down
39 changes: 19 additions & 20 deletions frontend/src/components/NotificationList.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ const NotificationList = ({ user }: NotificationListProps) => {

if (status === 200) {
const __rows = movininHelper.clone(rows) as movininTypes.Notification[]
for (const row of __rows) {
__rows.filter((row) => ids.includes(row._id)).forEach((row) => {
row.isRead = true
}
})
setRows(__rows)
setNotificationCount((prev) => prev - _rows.length)
} else {
Expand Down Expand Up @@ -175,9 +175,9 @@ const NotificationList = ({ user }: NotificationListProps) => {

if (status === 200) {
const __rows = movininHelper.clone(rows) as movininTypes.Notification[]
for (const row of __rows) {
__rows.filter((row) => ids.includes(row._id)).forEach((row) => {
row.isRead = false
}
})
setRows(__rows)
setNotificationCount((prev) => prev + _rows.length)
} else {
Expand Down Expand Up @@ -207,7 +207,7 @@ const NotificationList = ({ user }: NotificationListProps) => {
</div>
</div>
<div ref={notificationsListRef} className="notifications-list">
{rows.map((row) => (
{rows.map((row, index) => (
<div key={row._id} className="notification-container">
<div className="notification-checkbox">
<Checkbox
Expand Down Expand Up @@ -247,8 +247,9 @@ const NotificationList = ({ user }: NotificationListProps) => {
const status = await NotificationService.markAsRead(user._id, [row._id])

if (status === 200) {
row.isRead = true
setRows(movininHelper.clone(rows))
const _rows = movininHelper.cloneArray(rows) as movininTypes.Notification[]
_rows[index].isRead = true
setRows(_rows)
setNotificationCount((prev) => prev - 1)
__navigate__()
} else {
Expand Down Expand Up @@ -279,8 +280,9 @@ const NotificationList = ({ user }: NotificationListProps) => {
const status = await NotificationService.markAsRead(user._id, [row._id])

if (status === 200) {
row.isRead = true
setRows(movininHelper.clone(rows))
const _rows = movininHelper.cloneArray(rows) as movininTypes.Notification[]
_rows[index].isRead = true
setRows(_rows)
setNotificationCount((prev) => prev - 1)
} else {
helper.error()
Expand All @@ -306,8 +308,9 @@ const NotificationList = ({ user }: NotificationListProps) => {
const status = await NotificationService.markAsUnread(user._id, [row._id])

if (status === 200) {
row.isRead = false
setRows(movininHelper.clone(rows))
const _rows = movininHelper.cloneArray(rows) as movininTypes.Notification[]
_rows[index].isRead = false
setRows(_rows)
setNotificationCount((prev) => prev + 1)
} else {
helper.error()
Expand Down Expand Up @@ -399,17 +402,13 @@ const NotificationList = ({ user }: NotificationListProps) => {
fetch()
}
} else {
selectedRows.forEach((row) => {
rows.splice(
rows.findIndex((_row) => _row._id === row._id),
1,
)
})
setRows(movininHelper.clone(rows))
const _rows = movininHelper.clone(rows) as movininTypes.Notification[]
setRows(_rows.filter((row) => !ids.includes(row._id)))
setRowCount(rowCount - selectedRows.length)
setTotalRecords(totalRecords - selectedRows.length)
}
setNotificationCount((prev) => prev - selectedRows.length)
setNotificationCount((prev) => prev - selectedRows.filter((row) => !row.isRead).length)
console.log(selectedRows.length)
setOpenDeleteDialog(false)
} else {
helper.error()
Expand All @@ -419,7 +418,7 @@ const NotificationList = ({ user }: NotificationListProps) => {
}
}}
variant="contained"
color="error"
color="primary"
>
{commonStrings.DELETE}
</Button>
Expand Down

0 comments on commit a0d57ab

Please sign in to comment.