astra
/
ntfy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix param reassignment issue

pull/750/head
nimbleghost 2023-05-24 18:08:59 +02:00
parent 4d90e32fe9
commit d178be7576
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/src/app/SubscriptionManager.js
View File

@ -105,9 +105,12 @@ class SubscriptionManager {
return false; return false;
} }
try { try {
// eslint-disable-next-line no-param-reassign await db.notifications.add({
notification.new = 1; // New marker (used for bubble indicator); cannot be boolean; Dexie index limitation ...notification,
await db.notifications.add({ ...notification, subscriptionId }); // FIXME consider put() for double tab subscriptionId,
// New marker (used for bubble indicator); cannot be boolean; Dexie index limitation
new: 1,
}); // FIXME consider put() for double tab
await db.subscriptions.update(subscriptionId, { await db.subscriptions.update(subscriptionId, {
last: notification.id, last: notification.id,
}); });

11
web/src/components/Notifications.jsx
View File

@ -436,15 +436,10 @@ const ACTION_LABEL_SUFFIX = {
}; };
const updateActionStatus = (notification, action, progress, error) => { const updateActionStatus = (notification, action, progress, error) => {
// TODO(eslint): Fix by spreading? Does the code depend on the change, though? subscriptionManager.updateNotification({
// eslint-disable-next-line no-param-reassign ...notification,
notification.actions = notification.actions.map((a) => { actions: notification.actions.map((a) => (a.id === action.id ? { ...a, progress, error } : a)),
if (a.id !== action.id) {
return a;
}
return { ...a, progress, error };
}); });
subscriptionManager.updateNotification(notification);
}; };
const performHttpAction = async (notification, action) => { const performHttpAction = async (notification, action) => {