Merge branch 'feature/refactor_permissions_service' into bugfix/date_filter_on_testrun_view

Author: VladislavKostyukevich

.circleci/config.yml

@@ -49,7 +49,7 @@ jobs:
           command: |
             export NVM_DIR="/opt/circleci/.nvm"
             [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-            export TESTRUNID="$(npm run aquality:start -- ${TOKEN} All Docker_Chrome build_${CIRCLE_BUILD_NUM})"
+            export TESTRUNID="$(npm run aquality:start -- ${TOKEN} All Docker_Chrome build_${CIRCLE_BUILD_NUM}_${CIRCLE_BRANCH})"
             export TESTRUNID=${TESTRUNID##*$'\n'}
             echo $TESTRUNID
             echo "export TESTRUNID=$TESTRUNID" >> $BASH_ENV

src/app/pages/audit/audit-view/audit.info.component.ts

@@ -96,7 +96,6 @@ export class AuditInfoComponent implements OnInit {
 
   async updateCanEdit() {
     this.canEdit = this.isAuditAdmin || this.isAuditorOfAudit() && this.audit.status.id !== 4;
-    console.log(this.canEdit)
   }
 
   isAuditorOfAudit() {

src/app/pages/project/results/results-grid/results.grid.component.ts

@@ -210,7 +210,7 @@ export class ResultGridComponent implements OnInit {
     const queryParam = {};
     queryParam['selectedResult'] = testResultId;
     this.router.navigate([], { queryParams: queryParam, queryParamsHandling: 'merge' }).then(() => {
-      this.router.navigate(['/project/' + this.projectId + '/testresult/' + testResultId]);
+      this.router.navigate([`/project/${this.projectId}/testresult/${testResultId}`]);
     });
   }
 

src/app/pages/project/testrun/testrun-view/testrun.view.component.ts

@@ -60,7 +60,7 @@ export class TestRunViewComponent implements OnInit {
       && await this.permissions.hasProjectPermissions(this.projectId,
         [EGlobalPermissions.manager], [ELocalPermissions.manager, ELocalPermissions.admin, ELocalPermissions.engineer]);
     this.canEdit = await this.permissions.hasProjectPermissions(this.projectId,
-      [EGlobalPermissions.manager], [ELocalPermissions.manager, ELocalPermissions.engineer]);
+      [EGlobalPermissions.manager], [ELocalPermissions.manager, ELocalPermissions.admin, ELocalPermissions.engineer]);
 
     this.testRun = (await this.testRunService.getTestRunWithChilds({ id: this.route.snapshot.params.testRunId }))[0];
     this.milestones = await this.milestoneService.getMilestone({ project_id: this.projectId });