From 1f422a3134a0060be7e1f768d113859ddd1b36a3 Mon Sep 17 00:00:00 2001 From: Ludek Novy <13610612+ludeknovy@users.noreply.github.com> Date: Sun, 18 Feb 2024 14:48:22 +0100 Subject: [PATCH] Edit item status (#377) --- .../item-detail/item-detail.component.html | 2 +- src/app/item-detail/item-detail.component.ts | 3 +- .../request-stats-compare.component.spec.ts | 45 +++++++++---------- src/app/items.service.model.ts | 1 + .../add-new-item/add-new-item.model.ts | 3 +- .../item-controls/item-controls.model.ts | 1 + src/app/scenario/scenario.component.html | 2 +- .../edit-item/edit-item.component.html | 8 ++++ .../edit-item/edit-item.component.ts | 30 ++++++++----- 9 files changed, 58 insertions(+), 37 deletions(-) diff --git a/src/app/item-detail/item-detail.component.html b/src/app/item-detail/item-detail.component.html index 6b3fc669..23814817 100644 --- a/src/app/item-detail/item-detail.component.html +++ b/src/app/item-detail/item-detail.component.html @@ -18,7 +18,7 @@ class="fas fa-bars">
diff --git a/src/app/item-detail/item-detail.component.ts b/src/app/item-detail/item-detail.component.ts index 4a4cfd60..e8cc4c5b 100644 --- a/src/app/item-detail/item-detail.component.ts +++ b/src/app/item-detail/item-detail.component.ts @@ -57,7 +57,8 @@ export class ItemDetailComponent implements OnInit, OnDestroy { zeroErrorToleranceEnabled: null, topMetricsSettings: null, userSettings: null, - errorSummary: null + errorSummary: null, + status: null, }; overallChartOptions; scatterChartOptions; diff --git a/src/app/item-detail/request-stats/request-stats-compare.component.spec.ts b/src/app/item-detail/request-stats/request-stats-compare.component.spec.ts index a9cd0191..8c87ff7a 100644 --- a/src/app/item-detail/request-stats/request-stats-compare.component.spec.ts +++ b/src/app/item-detail/request-stats/request-stats-compare.component.spec.ts @@ -51,6 +51,7 @@ describe("RequestStatsCompareComponent", () => { reportStatus: undefined, topMetricsSettings: undefined, zeroErrorToleranceEnabled: false, + status: "10", overview: { maxVu: 100, avgConnect: 100, @@ -84,7 +85,6 @@ describe("RequestStatsCompareComponent", () => { } }, baseId: "", - statistics: [{ avgResponseTime: 10, bytes: 758, @@ -124,26 +124,26 @@ describe("RequestStatsCompareComponent", () => { satisfaction: 4, } }, - { - avgResponseTime: 10, - bytes: 758, - errorRate: 0, - label: "03 - Click_Log_In-20", - maxResponseTime: 38, - minResponseTime: 8, - n0: 33, - n5: 34, - n9: 37, - samples: 200, - throughput: 0.17, - responseMessageFailures: [ - { responseMessage: "error", count: 1 } - ], - apdex: { - toleration: 10, - satisfaction: 40, - } - }, ], + { + avgResponseTime: 10, + bytes: 758, + errorRate: 0, + label: "03 - Click_Log_In-20", + maxResponseTime: 38, + minResponseTime: 8, + n0: 33, + n5: 34, + n9: 37, + samples: 200, + throughput: 0.17, + responseMessageFailures: [ + { responseMessage: "error", count: 1 } + ], + apdex: { + toleration: 10, + satisfaction: 40, + } + },], errorSummary: { groupedErrors: [], topErrorsByLabel: [] @@ -174,7 +174,7 @@ describe("RequestStatsCompareComponent", () => { throughput: 0.17, }], plot: { - responseTime: [{ data: [], name: "label" } ], + responseTime: [{ data: [], name: "label" }], throughput: [{ data: [], name: "label" }] }, extraPlotData: {}, @@ -199,5 +199,4 @@ describe("RequestStatsCompareComponent", () => { .toEqual(["02 - Click_Log_In-22", "03 - Click_Log_In-20"]); }); }); - }); diff --git a/src/app/items.service.model.ts b/src/app/items.service.model.ts index 74df9218..3e7c669f 100644 --- a/src/app/items.service.model.ts +++ b/src/app/items.service.model.ts @@ -62,6 +62,7 @@ export interface ItemDetail { requestStats: RequestStats }; errorSummary: ErrorSummary + status: string } interface TopMetricsSettings { diff --git a/src/app/scenario/add-new-item/add-new-item.model.ts b/src/app/scenario/add-new-item/add-new-item.model.ts index b0b11438..b46bbb4b 100644 --- a/src/app/scenario/add-new-item/add-new-item.model.ts +++ b/src/app/scenario/add-new-item/add-new-item.model.ts @@ -2,5 +2,6 @@ export enum ItemStatus { Passed = "passed", Failed = "failed", Terminated = "terminated", - None = "none" + Error = "error", + None = "none", } diff --git a/src/app/scenario/item-controls/item-controls.model.ts b/src/app/scenario/item-controls/item-controls.model.ts index 0ebbce42..7480cabd 100644 --- a/src/app/scenario/item-controls/item-controls.model.ts +++ b/src/app/scenario/item-controls/item-controls.model.ts @@ -12,4 +12,5 @@ export interface ItemInput { params: ItemParams; name: string; resourcesLink?: string; + status: string; } diff --git a/src/app/scenario/scenario.component.html b/src/app/scenario/scenario.component.html index 4e4abd8c..eedc4534 100644 --- a/src/app/scenario/scenario.component.html +++ b/src/app/scenario/scenario.component.html @@ -129,7 +129,7 @@
Test Runs + [item]="{note: _.note, environment: _.environment, name: _.name, hostname: _.hostname, isBase: _.base, status: _.status, params: { id: _.id, scenarioName: params.scenarioName, projectName: params.projectName }}"> 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 e9da9901..3b3b5cde 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 @@ -38,6 +38,14 @@
+
+ + +
(); + note: string, environment: string, hostname: string, name: string + }>(); constructor( private modalService: NgbModal, private itemsApiService: ItemsApiService, private itemsService: ItemsService, private notification: NotificationMessage - ) { } + ) { + } ngOnInit(): void { this.isBase = this.itemDetailData.isBase; @@ -59,9 +66,11 @@ export class EditItemComponent implements OnInit { this.base = new FormControl(this.itemDetailData.isBase, []); this.name = new FormControl(this.itemDetailData.name, [ Validators.maxLength(200) - ]) + ]); this.resourcesLink = new FormControl(this.itemDetailData.resourcesLink, - [Validators.maxLength(350)]) + [Validators.maxLength(350)]); + this.status = new FormControl(Object.keys(ItemStatusValue).find(x => ItemStatusValue[x] === this.itemDetailData.status), [ + ]); } createForm() { @@ -72,6 +81,7 @@ export class EditItemComponent implements OnInit { base: this.base, name: this.name, resourcesLink: this.resourcesLink, + status: this.status, }); } @@ -81,20 +91,20 @@ export class EditItemComponent implements OnInit { onSubmit() { if (this.myform.valid) { - const { note, environment, base, hostname, name, resourcesLink } = this.myform.value; + const { note, environment, base, hostname, name, resourcesLink, status } = this.myform.value; const { projectName, id, scenarioName } = this.itemDetailData.params; this.itemsApiService.updateItemInfo(id, projectName, scenarioName, - { environment, note, base, hostname, name, resourcesLink }) + { environment, note, base, hostname, name, resourcesLink, status: ItemStatusValue[status] }) .pipe(catchError(r => of(r))) .subscribe(_ => { this.itemDetailChange.emit({ note, environment, hostname, name }); const message = this.notification.itemUpdate(_); return this.itemsApiService.setData(message); }).add((_) => { - if (this.reloadItems) { - this.itemsService.fetchItems(projectName, scenarioName); - } - }); + if (this.reloadItems) { + this.itemsService.fetchItems(projectName, scenarioName); + } + }); this.modalService.dismissAll(); } }