diff --git a/components/inspectit-ocelot-configurationserver-ui/package.json b/components/inspectit-ocelot-configurationserver-ui/package.json index 5feb752bb6..5e26b7e372 100644 --- a/components/inspectit-ocelot-configurationserver-ui/package.json +++ b/components/inspectit-ocelot-configurationserver-ui/package.json @@ -35,7 +35,7 @@ "jszip": "^3.10.0", "jwt-decode": "^3.1.2", "lodash": "^4.17.21", - "next": "^14.2.5", + "next": "^14.2.10", "primeflex": "^3.2.1", "primeicons": "^5.0.0", "primereact": "^8.5.0", @@ -58,7 +58,7 @@ "reselect": "^4.1.6", "strip-ansi": "^7.0.1", "uuid": "^8.3.2", - "webpack": "^5.0.0" + "webpack": "^5.94.0" }, "license": "Apache-2.0", "devDependencies": { diff --git a/components/inspectit-ocelot-configurationserver-ui/src/components/views/status/StatusTable.js b/components/inspectit-ocelot-configurationserver-ui/src/components/views/status/StatusTable.js index 6be7443a78..d18a78b7f3 100644 --- a/components/inspectit-ocelot-configurationserver-ui/src/components/views/status/StatusTable.js +++ b/components/inspectit-ocelot-configurationserver-ui/src/components/views/status/StatusTable.js @@ -152,11 +152,18 @@ class StatusTable extends React.Component { attributes: { service }, } = rowData; - let { logAvailable, agentCommandsEnabled, serviceStatesAvailable, serviceStates } = this.resolveServiceAvailability(metaInformation); + // Set default values + let logAvailable = false; + let agentCommandsEnabled = false; + let serviceStatesAvailable = false; + let serviceStates = '{}'; let name = '-'; - let agentIdElement; - let agentId = null; - if (metaInformation) { + let agentIdElement = ; + let agentId = ''; + + if (metaInformation && Object.entries(metaInformation).length > 0) { + ({ logAvailable, agentCommandsEnabled, serviceStatesAvailable, serviceStates } = this.resolveServiceAvailability(metaInformation)); + if (service) { name = service; } @@ -292,13 +299,18 @@ class StatusTable extends React.Component { }; agentHealthTemplate = (rowData) => { - const { onShowHealthStateDialog } = this.props; + const { onShowHealthStateDialog, onShowDownloadDialog } = this.props; const { healthState, metaInformation } = rowData; - const { health } = healthState; - const { agentId } = metaInformation; - const { onShowDownloadDialog } = this.props; + const health = healthState?.health ?? null; + const agentId = metaInformation?.agentId ?? ''; + const agentVersion = metaInformation?.agentVersion ?? ''; - let { agentCommandsEnabled, supportArchiveAvailable } = this.resolveServiceAvailability(metaInformation); + // Set default values + let agentCommandsEnabled = false; + let supportArchiveAvailable = false; + if (metaInformation && Object.entries(metaInformation).length > 0) { + ({ agentCommandsEnabled, supportArchiveAvailable } = this.resolveServiceAvailability(metaInformation)); + } let healthInfo; let iconClass; @@ -319,6 +331,11 @@ class StatusTable extends React.Component { iconClass = 'pi-minus-circle'; iconColor = '#e8c413'; break; + default: + healthInfo = 'Unknown'; + iconClass = 'pi-question-circle'; + iconColor = 'gray'; + break; } return ( @@ -350,7 +367,7 @@ class StatusTable extends React.Component {