Fix email_to field not persisting in edit modal - include all resource fields in dashboard API
This commit is contained in:
1 parent
63874a7329
commit
96e801b8be
2 files changed
+26
-2
No files matched your search
+17
-2
@@ -29,8 +29,23 @@ function History() {
|
|||||||
setError(null);
|
setError(null);
|
||||||
try {
|
try {
|
||||||
const response = await axios.get('/api/history/overview', { params: { days, page: currentPage, limit: pageSize } });
|
const response = await axios.get('/api/history/overview', { params: { days, page: currentPage, limit: pageSize } });
|
||||||
setHistoryData(response.data.resources || []);
|
console.log('History API Response:', response.data);
|
||||||
setTotalItems(response.data.total || response.data.resources?.length || 0);
|
|
||||||
|
let data = [];
|
||||||
|
let total = 0;
|
||||||
|
|
||||||
|
// Handle both response formats
|
||||||
|
if (response.data.resources && Array.isArray(response.data.resources)) {
|
||||||
|
data = response.data.resources;
|
||||||
|
total = response.data.total || data.length;
|
||||||
|
} else if (Array.isArray(response.data)) {
|
||||||
|
data = response.data;
|
||||||
|
total = data.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('Processed history data:', { data, total });
|
||||||
|
setHistoryData(data);
|
||||||
|
setTotalItems(total);
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error loading history:', error);
|
console.error('Error loading history:', error);
|
||||||
|
|||||||
@@ -181,6 +181,15 @@ app.get('/api/dashboard', (req, res) => {
|
|||||||
type: resource.type,
|
type: resource.type,
|
||||||
group_id: resource.group_id,
|
group_id: resource.group_id,
|
||||||
enabled: resource.enabled,
|
enabled: resource.enabled,
|
||||||
|
check_interval: resource.check_interval,
|
||||||
|
timeout: resource.timeout,
|
||||||
|
http_keyword: resource.http_keyword,
|
||||||
|
http_headers: resource.http_headers,
|
||||||
|
quiet_hours_start: resource.quiet_hours_start,
|
||||||
|
quiet_hours_end: resource.quiet_hours_end,
|
||||||
|
cert_expiry_days: resource.cert_expiry_days,
|
||||||
|
sla_target: resource.sla_target,
|
||||||
|
email_to: resource.email_to,
|
||||||
status: lastCheck?.status || 'unknown',
|
status: lastCheck?.status || 'unknown',
|
||||||
uptime: stats.uptime,
|
uptime: stats.uptime,
|
||||||
avgResponseTime: stats.avgResponseTime,
|
avgResponseTime: stats.avgResponseTime,
|
||||||
|
|||||||
Reference in new issue
Block a user