From 1f0a2a805a68ed7dab993e1d3cefbb4d1909a2db Mon Sep 17 00:00:00 2001
From: Yogesh Ojha <yogesh.ojha11@gmail.com>
Date: Sat, 19 Mar 2022 23:27:01 +0530
Subject: [PATCH] Order sub scan history and fixed widget

---
 web/api/views.py                              |  4 ++--
 .../static/startScan/js/detail_scan.js        | 21 ++++++++++++++++++-
 .../templates/startScan/detail_scan.html      |  4 ++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/web/api/views.py b/web/api/views.py
index 2905531c..84b22743 100644
--- a/web/api/views.py
+++ b/web/api/views.py
@@ -86,7 +86,7 @@ class ListSubScans(APIView):
 		response['status'] = False
 
 		if subdomain_id:
-			subscans = SubScan.objects.filter(subdomain__id=subdomain_id)
+			subscans = SubScan.objects.filter(subdomain__id=subdomain_id).order_by('-stop_scan_date')
 			subscan_results = SubScanSerializer(subscans, many=True).data
 
 			if subscans:
@@ -94,7 +94,7 @@ class ListSubScans(APIView):
 				response['results'] = subscan_results
 
 		elif scan_history:
-			subscans = SubScan.objects.filter(scan_history__id=scan_history)
+			subscans = SubScan.objects.filter(scan_history__id=scan_history).order_by('-stop_scan_date')
 			subscan_results = SubScanSerializer(subscans, many=True).data
 
 			if subscans:
diff --git a/web/startScan/static/startScan/js/detail_scan.js b/web/startScan/static/startScan/js/detail_scan.js
index 7117f243..18b5becf 100644
--- a/web/startScan/static/startScan/js/detail_scan.js
+++ b/web/startScan/static/startScan/js/detail_scan.js
@@ -1728,8 +1728,11 @@ function loadSubscanHistoryWidget(scan_history_id){
 		return response.json();
 	}).then(function(data) {
 		console.log(data);
+		$('#subscan_history_widget').empty();
 		if (data['status']) {
-			$('#subscan_history_widget').empty();
+			$('#sub_scan_history_count').append(`
+				<span class="badge badge-soft-primary me-1">${data['results'].length}</span>
+			`)
 			for (var result in data['results']) {
 
 				var result_obj = data['results'][result];
@@ -1749,6 +1752,11 @@ function loadSubscanHistoryWidget(scan_history_id){
 					bg_color = 'bg-soft-success';
 					status_badge = '<span class="float-end badge bg-success">Task Completed</span>';
 				}
+				else if(result_obj.status == 1){
+					color = 'primary';
+					bg_color = 'bg-soft-primary';
+					status_badge = '<span class="float-end badge bg-primary">Running</span>';
+				}
 
 				$('#subscan_history_widget').append(`
 					<div class="card border-${color} border mini-card">
@@ -1770,5 +1778,16 @@ function loadSubscanHistoryWidget(scan_history_id){
 					`);
 				}
 			}
+			else{
+				$('#sub_scan_history_count').append(`
+					<span class="badge badge-soft-primary me-1">0</span>
+				`)
+				$('#subscan_history_widget').append(`
+					<div class="alert alert-warning alert-dismissible fade show mt-2" role="alert">
+					<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+					No Subscans has been initiated for any subdomains. You can select individual subdomains and initiate subscans like Directory Fuzzing, Vulnerability Scan etc.
+					</div>
+				`);
+			}
 		});
 }
diff --git a/web/startScan/templates/startScan/detail_scan.html b/web/startScan/templates/startScan/detail_scan.html
index 8ed41e67..d174f94d 100644
--- a/web/startScan/templates/startScan/detail_scan.html
+++ b/web/startScan/templates/startScan/detail_scan.html
@@ -270,9 +270,9 @@ Scan Findings
 						<div class="d-flex align-items-start mb-3">
 							<div class="w-100">
 								<h5 class="mt-0 mb-0 font-15">
-									Sub Scan History for <span class="badge badge-soft-primary">{{history.domain.name}}</span>
+									<span id="sub_scan_history_count"></span> Sub Scan History for <span class="badge badge-soft-primary">{{history.domain.name}}</span>
 								</h5>
-								<div data-simplebar style="max-height: 410px;" class="p-2">
+								<div data-simplebar style="max-height: 510px;" class="p-2">
 									<div id="subscan_history_widget">
 									</div>
 								</div>