Merge pull request #191 from theta42/fix/fresh-install
fix(ui): site-status modal API, honest agent version fallback
This commit is contained in:
@@ -42,7 +42,7 @@ class ThetaAgentDriver extends BaseDriver {
|
|||||||
status: 'online',
|
status: 'online',
|
||||||
driver: this.name,
|
driver: this.name,
|
||||||
agentId: agent.id,
|
agentId: agent.id,
|
||||||
agentVersion: agent.version || (telemetry && telemetry.version) || 'v2.0.0',
|
agentVersion: agent.version || (telemetry && telemetry.version) || 'unknown',
|
||||||
lastSeen: agent.lastSeen,
|
lastSeen: agent.lastSeen,
|
||||||
system: {
|
system: {
|
||||||
cpu: telemetry.cpu || null,
|
cpu: telemetry.cpu || null,
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ class Agent extends Model {
|
|||||||
delete data.tokenHash;
|
delete data.tokenHash;
|
||||||
return {
|
return {
|
||||||
...data,
|
...data,
|
||||||
version: data.version || (data.lastDiscovery && data.lastDiscovery.version) || (data.lastTelemetry && data.lastTelemetry.version) || 'v2.0.0',
|
version: data.version || (data.lastDiscovery && data.lastDiscovery.version) || (data.lastTelemetry && data.lastTelemetry.version) || 'unknown',
|
||||||
lastSeen: data.last_seen ? new Date(data.last_seen * 1000).toISOString() : null,
|
lastSeen: data.last_seen ? new Date(data.last_seen * 1000).toISOString() : null,
|
||||||
connected: !!(liveState && liveState.connected),
|
connected: !!(liveState && liveState.connected),
|
||||||
// "Online" is a live-connection fact, not a stored one. A row with a
|
// "Online" is a live-connection fact, not a stored one. A row with a
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ class AgentManager {
|
|||||||
|
|
||||||
async handleDiscovery(agent, payload) {
|
async handleDiscovery(agent, payload) {
|
||||||
const discovery = {
|
const discovery = {
|
||||||
version: payload.version || payload.agent_version || 'v2.0.0',
|
version: payload.version || payload.agent_version || 'unknown',
|
||||||
hostname: payload.hostname || '',
|
hostname: payload.hostname || '',
|
||||||
ip_addresses: Array.isArray(payload.ip_addresses) ? payload.ip_addresses : [],
|
ip_addresses: Array.isArray(payload.ip_addresses) ? payload.ip_addresses : [],
|
||||||
public_ip: payload.public_ip || '',
|
public_ip: payload.public_ip || '',
|
||||||
|
|||||||
@@ -3360,7 +3360,7 @@
|
|||||||
|
|
||||||
html += '</div>';
|
html += '</div>';
|
||||||
|
|
||||||
app.modal.show('Multi-Site & Network Gateway Status', html, [], 'modal-lg');
|
app.modal.open({ title: 'Multi-Site & Network Gateway Status', bodyHtml: html, size: 'lg' });
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
app.messages.toast('Error fetching site status: ' + e.message, 'danger');
|
app.messages.toast('Error fetching site status: ' + e.message, 'danger');
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user