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

grid page improvements #321

Merged
merged 1 commit into from
Jan 22, 2024
Merged

grid page improvements #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions html/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3019,7 +3019,7 @@ <h4 v-if="metricsEnabled">{{ i18n.gridEps }} {{ gridEps | formatCount }}</h4>
</v-btn>
</td>
<td>
<v-icon v-if="props.item.status == NodeStatusFault || props.item.status == NodeStatusPending" :id="'nodeFaultIcon_' + props.item.id" :color="colorNodeStatus(props.item.status, props.item.nonCriticalNode)">{{ props.item.status | iconNodeStatus }}</v-icon>
<v-icon v-if="props.item.status != NodeStatusOk" :id="'nodeFaultIcon_' + props.item.id" :color="colorNodeStatus(props.item.status, props.item.nonCriticalNode)">{{ props.item.status | iconNodeStatus }}</v-icon>
</td>
<td :id="'nodeId_' + props.item.id" v-text="props.item.id"></td>
<td :id="'nodeRole_' + props.item.id" v-text="$root.localizeMessage(props.item.role)" class="d-none d-md-table-cell"></td>
Expand Down Expand Up @@ -3160,11 +3160,11 @@ <h4 v-if="metricsEnabled">{{ i18n.gridEps }} {{ gridEps | formatCount }}</h4>
</div>
<div v-if="item.metricsEnabled" class="text-no-wrap">
<span class="filter label">{{ i18n.nodeStatusRaid }}</span>
<span :class="areMetricsCurrent(item) ? colorNodeStatus(item.raidStatus) + '--text filter value' : 'filter value stale'">
<span v-if="!item.raidStatus || item.raidStatus == NodeStatusUnknown" id="node_raidStatus" >
<span>
<span v-if="!item.raidStatus || item.raidStatus == NodeStatusUnknown" id="node_raidStatus" class="info--text filter value">
{{ i18n.featureRequiresAppliance }}
</span>
<span v-else id="node_raidStatus" v-text="$root.localizeMessage(item.raidStatus)"/>
<span v-else id="node_raidStatus" v-text="$root.localizeMessage(item.raidStatus)" :class="areMetricsCurrent(item) ? colorNodeStatus(item.raidStatus) + '--text filter value' : 'filter value stale'"/>
</span>
</div>

Expand Down Expand Up @@ -3362,10 +3362,10 @@ <h4 v-if="metricsEnabled">{{ i18n.gridEps }} {{ gridEps | formatCount }}</h4>
<v-icon :title="i18n.huntForError">fa-crosshairs</v-icon>
</router-link>
</td>
<td :class="colorContainerStatus(container.Status) + '--text text-left'" :class="areMetricsCurrent(item) ? '' : 'stale'">
<td :class="areMetricsCurrent(item) ? colorContainerStatus(container.Status) + '--text text-left' : 'stale text-left'">
{{ $root.localizeMessage(container.Status) }}
</td>
<td class="text-left cyan--text" class="d-none d-lg-table-cell" :class="areMetricsCurrent(item) ? '' : 'stale'">
<td :class="areMetricsCurrent(item) ? 'cyan--text text-left d-none d-lg-table-cell' : 'stale cyan-text-left text-left d-none d-lg-table-cell'">
{{ container.Details }}
</td>
</tr>
Expand Down
1 change: 1 addition & 0 deletions html/js/i18n.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,7 @@ const i18n = {
reset: 'Reset',
resetDefaults: 'Reset Defaults',
resetDefaultsHint: 'Reset all local user SOC settings back to their original default values. This must be done on each browser or device that you have used with SOC.',
restart: 'Reboot',
restartMinionHelp: 'Reboot this node',
restartRequired: '(awaiting reboot)',
restartRequiredHelp: 'This node is waiting to be rebooted, typically after a kernel update; click to reboot now',
Expand Down
3 changes: 3 additions & 0 deletions html/js/routes/grid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const NodeStatusUnknown = "unknown";
const NodeStatusFault = "fault";
const NodeStatusOk = "ok";
const NodeStatusPending = "pending";
const NodeStatusRestart = "restart";

routes.push({ path: '/grid', name: 'grid', component: {
template: '#page-grid',
Expand Down Expand Up @@ -371,6 +372,7 @@ routes.push({ path: '/grid', name: 'grid', component: {
case NodeStatusFault: color = nonCritical ? "warning" : "error"; break;
case NodeStatusOk: color = "success"; break;
case NodeStatusPending: color = "warning"; break;
case NodeStatusRestart: color = "warning"; break;
}
return color;
},
Expand All @@ -380,6 +382,7 @@ routes.push({ path: '/grid', name: 'grid', component: {
case NodeStatusFault: icon = "fa-triangle-exclamation"; break;
case NodeStatusOk: icon = "fa-circle-check"; break;
case NodeStatusPending: icon = "fa-circle-exclamation"; break;
case NodeStatusRestart: icon = "fa-circle-info"; break;
}
return icon;
},
Expand Down
3 changes: 3 additions & 0 deletions html/js/routes/grid.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ test('colorNodeStatus', () => {
expect(comp.colorNodeStatus("pending")).toBe("warning");
expect(comp.colorNodeStatus("pending", true)).toBe("warning");
expect(comp.colorNodeStatus("unknown", true)).toBe("warning");
expect(comp.colorNodeStatus("restart", false)).toBe("info");
expect(comp.colorNodeStatus("restart", true)).toBe("info");
});

test('formatLinearColor', () => {
Expand All @@ -90,6 +92,7 @@ test('iconNodeStatus', () => {
expect(comp.iconNodeStatus("pending")).toBe("fa-circle-exclamation");
expect(comp.iconNodeStatus("ok")).toBe("fa-circle-check");
expect(comp.iconNodeStatus("other")).toBe("fa-circle-question");
expect(comp.iconNodeStatus("restart")).toBe("fa-circle-info");
});

test('colorContainerStatus', () => {
Expand Down
5 changes: 3 additions & 2 deletions model/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const NodeStatusUnknown = "unknown"
const NodeStatusOk = "ok"
const NodeStatusFault = "fault"
const NodeStatusPending = "pending"
const NodeStatusRestart = "restart"

type Node struct {
Id string `json:"id"`
Expand Down Expand Up @@ -125,8 +126,8 @@ func (node *Node) UpdateOverallStatus(enhancedStatusEnabled bool) bool {
newStatus = node.updateStatusComponent(newStatus, node.ProcessStatus)
newStatus = node.updateStatusComponent(newStatus, node.EventstoreStatus)

if node.OsNeedsRestart == 1 && newStatus != NodeStatusFault {
newStatus = NodeStatusPending
if node.OsNeedsRestart == 1 && newStatus == NodeStatusOk {
newStatus = NodeStatusRestart
}
}

Expand Down
2 changes: 1 addition & 1 deletion model/node_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,6 @@ func TestUpdateNodeStatusMultipleNotUnknownFaultFirst(tester *testing.T) {

func TestUpdateNodeStatusPending(tester *testing.T) {
testStatus(tester, true, NodeStatusOk, NodeStatusOk, NodeStatusOk, NodeStatusOk, NodeStatusPending, 0, NodeStatusPending)
testStatus(tester, true, NodeStatusOk, NodeStatusOk, NodeStatusOk, NodeStatusOk, NodeStatusOk, 1, NodeStatusPending)
testStatus(tester, true, NodeStatusOk, NodeStatusOk, NodeStatusOk, NodeStatusOk, NodeStatusOk, 1, NodeStatusRestart)
testStatus(tester, true, NodeStatusPending, NodeStatusFault, NodeStatusOk, NodeStatusOk, NodeStatusOk, 1, NodeStatusFault)
}
Loading