Fix data reloading issues for device detail vulnerability table

Nanitor · Dec 11, 2018 · dbc164a · dbc164a
1 parent 5ea2a4a
commit dbc164a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/organization/device/device.service.ts b/src/organization/device/device.service.ts
@@ -68,8 +68,8 @@ export class DeviceService extends TableCache {
         return this.accountService.executeGet(`/organization/${this.accountService.getOrganizationId()}/device/${id}/detail`);
     }
 
-    getVulnerabilities(deviceId: number, page: number, limit: number) {
-        if (this.vulnDetailPage == page) {
+    getVulnerabilities(deviceId: number, page: number, limit: number, force: boolean) {
+        if (this.vulnDetailPage == page && !force) {
             return;
         }
         this.spinnerService.setState(true);

diff --git a/src/organization/device/device_detail.component.ts b/src/organization/device/device_detail.component.ts
@@ -78,7 +78,6 @@ export class DeviceDetailComponent implements OnInit{
         ];
 
         this.vulnerabilityEnabled = this.service.accountService.isVulnerabilityEnabled(this.service.accountService.getCurrentOrganization());
-
         this.refresh();
     }
 
@@ -116,7 +115,9 @@ export class DeviceDetailComponent implements OnInit{
             p => {
                 this.setResponse(p);
                 this.spinnerService.setState(false);
-                this.loadVulnerabilityData();
+                if (this.vulnResponse) {
+                    this.loadVulnerabilityData();
+                }
             },
             err => {
                 this.spinnerService.setState(false);
@@ -139,7 +140,12 @@ export class DeviceDetailComponent implements OnInit{
     }
 
     loadVulnerabilityData() {
-        this.service.getVulnerabilities(parseInt(this.deviceId), 1, this.ROWS);
+        let currentPage = 1;
+        if (this.ptable && this.ptable.first) {
+            currentPage = this.ptable.first / this.ROWS + 1;
+            this.ptable.setScrollPosition(0);
+        }
+        this.service.getVulnerabilities(parseInt(this.deviceId), currentPage, this.ROWS, true);
     }
 
     getVulnColumnWidth(field) {
@@ -155,10 +161,9 @@ export class DeviceDetailComponent implements OnInit{
         this.savedScrollPos = 0;
     }
 
-
     vulnSortingChanged(event) {
         //loadMore, ptable in case with lazy and virtual scroll enabled calls the same function
-        this.service.getVulnerabilities(parseInt(this.deviceId), (event.first ? event.first : 0) / this.ROWS + 1, this.ROWS);
+        this.service.getVulnerabilities(parseInt(this.deviceId), (event.first ? event.first : 0) / this.ROWS + 1, this.ROWS, false);
     }
 
     setFocusToList() {