Merge pull request #104 from aquality-automation/feature/fix_external_issue_link

VladislavKostyukevich · web-flow · commit 60e245c8c4d6 · 2020-05-05T16:07:01.000+03:00
Feature/fix external issue link
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ Features:
 
 Bugfixes:
   - Test run View Page performance is bad -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/99)
+  - External Link does not work on Issues List -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/97)
 
 ## 0.3.9 (2020-04-21)
 
diff --git a/e2e/pages/issues/list.po/constants.ts b/e2e/pages/issues/list.po/constants.ts
@@ -16,6 +16,7 @@ export const columns = {
     resolution: 'Resolution',
     status: 'Status',
     title: 'Title',
-    assignee: 'Assignee'
+    assignee: 'Assignee',
+    externalIssue: 'External Issue'
 };
 
diff --git a/e2e/pages/issues/list.po/index.ts b/e2e/pages/issues/list.po/index.ts
@@ -58,6 +58,10 @@ class IssuesList extends BasePage {
     isIssuePresent(title: string): any {
         return elements.issuesTable.isRowExists(title, columns.title);
     }
+
+    openExternalIssueLink(title: string) {
+        return elements.issuesTable.clickCellLink(columns.externalIssue, title, columns.title)
+    }
 }
 
 export const issuesList = new IssuesList();
diff --git a/e2e/specs/issues/issues.list.spec.ts b/e2e/specs/issues/issues.list.spec.ts
@@ -9,6 +9,7 @@ import { issueView } from '../../pages/issues/view.po';
 import usersTestData from '../../data/users.json';
 import using from 'jasmine-data-provider';
 import resolutions from '../../data/resolutions.json';
+import { browser } from 'protractor';
 
 const editorExamples = {
     localManager: usersTestData.localManager,
@@ -24,8 +25,10 @@ const notEditorExamples = {
 const issue: Issue = {
     resolution_id: 1,
     title: 'Issue list example',
-    status_id: 1
+    status_id: 1,
+    external_url: 'https://github.com/aquality-automation/aquality-tracking',
 };
+
 let createdIssue: Issue;
 
 describe('Issues List:', () => {
@@ -101,6 +104,15 @@ describe('Issues List:', () => {
                     .toBe(`${usersTestData.localEngineer.first_name} ${usersTestData.localEngineer.second_name}`
                         , 'Status was not updated!');
             });
+            
+            it('I can open external issue link', async () => {
+                browser.ignoreSynchronization = true;
+                await issuesList.openExternalIssueLink(createdIssue.title);
+                await expect(browser.getCurrentUrl()).toBe(createdIssue.external_url, 'Should be navigated to github!');
+                await browser.navigate().back();
+                browser.ignoreSynchronization = false;
+
+            });
 
             it('I can open Issue by clicking row', async () => {
                 await issuesList.openIssue(createdIssue.title);
diff --git a/e2e/specs/milestone/milestoneView.spec.ts b/e2e/specs/milestone/milestoneView.spec.ts
@@ -224,15 +224,15 @@ describe('Milestone:', () => {
                 await milestoneView.notification.assertIsSuccess(`The milestone '${milestones.version3.name}' was updated.`);
                 await expect(milestoneView.isWarningPresent()).toBe(true, 'Warning should present when due date is today!');
                 return expect(milestoneView.getWarningTitle())
-                    .toBe(`Today is the last day for the '${milestones.version3.name}' Milestone`);
+                    .toBe(`Today is the last day for the '${milestones.version3.name}' Milestone`, `Title is wrong! Current date: ${new Date()}, Due date: ${date}`);
             });
 
             it('I can see warning when Due date is in past', async () => {
                 const date = new Date();
                 date.setDate(date.getDate() - 1);
                 await milestoneView.setDueDate(date);
                 await milestoneView.notification.assertIsSuccess(`The milestone '${milestones.version3.name}' was updated.`);
-                await expect(milestoneView.isWarningPresent()).toBe(true, 'Warning should present when due date is in past!');
+                await expect(milestoneView.isWarningPresent()).toBe(true, `Warning should present when due date is in past! Current date: ${new Date()}, Due date: ${date}`);
                 return expect(milestoneView.getWarningTitle())
                     .toBe(`Past due by 1 day`);
             });
diff --git a/src/app/elements/table/table.filter.component.html b/src/app/elements/table/table.filter.component.html
@@ -40,17 +40,18 @@
                 </tr>
                 <tr class="names-header">
                     <th *ngFor="let col of columns" [setClass]="col.class" [id]="'tf_header_' + col.property"
-                        [sorter]="getDefaultSorter(col)"
-                        (sorted)="sort($event)" class="{{col.property}}" [ngClass]="{
+                        [sorter]="getDefaultSorter(col)" (sorted)="sort($event)" class="{{col.property}}" [ngClass]="{
                             'fit': col.type === 'checkbox' || col.property === 'action',
                             'percent':col.type === 'percent' || col.type === 'number'
                         }">
                         <fa-icon class="icon up sorter" [icon]="icons.faArrowUp" style="display: none"></fa-icon>
                         <fa-icon class="icon down sorter" [icon]="icons.faArrowDown" style="display: none"></fa-icon>
 
-                        <div *ngIf="!col.headerlink && col.type !== 'selector'" class="pull-left">{{col?.name}}{{col?.type === 'percent' ? ', %' : ''}}</div>
+                        <div *ngIf="!col.headerlink && col.type !== 'selector'" class="pull-left">
+                            {{col?.name}}{{col?.type === 'percent' ? ', %' : ''}}</div>
                         <a *ngIf="col.headerlink" class="pull-left" oncontextmenu="return false;"
-                            (contextmenu)="openlink(col.headerlink)" title="Right click to open">{{col?.name}}{{col?.type === 'percent' ? ', %' : ''}}</a>
+                            (contextmenu)="openlink(col.headerlink)"
+                            title="Right click to open">{{col?.name}}{{col?.type === 'percent' ? ', %' : ''}}</a>
                         <input *ngIf="col.type === 'selector'" name="select_all" type="checkbox"
                             [title]="selectAll ? 'Deselect All' : 'Select All'" [ngModel]="selectAll"
                             (ngModelChange)="toggleSelectAll($event)" />
@@ -77,12 +78,12 @@
                         </div>
                         <lookup class="ms-lookup-sm" [small]="true" [cutLongText]="true"
                             [model]="textFilterData(col.property)" *ngIf="col.type === 'link' && col.filter"
-                            placeholder="{{col?.name}} Filter" [allowEmptyValue]="true" [array]="col.lookup.filterValues ? col.lookup.filterValues : col.lookup.values"
+                            placeholder="{{col?.name}} Filter" [allowEmptyValue]="true"
+                            [array]="col.lookup.filterValues ? col.lookup.filterValues : col.lookup.values"
                             (modelChange)="handleFilterChange(col, $event)"></lookup>
 
                         <lookup-colored *ngIf="col.type === 'lookup-colored' && col.filter" [cutLongText]="true"
-                            [small]="true" [colorProperty]="'color'"
-                            [propertiesToShow]="col.lookup.propToShow"
+                            [small]="true" [colorProperty]="'color'" [propertiesToShow]="col.lookup.propToShow"
                             [array]="col.lookup.values"
                             [placeholder]="col.lookup.placeholder ? col.lookup.placeholder : 'None'"
                             [allowEmptyValue]="true" [model]="getLookupFilterValue(col)[0]"
@@ -107,18 +108,21 @@
                             <input placeholder="from" class="inline form-control input-sm ft-range-selector"
                                 (keyup)="rangeKeyUp($event, col)"
                                 (ngModelChange)="handleRangeFilterChange(col, $event, 'from')"
-                                [ngModel]="rangeFilterData(col.property, 'from')" type="number" min="0" [max]="col.type === 'percent' ? 100 : undefined"
+                                [ngModel]="rangeFilterData(col.property, 'from')" type="number" min="0"
+                                [max]="col.type === 'percent' ? 100 : undefined"
                                 oninput="this.value = this.value.replace(/[^0-9]/g, '');">
                             <input placeholder="to" class="inline form-control input-sm ft-range-selector"
                                 (ngModelChange)="handleRangeFilterChange(col, $event, 'to')"
-                                [ngModel]="rangeFilterData(col.property, 'to')" type="number" min="0" [max]="col.type === 'percent' ? 100 : undefined"
-                                (keyup)="rangeKeyUp($event, col)" oninput="this.value = this.value.replace(/[^0-9]/g, '');">
+                                [ngModel]="rangeFilterData(col.property, 'to')" type="number" min="0"
+                                [max]="col.type === 'percent' ? 100 : undefined" (keyup)="rangeKeyUp($event, col)"
+                                oninput="this.value = this.value.replace(/[^0-9]/g, '');">
                             <fa-icon class="icon" [icon]="icons.faTimes" (click)="removeRangeFilter(col.property)">
                             </fa-icon>
                         </div>
                         <lookup-autocomplete-multiselect class="ms-lookup-sm" [cutLongText]="true"
                             *ngIf="col.type === 'multiselect' && col.filter" placeholder="{{col?.name}} Filter"
-                            [propertiesToShow]="col.lookup.propToShow" [array]="col.lookup.filterValues ? col.lookup.filterValues : col.lookup.values"
+                            [propertiesToShow]="col.lookup.propToShow"
+                            [array]="col.lookup.filterValues ? col.lookup.filterValues : col.lookup.values"
                             [model]="getLookupFilterValue(col)"
                             (modelChange)="handleLookupFilterChange(col.property, $event)">
                         </lookup-autocomplete-multiselect>
@@ -176,8 +180,8 @@
 
                         <lookup-colored *ngIf="col.creation && col.type === 'lookup-colored'" [cutLongText]="true"
                             [small]="true" placeholder="col?.name" [allowEmptyValue]="!col.creation.required"
-                            [propertiesToShow]="col.lookup.propToShow"
-                            [array]="col.lookup.values" [model]="getFilterLookupModel(col.property)"
+                            [propertiesToShow]="col.lookup.propToShow" [array]="col.lookup.values"
+                            [model]="getFilterLookupModel(col.property)"
                             (modelChange)="setNewValueFromLookup(col.property, $event)" [colorProperty]="'color'">
                         </lookup-colored>
 
@@ -227,8 +231,7 @@
                             </lookup-autocomplete>
 
                             <lookup-colored *ngIf="col.type === 'lookup-colored'" [cutLongText]="true" [small]="true"
-                                [colorProperty]="'color'"
-                                [propertiesToShow]="col.lookup.propToShow"
+                                [colorProperty]="'color'" [propertiesToShow]="col.lookup.propToShow"
                                 [array]="col.lookup.values" placeholder="Not Assigned"
                                 [allowEmptyValue]="col.lookup.allowEmpty"
                                 [model]="transformationsService.getPropertyValue(bulkChangeEntity, col.property)"
@@ -286,8 +289,8 @@
 
                             <lookup-autocomplete *ngIf="col.type === 'lookup-autocomplete'" [cutLongText]="true"
                                 [small]="true" [allowEmptyValue]="col.lookup.allowEmpty"
-                                [allowCreation]="col.lookup.allowCreation"
-                                [propertiesToShow]="col.lookup.propToShow" [array]="col.lookup.values"
+                                [allowCreation]="col.lookup.allowCreation" [propertiesToShow]="col.lookup.propToShow"
+                                [array]="col.lookup.values"
                                 [model]="transformationsService.getPropertyValue(entity, col.property)"
                                 [disabled]="!col.editable || entity.constantRow || notEditableByProperty(entity, col)"
                                 placeholder="Not Assigned" [addAction]="col.lookup.addAction"
@@ -297,8 +300,7 @@
                             </lookup-autocomplete>
 
                             <lookup-colored *ngIf="col.type === 'lookup-colored'" [cutLongText]="true" [small]="true"
-                                [colorProperty]="'color'"
-                                [propertiesToShow]="col.lookup.propToShow"
+                                [colorProperty]="'color'" [propertiesToShow]="col.lookup.propToShow"
                                 [array]="col.lookup.values"
                                 [disabled]="!col.editable || entity.constantRow || notEditableByProperty(entity, col)"
                                 placeholder="Not Assigned" [allowEmptyValue]="col.lookup.allowEmpty"
@@ -327,6 +329,9 @@
                             <a *ngIf="!col.editable && col.link" [routerLink]="createRouterLink(col, entity)"
                                 [queryParams]="col?.link.params">{{transformationsService.getPropertyValue(entity, col.property)}}</a>
 
+                            <a *ngIf="col.type === 'externalLink' && transformationsService.getPropertyValue(entity, col.property).link"
+                                [href]="transformationsService.getPropertyValue(entity, col.property).link">{{transformationsService.getPropertyValue(entity, col.property).text}}</a>
+
                             <div
                                 *ngIf="col.type === 'link' && !transformationsService.getPropertyValue(entity, col.property).link">
                                 {{transformationsService.getPropertyValue(entity, col.property).text}}</div>
@@ -343,18 +348,21 @@
                                 (modelChange)="setPropertyValue(entity, col.property, $event)">
                             </lookup-autocomplete-multiselect>
 
-                            <div *ngIf="col.type === 'date' && col.format && (!col.editable || entity.constantRow || notEditableByProperty(entity, col))" class="nowrap">
+                            <div *ngIf="col.type === 'date' && col.format && (!col.editable || entity.constantRow || notEditableByProperty(entity, col))"
+                                class="nowrap">
                                 {{transformationsService.getPropertyValue(entity, col.property) | date:col.format}}
                             </div>
 
-                            <div *ngIf="col.type === 'date' && !col.format && (!col.editable || entity.constantRow || notEditableByProperty(entity, col))" class="nowrap">
+                            <div *ngIf="col.type === 'date' && !col.format && (!col.editable || entity.constantRow || notEditableByProperty(entity, col))"
+                                class="nowrap">
                                 {{transformationsService.getPropertyValue(entity, col.property) | date:'MM/dd/yy hh:mm:ss a'}}
                             </div>
-                            
-                            <ng-datepicker *ngIf="col.type === 'date' && col.editable && !entity.constantRow && !notEditableByProperty(entity, col)" 
+
+                            <ng-datepicker
+                                *ngIf="col.type === 'date' && col.editable && !entity.constantRow && !notEditableByProperty(entity, col)"
                                 [ngModel]="transformationsService.getPropertyValue(entity, col.property)"
-                                (ngModelChange)="setPropertyValue(entity, col.property, $event)"
-                                [options]="col.format"></ng-datepicker>
+                                (ngModelChange)="setPropertyValue(entity, col.property, $event)" [options]="col.format">
+                            </ng-datepicker>
 
                             <div
                                 *ngIf="col.type === 'time' && (!col.editable || entity.constantRow || notEditableByProperty(entity, col))">
diff --git a/src/app/elements/table/table.filter.component.ts b/src/app/elements/table/table.filter.component.ts
@@ -662,6 +662,7 @@ export class TableFilterComponent implements OnInit, AfterViewInit, OnDestroy, O
     const el: HTMLElement = $event.target;
     const canClick = (!col.editable || this.notEditableByProperty(entity, col) || el.classList.contains('ft-cell'))
       && col.type !== TFColumnType.link
+      && col.type !== TFColumnType.externalLink
       && col.type !== TFColumnType.longtext
       && col.type !== TFColumnType.autocomplete
       && !col.link;
diff --git a/src/app/elements/table/tfColumn.ts b/src/app/elements/table/tfColumn.ts
@@ -84,6 +84,7 @@ export enum TFColumnType {
     selector = 'selector',
     date = 'date',
     link = 'link',
+    externalLink = 'externalLink',
     file = 'file',
     dots = 'dots'
 }
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
@@ -164,7 +164,7 @@ export class IssueListComponent implements OnInit {
       }, {
         name: 'External Issue',
         property: 'external_link',
-        type: TFColumnType.link,
+        type: TFColumnType.externalLink,
         class: 'ft-width-250'
       },
     ];

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,10 @@ class IssuesList extends BasePage {`
`58`	`58`	`isIssuePresent(title: string): any {`
`59`	`59`	`return elements.issuesTable.isRowExists(title, columns.title);`
`60`	`60`	`}`
	`61`	`+`
	`62`	`+ openExternalIssueLink(title: string) {`
	`63`	`+ return elements.issuesTable.clickCellLink(columns.externalIssue, title, columns.title)`
	`64`	`+ }`
`61`	`65`	`}`
`62`	`66`
`63`	`67`	`export const issuesList = new IssuesList();`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ export enum TFColumnType {`
`84`	`84`	`selector = 'selector',`
`85`	`85`	`date = 'date',`
`86`	`86`	`link = 'link',`
	`87`	`+ externalLink = 'externalLink',`
`87`	`88`	`file = 'file',`
`88`	`89`	`dots = 'dots'`
`89`	`90`	`}`