From 0459a17373284d6d3dc099cdd06320b6d12107bc Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 19 May 2021 08:37:49 +0000 Subject: [PATCH 1/5] Bump watchdog from 2.1.1 to 2.1.2 Bumps [watchdog](https://github.com/gorakhargosh/watchdog) from 2.1.1 to 2.1.2. - [Release notes](https://github.com/gorakhargosh/watchdog/releases) - [Changelog](https://github.com/gorakhargosh/watchdog/blob/master/changelog.rst) - [Commits](https://github.com/gorakhargosh/watchdog/compare/v2.1.1...v2.1.2) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 700fa24b..31314517 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ pymongo==3.11.4 netaddr==0.8.0 flask==2.0.0 terminable_thread==0.7.1 -watchdog==2.1.1 +watchdog==2.1.2 pyshark==0.4.3 oschmod==0.3.12 argparse==1.4.0 \ No newline at end of file From 124024fc42006dd0166a936bd233c08e5890e6d1 Mon Sep 17 00:00:00 2001 From: spiderxm Date: Wed, 19 May 2021 19:58:18 +0530 Subject: [PATCH 2/5] Fix issue when 0 log records are returned --- web/static/js/explore.js | 47 +++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/web/static/js/explore.js b/web/static/js/explore.js index a7ec6e07..344ea292 100644 --- a/web/static/js/explore.js +++ b/web/static/js/explore.js @@ -193,27 +193,29 @@ $.fn.dataTable.pipeline = function ( opts ) { } } json = tmpj - index = Object.keys(json['data'][0])[settings.aLastSort[0].col] - order = settings.aLastSort[0].dir - if (order == "asc"){ - json['data'].sort( - (a, b) => { - if (a[index] < b[index]) - return -1; - if (a[index] > b[index]) - return 1; - return 0; - }) - - } else { - json['data'].sort( - (a, b) => { - if (a[index] > b[index]) - return -1; - if (a[index] < b[index]) - return 1; - return 0; - }) + if(json['data'].length > 0){ + index = Object.keys(json['data'][0])[settings.aLastSort[0].col] + order = settings.aLastSort[0].dir + if (order == "asc") { + json['data'].sort( + (a, b) => { + if (a[index] < b[index]) + return -1; + if (a[index] > b[index]) + return 1; + return 0; + }) + + } else { + json['data'].sort( + (a, b) => { + if (a[index] > b[index]) + return -1; + if (a[index] < b[index]) + return 1; + return 0; + }) + } } return JSON.stringify( json ); }, @@ -295,7 +297,8 @@ function get_event_data(api_endpoint, column_list, api_params) { processing: true, language:{ loadingRecords: ' ', - processing: '' + processing: '', + sEmptyTable: '
No records are present for given request
' }, oLanguage: { sStripClasses: "", From 3546e6fe37c94d35b3fa24b07db83b4a79bffcb5 Mon Sep 17 00:00:00 2001 From: spiderxm Date: Thu, 20 May 2021 02:23:43 +0530 Subject: [PATCH 3/5] Fix minor bug in chart colors --- web/static/js/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/static/js/main.js b/web/static/js/main.js index 6f4cd9bf..6e45daf1 100644 --- a/web/static/js/main.js +++ b/web/static/js/main.js @@ -11,11 +11,11 @@ window.chartColors = { blue: "rgb(54, 162, 235)", purple: "rgb(153, 102, 255)", grey: "rgb(201, 203, 207)", - cyan: "rgb(0, 255, 255" + cyan: "rgb(0, 255, 255)" }; var colors_array = ["rgb(255, 0, 0)", "rgb(255, 0, 191)", "rgb(255, 159, 64)", "rgb(255, 205, 86)", "rgb(75, 192, 192)", - "rgb(191, 255, 0)", "rgb(54, 162, 235)", "rgb(153, 102, 255)", "rgb(201, 203, 207)", "rgb(0, 255, 255"] + "rgb(191, 255, 0)", "rgb(54, 162, 235)", "rgb(153, 102, 255)", "rgb(201, 203, 207)", "rgb(0, 255, 255)"] var color = Chart.helpers.color; var chartColors = window.chartColors; From 109d1a2427e055cdbf6be2b9cd0d0b50e269b72e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 21 May 2021 16:05:11 +0000 Subject: [PATCH 4/5] Bump flask from 2.0.0 to 2.0.1 Bumps [flask](https://github.com/pallets/flask) from 2.0.0 to 2.0.1. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/2.0.0...2.0.1) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 31314517..dab6c924 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ setuptools==56.2.0 pymongo==3.11.4 netaddr==0.8.0 -flask==2.0.0 +flask==2.0.1 terminable_thread==0.7.1 watchdog==2.1.2 pyshark==0.4.3 From 1519e8487c90d75141e292f21f5d84f40f30e4c0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 23 May 2021 04:06:52 +0000 Subject: [PATCH 5/5] Bump setuptools from 56.2.0 to 57.0.0 Bumps [setuptools](https://github.com/pypa/setuptools) from 56.2.0 to 57.0.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst) - [Commits](https://github.com/pypa/setuptools/compare/v56.2.0...v57.0.0) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index dab6c924..39dcfc41 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -setuptools==56.2.0 +setuptools==57.0.0 pymongo==3.11.4 netaddr==0.8.0 flask==2.0.1