Merge pull request primefaces#348 from atretyak1985/issue_#NNTR-281

Issue dashboard - clicking subregion number to go to Issue list filte…

src/common/list/base-list.ts

@@ -151,7 +151,6 @@ export abstract class BaseList implements OnInit {
                 }
 
                 if (this.updateQueryFilters()) {
-                    this.ptable.first = 0;
                     this.refresh();
                 }
 

src/organization/issue/issue_list.component.html

@@ -16,14 +16,15 @@ <h1 class="panel-title">Issues
                     <button class="btn btn-sm btn-primary pull-right" (click)="clickNavigateOnPage('/issue/dashboard')" title="RISC Prioritization">
                         <i class="fa fa-diamond" aria-hidden="true"></i>
                     </button>
+                    <span class="label label-black pull-right m-r-15" style="color:white; width: auto;">Total: {{ totalRecords }}</span>
                 </h1>
             </div>
             <div class="panel-body">
                 <div class="no-data" *ngIf="emptyResponse">
                     <p>There is currently nothing to display.</p>
                 </div>
 
-                <div>
+                <div *ngIf="!emptyResponse">
                     <p-table #ptable class="p-table" [columns]="cols" [value]="items" [lazy]="true" (onLazyLoad)="sortingChanged($event)" [paginator]="true" 
                         [rows]="ROWS" [totalRecords]="totalRecords" scrollable="true" [scrollHeight]="window.innerHeight - HEADER_HEIGHT + 'px'" [customSort]="true" sortMode="multiple"
                         [style]="{width: window.innerWidth - (filterPanel.isCollapsed ? LIST_BASE_PADDING : LIST_BASE_PADDING + FILTER_WIDTH) + 'px'}"

src/organization/issue/issue_list.component.ts

@@ -1,6 +1,7 @@
 import { Component, Injector } from '@angular/core';
 import { BaseList } from 'common/list/base-list';
 import { IssueService } from './issue.service';
+import { isEqual, cloneDeep } from 'lodash';
 
 
 @Component({
@@ -14,6 +15,7 @@ import { IssueService } from './issue.service';
 export class IssueListComponent extends BaseList {
     public exportLimitOptions: any;
     public riscSummary: any;
+    private currentProfileFilter: Array<any>;
 
     constructor(
         service: IssueService,
@@ -24,6 +26,7 @@ export class IssueListComponent extends BaseList {
         this.HEADER_HEIGHT = 310;
         this.FILTER_WIDTH = 300;
         this.LIST_BASE_PADDING = 120;
+        this.currentProfileFilter = [];
     }
 
     ngOnInit() {
@@ -57,6 +60,15 @@ export class IssueListComponent extends BaseList {
             this.service.userFiltersState['issue_risc'] = issueRisc;
             isChanged = true;
         }
+        if (!assetRisc && !issueRisc) {
+            if (this.service.userFiltersState['asset_risc']) {
+                delete this.service.userFiltersState['asset_risc'];
+            }
+            if (this.service.userFiltersState['issue_risc']) {
+                delete this.service.userFiltersState['issue_risc'];
+            }
+            isChanged = true;
+        }
         return isChanged;
     }
 
@@ -92,4 +104,16 @@ export class IssueListComponent extends BaseList {
         super.clearContextFilter();
         this.updateQueryFilters();
     }
+
+    updateProfileFilters(event) {
+        if (this.ptable) {
+            this.ptable.first = 0;
+        }
+        const isFiltersEqual = isEqual(this.currentProfileFilter, event);
+        this.currentProfileFilter = cloneDeep(event);
+        if (!isFiltersEqual) {
+            this.refresh();
+            this.service.setProfileFilters(event);
+        }
+    }
 }