Skip to content

Commit

Permalink
Merge pull request #1039 from psyray/fix-2-click-datatable-bug
Browse files Browse the repository at this point in the history 
Add a check to not load datatables twice
  • Loading branch information
@AnonymousWP
AnonymousWP authored Nov 21, 2023
2 parents 4603308 + 4830d88 commit fafbf7a
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 6 deletions.
22 changes: 21 additions & 1 deletion web/startScan/templates/startScan/detail_scan.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,7 @@ <h5 class="text-center mt-3">Loading Screenshots...</h5>
</div>
</div>
<div class="col-12">
<div class="gridzy">
<div class="gridzy" id="screenshots-table">
</div>
</div>
</div>
Expand Down Expand Up @@ -1536,6 +1536,11 @@ <h4 class="header-title mb-0"><span id="endpoint_change_count"><span class="spin
// vulnerability datatable
const ps2 = new PerfectScrollbar(document.querySelector('.vulnerability-search'));
$("#pills-vulnerabilities-tab").click(function() {
// prevent table loading twice
// https://datatables.net/manual/tech-notes/3
if ( $.fn.dataTable.isDataTable( '#vulnerability_results' ) ) {
return false;
}
var is_grouping = false;
var grouping_col = 3;
var vuln_ajax_url = '/api/listVulnerability/?scan_history={{scan_history_id}}&format=datatables';
Expand Down Expand Up @@ -1777,6 +1782,10 @@ <h4 class="header-title mb-0"><span id="endpoint_change_count"><span class="spin
});
});

$('#reload_vulnerabilities_table_btn').click(function () {
vulnerability_table.ajax.reload();
});

$('#vulnerability-search-button').click(function () {
vulnerability_table.search($('#vulnerability-search').val()).draw() ;
});
Expand Down Expand Up @@ -2011,6 +2020,9 @@ <h4 class="header-title mb-0"><span id="endpoint_change_count"><span class="spin

{% if 'screenshot' in history.tasks %}
$("#pills-screenshot-tab").click(function() {
if($('#screenshots-table').children().length > 0) {
return false;
}
get_screenshot({{scan_history_id}});

//animate search placeholder
Expand Down Expand Up @@ -2095,6 +2107,9 @@ <h4 class="header-title mb-0"><span id="endpoint_change_count"><span class="spin
});

$("#pills-visualisation-tab").click(function() {
if($('#visualisation').children().length > 0) {
return false;
}
visualise_scan_results({{scan_history_id}});
});

Expand All @@ -2111,6 +2126,11 @@ <h4 class="header-title mb-0"><span id="endpoint_change_count"><span class="spin
{% endif %}
$("#pills-subdomain-tab").click(function() {
// prevent table loading twice
// https://datatables.net/manual/tech-notes/3
if ( $.fn.dataTable.isDataTable( '#subdomain_scan_results' ) ) {
return false;
}
var subdomain_ajax_url = '/api/listDatatableSubdomain/?project={{current_project.slug}}&scan_id={{scan_history_id}}&format=datatables';
var is_subd_grouping = false;
var subd_grouping_col = 8;
Expand Down
3 changes: 3 additions & 0 deletions web/startScan/templates/startScan/vulnerabilities.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,9 @@
}
});
});
$('#reload_vulnerabilities_table_btn').click(function () {
vulnerability_table.ajax.reload();
});
});

var vulnerability_cols = [
Expand Down
19 changes: 16 additions & 3 deletions web/targetApp/templates/target/summary.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -903,14 +903,19 @@ <h4 class="header-title mb-0"><span id="technologies-count"><span class="spinner
chart.render()

$("#pills-subdomain-tab").click(function() {
var subdomain_ajax_url = '/api/listDatatableSubdomain/?project={{current_project.slug}}&target_id={{target.id}}&format=datatables';
// prevent table loading twice
// https://datatables.net/manual/tech-notes/3
if ( $.fn.dataTable.isDataTable( '#subdomain_scan_results' ) ) {
return false;
}
var subdomain_ajax_url = '/api/listDatatableSubdomain/?project={{current_project.slug}}&scan_id={{target.id}}&format=datatables';
var is_subd_grouping = false;
var subd_grouping_col = 8;
var subdomain_datatables = $('#subdomain_scan_results').DataTable({
"headerCallback": function(e, a, t, n, s) {
e.getElementsByTagName("th")[0].innerHTML='<div class="form-check ms-1 form-check-primary"><input type="checkbox" class="float-start form-check-input chk-parent" id="head_checkbox" onclick=mainCheckBoxSelected(this)>\n<span class="new-control-indicator"></span><span style="visibility:hidden">c</span></div>\n'
},
"destroy": true,
"destroy": false,
"processing": true,
"oLanguage": subdomain_oLanguage,
"fnCreatedRow": function (nRow, aData, iDataIndex) {
Expand Down Expand Up @@ -1335,11 +1340,16 @@ <h4 class="header-title mb-0"><span id="technologies-count"><span class="spinner
});

$("#pills-vulnerabilities-tab").click(function() {
// prevent table loading twice
// https://datatables.net/manual/tech-notes/3
if ( $.fn.dataTable.isDataTable( '#vulnerability_results' ) ) {
return false;
}
var is_grouping = false;
var grouping_col = 3;
var vuln_ajax_url = '/api/listVulnerability/?target_id={{target.id}}&format=datatables';
var vulnerability_table = $('#vulnerability_results').DataTable({
"destroy": true,
"destroy": false,
"oLanguage": {
"oPaginate": {
"sPrevious": '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" class="feather feather-arrow-left"><line x1="19" y1="12" x2="5" y2="12"></line><polyline points="12 19 5 12 12 5"></polyline></svg>',
Expand Down Expand Up @@ -1558,6 +1568,9 @@ <h4 class="header-title mb-0"><span id="technologies-count"><span class="spinner
}
});
});
$('#reload_vulnerabilities_table_btn').click(function() {
vulnerability_table.ajax.reload();
});
// column visibility
vulnerability_datatable_col_visibility(vulnerability_table);
},
Expand Down
7 changes: 5 additions & 2 deletions web/templates/base/_items/vulnerability_tab_content.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<button class="btn btn-soft-primary dropdown-toggle ms-1" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-toggle="tooltip" data-placement="left" title="Filter Columns">
<i class="fe-filter"></i>
</button>
<div class="dropdown-menu" style="">
<div class="dropdown-menu">
<div class="dropdown-item">
<div class="form-check">
<input type="checkbox" class="form-check-input" id="vuln_source_checkbox" name="vuln_source_checkbox" checked>
Expand Down Expand Up @@ -54,12 +54,15 @@
</div>
</div>
</div>
<a class="btn btn-soft-primary ms-2 me-2" data-toggle="tooltip" data-placement="top" title="Reload Vulnerabilities" id="reload_vulnerabilities_table_btn">
<i class="fe-refresh-cw"></i>
</a>
</div>
<div class="btn-group mb-2 float-end dropstart">
<button class="btn btn-soft-info dropdown-toggle ms-1" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-toggle="tooltip" data-placement="left" title="Vulnerability Grouping">
<i class="fe-layout"></i>
</button>
<div class="dropdown-menu" style="">
<div class="dropdown-menu">
<div class="dropdown-item">
<div class="form-check">
<input type="radio" id="vulnerability_name_grouping" name="grouping_vuln_row" class="form-check-input" value="name">
Expand Down

0 comments on commit fafbf7a

Please sign in to comment.