Browse Source

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
pull/4525/head
Vladyslav 5 years ago
committed by GitHub
parent
commit
99a25cab00
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      ui-ngx/src/app/modules/home/components/event/event-filter-panel.component.html
  2. 6
      ui-ngx/src/app/modules/home/components/event/event-filter-panel.component.ts
  3. 3
      ui-ngx/src/app/modules/home/components/event/event-table-config.ts
  4. 10
      ui-ngx/src/app/shared/models/event.models.ts

3
ui-ngx/src/app/modules/home/components/event/event-filter-panel.component.html

@ -39,7 +39,8 @@
</mat-form-field> </mat-form-field>
</ng-template> </ng-template>
<ng-template [ngSwitchCase]="'isError'"> <ng-template [ngSwitchCase]="'isError'">
<tb-checkbox formControlName="isError" [falseValue]="''"> <tb-checkbox formControlName="isError" [falseValue]="''"
(ngModelChange)="changeIsError($event)">
{{ 'event.has-error' | translate }} {{ 'event.has-error' | translate }}
</tb-checkbox> </tb-checkbox>
</ng-template> </ng-template>

6
ui-ngx/src/app/modules/home/components/event/event-filter-panel.component.ts

@ -105,5 +105,11 @@ export class EventFilterPanelComponent {
cancel() { cancel() {
this.overlayRef.dispose(); this.overlayRef.dispose();
} }
changeIsError(value: boolean | string) {
if (this.conditionError && value === '') {
this.eventFilterFormGroup.get('error').reset('', {emitEvent: false});
}
}
} }

3
ui-ngx/src/app/modules/home/components/event/event-table-config.ts

@ -288,7 +288,7 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
break; break;
case EventType.LC_EVENT: case EventType.LC_EVENT:
this.filterColumns.push( this.filterColumns.push(
{key: 'method', title: 'event.event'}, {key: 'event', title: 'event.event'},
{key: 'status', title: 'event.status'}, {key: 'status', title: 'event.status'},
{key: 'error', title: 'event.error'} {key: 'error', title: 'event.error'}
); );
@ -356,6 +356,7 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
componentRef.onDestroy(() => { componentRef.onDestroy(() => {
if (componentRef.instance.result && !isEqual(this.filterParams, componentRef.instance.result.filterParams)) { if (componentRef.instance.result && !isEqual(this.filterParams, componentRef.instance.result.filterParams)) {
this.filterParams = componentRef.instance.result.filterParams; this.filterParams = componentRef.instance.result.filterParams;
this.table.paginator.pageIndex = 0;
this.table.updateData(); this.table.updateData();
} }
}); });

10
ui-ngx/src/app/shared/models/event.models.ts

@ -91,17 +91,18 @@ export interface BaseFilterEventBody {
export interface ErrorFilterEventBody extends BaseFilterEventBody { export interface ErrorFilterEventBody extends BaseFilterEventBody {
method?: string; method?: string;
error?: string;
} }
export interface LcFilterEventEventBody extends BaseFilterEventBody { export interface LcFilterEventEventBody extends BaseFilterEventBody {
method?: string; event?: string;
status?: string; status?: string;
isError?: boolean; error?: string;
} }
export interface StatsFilterEventBody extends BaseFilterEventBody { export interface StatsFilterEventBody extends BaseFilterEventBody {
messagesProcessed?: string; messagesProcessed?: number;
errorsOccurred?: string; errorsOccurred?: number;
} }
export interface DebugFilterRuleNodeEventBody extends BaseFilterEventBody { export interface DebugFilterRuleNodeEventBody extends BaseFilterEventBody {
@ -114,6 +115,7 @@ export interface DebugFilterRuleNodeEventBody extends BaseFilterEventBody {
dataSearch?: string; dataSearch?: string;
metadataSearch?: string; metadataSearch?: string;
isError?: boolean; isError?: boolean;
error?: string;
} }
export type FilterEventBody = ErrorFilterEventBody & LcFilterEventEventBody & StatsFilterEventBody & DebugFilterRuleNodeEventBody; export type FilterEventBody = ErrorFilterEventBody & LcFilterEventEventBody & StatsFilterEventBody & DebugFilterRuleNodeEventBody;

Loading…
Cancel
Save