Gnous/mailcow
2
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #4914 from tomudding/fix/datatables-not-ordering-datetimes-correctly

Browse Source 
Fix sorting dates and missing Rspamd attributes in datatables
This commit is contained in:
Niklas Meyer 2022-12-26 14:07:14 +01:00 committed by GitHub
commit e67b512499
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 1894 additions and 1964 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
data/web/js/build/005-datatables.js → data/web/js/build/004-datatables.js
View File

7
data/web/js/build/004-moment.min.js vendored
View File

File diff suppressed because one or more lines are too long

0
data/web/js/build/007-notifications.min.js → data/web/js/build/005-notifications.min.js vendored
View File

70
data/web/js/build/006-datetime-moment.js
View File

@ -1,70 +0,0 @@
/**
* This plug-in for DataTables represents the ultimate option in extensibility
* for sorting date / time strings correctly. It uses
* [Moment.js](http://momentjs.com) to create automatic type detection and
* sorting plug-ins for DataTables based on a given format. This way, DataTables
* will automatically detect your temporal information and sort it correctly.
*
* For usage instructions, please see the DataTables blog
* post that [introduces it](//datatables.net/blog/2014-12-18).
*
* @name Ultimate Date / Time sorting
* @summary Sort date and time in any format using Moment.js
* @author [Allan Jardine](//datatables.net)
* @depends DataTables 1.10+, Moment.js 1.7+
*
* @example
* $.fn.dataTable.moment( 'HH:mm MMM D, YY' );
* $.fn.dataTable.moment( 'dddd, MMMM Do, YYYY' );
*
* $('#example').DataTable();
*/
(function (factory) {
if (typeof define === "function" && define.amd) {
define(["jquery", "moment", "datatables.net"], factory);
} else {
factory(jQuery, moment);
}
}(function ($, moment) {
function strip (d) {
if ( typeof d === 'string' ) {
// Strip HTML tags and newline characters if possible
d = d.replace(/(<.*?>)|(\r?\n|\r)/g, '');
// Strip out surrounding white space
d = d.trim();
}
return d;
}
$.fn.dataTable.moment = function ( format, locale, reverseEmpties ) {
var types = $.fn.dataTable.ext.type;
// Add type detection
types.detect.unshift( function ( d ) {
d = strip(d);
// Null and empty values are acceptable
if ( d === '' || d === null ) {
return 'moment-'+format;
}
return moment( d, format, locale, true ).isValid() ?
'moment-'+format :
null;
} );
// Add sorting method - use an integer for the sorting
types.order[ 'moment-'+format+'-pre' ] = function ( d ) {
d = strip(d);
return !moment(d, format, locale, true).isValid() ?
(reverseEmpties ? -Infinity : Infinity) :
parseInt( moment( d, format, locale, true ).format( 'x' ), 10 );
};
};
}));

0
data/web/js/build/008-formcache.min.js → data/web/js/build/006-formcache.min.js vendored
View File

0
data/web/js/build/009-chart.js → data/web/js/build/007-chart.js
View File

0
data/web/js/build/010-chartjs-plugin-datalabels.js → data/web/js/build/008-chartjs-plugin-datalabels.js
View File

0
data/web/js/build/011-numberedtextarea.min.js → data/web/js/build/009-numberedtextarea.min.js vendored
View File

0
data/web/js/build/012-sha1.min.js → data/web/js/build/010-sha1.min.js vendored
View File

0
data/web/js/build/013-api.js → data/web/js/build/011-api.js
View File

0
data/web/js/build/014-markdown-it.min.js → data/web/js/build/012-markdown-it.min.js vendored
View File

3
data/web/js/build/015-mailcow.js → data/web/js/build/013-mailcow.js
View File

@ -274,11 +274,10 @@ $(document).ready(function() {
});
})
// Jquery Datatables, enable responsive plugin and date sort plugin
// Jquery Datatables, enable responsive plugin
$.extend($.fn.dataTable.defaults, {
responsive: true
});
$.fn.dataTable.moment('dd:mm:YYYY');
// tag boxes
$('.tag-box .tag-add').click(function(){

130
data/web/js/site/debug.js
View File

@ -1,3 +1,13 @@
const LOCALE = undefined;
const DATETIME_FORMAT = {
year: "numeric",
month: "2-digit",
day: "2-digit",
hour: "2-digit",
minute: "2-digit",
second: "2-digit"
};
$(document).ready(function() {
// Parse seconds ago to date
// Get "now" timestamp
@ -7,14 +17,7 @@ $(document).ready(function() {
if (typeof started_s_ago != 'NaN') {
var started_date = new Date((ts_now - started_s_ago) * 1000);
if (started_date instanceof Date && !isNaN(started_date)) {
var started_local_date = started_date.toLocaleDateString(undefined, {
year: "numeric",
month: "2-digit",
day: "2-digit",
hour: "2-digit",
minute: "2-digit",
second: "2-digit"
});
var started_local_date = started_date.toLocaleDateString(LOCALE, DATETIME_FORMAT);
$(this).text(started_local_date);
} else {
$(this).text('-');
@ -25,14 +28,7 @@ $(document).ready(function() {
$('.parse_date').each(function(i, parse_date) {
var started_date = new Date(Date.parse($(this).text()));
if (typeof started_date != 'NaN') {
var started_local_date = started_date.toLocaleDateString(undefined, {
year: "numeric",
month: "2-digit",
day: "2-digit",
hour: "2-digit",
minute: "2-digit",
second: "2-digit"
});
var started_local_date = started_date.toLocaleDateString(LOCALE, DATETIME_FORMAT);
$(this).text(started_local_date);
}
});
@ -75,6 +71,13 @@ jQuery(function($){
var table_name = $(this).data('table');
$('#' + table_name).DataTable().ajax.reload();
});
function createSortableDate(td, cellData) {
$(td).attr({
"data-order": cellData,
"data-sort": cellData
});
$(td).html(convertTimestampToLocalFormat(cellData));
}
function draw_autodiscover_logs() {
// just recalc width if instance already exists
if ($.fn.DataTable.isDataTable('#autodiscover_log') ) {
@ -100,9 +103,8 @@ jQuery(function($){
data: 'time',
defaultContent: '',
responsivePriority: 1,
render: function(data, type){
var date = new Date(data ? data * 1000 : 0);
return date.toLocaleDateString(undefined, {year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"});
createdCell: function(td, cellData) {
createSortableDate(td, cellData)
}
},
{
@ -157,9 +159,8 @@ jQuery(function($){
title: lang.time,
data: 'time',
defaultContent: '',
render: function(data, type){
var date = new Date(data ? data * 1000 : 0);
return date.toLocaleDateString(undefined, {year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"});
createdCell: function(td, cellData) {
createSortableDate(td, cellData)
}
},
{
@ -200,9 +201,8 @@ jQuery(function($){
title: lang.time,
data: 'time',
defaultContent: '',
render: function(data, type){
var date = new Date(data ? data * 1000 : 0);
return date.toLocaleDateString(undefined, {year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"});
createdCell: function(td, cellData) {
createSortableDate(td, cellData)
}
},
{
@ -247,9 +247,8 @@ jQuery(function($){
title: lang.time,
data: 'time',
defaultContent: '',
render: function(data, type){
var date = new Date(data ? data * 1000 : 0);
return date.toLocaleDateString(undefined, {year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"});
createdCell: function(td, cellData) {
createSortableDate(td, cellData)
}
},
{
@ -306,9 +305,8 @@ jQuery(function($){
title: lang.time,
data: 'time',
defaultContent: '',
render: function(data, type){
var date = new Date(data ? data * 1000 : 0);
return date.toLocaleDateString(undefined, {year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"});
createdCell: function(td, cellData) {
createSortableDate(td, cellData)
}
},
{
@ -393,9 +391,8 @@ jQuery(function($){
title: lang.time,
data: 'time',
defaultContent: '',
render: function(data, type){
var date = new Date(data ? data * 1000 : 0);
return date.toLocaleDateString(undefined, {year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"});
createdCell: function(td, cellData) {
createSortableDate(td, cellData)
}
},
{
@ -481,9 +478,9 @@ jQuery(function($){
title: lang.login_time,
data: 'datetime',
defaultContent: '',
render: function(data, type){
var date = new Date(data.replace(/-/g, "/"));
return date.toLocaleDateString(undefined, {year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"});
createdCell: function(td, cellData) {
cellData = Math.floor((new Date(data.replace(/-/g, "/"))).getTime() / 1000);
createSortableDate(td, cellData)
}
}
]
@ -513,9 +510,8 @@ jQuery(function($){
title: lang.time,
data: 'time',
defaultContent: '',
render: function(data, type){
var date = new Date(data ? data * 1000 : 0);
return date.toLocaleDateString(undefined, {year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"});
createdCell: function(td, cellData) {
createSortableDate(td, cellData)
}
},
{
@ -551,9 +547,8 @@ jQuery(function($){
title: lang.time,
data: 'time',
defaultContent: '',
render: function(data, type){
var date = new Date(data ? data * 1000 : 0);
return date.toLocaleDateString(undefined, {year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"});
createdCell: function(td, cellData) {
createSortableDate(td, cellData)
}
},
{
@ -594,9 +589,8 @@ jQuery(function($){
title: lang.time,
data: 'time',
defaultContent: '',
render: function(data, type){
var date = new Date(data ? data * 1000 : 0);
return date.toLocaleDateString(undefined, {year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"});
createdCell: function(td, cellData) {
createSortableDate(td, cellData)
}
},
{
@ -637,9 +631,8 @@ jQuery(function($){
title: lang.time,
data: 'time',
defaultContent: '',
render: function(data, type){
var date = new Date(data ? data * 1000 : 0);
return date.toLocaleDateString(undefined, {year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"});
createdCell: function(td, cellData) {
createSortableDate(td, cellData)
}
},
{
@ -728,6 +721,7 @@ jQuery(function($){
processing: true,
serverSide: false,
language: lang_datatables,
order: [[0, 'desc']],
ajax: {
type: "GET",
url: "/api/v1/get/logs/rspamd-history",
@ -738,11 +732,10 @@ jQuery(function($){
columns: [
{
title: lang.time,
data: 'time',
data: 'unix_time',
defaultContent: '',
render: function(data, type){
var date = new Date(data ? data * 1000 : 0);
return date.toLocaleDateString(undefined, {year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"});
createdCell: function(td, cellData) {
createSortableDate(td, cellData)
}
},
{
@ -773,7 +766,14 @@ jQuery(function($){
{
title: 'Score',
data: 'score',
defaultContent: ''
defaultContent: '',
createdCell: function(td, cellData) {
$(td).attr({
"data-order": cellData.sortBy,
"data-sort": cellData.sortBy
});
$(td).html(cellData.value);
}
},
{
title: 'Subject',
@ -794,7 +794,14 @@ jQuery(function($){
{
title: 'Scan Time',
data: 'scan_time',
defaultContent: ''
defaultContent: '',
createdCell: function(td, cellData) {
$(td).attr({
"data-order": cellData.sortBy,
"data-sort": cellData.sortBy
});
$(td).html(cellData.value);
}
},
{
title: 'ID',
@ -851,9 +858,7 @@ jQuery(function($){
scan_time += ' / ' + item.time_virtual.toFixed(3);
}
item.scan_time = {
"options": {
"sortValue": item.time_real
},
"sortBy": item.time_real,
"value": scan_time
};
if (item.action === 'clean' || item.action === 'no action') {
@ -872,9 +877,7 @@ jQuery(function($){
score_content = "[ <span class='text-danger'>" + item.score.toFixed(2) + " / " + item.required_score + "</span> ]";
}
item.score = {
"options": {
"sortValue": item.score
},
"sortBy": item.score,
"value": score_content
};
if (item.user == null) {
@ -1531,3 +1534,8 @@ function parseGithubMarkdownLinks(inputText) {
return replacedText;
}
function convertTimestampToLocalFormat(timestamp) {
var date = new Date(timestamp ? timestamp * 1000 : 0);
return date.toLocaleDateString(LOCALE, DATETIME_FORMAT);
}