Skip to content

Commit

Permalink
Merge pull request #89 from synyx/2-hide-filtered-alerts
Browse files Browse the repository at this point in the history
Hide filtered alerts
  • Loading branch information
BuJo committed Sep 2, 2023
2 parents b6e1115 + cd8eb8c commit 1209c3f
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 7 deletions.
8 changes: 8 additions & 0 deletions pkg/web/static/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -321,3 +321,11 @@ nav#menu:target ul li a:hover {
margin-top: 1vw;
}
}

h3.filtered {
margin-top: 119px;
}

.hidden {
display: none;
}
3 changes: 3 additions & 0 deletions pkg/web/static/js/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import * as Turbo from '@hotwired/turbo';
import ReconnectingWebSocket from 'reconnecting-websocket';
import { toggleFilteredStatus } from "./toggle-filtered";

toggleFilteredStatus();

class SSEConn {
constructor(socketUrl) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/web/static/js/index.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/web/static/js/index.min.js.map

Large diffs are not rendered by default.

29 changes: 29 additions & 0 deletions pkg/web/static/js/toggle-filtered.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
export function toggleFilteredStatus() {
const toggleButton = document.getElementById("toggle-filtered-alerts");
const filteredTable = document.getElementById("filtered-table");

toggleButton.addEventListener("click", () => {
filteredTable.classList.toggle("hidden");
const filteredAreShown = !filteredTable.classList.contains("hidden");
toggleButton.innerText = filteredAreShown ? "Hide" : "Show";
localStorage.setItem("filteredAreShown", filteredAreShown.toString());
if (filteredAreShown) {
filteredTable.scrollIntoView();
}
});

function reRegisterToggleFilteredStatus(event) {
const fallbackToDefaultActions = event.detail.render

event.detail.render = function (streamElement) {
fallbackToDefaultActions(streamElement)
toggleFilteredStatus();
}
}
document.addEventListener("turbo:before-stream-render", reRegisterToggleFilteredStatus);

if (localStorage.getItem("filteredAreShown") === "true") {
filteredTable.classList.remove("hidden");
toggleButton.innerText = "Show";
}
}
8 changes: 5 additions & 3 deletions pkg/web/templates/alerts.gohtml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,11 @@
</tbody>
</table>

<br /><br /><br /><br /><br /><br /><br />
<h3 class="filtered">Filtered Alerts</h3>
<table class="widetable filtered">
<h3 class="filtered">
Filtered Alerts ({{ len .Content.Blocked }})
<button id="toggle-filtered-alerts">Show</button>
</h3>
<table id="filtered-table" class="widetable filtered hidden">
<thead>
<tr>
<th width="30%">Where</th>
Expand Down

0 comments on commit 1209c3f

Please sign in to comment.