fixed filters
This commit is contained in:
@@ -8,7 +8,8 @@
|
||||
<option value="">All Event Types</option>
|
||||
<option value="user_login">User Login</option>
|
||||
<option value="user_logout">User Logout</option>
|
||||
<option value="user_register">User Registration</option>
|
||||
<option value="user_create">User Create</option>
|
||||
<option value="user_delete">User Delete</option>
|
||||
<option value="user_update">User Update</option>
|
||||
<option value="file_upload">File Upload</option>
|
||||
<option value="file_delete">File Delete</option>
|
||||
@@ -24,11 +25,15 @@
|
||||
<option value="room_delete">Room Delete</option>
|
||||
<option value="room_update">Room Update</option>
|
||||
<option value="room_open">Room Open</option>
|
||||
<option value="room_member_add">Room Member Add</option>
|
||||
<option value="room_member_remove">Room Member Remove</option>
|
||||
<option value="room_member_permissions_update">Room Member Permissions Update</option>
|
||||
<option value="room_permission_update">Room Permission Update</option>
|
||||
<option value="conversation_create">Conversation Create</option>
|
||||
<option value="conversation_update">Conversation Update</option>
|
||||
<option value="conversation_delete">Conversation Delete</option>
|
||||
<option value="conversation_open">Conversation Open</option>
|
||||
<option value="message_sent">Message Sent</option>
|
||||
<option value="message_create">Message Create</option>
|
||||
<option value="attachment_download">Attachment Download</option>
|
||||
</select>
|
||||
<select id="dateRangeFilter" class="form-select form-select-sm">
|
||||
@@ -43,7 +48,9 @@
|
||||
<option value="{{ user.id }}">{{ user.username }} {{ user.last_name }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<button id="applyFilters" class="btn btn-primary btn-sm">Apply Filters</button>
|
||||
<button id="clearFilters" class="btn btn-secondary btn-sm">
|
||||
<i class="fas fa-times me-1"></i>Clear Filters
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -65,13 +72,15 @@
|
||||
<td>{{ event.timestamp.strftime('%Y-%m-%d %H:%M:%S') }}</td>
|
||||
<td>
|
||||
{% if event.event_type == 'user_login' %}
|
||||
<span class="badge bg-success">User Login</span>
|
||||
<span class="badge bg-info">User Login</span>
|
||||
{% elif event.event_type == 'user_logout' %}
|
||||
<span class="badge bg-secondary">User Logout</span>
|
||||
{% elif event.event_type == 'user_register' %}
|
||||
<span class="badge bg-info">User Registration</span>
|
||||
<span class="badge bg-info">User Logout</span>
|
||||
{% elif event.event_type == 'user_create' %}
|
||||
<span class="badge bg-success">User Create</span>
|
||||
{% elif event.event_type == 'user_delete' %}
|
||||
<span class="badge bg-danger">User Delete</span>
|
||||
{% elif event.event_type == 'user_update' %}
|
||||
<span class="badge bg-primary">User Update</span>
|
||||
<span class="badge bg-warning">User Update</span>
|
||||
{% elif event.event_type == 'file_upload' %}
|
||||
<span class="badge bg-success">File Upload</span>
|
||||
{% elif event.event_type == 'file_delete' %}
|
||||
@@ -81,13 +90,13 @@
|
||||
{% elif event.event_type == 'file_restore' %}
|
||||
<span class="badge bg-warning">File Restore</span>
|
||||
{% elif event.event_type == 'file_move' %}
|
||||
<span class="badge bg-primary">File Move</span>
|
||||
<span class="badge bg-warning">File Move</span>
|
||||
{% elif event.event_type == 'file_rename' %}
|
||||
<span class="badge bg-info">File Rename</span>
|
||||
<span class="badge bg-warning">File Rename</span>
|
||||
{% elif event.event_type == 'file_star' %}
|
||||
<span class="badge bg-warning">File Star</span>
|
||||
{% elif event.event_type == 'file_unstar' %}
|
||||
<span class="badge bg-secondary">File Unstar</span>
|
||||
<span class="badge bg-warning">File Unstar</span>
|
||||
{% elif event.event_type == 'file_delete_permanent' %}
|
||||
<span class="badge bg-danger">File Delete Permanent</span>
|
||||
{% elif event.event_type == 'folder_create' %}
|
||||
@@ -97,19 +106,27 @@
|
||||
{% elif event.event_type == 'room_delete' %}
|
||||
<span class="badge bg-danger">Room Delete</span>
|
||||
{% elif event.event_type == 'room_update' %}
|
||||
<span class="badge bg-primary">Room Update</span>
|
||||
<span class="badge bg-warning">Room Update</span>
|
||||
{% elif event.event_type == 'room_open' %}
|
||||
<span class="badge bg-info">Room Open</span>
|
||||
{% elif event.event_type == 'room_member_add' %}
|
||||
<span class="badge bg-success">Room Member Add</span>
|
||||
{% elif event.event_type == 'room_member_remove' %}
|
||||
<span class="badge bg-danger">Room Member Remove</span>
|
||||
{% elif event.event_type == 'room_member_permissions_update' %}
|
||||
<span class="badge bg-primary">Room Member Permissions Update</span>
|
||||
<span class="badge bg-warning">Room Member Permissions Update</span>
|
||||
{% elif event.event_type == 'room_permission_update' %}
|
||||
<span class="badge bg-warning">Room Permission Update</span>
|
||||
{% elif event.event_type == 'conversation_create' %}
|
||||
<span class="badge bg-success">Conversation Create</span>
|
||||
{% elif event.event_type == 'conversation_update' %}
|
||||
<span class="badge bg-warning">Conversation Update</span>
|
||||
{% elif event.event_type == 'conversation_delete' %}
|
||||
<span class="badge bg-danger">Conversation Delete</span>
|
||||
{% elif event.event_type == 'conversation_open' %}
|
||||
<span class="badge bg-info">Conversation Open</span>
|
||||
{% elif event.event_type == 'message_sent' %}
|
||||
<span class="badge bg-primary">Message Sent</span>
|
||||
{% elif event.event_type == 'message_create' %}
|
||||
<span class="badge bg-success">Message Create</span>
|
||||
{% elif event.event_type == 'attachment_download' %}
|
||||
<span class="badge bg-info">Attachment Download</span>
|
||||
{% else %}
|
||||
@@ -161,6 +178,140 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
const eventTypeFilter = document.getElementById('eventTypeFilter');
|
||||
const dateRangeFilter = document.getElementById('dateRangeFilter');
|
||||
const userFilter = document.getElementById('userFilter');
|
||||
const clearFiltersBtn = document.getElementById('clearFilters');
|
||||
const eventsTableBody = document.getElementById('eventsTableBody');
|
||||
const currentPageSpan = document.getElementById('currentPage');
|
||||
const totalPagesSpan = document.getElementById('totalPages');
|
||||
const prevPageBtn = document.getElementById('prevPage');
|
||||
const nextPageBtn = document.getElementById('nextPage');
|
||||
|
||||
let currentPage = 1;
|
||||
let totalPages = parseInt(totalPagesSpan.textContent);
|
||||
let isFetching = false;
|
||||
|
||||
// Function to update the URL with filter parameters
|
||||
function updateURL() {
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
params.set('event_type', eventTypeFilter.value);
|
||||
params.set('date_range', dateRangeFilter.value);
|
||||
params.set('user_id', userFilter.value);
|
||||
params.set('page', currentPage);
|
||||
window.history.replaceState({}, '', `${window.location.pathname}?${params.toString()}`);
|
||||
}
|
||||
|
||||
// Function to fetch filtered events
|
||||
function fetchEvents() {
|
||||
if (isFetching) return;
|
||||
isFetching = true;
|
||||
|
||||
const params = new URLSearchParams({
|
||||
event_type: eventTypeFilter.value,
|
||||
date_range: dateRangeFilter.value,
|
||||
user_id: userFilter.value,
|
||||
page: currentPage,
|
||||
ajax: 'true' // Add this to indicate it's an AJAX request
|
||||
});
|
||||
|
||||
fetch(`${window.location.pathname}?${params.toString()}`, {
|
||||
headers: {
|
||||
'X-Requested-With': 'XMLHttpRequest'
|
||||
}
|
||||
})
|
||||
.then(response => {
|
||||
if (!response.ok) {
|
||||
throw new Error('Network response was not ok');
|
||||
}
|
||||
return response.text();
|
||||
})
|
||||
.then(html => {
|
||||
const parser = new DOMParser();
|
||||
const doc = parser.parseFromString(html, 'text/html');
|
||||
const newTableBody = doc.getElementById('eventsTableBody');
|
||||
|
||||
if (newTableBody) {
|
||||
eventsTableBody.innerHTML = newTableBody.innerHTML;
|
||||
|
||||
// Update pagination
|
||||
const newCurrentPage = parseInt(doc.getElementById('currentPage').textContent);
|
||||
const newTotalPages = parseInt(doc.getElementById('totalPages').textContent);
|
||||
currentPage = newCurrentPage;
|
||||
totalPages = newTotalPages;
|
||||
currentPageSpan.textContent = currentPage;
|
||||
totalPagesSpan.textContent = totalPages;
|
||||
|
||||
// Update pagination buttons
|
||||
prevPageBtn.disabled = currentPage === 1;
|
||||
nextPageBtn.disabled = currentPage === totalPages;
|
||||
|
||||
// Update URL
|
||||
updateURL();
|
||||
} else {
|
||||
console.error('Could not find events table in response');
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error fetching events:', error);
|
||||
// Optionally show an error message to the user
|
||||
})
|
||||
.finally(() => {
|
||||
isFetching = false;
|
||||
});
|
||||
}
|
||||
|
||||
// Add event listeners for filters with debounce
|
||||
let filterTimeout;
|
||||
function debouncedFetch() {
|
||||
clearTimeout(filterTimeout);
|
||||
filterTimeout = setTimeout(fetchEvents, 300);
|
||||
}
|
||||
|
||||
eventTypeFilter.addEventListener('change', debouncedFetch);
|
||||
dateRangeFilter.addEventListener('change', debouncedFetch);
|
||||
userFilter.addEventListener('change', debouncedFetch);
|
||||
|
||||
// Add event listeners for pagination
|
||||
prevPageBtn.addEventListener('click', () => {
|
||||
if (currentPage > 1) {
|
||||
currentPage--;
|
||||
fetchEvents();
|
||||
}
|
||||
});
|
||||
|
||||
nextPageBtn.addEventListener('click', () => {
|
||||
if (currentPage < totalPages) {
|
||||
currentPage++;
|
||||
fetchEvents();
|
||||
}
|
||||
});
|
||||
|
||||
// Add event listener for clear filters
|
||||
clearFiltersBtn.addEventListener('click', () => {
|
||||
eventTypeFilter.value = '';
|
||||
dateRangeFilter.value = '24h';
|
||||
userFilter.value = '';
|
||||
currentPage = 1;
|
||||
fetchEvents();
|
||||
});
|
||||
|
||||
// Initialize filters from URL parameters
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
eventTypeFilter.value = params.get('event_type') || '';
|
||||
dateRangeFilter.value = params.get('date_range') || '24h';
|
||||
userFilter.value = params.get('user_id') || '';
|
||||
currentPage = parseInt(params.get('page')) || 1;
|
||||
|
||||
// Initial fetch if filters are set
|
||||
if (eventTypeFilter.value || dateRangeFilter.value !== '24h' || userFilter.value) {
|
||||
fetchEvents();
|
||||
}
|
||||
});
|
||||
</script>
|
||||
{% endmacro %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
Reference in New Issue
Block a user