From afd9caf73eafe69a5497a6f1b186912ab8cf9d81 Mon Sep 17 00:00:00 2001 From: Chris Brame Date: Sat, 20 Aug 2022 04:30:16 -0400 Subject: [PATCH] fix(dashboard): fails to load if show overdue tickets is disabled #552 --- src/client/reducers/dashboardReducer.js | 4 ++++ src/controllers/api/v1/tickets.js | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/client/reducers/dashboardReducer.js b/src/client/reducers/dashboardReducer.js index 5735820f6..2c69ec73f 100644 --- a/src/client/reducers/dashboardReducer.js +++ b/src/client/reducers/dashboardReducer.js @@ -116,6 +116,10 @@ const reducer = handleActions( }, [FETCH_DASHBOARD_OVERDUE_TICKETS.SUCCESS]: (state, action) => { + if (action.response.success && action.response.error) { + return { ...state, loadingOverdueTickets: false, overdueTickets: initialState.overdueTickets } + } + return { ...state, loadingOverdueTickets: false, diff --git a/src/controllers/api/v1/tickets.js b/src/controllers/api/v1/tickets.js index ae0fa8cf7..382f4c5f5 100644 --- a/src/controllers/api/v1/tickets.js +++ b/src/controllers/api/v1/tickets.js @@ -1958,7 +1958,7 @@ apiTickets.getOverdue = function (req, res) { ], function (err, overdueTickets) { if (err) return res.status(400).json({ success: false, error: err.message }) - + if (!overdueTickets) overdueTickets = [] return res.json({ success: true, tickets: overdueTickets }) } )