fixed filters
This commit is contained in:
@@ -1,18 +1,21 @@
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
// Initialize variables
|
||||
let currentPage = 1;
|
||||
const totalPages = parseInt(document.getElementById('totalPages').textContent);
|
||||
let totalPages = parseInt(document.getElementById('totalPages').textContent) || 1;
|
||||
let isFetching = false;
|
||||
|
||||
// Get filter elements
|
||||
const eventTypeFilter = document.getElementById('eventTypeFilter');
|
||||
const dateRangeFilter = document.getElementById('dateRangeFilter');
|
||||
const userFilter = document.getElementById('userFilter');
|
||||
const applyFiltersBtn = document.getElementById('applyFilters');
|
||||
const clearFiltersBtn = document.getElementById('clearFilters');
|
||||
|
||||
// Get pagination elements
|
||||
const prevPageBtn = document.getElementById('prevPage');
|
||||
const nextPageBtn = document.getElementById('nextPage');
|
||||
const currentPageSpan = document.getElementById('currentPage');
|
||||
const totalPagesSpan = document.getElementById('totalPages');
|
||||
const eventsTableBody = document.getElementById('eventsTableBody');
|
||||
|
||||
// Event details modal
|
||||
const eventDetailsModal = document.getElementById('eventDetailsModal');
|
||||
@@ -21,22 +24,76 @@ document.addEventListener('DOMContentLoaded', function() {
|
||||
// Function to update URL with current filters
|
||||
function updateURL() {
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
params.set('tab', 'events');
|
||||
params.set('page', currentPage);
|
||||
if (eventTypeFilter.value) params.set('event_type', eventTypeFilter.value);
|
||||
if (dateRangeFilter.value) params.set('date_range', dateRangeFilter.value);
|
||||
if (userFilter.value) params.set('user_id', userFilter.value);
|
||||
params.set('event_type', eventTypeFilter.value);
|
||||
params.set('date_range', dateRangeFilter.value);
|
||||
params.set('user_id', userFilter.value);
|
||||
window.history.replaceState({}, '', `${window.location.pathname}?${params.toString()}`);
|
||||
}
|
||||
|
||||
// Function to load events with current filters
|
||||
function loadEvents() {
|
||||
const params = new URLSearchParams();
|
||||
params.set('page', currentPage);
|
||||
if (eventTypeFilter.value) params.set('event_type', eventTypeFilter.value);
|
||||
if (dateRangeFilter.value) params.set('date_range', dateRangeFilter.value);
|
||||
if (userFilter.value) params.set('user_id', userFilter.value);
|
||||
// Function to fetch filtered events
|
||||
function fetchEvents() {
|
||||
if (isFetching) return;
|
||||
isFetching = true;
|
||||
|
||||
window.location.href = `${window.location.pathname}?${params.toString()}`;
|
||||
// Show loading state
|
||||
eventsTableBody.innerHTML = '<tr><td colspan="5" class="text-center">Loading...</td></tr>';
|
||||
|
||||
const params = new URLSearchParams({
|
||||
tab: 'events',
|
||||
page: currentPage,
|
||||
event_type: eventTypeFilter.value,
|
||||
date_range: dateRangeFilter.value,
|
||||
user_id: userFilter.value,
|
||||
ajax: 'true'
|
||||
});
|
||||
|
||||
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) || 1;
|
||||
const newTotalPages = parseInt(doc.getElementById('totalPages').textContent) || 1;
|
||||
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');
|
||||
eventsTableBody.innerHTML = '<tr><td colspan="5" class="text-center">Error loading events</td></tr>';
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error fetching events:', error);
|
||||
eventsTableBody.innerHTML = '<tr><td colspan="5" class="text-center">Error loading events</td></tr>';
|
||||
})
|
||||
.finally(() => {
|
||||
isFetching = false;
|
||||
});
|
||||
}
|
||||
|
||||
// Function to load event details
|
||||
@@ -51,14 +108,7 @@ document.addEventListener('DOMContentLoaded', function() {
|
||||
console.log('Received event data:', data);
|
||||
|
||||
// Format the details for display
|
||||
const formattedDetails = {
|
||||
// 'Event ID': data.id,
|
||||
// 'Event Type': data.event_type,
|
||||
// 'Timestamp': new Date(data.timestamp).toLocaleString(),
|
||||
// 'User': data.user ? `${data.user.username} (${data.user.last_name})` : 'N/A',
|
||||
// 'IP Address': data.ip_address || 'N/A',
|
||||
// 'User Agent': data.user_agent || 'N/A'
|
||||
};
|
||||
const formattedDetails = {};
|
||||
|
||||
// Handle details separately
|
||||
if (data.details) {
|
||||
@@ -85,24 +135,41 @@ document.addEventListener('DOMContentLoaded', function() {
|
||||
});
|
||||
}
|
||||
|
||||
// Event listeners for filters
|
||||
applyFiltersBtn.addEventListener('click', function() {
|
||||
// Add event listeners for filters with debounce
|
||||
let filterTimeout;
|
||||
function debouncedFetch() {
|
||||
clearTimeout(filterTimeout);
|
||||
filterTimeout = setTimeout(() => {
|
||||
currentPage = 1; // Reset to first page when filters change
|
||||
fetchEvents();
|
||||
}, 300);
|
||||
}
|
||||
|
||||
eventTypeFilter.addEventListener('change', debouncedFetch);
|
||||
dateRangeFilter.addEventListener('change', debouncedFetch);
|
||||
userFilter.addEventListener('change', debouncedFetch);
|
||||
|
||||
// Event listener for clear filters
|
||||
clearFiltersBtn.addEventListener('click', function() {
|
||||
eventTypeFilter.value = '';
|
||||
dateRangeFilter.value = '24h';
|
||||
userFilter.value = '';
|
||||
currentPage = 1;
|
||||
loadEvents();
|
||||
fetchEvents();
|
||||
});
|
||||
|
||||
// Event listeners for pagination
|
||||
prevPageBtn.addEventListener('click', function() {
|
||||
if (currentPage > 1) {
|
||||
currentPage--;
|
||||
loadEvents();
|
||||
fetchEvents();
|
||||
}
|
||||
});
|
||||
|
||||
nextPageBtn.addEventListener('click', function() {
|
||||
if (currentPage < totalPages) {
|
||||
currentPage++;
|
||||
loadEvents();
|
||||
fetchEvents();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -115,13 +182,13 @@ document.addEventListener('DOMContentLoaded', function() {
|
||||
|
||||
// Initialize filters from URL parameters
|
||||
const urlParams = new URLSearchParams(window.location.search);
|
||||
if (urlParams.has('event_type')) eventTypeFilter.value = urlParams.get('event_type');
|
||||
if (urlParams.has('date_range')) dateRangeFilter.value = urlParams.get('date_range');
|
||||
if (urlParams.has('user_id')) userFilter.value = urlParams.get('user_id');
|
||||
if (urlParams.has('page')) currentPage = parseInt(urlParams.get('page'));
|
||||
eventTypeFilter.value = urlParams.get('event_type') || '';
|
||||
dateRangeFilter.value = urlParams.get('date_range') || '24h';
|
||||
userFilter.value = urlParams.get('user_id') || '';
|
||||
currentPage = parseInt(urlParams.get('page')) || 1;
|
||||
|
||||
// Update pagination buttons state
|
||||
prevPageBtn.disabled = currentPage === 1;
|
||||
nextPageBtn.disabled = currentPage === totalPages;
|
||||
currentPageSpan.textContent = currentPage;
|
||||
// Initial fetch if filters are set
|
||||
if (eventTypeFilter.value || dateRangeFilter.value !== '24h' || userFilter.value) {
|
||||
fetchEvents();
|
||||
}
|
||||
});
|
||||
Reference in New Issue
Block a user