Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SK Server Admin UI Activity View Update #1669

Merged
merged 13 commits into from
Feb 11, 2024
+165 −136
Merged

SK Server Admin UI Activity View Update #1669

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
63d0101
fix: separate and sort Connections and Plugins lists on UI
KEGustafsson Feb 3, 2024
542696f
fix: format
KEGustafsson Feb 3, 2024
d1d32b5
fix: activities heading font size increased
KEGustafsson Feb 4, 2024
03f04a9
fix: prettier
KEGustafsson Feb 4, 2024
bc6176d
fix: hide plugins view if none
KEGustafsson Feb 4, 2024
dccf72b
fix: links to point correct directions
KEGustafsson Feb 4, 2024
b04411b
fix: history link pointing to dashboard
KEGustafsson Feb 4, 2024
a39e5f9
fix: format
KEGustafsson Feb 4, 2024
c577994
fix: use functions to render list
KEGustafsson Feb 7, 2024
6147525
fix: optimize functions
KEGustafsson Feb 8, 2024
7689931
fix: font size modification
KEGustafsson Feb 9, 2024
27c17fc
fix: updates to status view functions
KEGustafsson Feb 9, 2024
a37d38a
fix: rename render-functions and typo correction
KEGustafsson Feb 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
301 changes: 165 additions & 136 deletions packages/server-admin-ui/src/views/Dashboard/Dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,123 @@ const Dashboard = (props) => {
if (errorCount > 0) {
errors = `(${errorCount} errors)`
}

const getLinkType = (providerId) => {
try {
return providerStatus.find((item) => item.id === providerId).statusType
} catch (err) {
return 'provider'
}
}

const inputPulseIconClass = (providerStats) => {
return (
'icon-login' +
(providerStats.deltaRate > 50
? ' text-primary fa-pulse-fast'
: providerStats.deltaRate > 0
? ' text-primary fa-pulse'
: '')
)
}

const outputPulseIconClass = (providerStats) => {
return (
'icon-logout' +
(providerStats.writeRate > 50
? ' text-primary fa-pulse-fast'
: providerStats.writeRate > 0
? ' text-primary fa-pulse'
: '')
)
}

const renderActivity = (providerId, providerStats, linkType) => {
return (
<li key={providerId} onClick={() => props.history.push(`/dashboard`)}>
<i
className={inputPulseIconClass(providerStats)}
style={{
color: providerStats.deltaCount ? '#039' : 'lightblue',
}}
/>
<i
className={outputPulseIconClass(providerStats)}
style={{
transform: 'scaleX(-1)',
color: providerStats.writeCount ? '#039' : 'lightblue',
}}
/>
<span className="title">
{linkType === 'plugin'
? pluginNameLink(providerId)
: providerIdLink(providerId)}
</span>
{providerStats.writeRate > 0 && (
<span className="value">
{' '}
{providerStats.writeRate}{' '}
<span className="text-muted small">{'msg/s'}</span>{' '}
</span>
)}
{providerStats.deltaRate > 0 && providerStats.writeRate > 0 && (
<span className="value">
<span className="text-muted small">{','}</span>
&#160;
</span>
)}
{providerStats.deltaRate > 0 && (
<span className="value">
{' '}
{providerStats.deltaRate}{' '}
<span className="text-muted small">
({((providerStats.deltaRate / deltaRate) * 100).toFixed(0)}
%)
</span>{' '}
<span className="text-muted small">{'deltas/s'}</span>{' '}
</span>
)}
<div className="bars">
<Progress
className="progress-xs"
color="warning"
value={(providerStats.deltaRate / deltaRate) * 100}
/>
</div>
</li>
)
}

const renderStatus = (status, statusClass, lastError) => {
return (
<tr
key={status.id}
onClick={() => {
props.history.push(
'/serverConfiguration/' +
(status.statusType === 'plugin' ? 'plugins/' : 'connections/') +
status.id
)
}}
>
<td>
{status.statusType === 'plugin'
? pluginNameLink(status.id)
: providerIdLink(status.id)}
</td>
<td>
<p className="text-danger">{lastError}</p>
</td>
<td>
<p className={statusClass}>
{(status.message || '').substring(0, 80)}
{status.message.length > 80 ? '...' : ''}
</p>
</td>
</tr>
)
}

return (
<div className="animated fadeIn">
{props.websocketStatus === 'open' && (
Expand Down Expand Up @@ -73,106 +190,42 @@ const Dashboard = (props) => {
</div>
</Col>
<Col xs="12" md="6">
<div className="text-muted">Connection activity</div>
<div className="text-muted" style={{ fontSize: '1rem' }}>
Connections activity
</div>
<ul className="horizontal-bars type-2">
{Object.keys(providerStatistics || {})
.sort()
.map((providerId) => {
if (getLinkType(providerId) === 'provider') {
return renderActivity(
providerId,
providerStatistics[providerId],
'provider'
)
}
})}
</ul>
<br></br>
<div className="text-muted" style={{ fontSize: '1rem' }}>
{Object.keys(providerStatistics || {}).some(
(providerId) => getLinkType(providerId) === 'plugin'
)
? 'Plugins activity'
: null}
</div>
<ul className="horizontal-bars type-2">
{Object.keys(providerStatistics || {}).map((providerId) => {
const providerStats = providerStatistics[providerId]
let linkType = 'provider'
try {
linkType = providerStatus.find(
(item) => item.id === providerId
).statusType
} catch (error) {}
const inputPulseIconClass =
'icon-login' +
(providerStats.deltaRate > 50
? ' text-primary fa-pulse-fast'
: providerStats.deltaRate > 0
? ' text-primary fa-pulse'
: '')
const outputPulseIconClass =
'icon-logout' +
(providerStats.writeRate > 50
? ' text-primary fa-pulse-fast'
: providerStats.writeRate > 0
? ' text-primary fa-pulse'
: '')
return (
<li
key={providerId}
onClick={() =>
props.history.push(
`/serverConfiguration/connections/${providerId}`
)
}
>
<i
className={inputPulseIconClass}
style={{
color: providerStats.deltaCount
? '#039'
: 'lightblue',
}}
/>
<i
className={outputPulseIconClass}
style={{
transform: 'scaleX(-1)',
color: providerStats.writeCount
? '#039'
: 'lightblue',
}}
/>
<span className="title">
{linkType === 'plugin'
? pluginNameLink(providerId)
: providerIdLink(providerId)}
</span>
{providerStats.writeRate > 0 && (
<span className="value">
{' '}
{providerStats.writeRate}{' '}
<span className="text-muted small">
{'msg/s'}
</span>{' '}
</span>
)}
{providerStats.deltaRate > 0 &&
providerStats.writeRate > 0 && (
<span className="value">
<span className="text-muted small">{','}</span>
&#160;
</span>
)}
{providerStats.deltaRate > 0 && (
<span className="value">
{' '}
{providerStats.deltaRate}{' '}
<span className="text-muted small">
(
{(
(providerStats.deltaRate / deltaRate) *
100
).toFixed(0)}
%)
</span>{' '}
<span className="text-muted small">
{'deltas/s'}
</span>{' '}
</span>
)}
<div className="bars">
<Progress
className="progress-xs"
color="warning"
value={
(providerStats.deltaRate / deltaRate) * 100
}
/>
</div>
</li>
)
})}
{Object.keys(providerStatistics || {})
.sort()
.map((providerId) => {
if (getLinkType(providerId) === 'plugin') {
return renderActivity(
providerId,
providerStatistics[providerId],
'plugin'
)
}
})}
</ul>
</Col>
</Row>
Expand All @@ -196,49 +249,19 @@ const Dashboard = (props) => {
</thead>
<tbody>
{providerStatus.map((status) => {
let statusClass
if (status.type === 'status') {
statusClass = 'text-success'
} else if (status.type === 'warning') {
statusClass = 'text-warning'
} else {
statusClass = 'text-danger'
const statusClasses = {
status: 'text-success',
warning: 'text-warning',
error: 'text-danger',
}
const statusClass = statusClasses[status.type]
const lastError =
status.lastError && status.lastError != status.message
? status.lastErrorTimeStamp +
': ' +
status.lastError
: ''
return (
<tr
key={status.id}
onClick={() => {
props.history.push(
'/serverConfiguration/' +
(status.statusType === 'plugin'
? 'plugins/'
: 'connections/') +
status.id
)
}}
>
<td>
{status.statusType === 'plugin'
? pluginNameLink(status.id)
: providerIdLink(status.id)}
</td>
<td>
<p className="text-danger">{lastError}</p>
</td>
<td>
<p className={statusClass}>
{(status.message || '').substring(0, 80)}
{status.message.length > 80 ? '...' : ''}
</p>
</td>
</tr>
)
return renderStatus(status, statusClass, lastError)
})}
</tbody>
</Table>
Expand All @@ -263,7 +286,13 @@ function pluginNameLink(id) {
}

function providerIdLink(id) {
return <a href={'#/serverConfiguration/connections/' + id}>{id}</a>
if (id === 'defaults') {
return <a href={'#/serverConfiguration/settings'}>{id}</a>
} else if (id.startsWith('ws.')) {
return <a href={'#/security/devices'}>{id}</a>
} else {
return <a href={'#/serverConfiguration/connections/' + id}>{id}</a>
}
}

export default connect(
Expand Down
Loading