Merge pull request #441 from kac89/dev

fix report issues export/edit and paginator
kac89 · Dec 20, 2024 · 3fee1f7 · 3fee1f7
2 parents ef0e732 + 652453f
commit 3fee1f7
Show file tree

Hide file tree

Showing 7 changed files with 152 additions and 97 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
-    "angular.enable-strict-mode-prompt": false
+    "angular.enable-strict-mode-prompt": false,
+    "typescript.tsdk": "node_modules\\typescript\\lib"
 }
diff --git a/src/app/dialog-exportissues/dialog-exportissues.component.ts b/src/app/dialog-exportissues/dialog-exportissues.component.ts
@@ -53,11 +53,18 @@ export class DialogExportissuesComponent implements OnInit {
     ngOnInit() {
 
       if (this.data.sel) {
+
         this.data.sel.forEach((item, index) => {
-          if (item === true) {
-            this.isReturn.push(this.data.orig[index]);
+          if (item.data) {
+
+            const index2: number = this.data.orig.findIndex(i => i === item.data)
+            if (index2 !== -1) {
+              this.isReturn.push(this.data.orig[index2]);
+            }
+
           }
       });
+
       } else {
           this.isReturn = this.data;
       }

diff --git a/src/app/dialog-issues-edit/dialog-issues-edit.component.html b/src/app/dialog-issues-edit/dialog-issues-edit.component.html
@@ -1,7 +1,7 @@
 <mat-card appearance="outlined">
     <mat-card-header>
       <mat-icon mat-card-avatar class="vertical-align-middle padding-bottom-3 size-45">edit</mat-icon>
-      <mat-card-title>Edit selected ({{selected_items_true.length}})</mat-card-title>
+      <mat-card-title>Edit selected ({{data.sel.length}})</mat-card-title>
       <mat-card-subtitle>Make changes on multiple issues</mat-card-subtitle>
     </mat-card-header>
 
@@ -32,9 +32,10 @@
 
         </div>
         <p>
-            <button mat-raised-button color="primary" (click)="closedialog()">Close</button>
+          <button mat-raised-button color="accent" (click)="applychanges()"><mat-icon>save</mat-icon> Apply changes</button>
+
             &nbsp;&nbsp;
-            <button mat-raised-button color="accent" (click)="applychanges()"><mat-icon>save</mat-icon> Apply changes</button>
+            <button mat-raised-button color="primary" (click)="closedialog()">Close</button>
         </p>
 
     </mat-card-content>

diff --git a/src/app/dialog-issues-edit/dialog-issues-edit.component.ts b/src/app/dialog-issues-edit/dialog-issues-edit.component.ts
@@ -12,7 +12,6 @@ import { UtilsService } from '../utils.service';
 export class DialogIssuesEditComponent implements OnInit {
 
   isReturn = [];
-  selected_items_true = [];
   selseverity = '';
   selstatus = '';
 
@@ -25,14 +24,17 @@ export class DialogIssuesEditComponent implements OnInit {
 
 
   ngOnInit() {
-
     this.data.sel.forEach((item, index) => {
-      if (item === true) {
-        this.isReturn.push(this.data.orig[index]);
+      if (item.data) {
+
+        const index2: number = this.data.orig.findIndex(i => i === item.data)
+        if (index2 !== -1) {
+          this.isReturn.push(this.data.orig[index2]);
+        }
+
       }
   });
 
-  this.selected_items_true = this.data.sel.filter(item => item === true);
 
   this.tableseverity = this.utilsService.severitytable;
   this.tablestatus = this.utilsService.issueStatustable;

diff --git a/src/app/dialog-removeitems/dialog-removeitems.component.ts b/src/app/dialog-removeitems/dialog-removeitems.component.ts
@@ -14,12 +14,18 @@ export class DialogRemoveitemsComponent implements OnInit {
 
   ngOnInit() {
 
-    this.data.sel.forEach((item, index) => {
-        if (item === true) {
-          this.isReturn.push(this.data.orig[index]);
+    if(this.data.sel) {
+      this.data.sel.forEach((item, index) => {
+        if (item.data) {
+
+          const index2: number = this.data.orig.findIndex(i => i === item.data)
+          if (index2 !== -1) {
+            this.isReturn.push(this.data.orig[index2]);
+          }
+
         }
     });
-
+    }
   }
 
   cancel(): void {

diff --git a/src/app/report/report.component.html b/src/app/report/report.component.html
@@ -193,8 +193,8 @@ <h1 style="margin: 0 0 0;" class="mat-headline-3">{{reportdesc?.report_name}} <a
             </button>
 
             <mat-menu #dropdownMenuOne="matMenu">
-              <button *ngIf="getselectedissues(selected3) == 0" mat-menu-item (click)="export_issues(selected3, decryptedReportDataChanged.report_vulns)">Export all</button>
-              <button *ngIf="getselectedissues(selected3) >= 1" mat-menu-item (click)="export_issues(selected3, decryptedReportDataChanged.report_vulns)">Export selected ({{getselectedissues(selected3)}})</button>
+              <button mat-menu-item (click)="export_issues(decryptedReportDataChanged.report_vulns, 'all')">Export all</button>
+              <button *ngIf="selectedIssues.length >= 1" mat-menu-item (click)="export_issues(decryptedReportDataChanged.report_vulns, 'selected')">Export selected ({{selectedIssues.length}})</button>
               <button mat-menu-item [matMenuTriggerFor]="bysev">Export by Severity</button>
               <button *ngIf="getTags(decryptedReportDataChanged.report_vulns) >= 1" mat-menu-item [matMenuTriggerFor]="bytag">Export by Tag</button>
             </mat-menu>
@@ -253,7 +253,7 @@ <h1 style="margin: 0 0 0;" class="mat-headline-3">{{reportdesc?.report_name}} <a
           <mat-expansion-panel-header fxLayout="row wrap" cdkDragHandle>
             <mat-panel-title fxLayoutAlign="start">
               <div style="white-space: nowrap;">
-                <mat-checkbox [(ngModel)]="selected3[i]" (change)="toggle()"
+                <mat-checkbox [checked]="checkcheckbox(i)" (change)="toggle(i,$event.checked)"
                   (click)="$event.stopPropagation()"></mat-checkbox>&nbsp;&nbsp;
                 <span
                   class="label {{dec_data.severity | lowercase}}">{{dec_data.severity}}</span>
@@ -538,30 +538,43 @@ <h1 style="margin: 0 0 0;" class="mat-headline-3">{{reportdesc?.report_name}} <a
                 settings</mat-icon>
 
 
-              <button mat-stroked-button color="accent" [routerLink]="[]" (click)="selectall()">
-                <mat-icon>done_all</mat-icon>
-                Select all
-              </button>
 
-              &nbsp;
+                <div fxLayout="row wrap" fxLayoutGap="0px" class="example-full-width">
+
+                  <div fxLayoutAlign="start start" fxFlex="50%" fxFlex.sm="50%" fxFlex.xs="100%">
+                    <button mat-stroked-button color="accent" [routerLink]="[]" (click)="openissuesedit(selectedIssues)">
+                      <mat-icon>edit</mat-icon>
+                      Edit ({{ selectedIssues.length }})
+                    </button>
 
-              <button mat-stroked-button color="accent" [routerLink]="[]" (click)="deselectall()">
-                <mat-icon>done_all</mat-icon>
-                Unselect all
-              </button>
+                    &nbsp;
+
+                    <button mat-stroked-button color="accent" [routerLink]="[]" (click)="selectall()">
+                      <mat-icon>done_all</mat-icon>
+                      Select all
+                    </button>
 
-              &nbsp;
+                    &nbsp;
+
+                    <button mat-stroked-button color="accent" [routerLink]="[]" (click)="deselectall()">
+                      <mat-icon>done_all</mat-icon>
+                      Clear selected ({{ selectedIssues.length }})
+                    </button>
 
-              <button mat-stroked-button color="accent" [routerLink]="[]" (click)="openissuesedit(selected3)">
-                <mat-icon>edit</mat-icon>
-                Edit ({{ selected3_true.length }})
-              </button>
+                  </div>
+
+                  <div fxLayoutAlign="end end" fxFlex="50%" fxFlex.sm="50%" fxFlex.xs="100%">
 
-              &nbsp;&nbsp;
+                    <button mat-stroked-button color="warn" (click)="removeSelecteditems(selectedIssues)" [matMenuTriggerFor]="trewwertwe">
+                      <mat-icon class="vertical-align-middle padding-bottom-3" matSuffix>remove_circle</mat-icon> Remove ({{ selectedIssues.length }})
+                    </button>
 
-              <button mat-stroked-button color="warn" (click)="removeSelecteditems(selected3)">
-                <mat-icon class="vertical-align-middle padding-bottom-3" matSuffix>remove_circle</mat-icon> REMOVE ({{ selected3_true.length }})
-              </button>
+                  </div>
+
+
+
+
+                </div>
 
             </mat-panel-title>
           </mat-expansion-panel-header>