Skip to content

Commit

Permalink
allow filtering by overdue #674
Browse files Browse the repository at this point in the history
  • Loading branch information
wh1te909 committed Sep 1, 2021
1 parent 5c92d4b commit eae5e00
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 3 deletions.
6 changes: 4 additions & 2 deletions web/src/components/AgentTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,8 @@ export default {
if (filter === "actionspending") actions = true;
else if (filter === "checksfailing") checks = true;
else if (filter === "rebootneeded") reboot = true;
else if (filter === "online" || filter === "offline" || filter === "expired") availability = filter;
else if (filter === "online" || filter === "offline" || filter === "expired" || filter === "overdue")
availability = filter;
} else {
search = param + "";
}
Expand All @@ -492,7 +493,8 @@ export default {
if (actions && row.pending_actions_count === 0) return false;
if (reboot && !row.needs_reboot) return false;
if (availability === "online" && row.status !== "online") return false;
else if (availability === "offline" && row.status !== "overdue") return false;
else if (availability === "offline" && row.status !== "offline") return false;
else if (availability === "overdue" && row.status !== "overdue") return false;
else if (availability === "expired") {
let now = new Date();
let lastSeen = date.extractDate(row.last_seen, "MM DD YYYY HH:mm");
Expand Down
17 changes: 16 additions & 1 deletion web/src/views/Dashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,16 @@
</q-item-section>
</q-item>

<q-item>
<q-item-section side>
<q-radio val="overdue" v-model="filterAvailability" />
</q-item-section>

<q-item-section>
<q-item-label>Show Overdue Only</q-item-label>
</q-item-section>
</q-item>

<q-item>
<q-item-section side>
<q-radio val="offline_30days" v-model="filterAvailability" />
Expand Down Expand Up @@ -809,7 +819,10 @@ export default {
// clear search if availability changes to all
if (
this.filterAvailability === "all" &&
(this.search.includes("is:online") || this.search.includes("is:offline") || this.search.includes("is:expired"))
(this.search.includes("is:online") ||
this.search.includes("is:offline") ||
this.search.includes("is:expired") ||
this.search.includes("is:overdue"))
)
this.clearFilter();
Expand Down Expand Up @@ -841,6 +854,8 @@ export default {
filterText += "is:offline ";
} else if (this.filterAvailability === "offline_30days") {
filterText += "is:expired ";
} else if (this.filterAvailability === "overdue") {
filterText += "is:overdue ";
}
}
Expand Down

0 comments on commit eae5e00

Please sign in to comment.