From ed0c1abd2f4cc1c3b0cce2475dff20855301d99e Mon Sep 17 00:00:00 2001 From: binwiederhier Date: Mon, 15 May 2023 13:37:30 -0400 Subject: [PATCH] Tiny web app fixes --- web/src/app/Api.js | 7 +++++-- web/src/components/Preferences.js | 4 ++-- web/src/components/ReserveDialogs.js | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/web/src/app/Api.js b/web/src/app/Api.js index 3d20d922..59bd78b8 100644 --- a/web/src/app/Api.js +++ b/web/src/app/Api.js @@ -21,8 +21,11 @@ class Api { const headers = maybeWithAuth({}, user); console.log(`[Api] Polling ${url}`); for await (let line of fetchLinesIterator(url, headers)) { - console.log(`[Api, ${shortUrl}] Received message ${line}`); - messages.push(JSON.parse(line)); + const message = JSON.parse(line); + if (message.id) { + console.log(`[Api, ${shortUrl}] Received message ${line}`); + messages.push(message); + } } return messages; } diff --git a/web/src/components/Preferences.js b/web/src/components/Preferences.js index 0cccc6b4..ec1c79da 100644 --- a/web/src/components/Preferences.js +++ b/web/src/components/Preferences.js @@ -541,8 +541,8 @@ const ReservationsTable = (props) => { const [deleteDialogOpen, setDeleteDialogOpen] = useState(false); const { subscriptions } = useOutletContext(); const localSubscriptions = (subscriptions?.length > 0) - ? Object.assign(...subscriptions.filter(s => s.baseUrl === config.base_url).map(s => ({[s.topic]: s}))) - : []; + ? Object.assign({}, ...subscriptions.filter(s => s.baseUrl === config.base_url).map(s => ({[s.topic]: s}))) + : {}; const handleEditClick = (reservation) => { setDialogKey(prev => prev+1); diff --git a/web/src/components/ReserveDialogs.js b/web/src/components/ReserveDialogs.js index 7a6a044f..e466269a 100644 --- a/web/src/components/ReserveDialogs.js +++ b/web/src/components/ReserveDialogs.js @@ -34,7 +34,7 @@ export const ReserveAddDialog = (props) => { const handleSubmit = async () => { try { await accountApi.upsertReservation(topic, everyone); - console.debug(`[ReserveAddDialog] Added reservation for topic ${t}: ${everyone}`); + console.debug(`[ReserveAddDialog] Added reservation for topic ${topic}: ${everyone}`); } catch (e) { console.log(`[ReserveAddDialog] Error adding topic reservation.`, e); if (e instanceof UnauthorizedError) {