Add Sync suite feature

Author: VladislavKostyukevich

src/app/elements/table/table.filter.component.ts

@@ -39,6 +39,7 @@ export class TableFilterComponent implements OnInit, AfterViewInit, OnDestroy, O
   @Input() actionsHeader = true;
   @Input() allowRefresh = false;
   @Input() allowBulkUpdate = false;
+  @Input() withSelector = false;
 
   @Output() createEntity = new EventEmitter();
   @Output() dataChange = new EventEmitter();
@@ -116,7 +117,7 @@ export class TableFilterComponent implements OnInit, AfterViewInit, OnDestroy, O
     if (this.allowDelete || this.allowCreate || this.allowBulkUpdate) {
       this.columns.push({ name: 'Action', property: 'action', type: 'button', editable: true });
     }
-    if (this.allowBulkUpdate) {
+    if (this.allowBulkUpdate || this.withSelector) {
       this.columns.unshift({ name: 'Selector', property: 'ft_select', type: 'selector', editable: true, class: 'fit' });
     }
   }
@@ -185,7 +186,7 @@ export class TableFilterComponent implements OnInit, AfterViewInit, OnDestroy, O
   }
 
   bulkUpdate() {
-    const entitiesToUpdate = this.filteredData.filter(entity => entity.ft_select === true || entity.ft_select === 1);
+    const entitiesToUpdate = this.getSelectedEntitites();
     entitiesToUpdate.forEach(entity => {
       for (const property in this.bulkChangeEntity) {
         if (property) {
@@ -198,6 +199,10 @@ export class TableFilterComponent implements OnInit, AfterViewInit, OnDestroy, O
     this.bulkChangeEntity = {};
   }
 
+  getSelectedEntitites() {
+    return this.filteredData.filter(entity => entity.ft_select === true || entity.ft_select === 1);
+  }
+
   manageColumns() {
     this.hideManageColumnsModal = false;
   }

src/app/pages/project/project.module.ts

@@ -54,6 +54,7 @@ import { StepsListComponent } from './steps/steps-list/steps-list.component';
 import { StepsService } from '../../services/steps.service';
 import { StepsContainerComponent } from './test/steps-container/steps-container.component';
 import { TestViewCanDeactivate } from '../../shared/guards/can-deactivate-guard.service';
+import { SyncSuiteModalComponent } from './testsuite/sync-suite-modal/sync-suite-modal.component';
 
 @NgModule({
   imports: [
@@ -95,7 +96,8 @@ import { TestViewCanDeactivate } from '../../shared/guards/can-deactivate-guard.
     SuiteDashboardComponent,
     StepsListComponent,
     StepsContainerComponent,
-    SafePipe
+    SafePipe,
+    SyncSuiteModalComponent
   ],
   providers: [
     ProjectService,

src/app/pages/project/testsuite/sync-suite-modal/sync-suite-modal.component.css

@@ -0,0 +1,34 @@
+.mt-overlay{
+  display: block;
+}
+
+.simple-modal{
+  top: 220px;
+}
+
+.modal-message{
+  max-height: 500px;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  border-bottom: solid 1px lightgray;
+}
+
+.panel-body {
+  padding-bottom: 10px;
+}
+
+.table-holder {
+  padding-bottom: 0px;
+  padding-top: 0px;
+  max-height: 700px;
+  overflow: auto;
+}
+
+.modal-buttons label {
+  margin-top: 15px;
+  text-transform: none;
+}
+
+.modal-buttons input{
+  margin-top: 20px;
+}

src/app/pages/project/testsuite/sync-suite-modal/sync-suite-modal.component.html

@@ -0,0 +1,54 @@
+<div class="overlay mt-overlay">
+    <div class="simple-modal panel" [ngClass]="{
+        'panel-warning':type=='warning',
+        'panel-danger':type=='error',
+        'panel-info':type=='info',
+        'panel-success':type=='success',
+        'panel-primary':type==''
+    }">
+        <div class="panel-heading col-sm-12">
+            <h4 class="panel-title pull-left">{{title}}</h4>
+            <span (click)="hideModal()" class="glyphicon glyphicon-remove clickable-element pull-right"
+                aria-hidden="true"></span>
+        </div>
+        <div class="panel-body">
+            <div class="col-sm-12 modal-message">
+                <div class="col-sm-7">
+                    <lookup-autocomplete id="sync-suite-selector" [allowEmptyValue]="false"
+                        [propertiesToShow]="['name']" [array]="suites" [model]="suite" [disabled]="false"
+                        placeholder="Select Suite" (modelChange)="suiteChange($event)" title="Suite to sync">
+                    </lookup-autocomplete>
+                </div>
+                <div class="col-sm-2">
+                    <input id="not-executed-for" class="form-control" placeholder="#" [(ngModel)]="notExecutedFor"
+                        title="Number of Not Executed results in a row" />
+                </div>
+                <div class="col-sm-2">
+                    <button id="find-tests-to-sync" (click)="findTests()" class="btn btn-success">Find
+                        Tests</button>
+                </div>
+            </div>
+            <div class="col-sm-12 modal-buttons">
+                <div class="col-sm-7">
+                    <label for="remove-not-executed">Remove 'Not Executed' results till first meaningful</label>
+                </div>
+                <div class="col-sm-1">
+                    <input type="checkbox" id="remove-not-executed" [(ngModel)]="removeNotExecuted"
+                        title="Check if you want to remove all Not Executed results till first meaningful result." />
+                </div>
+                <div class="col-sm-4 modal-buttons-form">
+                    <button [id]="button.name" autofocus (click)="accept(button.execute)"
+                        [disabled]="button.execute && !suite" class="btn btn-sm btn-default"
+                        *ngFor="let button of buttons">{{button.name}}</button>
+                </div>
+            </div>
+        </div>
+
+        <div class="table-holder panel-body">
+            <table-filter id="sync-test-table" *ngIf="cols" #syncTestTable [rowsOnPage]="10" [queryParams]="false"
+                [data]="tests" [columns]="cols" [defaultSortBy]="{ property: 'name', order: 'desc' }"
+                [columnManagement]="false" [rowsOnPageSet]="[10]" [withSelector]="true">
+            </table-filter>
+        </div>
+    </div>
+</div>

src/app/pages/project/testsuite/sync-suite-modal/sync-suite-modal.component.ts

@@ -0,0 +1,75 @@
+import { Component, Input, Output, EventEmitter, OnInit, ViewChild } from '@angular/core';
+import { BasePopupComponent } from '../../../../elements/modals/basePopup.component';
+import { Test } from '../../../../shared/models/test';
+import { SimpleRequester } from '../../../../services/simple-requester';
+import { TestSuite } from '../../../../shared/models/testSuite';
+import { TableFilterComponent } from '../../../../elements/table/table.filter.component';
+import { TestSuiteService } from '../../../../services/testSuite.service';
+
+@Component({
+    selector: 'sync-suite-modal',
+    templateUrl: 'sync-suite-modal.component.html',
+    styleUrls: ['sync-suite-modal.component.css'],
+    providers: [
+        SimpleRequester
+    ]
+})
+export class SyncSuiteModalComponent extends BasePopupComponent implements OnInit {
+    title = 'Sync suite';
+    @Input() type = 'info';
+    @Input() buttons = [{ name: 'Sync', execute: true }, { name: 'Cancel', execute: false }];
+    @Input() suites: TestSuite[];
+    @Input() suite: TestSuite;
+    @Output() testSyncTo = new EventEmitter();
+    @ViewChild(TableFilterComponent) syncTestTable: TableFilterComponent;
+    tests: Test[] = [];
+    testsToSync: Test[] = [];
+    notExecutedFor = 5;
+    removeNotExecuted = true;
+    cols = [
+        {
+            name: 'Name',
+            property: 'name',
+            filter: true,
+            sorting: true,
+            type: 'text'
+        }
+    ];
+
+    constructor(
+        private testSuiteService: TestSuiteService,
+    ) {
+        super();
+    }
+
+    async accept(execute: boolean) {
+        this.testsToSync = this.syncTestTable.getSelectedEntitites();
+        if (execute) {
+            if (this.testsToSync.length > 0) {
+                if (this.testsToSync.length > 50) {
+                    this.testSuiteService.handleInfo(`You are running synchronization for ${this.testsToSync.length},
+                     be patient it will take some time.`);
+                }
+                await this.testSuiteService.syncSuite(this.testsToSync, this.suite.id, this.removeNotExecuted);
+                this.testSuiteService.handleSuccess('Tests were synchronized!');
+            } else {
+                this.testSuiteService.handleWarning('No tests selected', 'You should select at least one test to sync!');
+                return;
+            }
+        }
+        this.onClick(execute);
+    }
+
+    suiteChange(suite: TestSuite) {
+        this.suite = suite;
+    }
+
+    async findTests() {
+        this.tests = await this.testSuiteService.findTestToSync(this.notExecutedFor, this.suite.id);
+        if (this.tests.length < 1) {
+            this.testSuiteService.handleWarning('No tests found',
+                `No test were stored with Not Executed result for at least ${this.notExecutedFor
+                } last test runs for ${this.suite.name} suite!`);
+        }
+    }
+}

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

@@ -26,6 +26,7 @@ import { TableFilterComponent } from '../../../../elements/table/table.filter.co
 })
 export class TestSuiteViewComponent implements OnInit {
   hideMoveModal = true;
+  syncTestsModal = false;
   MoveModalTitle = 'Move Test';
   hideModal = true;
   removeModalTitle: string;
@@ -254,8 +255,8 @@ export class TestSuiteViewComponent implements OnInit {
     this.hideModal = false;
   }
 
-  execute($event: any) {
-    if ($event) {
+  async execute(answer: any) {
+    if (await answer) {
       this.testService.removeTest(this.testToRemove).subscribe();
       this.testSuite.tests = this.testSuite.tests.filter(x => x !== this.testToRemove);
     }
@@ -270,8 +271,8 @@ export class TestSuiteViewComponent implements OnInit {
     this.hideMoveModal = false;
   }
 
-  moveToExecute($event) {
-    if ($event) {
+  moveToExecute(answer) {
+    if (answer) {
       this.testSuiteService.getTestSuiteWithChilds({ id: this.route.snapshot.params['testsuiteId'] }).then(testSuites => {
         this.testSuite = testSuites[0];
         this.child.data = this.testSuite.tests;
@@ -295,7 +296,16 @@ export class TestSuiteViewComponent implements OnInit {
     this.hideMoveModal = true;
   }
 
+  syncSuiteClosed() {
+    this.syncTestsModal = false;
+  }
+
   syncSuite() {
-    this.testSuiteService.syncSuite(this.testSuite, 5, true);
+    this.syncTestsModal = true;
+  }
+
+  async syncTests(answer) {
+    await answer;
+    this.syncSuiteClosed();
   }
 }

src/app/pages/project/testsuite/view/testsuite.view.component.html

@@ -5,6 +5,8 @@
   <move-test-modal *ngIf="!hideMoveModal" [title]="MoveModalTitle" [tests]="testSuite.tests"
     [buttons]="[{name:'Move', execute:true }, {name:'Cancel', execute:false}]" (execute)="moveToExecute($event)"
     (closed)="moveToWasClosed($event)"></move-test-modal>
+  <sync-suite-modal *ngIf="syncTestsModal" [suites]="testSuites" (execute)="syncTests($event)"
+    (closed)="syncSuiteClosed($event)" [suite]="selectedTestSuite"></sync-suite-modal>
   <div class="row">
     <div class="col-sm-4">
       <h2 class="pull-left" id="suite-view">Test Suite:</h2>

src/app/services/simple-requester.ts

@@ -36,12 +36,12 @@ export class SimpleRequester extends Http {
     }
   }
 
-  public doPost(url: string, object?) {
+  public doPost(url: string, object?, params: { [key: string]: any | any[]; } = null, showLoading: boolean = false) {
     let jsonString = JSON.stringify(object);
     if (typeof jsonString === 'undefined') { jsonString = '{}'; }
     const headers = new Headers();
     this.createAuthorizationHeader(headers);
-    return this.intercept(super.post(this.api + url, jsonString, { headers: headers }), true);
+    return this.intercept(super.post(this.api + url, jsonString, { headers: headers, params }), showLoading);
   }
 
   public doPut(url: string, object?) {
@@ -90,6 +90,7 @@ export class SimpleRequester extends Http {
   intercept(observable: Observable<Response>, showLoading: boolean, handleError: boolean = true): Observable<Response> {
     if (showLoading) {
       this.globaldata.requestQuery++;
+      this.turnOnModal();
     }
     return observable
       .catch((err, source) => {
@@ -155,4 +156,11 @@ export class SimpleRequester extends Http {
       message
     );
   }
+
+  handleInfo(message: string) {
+    this.notificationsService.info(
+      `Information`,
+      message
+    );
+  }
 }

src/app/services/test.service.ts

@@ -52,6 +52,6 @@ export class TestService extends SimpleRequester {
 
   removeTest(test: Test) {
     return this.doDelete(`/test?id=${test.id}&projectId=${test.project_id}`)
-    .map(() => this.handleSuccess(`Test '${test.name}' was deleted.`));
+      .map(() => this.handleSuccess(`Test '${test.name}' was deleted.`));
   }
 }

src/app/services/testSuite.service.ts

@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import 'rxjs/add/operator/map';
 import { SimpleRequester } from './simple-requester';
 import { TestSuite, SuiteDashboard } from '../shared/models/testSuite';
+import { Test } from '../shared/models/test';
 
 
 @Injectable()
@@ -51,7 +52,11 @@ export class TestSuiteService extends SimpleRequester {
     return this.doPost(`/suite/dashboard`, suiteDashboard).map(res => res.json()).toPromise();
   }
 
-  syncSuite(testSuite: TestSuite, notExecutedFor: number, removeNotExecutedResults: boolean) {
-    return this.doGet(`/suite/sync`, {id: testSuite.id, notExecutedFor, removeNotExecutedResults}).map(res => res).toPromise();
+  syncSuite(tests: Test[], suiteId: number, removeNotExecutedResults: boolean) {
+    return this.doPost(`/suite/sync`, tests, { suiteId, removeNotExecutedResults }, true).map(res => res).toPromise();
+  }
+
+  findTestToSync(notExecutedFor: number, suiteId: number): Promise<Test[]> {
+    return this.doGet('/suite/sync', { notExecutedFor, suiteId }, true).map(res => res.json()).toPromise();
   }
 }