Use ip as host id instead of hostname

Author: J12934

scb-scanprocesses/nmap-process/src/main/resources/forms/nmap/approve-port-scanner-results.html

@@ -39,19 +39,24 @@
             const openPorts = portScannerResult.filter((finding) => finding.category === 'Open Port');
             const hosts = portScannerResult.filter((finding) => finding.category === 'Host');
 
+            $scope.groupedResults = {};
+
             for(const host of hosts){
-                $scope.groupedResults[host.attributes.hostname] = [];
+                $scope.groupedResults[host.attributes.ip_address] = { hostname: host.attributes.hostname, ports: [] };
             }
 
             $scope.groupedResults = openPorts.reduce(
                 function (carry, item) {
-                    if (!carry.hasOwnProperty(item.attributes.hostname)) {
-                        carry[item.attributes.hostname] = [];
+                    console.log(item);
+                    if (!carry.hasOwnProperty(item.attributes.ip_address)) {
+                        carry[item.attributes.ip_address] = { hostname: item.attributes.hostname, ports: [] };
+                    }
+                    if(item.attributes.ip_address !== null){
+                        carry[item.attributes.ip_address].ports.push(item);
                     }
-                    carry[item.attributes.hostname].push(item);
                     return carry;
                 },
-                {}
+                $scope.groupedResults
             );
         });
     </script>
@@ -86,21 +91,25 @@ <h2>
                 </p>
             </div>
 
-            <div class="well well-sm" style="color: inherit;" ng-repeat="(address, ports) in groupedResults">
-                <strong>Results for Host: {{ address }}</strong>
-                <span class="table table-striped" ng-if="ports.length === 0">
+            <div class="well well-sm" style="color: inherit;" ng-repeat="(ip, host) in groupedResults">
+                <strong>
+                    Results for Host:
+                    <span>{{ ip }}</span>
+                    <span ng-if="host.hostname">({{host.hostname}})</span>
+                </strong>
+                <span class="table table-striped" ng-if="host.ports.length === 0">
                     No ports identified for this host.
                 </span>
-                <table class="table table-striped" ng-if="ports.length > 0">
+                <table class="table table-striped" ng-if="host.ports.length > 0">
                     <tr>
                         <th>Host:</th>
                         <th>Port:</th>
                         <th>Name:</th>
                         <th>Protocol:</th>
                         <th>State:</th>
                     </tr>
-                    <tr class="danger" ng-repeat="port in ports">
-                        <td>{{ address }} ({{ port.attributes.ip_address }})</td></td>
+                    <tr class="danger" ng-repeat="port in host.ports">
+                        <td>{{ port.attributes.ip_address }}</td></td>
                         <td>{{ (port.category === 'Open Port' || port.category === 'Http Header') ? port.attributes.port : '' }}</td>
                         <td>{{ (port.category === 'Open Port' && !port.name) ? port.attributes.service : port.name}}</td>
                         <td>{{ (port.category === 'Open Port' || port.category === 'Http Header') ? port.attributes.protocol : '' }}</td>