Commit 99a25cab00a38bcff520f25ca1c2c1cda0f25cb2

Authored by Vladyslav
Committed by GitHub
1 parent fbf2d3ef

UI: Fixed field name in LC_EVENT; Added error field reset at hiding in event filters (#4453)

* UI: Fixed field name in LC_EVENT; Added error field reset at hiding in event filters

* UI: Updated event filter interface

* UI: Add reset page in event filter
... ... @@ -39,7 +39,8 @@
39 39 </mat-form-field>
40 40 </ng-template>
41 41 <ng-template [ngSwitchCase]="'isError'">
42   - <tb-checkbox formControlName="isError" [falseValue]="''">
  42 + <tb-checkbox formControlName="isError" [falseValue]="''"
  43 + (ngModelChange)="changeIsError($event)">
43 44 {{ 'event.has-error' | translate }}
44 45 </tb-checkbox>
45 46 </ng-template>
... ...
... ... @@ -105,5 +105,11 @@ export class EventFilterPanelComponent {
105 105 cancel() {
106 106 this.overlayRef.dispose();
107 107 }
  108 +
  109 + changeIsError(value: boolean | string) {
  110 + if (this.conditionError && value === '') {
  111 + this.eventFilterFormGroup.get('error').reset('', {emitEvent: false});
  112 + }
  113 + }
108 114 }
109 115
... ...
... ... @@ -288,7 +288,7 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
288 288 break;
289 289 case EventType.LC_EVENT:
290 290 this.filterColumns.push(
291   - {key: 'method', title: 'event.event'},
  291 + {key: 'event', title: 'event.event'},
292 292 {key: 'status', title: 'event.status'},
293 293 {key: 'error', title: 'event.error'}
294 294 );
... ... @@ -356,6 +356,7 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
356 356 componentRef.onDestroy(() => {
357 357 if (componentRef.instance.result && !isEqual(this.filterParams, componentRef.instance.result.filterParams)) {
358 358 this.filterParams = componentRef.instance.result.filterParams;
  359 + this.table.paginator.pageIndex = 0;
359 360 this.table.updateData();
360 361 }
361 362 });
... ...
... ... @@ -91,17 +91,18 @@ export interface BaseFilterEventBody {
91 91
92 92 export interface ErrorFilterEventBody extends BaseFilterEventBody {
93 93 method?: string;
  94 + error?: string;
94 95 }
95 96
96 97 export interface LcFilterEventEventBody extends BaseFilterEventBody {
97   - method?: string;
  98 + event?: string;
98 99 status?: string;
99   - isError?: boolean;
  100 + error?: string;
100 101 }
101 102
102 103 export interface StatsFilterEventBody extends BaseFilterEventBody {
103   - messagesProcessed?: string;
104   - errorsOccurred?: string;
  104 + messagesProcessed?: number;
  105 + errorsOccurred?: number;
105 106 }
106 107
107 108 export interface DebugFilterRuleNodeEventBody extends BaseFilterEventBody {
... ... @@ -114,6 +115,7 @@ export interface DebugFilterRuleNodeEventBody extends BaseFilterEventBody {
114 115 dataSearch?: string;
115 116 metadataSearch?: string;
116 117 isError?: boolean;
  118 + error?: string;
117 119 }
118 120
119 121 export type FilterEventBody = ErrorFilterEventBody & LcFilterEventEventBody & StatsFilterEventBody & DebugFilterRuleNodeEventBody;
... ...