From 4cfe74c3b20097a42b0b1c708c6973eaa1f68d97 Mon Sep 17 00:00:00 2001
From: Ludek Novy <13610612+ludeknovy@users.noreply.github.com>
Date: Fri, 7 Apr 2023 22:32:39 +0200
Subject: [PATCH] external link (#317)

---
 src/app/item-detail/item-detail.component.html        |  8 +++++++-
 src/app/item-detail/item-detail.component.ts          |  4 +---
 src/app/items-api.service.ts                          |  3 ++-
 src/app/items.service.model.ts                        |  1 +
 .../scenario/add-new-item/add-new-item.component.html |  9 +++++++++
 .../scenario/add-new-item/add-new-item.component.ts   | 10 ++++++----
 src/app/scenario/item-controls/item-controls.model.ts |  1 +
 .../shared-item/edit-item/edit-item.component.html    |  8 ++++++++
 .../shared-item/edit-item/edit-item.component.ts      | 11 ++++++++---
 9 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/src/app/item-detail/item-detail.component.html b/src/app/item-detail/item-detail.component.html
index d3cc547f..228d8716 100644
--- a/src/app/item-detail/item-detail.component.html
+++ b/src/app/item-detail/item-detail.component.html
@@ -16,7 +16,7 @@
             class="fas fa-bars"></i></button>
         <div class="dropdown-menu jtl-dropdown-control-menu" ngbDropdownMenu>
           <app-edit-item *ngIf="itemData.environment"
-            [itemDetailData]="{note: itemData.note, environment: itemData.environment, hostname: itemData.hostname, isBase: itemData.isBase, params: itemParams, name: itemData.name}"
+            [itemDetailData]="{note: itemData.note, resourcesLink: itemData.resourcesLink, environment: itemData.environment, hostname: itemData.hostname, isBase: itemData.isBase, params: itemParams, name: itemData.name}"
             (itemDetailChange)="itemDetailChanged($event)"></app-edit-item>
           <app-share [params]=itemParams></app-share>
           <app-delete-item *ngIf="itemData.reportStatus !== 'in_progress'" [itemData]="itemParams"></app-delete-item>
@@ -273,6 +273,12 @@ <h6 class="card-header bg-white border-0">Summary</h6>
                   <div class="col-sm mb-1 summary-bold">Note</div>
                   <div class="col-sm mb-1">{{itemData.note}}</div>
                 </div>
+                <div class="row">
+                  <i class="fas fa-external-link text-carrot"></i>
+                  <div class="col-sm mb-1 summary-bold">External Link</div>
+                  <div class="col-sm mb-1"><a target="_blank" href="{{itemData.resourcesLink}}"><i class="fas fa-link"></i> <span> Resources</span>
+                  </a></div>
+                </div>
                 <div class="row" *ngIf="itemData.monitoring.cpu.data.length > 0">
                   <div class="col-sm mb-1 summary-bold">Max CPU usage</div>
                   <div class="col-sm mb-1">{{itemData.monitoring.cpu.max}}%  <app-monitoring-stats [data]="itemData.monitoring.cpu.data">
diff --git a/src/app/item-detail/item-detail.component.ts b/src/app/item-detail/item-detail.component.ts
index f9281ddf..609b30d1 100644
--- a/src/app/item-detail/item-detail.component.ts
+++ b/src/app/item-detail/item-detail.component.ts
@@ -35,6 +35,7 @@ export class ItemDetailComponent implements OnInit, OnDestroy {
     baseId: null,
     note: null,
     plot: null,
+    resourcesLink: null,
     extraPlotData: null,
     reportStatus: null,
     histogramPlotData: null,
@@ -56,9 +57,7 @@ export class ItemDetailComponent implements OnInit, OnDestroy {
   statusChartOptions;
   updateChartFlag = false;
   updateScatterChartFlag = false;
-  monitoringChart;
   itemParams;
-  hasErrorsAttachment;
   Math: any;
   token: string;
   isAnonymous = false;
@@ -68,7 +67,6 @@ export class ItemDetailComponent implements OnInit, OnDestroy {
   performanceAnalysisLines = null;
   externalSearchTerm = null;
   totalRequests = null;
-  overallChart = null;
 
 
   constructor(
diff --git a/src/app/items-api.service.ts b/src/app/items-api.service.ts
index 96c4eb97..eee275d8 100644
--- a/src/app/items-api.service.ts
+++ b/src/app/items-api.service.ts
@@ -30,7 +30,7 @@ export class ItemsApiService {
   }
 
   addNewTestItem(projectName: string, scenarioName: string,
-    environment: string = null, note, hostname, status, kpiFile, name, errorFile?, monitoringFile?) {
+    environment: string = null, note, hostname, status, kpiFile, name, resourcesLink, errorFile?, monitoringFile?) {
     const headers = new HttpHeaders();
     headers.set("Content-Type", null);
     headers.set("Accept", "multipart/form-data");
@@ -41,6 +41,7 @@ export class ItemsApiService {
     formData.append("hostname", hostname);
     formData.append("status", status);
     formData.append("name", name);
+    formData.append("resourcesLink", resourcesLink);
     if (errorFile) {
       formData.append("errors", errorFile);
     }
diff --git a/src/app/items.service.model.ts b/src/app/items.service.model.ts
index 8c6e6d8c..4b8ee71b 100644
--- a/src/app/items.service.model.ts
+++ b/src/app/items.service.model.ts
@@ -35,6 +35,7 @@ export interface ItemDetail {
   baseId: string;
   name: string;
   note: string;
+  resourcesLink?: string;
   hostname: string;
   environment: string;
   plot: ItemDataPlot;
diff --git a/src/app/scenario/add-new-item/add-new-item.component.html b/src/app/scenario/add-new-item/add-new-item.component.html
index 8627ecd0..9fd72b9c 100644
--- a/src/app/scenario/add-new-item/add-new-item.component.html
+++ b/src/app/scenario/add-new-item/add-new-item.component.html
@@ -46,6 +46,15 @@ <h5 class="modal-title" id="modal-basic-title">Add test run</h5>
           aria-describedby="inputGroup-sizing-default">
       </div>
 
+      <div class="form-group mb-3">
+        <label for="resourcesLink">External Link</label>
+        <input type="hostname" id="resourcesLink" class="form-control" formControlName="resourcesLink" aria-label="Default"
+               aria-describedby="inputGroup-sizing-default">
+        <div class="form-control-feedback" *ngIf="resourcesLink.errors && (resourcesLink.dirty || resourcesLink.touched)">
+          <p class="form-validation-error" *ngIf="resourcesLink.errors.maxlenght">Link is too long. Max length is 350.</p>
+        </div>
+      </div>
+
       <div class="form-group mb-3">
         <label for="status">Status</label>
         <select id="status" class="form-control custom-select" formControlName="status">
diff --git a/src/app/scenario/add-new-item/add-new-item.component.ts b/src/app/scenario/add-new-item/add-new-item.component.ts
index d94480d8..eb9e040f 100644
--- a/src/app/scenario/add-new-item/add-new-item.component.ts
+++ b/src/app/scenario/add-new-item/add-new-item.component.ts
@@ -19,7 +19,6 @@ import { ScenarioService } from "src/app/scenario.service";
 
 })
 export class AddNewItemComponent implements OnInit {
-  closeResult: string;
   addItemForm: FormGroup;
   kpiFile: FormControl;
   monitoringFile: FormControl;
@@ -28,6 +27,7 @@ export class AddNewItemComponent implements OnInit {
   status: FormControl;
   hostname: FormControl;
   name: FormControl;
+  resourcesLink: FormControl;
   routeParams;
   statuses = Object.values(ItemStatus);
   DEFAULT_STATUS = ItemStatus.None;
@@ -67,6 +67,7 @@ export class AddNewItemComponent implements OnInit {
     this.name = new FormControl("", [
       Validators.maxLength(200)
     ])
+    this.resourcesLink = new FormControl("", [Validators.maxLength(350)])
   }
 
   createForm() {
@@ -77,7 +78,8 @@ export class AddNewItemComponent implements OnInit {
       note: this.note,
       hostname: this.hostname,
       status: this.status,
-      name: this.name
+      name: this.name,
+      resourcesLink: this.resourcesLink
     });
   }
 
@@ -96,12 +98,12 @@ export class AddNewItemComponent implements OnInit {
     this.formCheck();
     if (this.addItemForm.valid) {
       this.spinner.show();
-      const { kpiFile, errorFile, monitoringFile, environment, note, hostname, status, name } = this.addItemForm.value;
+      const { kpiFile, errorFile, monitoringFile, environment, note, hostname, status, name, resourcesLink } = this.addItemForm.value;
       this.itemsApiService.addNewTestItem(
         this.routeParams.projectName,
         this.routeParams.scenarioName,
         environment, note, hostname, ItemStatusValue[status],
-        kpiFile, name, errorFile, monitoringFile)
+        kpiFile, name, resourcesLink, errorFile, monitoringFile)
         .pipe(catchError(r => of(r)))
         .subscribe(_ => {
           const message = this.notification.newTestItemNotificationMessage(_);
diff --git a/src/app/scenario/item-controls/item-controls.model.ts b/src/app/scenario/item-controls/item-controls.model.ts
index 07bcdec0..0ebbce42 100644
--- a/src/app/scenario/item-controls/item-controls.model.ts
+++ b/src/app/scenario/item-controls/item-controls.model.ts
@@ -11,4 +11,5 @@ export interface ItemInput {
   hostname?: string;
   params: ItemParams;
   name: string;
+  resourcesLink?: string;
 }
diff --git a/src/app/shared/shared-item/edit-item/edit-item.component.html b/src/app/shared/shared-item/edit-item/edit-item.component.html
index 4d060078..e9da9901 100644
--- a/src/app/shared/shared-item/edit-item/edit-item.component.html
+++ b/src/app/shared/shared-item/edit-item/edit-item.component.html
@@ -17,6 +17,14 @@ <h5 class="modal-title" id="modal-basic-title">Edit test item</h5>
         <input type="input" id="note" class="form-control" formControlName="note" aria-label="Default"
           aria-describedby="inputGroup-sizing-default">
       </div>
+      <div class="form-group mb-3">
+        <label for="resourcesLink">External Link</label>
+        <input type="input" id="resourcesLink" class="form-control" formControlName="resourcesLink" aria-label="Default"
+               aria-describedby="inputGroup-sizing-default">
+        <div class="form-control-feedback" *ngIf="resourcesLink.errors && (resourcesLink.dirty || resourcesLink.touched)">
+          <p class="form-validation-error" *ngIf="resourcesLink.errors.maxlength">Link is too long. Max length is 350.</p>
+        </div>
+      </div>
       <div class="form-group mb-3">
         <label for="environment">Environment <span class="text-danger">*</span></label>
         <input type="testName" id="environment" class="form-control" formControlName="environment" aria-label="Default"
diff --git a/src/app/shared/shared-item/edit-item/edit-item.component.ts b/src/app/shared/shared-item/edit-item/edit-item.component.ts
index be1e949d..13f07d69 100644
--- a/src/app/shared/shared-item/edit-item/edit-item.component.ts
+++ b/src/app/shared/shared-item/edit-item/edit-item.component.ts
@@ -24,6 +24,7 @@ export class EditItemComponent implements OnInit {
   isBase;
   disabled;
   name;
+  resourcesLink;
 
   @Input() reloadItems: boolean;
   @Input() itemDetailData: ItemInput;
@@ -59,6 +60,8 @@ export class EditItemComponent implements OnInit {
     this.name = new FormControl(this.itemDetailData.name, [
       Validators.maxLength(200)
     ])
+    this.resourcesLink = new FormControl(this.itemDetailData.resourcesLink,
+      [Validators.maxLength(350)])
   }
 
   createForm() {
@@ -67,7 +70,8 @@ export class EditItemComponent implements OnInit {
       environment: this.environment,
       hostname: this.hostname,
       base: this.base,
-      name: this.name
+      name: this.name,
+      resourcesLink: this.resourcesLink,
     });
   }
 
@@ -77,9 +81,10 @@ export class EditItemComponent implements OnInit {
 
   onSubmit() {
     if (this.myform.valid) {
-      const { note, environment, base, hostname, name } = this.myform.value;
+      const { note, environment, base, hostname, name, resourcesLink } = this.myform.value;
       const { projectName, id, scenarioName } = this.itemDetailData.params;
-      this.itemsApiService.updateItemInfo(id, projectName, scenarioName, { environment, note, base, hostname, name })
+      this.itemsApiService.updateItemInfo(id, projectName, scenarioName,
+        { environment, note, base, hostname, name, resourcesLink })
         .pipe(catchError(r => of(r)))
         .subscribe(_ => {
           this.itemDetailChange.emit({ note, environment, hostname, name });