Merge remote-tracking branch 'origin/fix/issue-136' into hotfixes

EvgenySafronov · EvgenySafronov · commit ca5f5466b4a5 · 2024-10-04T11:10:18.000+03:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aquality-tracking-ui",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
diff --git a/src/app/elements/table-filter/table-filter.component.ts b/src/app/elements/table-filter/table-filter.component.ts
@@ -61,6 +61,7 @@ export class TableFilterComponent implements OnInit, AfterViewInit, OnDestroy, O
   @Input() allowBulkUpdate = false;
   @Input() allowBulkDelete = false;
   @Input() withSelector = false;
+  @Input() urlGenerator!: (entity: any) => string;
 
   @Output() createEntity = new EventEmitter();
   @Output() dataChange = new EventEmitter();
@@ -733,7 +734,12 @@ export class TableFilterComponent implements OnInit, AfterViewInit, OnDestroy, O
     const canClick = notInlineEditorButton || (notClickableElement && notEditable);
 
     if (canClick) {
-      this.rowClick.emit(entity);
+      if (typeof this.urlGenerator == 'function' && ($event.ctrlKey || $event.metaKey)) {
+        const url = this.urlGenerator(entity);
+        window.open(`/#${url}`, '_blank');
+      } else {
+        this.rowClick.emit(entity);
+      }
     }
   }
 
diff --git a/src/app/pages/administration/global/users/administration.users.component.html b/src/app/pages/administration/global/users/administration.users.component.html
@@ -1,5 +1,7 @@
 <app-modal *ngIf="tbCols && !hideModal" [title]="removeModalTitle" [message]="removeModalMessage" [type]="'warning'" [buttons]="[{name:'yes', execute:true }, {name:'no', execute:false}]"
     (execute)="execute($event)" (closed)="wasClosed()">
 </app-modal>
-<table-filter id="users-table" *ngIf="tbCols" [data]="users" [queryParams]="true" [columns]="tbCols" [hide]="hideVal" (rowClick)="rowClicked($event)" (customEvent)="resetPassword()" [allowCreate]="true" [allowDelete]="true" (dataChange)="updateUser($event)"
-    (action)="handleAction($event)" (createEntity)="createEntityChange($event)"></table-filter>
+<table-filter id="users-table" *ngIf="tbCols" [data]="users" [queryParams]="true" [columns]="tbCols" [hide]="hideVal"
+    (rowClick)="rowClicked($event)" (customEvent)="resetPassword()" [allowCreate]="true"
+    [allowDelete]="true" (dataChange)="updateUser($event)" (action)="handleAction($event)"
+    (createEntity)="createEntityChange($event)"></table-filter>
diff --git a/src/app/pages/audit/audit-list/audit.component.html b/src/app/pages/audit/audit-list/audit.component.html
@@ -22,5 +22,5 @@ <h2>Audits Dashboard</h2>
 </div>
 <div *ngIf="stats && auditors && columns && services" class="col-sm-12 no-padding">
   <table-filter [data]="stats" [rowColors]="rowColors" [columns]="columns" [defaultSortBy]="defSort"
-    [queryParams]="true" (rowClick)="rowClicked($event)" rowsOnPage="20"></table-filter>
+    [queryParams]="true" [urlGenerator]="generateAuditUrl" (rowClick)="rowClicked($event)" rowsOnPage="20"></table-filter>
 </div>
diff --git a/src/app/pages/audit/audit-list/audit.component.ts b/src/app/pages/audit/audit-list/audit.component.ts
@@ -98,8 +98,12 @@ export class AuditComponent implements OnInit {
     BlobUtils.download(result.blob, filename);
   }
 
-  rowClicked($event) {
-    this.router.navigate([`/audit/${$event.id}`]);
+  generateAuditUrl(entity: AuditStat) {
+    return`/audit/${entity.id}`;
+  }
+
+  rowClicked($event: AuditStat) {
+    this.router.navigate([this.generateAuditUrl($event)]);
   }
 
   createColumns() {
diff --git a/src/app/pages/customer/customer-list/customer.component.html b/src/app/pages/customer/customer-list/customer.component.html
@@ -13,6 +13,6 @@ <h2>Customers Dashboard</h2>
 
 <div class="col-sm-12 no-padding">
   <table-filter *ngIf="customers && columns" [data]="customers" [columns]="columns" [defaultSortBy]="defSort"
-    (action)="handleAction($event)" [allowDelete]="allowCreate" [queryParams]="true" (rowClick)="rowClicked($event)"
-    rowsOnPage="20"></table-filter>
+    (action)="handleAction($event)" [allowDelete]="allowCreate" [queryParams]="true" [urlGenerator]="generateCustomerUrl"
+    (rowClick)="rowClicked($event)" rowsOnPage="20"></table-filter>
 </div>
diff --git a/src/app/pages/customer/customer-list/customer.component.ts b/src/app/pages/customer/customer-list/customer.component.ts
@@ -62,8 +62,12 @@ export class CustomerComponent implements OnInit {
         ];
     }
 
-    rowClicked($event) {
-        this.router.navigate([`/customer/${$event.id}`]);
+    generateCustomerUrl(entity: Customer) {
+        return`/customer/${entity.id}`;
+    }
+
+    rowClicked($event: Customer) {
+        this.router.navigate([this.generateCustomerUrl($event)]);
     }
 
     handleAction($event) {
diff --git a/src/app/pages/project/issue/issue-list/issue-list.component.html b/src/app/pages/project/issue/issue-list/issue-list.component.html
@@ -16,7 +16,7 @@ <h2 id="issues-list">Issues</h2>
   <issue-create-modal *ngIf="!hideCreateModal" (execute)="execute($event)" (closed)="wasClosed()" [resolutions]="resolutions" [users]="users"
   [existingIssues]="issues"></issue-create-modal>
   <table-filter id="issues-table" *ngIf="issues && columns" [data]="issues" [columns]="columns"
-    [hiddenColumns]="hiddenColumns" [defaultSortBy]="defSort" [queryParams]="true"
+    [hiddenColumns]="hiddenColumns" [defaultSortBy]="defSort" [queryParams]="true" [urlGenerator]="generateIssueUrl"
     (dataChange)="updateIssue($event)" (rowClick)="rowClicked($event)" rowsOnPage="20"
     (filterLookupChange)="handleFilterLookupChange($event)">
   </table-filter>
diff --git a/src/app/pages/project/issue/issue-list/issue-list.component.ts b/src/app/pages/project/issue/issue-list/issue-list.component.ts
@@ -142,8 +142,12 @@ export class IssueListComponent implements OnInit {
     this.hideCreateModal = true;
   }
 
-  rowClicked(issue: Issue) {
-    return this.router.navigate([`/project/${this.route.snapshot.params['projectId']}/issue/${issue.id}`]);
+  generateIssueUrl(entity: Issue) {
+    return `/project/${this.route.snapshot.params['projectId']}/issue/${entity.id}`;
+  }
+
+  rowClicked($event: Issue) {
+    return this.router.navigate([this.generateIssueUrl($event)]);
   }
 
   private async updateList() {
diff --git a/src/app/pages/project/milestone/list-milestone/list-milestone.component.html b/src/app/pages/project/milestone/list-milestone/list-milestone.component.html
@@ -9,5 +9,6 @@ <h2 id="milestones-list">Milestones</h2>
 
   <table-filter id="milestones-table" *ngIf="milestones && columns" [data]="milestones" [columns]="columns" [defaultSortBy]="defSort"
     (action)="handleAction($event)" [queryParams]="true" [allowDelete]="canEdit" [allowCreate]="canEdit"
-    (dataChange)="updateMilestone($event)" (rowClick)="rowClicked($event)" rowsOnPage="20"></table-filter>
+    [urlGenerator]="generateMilestoneUrl" (dataChange)="updateMilestone($event)" (rowClick)="rowClicked($event)"
+    rowsOnPage="20"></table-filter>
 </div>
diff --git a/src/app/pages/project/milestone/list-milestone/list-milestone.component.ts b/src/app/pages/project/milestone/list-milestone/list-milestone.component.ts
@@ -90,8 +90,12 @@ export class ListMilestoneComponent implements OnInit {
       }];
   }
 
+  generateMilestoneUrl(entity: Milestone) {
+    return `/project/${entity.project_id}/milestone/${entity.id}`
+  }
+
   rowClicked(milestone: Milestone) {
-    return this.router.navigate([`/project/${this.projectId}/milestone/${milestone.id}`]);
+    return this.router.navigate([this.generateMilestoneUrl(milestone)]);
   }
 
   getMilestones() {
diff --git a/src/app/pages/project/project-view/project-veiw.component.ts b/src/app/pages/project/project-view/project-veiw.component.ts
@@ -127,12 +127,20 @@ export class ProjectViewComponent implements OnInit {
     return this.testrunService.getPassRate(stats);
   }
 
+  generateTestRunUrl(entity: TestRun): string {
+    return `/project/${entity.project_id}/testrun/${entity.id}`
+  }
+
+  generateIssueUrl(entity: Issue): string {
+    return `/project/${entity.project_id}/issue/${entity.id}`
+  }
+
   openTestRun(testrun: TestRun) {
-    this.router.navigate([`/project/${testrun.project_id}/testrun/${testrun.id}`]);
+    this.router.navigate([this.generateTestRunUrl(testrun)]);
   }
 
   openIssue(issue: Issue) {
-    this.router.navigate([`/project/${issue.project_id}/issue/${issue.id}`]);
+    this.router.navigate([this.generateIssueUrl(issue)]);
   }
 
   generateAuditNotification(audits: Audit[]): string {
diff --git a/src/app/pages/project/project-view/project-view.component.html b/src/app/pages/project/project-view/project-view.component.html
@@ -47,12 +47,12 @@ <h2 class="text-centered">{{issueStat?.totalApp}}</h2>
   <div class="col-sm-6" [ngClass]="{'col-sm-6': isProjectUser, 'col-sm-12': !isProjectUser}">
     <h4>Last Test Runs</h4>
     <table-filter *ngIf="!IsHideAll()" [data]="testruns" [actionsHeader]="false" [columns]="testrunColumns"
-      [allowDelete]="false" [hideFilter]="true" (rowClick)="openTestRun($event)" rowsOnPage="5"></table-filter>
+      [allowDelete]="false" [hideFilter]="true" [urlGenerator]="generateTestRunUrl" (rowClick)="openTestRun($event)" rowsOnPage="5"></table-filter>
   </div>
   <div *ngIf="isProjectUser" class="col-sm-6">
     <h4>My Open Issues</h4>
     <table-filter *ngIf="!IsHideAll()" [data]="myIssues" [actionsHeader]="false" [columns]="issueColumns"
-      [allowDelete]="false" [hideFilter]="true" (rowClick)="openIssue($event)" rowsOnPage="5"></table-filter>
+      [allowDelete]="false" [hideFilter]="true" [urlGenerator]="generateIssueUrl" (rowClick)="openIssue($event)" rowsOnPage="5"></table-filter>
   </div>
 </div>
 
diff --git a/src/app/pages/project/results/results-grid/results-grid.component.html b/src/app/pages/project/results/results-grid/results-grid.component.html
@@ -19,9 +19,10 @@
   [rowsOnPage]="20"
   [columns]="tbCols" 
   [hiddenColumns]="tbHiddenCols" 
-  [allowBulkUpdate]="canEdit" 
-  [defaultSortBy]="sortBy" 
-  [queryParams]="true" 
+  [allowBulkUpdate]="canEdit"
+  [defaultSortBy]="sortBy"
+  [queryParams]="true"
+  [urlGenerator]="generateTestRunUrl"
   (customEvent)="serchForSameResults($event)" 
   (dataChange)="resultUpdate($event)" 
   (bulkChanges)="bulkResultUpdate($event)"
diff --git a/src/app/pages/project/results/results-grid/results-grid.component.ts b/src/app/pages/project/results/results-grid/results-grid.component.ts
@@ -168,8 +168,12 @@ export class ResultGridComponent implements OnInit {
     }
   }
 
+  generateTestRunUrl(entity: TestResult) {
+    return `/project/${entity.project_id}/testrun/${entity.test_run_id}`;
+  }
+
   rowClicked($event: TestResult) {
-    this.router.navigate([`/project/${$event.project_id}/testrun/${$event.test_run_id}`]);
+    this.router.navigate([this.generateTestRunUrl($event)]);
   }
 
   wasClosed() {
diff --git a/src/app/pages/project/suite/suite-list/suite.list.component.html b/src/app/pages/project/suite/suite-list/suite.list.component.html
@@ -19,7 +19,8 @@ <h2 id="test-suites-list">Test Suites List</h2>
     [defaultSortBy]="sortBy" 
     [allowDelete]="allowCreateDelete"
     [allowCreate]="allowCreateDelete"
-    (rowClick)="openTestSuite($event.id)"
+    [urlGenerator]="generateTestSuiteUrl"
+    (rowClick)="openTestSuite($event)"
     (dataChange)="suiteUpdate($event)" 
     (action)="handleAction($event)"></table-filter>
 </div>
diff --git a/src/app/pages/project/suite/suite-list/suite.list.component.ts b/src/app/pages/project/suite/suite-list/suite.list.component.ts
@@ -64,8 +64,12 @@ export class TestSuiteComponent implements OnInit {
     this.testSuites = result;
   }
 
-  openTestSuite(id: number) {
-    this.router.navigate([`/project/${this.projectId}/tests`], { queryParams: { suite: id } });
+  generateTestSuiteUrl(entity: TestSuite) {
+    return `/project/${entity.project_id}/tests?suite=${entity.id}`;
+  }
+
+  openTestSuite($event: TestSuite) {
+    this.router.navigate([`/project/${this.projectId}/tests`], { queryParams: { suite: $event.id } });
   }
 
   handleAction(event: { action: string, entity: TestSuite }) {
diff --git a/src/app/pages/project/suite/suite-view/testsuite.view.component.html b/src/app/pages/project/suite/suite-view/testsuite.view.component.html
@@ -63,7 +63,7 @@ <h2 class="pull-left" id="suite-view">Test Suite:</h2>
 <div class="panel-body">
   <table-filter id="test-table" *ngIf="tbCols && testSuite && testSuite.tests" #table [rowsOnPageSet]="[5,10,20]"
     [rowsOnPage]="20" [queryParams]="true" [data]="testSuite.tests" [columns]="tbCols"
-    [defaultSortBy]="sortBy" [allowDelete]="allowEdit" [allowBulkUpdate]="allowEdit" [allowBulkDelete]="allowDelete"
-    (bulkDelete)="bulkDelete($event)" (rowClick)="rowClicked($event)" (dataChange)="testUpdate($event)"
+    [defaultSortBy]="sortBy" [allowDelete]="allowEdit" [allowBulkUpdate]="allowEdit"
+    [urlGenerator]="generateTestUrl" (rowClick)="rowClicked($event)" (dataChange)="testUpdate($event)" 
     (action)="handleAction($event)" (bulkChanges)="bulkUpdate($event)"></table-filter>
 </div>
diff --git a/src/app/pages/project/suite/suite-view/testsuite.view.component.ts b/src/app/pages/project/suite/suite-view/testsuite.view.component.ts
@@ -183,8 +183,13 @@ export class TestSuiteViewComponent implements OnInit {
     }
   }
 
-  rowClicked($event: { id: string }) {
-    this.router.navigate([`/project/${this.projectId}/test/${$event.id}`]);
+  generateTestUrl(entity: Test) {
+    return `/project/${entity.project_id}/test/${entity.id}`;
+    //return `/project/${this.projectId}/test/${entity.id}`;
+  }
+
+  rowClicked($event: Test) {
+    this.router.navigate([this.generateTestUrl($event)]);
   }
 
   openTestCreation() {
diff --git a/src/app/pages/project/testrun/testrun-list/testrun-list.component.html b/src/app/pages/project/testrun/testrun-list/testrun-list.component.html
@@ -15,7 +15,8 @@
       <div class="col-sm-12">
         <table-filter #testrunsTable *ngIf="tbCols && labels" [allowDelete]="allowDelete" [allowBulkDelete]="allowDelete" (bulkDelete)="bulkDelete($event)"
           [allowExport]="true" [data]="testruns" (shownData)="tableDataUpdate($event)" [columns]="tbCols" [hiddenColumns]="hiddenCols" [defaultSortBy]="sortBy"
-          [queryParams]="true" (rowClick)="rowClicked($event)" (dataChange)="testrunUpdate($event)" (action)="handleAction($event)"></table-filter>
+          [queryParams]="true" [urlGenerator]="generateTestRunUrl" (rowClick)="rowClicked($event)" (dataChange)="testrunUpdate($event)"
+          (action)="handleAction($event)"></table-filter>
       </div>
     </div>
   </div>
diff --git a/src/app/pages/project/testrun/testrun-list/testrun-list.component.ts b/src/app/pages/project/testrun/testrun-list/testrun-list.component.ts
@@ -87,8 +87,12 @@ export class TestRunsComponent implements OnInit {
     this.testrunStatsFiltered = this.testrunStats.filter(stat => $event.find(testrun => testrun.id === stat.id));
   }
 
+  generateTestRunUrl(entity: TestRun): string {
+    return `/project/${entity.project_id}/testrun/${entity.id}`
+  }
+
   rowClicked($event: TestRun) {
-    this.router.navigate([`/project/${$event.project_id}/testrun/${$event.id}`]);
+    this.router.navigate([this.generateTestRunUrl($event)]);
   }
 
   bulkDelete(testruns: TestRun[]) {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "aquality-tracking-ui",`
`3`		`- "version": "1.4.4",`
	`3`	`+ "version": "1.4.5",`
`4`	`4`	`"scripts": {`
`5`	`5`	`"ng": "ng",`
`6`	`6`	`"start": "ng serve",`
Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,12 @@ export class AuditComponent implements OnInit {`
`98`	`98`	`BlobUtils.download(result.blob, filename);`
`99`	`99`	`}`
`100`	`100`
`101`		`- rowClicked($event) {`
`102`		- this.router.navigate([`/audit/${$event.id}`]);
	`101`	`+ generateAuditUrl(entity: AuditStat) {`
	`102`	+ return`/audit/${entity.id}`;
	`103`	`+ }`
	`104`	`+`
	`105`	`+ rowClicked($event: AuditStat) {`
	`106`	`+ this.router.navigate([this.generateAuditUrl($event)]);`
`103`	`107`	`}`
`104`	`108`
`105`	`109`	`createColumns() {`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,12 @@ export class CustomerComponent implements OnInit {`
`62`	`62`	`];`
`63`	`63`	`}`
`64`	`64`
`65`		`- rowClicked($event) {`
`66`		- this.router.navigate([`/customer/${$event.id}`]);
	`65`	`+ generateCustomerUrl(entity: Customer) {`
	`66`	+ return`/customer/${entity.id}`;
	`67`	`+ }`
	`68`	`+`
	`69`	`+ rowClicked($event: Customer) {`
	`70`	`+ this.router.navigate([this.generateCustomerUrl($event)]);`
`67`	`71`	`}`
`68`	`72`
`69`	`73`	`handleAction($event) {`
Original file line number	Diff line number	Diff line change
`@@ -142,8 +142,12 @@ export class IssueListComponent implements OnInit {`
`142`	`142`	`this.hideCreateModal = true;`
`143`	`143`	`}`
`144`	`144`
`145`		`- rowClicked(issue: Issue) {`
`146`		- return this.router.navigate([`/project/${this.route.snapshot.params['projectId']}/issue/${issue.id}`]);
	`145`	`+ generateIssueUrl(entity: Issue) {`
	`146`	+ return `/project/${this.route.snapshot.params['projectId']}/issue/${entity.id}`;
	`147`	`+ }`
	`148`	`+`
	`149`	`+ rowClicked($event: Issue) {`
	`150`	`+ return this.router.navigate([this.generateIssueUrl($event)]);`
`147`	`151`	`}`
`148`	`152`
`149`	`153`	`private async updateList() {`