dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update clear Events request

Browse Source
This commit is contained in:
Kalutka Zhenya 2021-11-08 13:24:55 +02:00 committed by Viacheslav Klimov
parent 4d86a61580
commit e718e31f63
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui-ngx/src/app/core/http/event.service.ts
View File

@ -46,10 +46,9 @@ export class EventService {
} }
public clearEvents(entityId: EntityId, eventType: EventType | DebugEventType, filters: FilterEventBody, tenantId: string, public clearEvents(entityId: EntityId, eventType: EventType | DebugEventType, filters: FilterEventBody, tenantId: string,
startTime?: number, endTime?: number, config?: RequestConfig) { pageLink: TimePageLink, config?: RequestConfig) {
return this.http.post(`/api/events/${entityId.entityType}/${entityId.id}/${eventType}/clear&tenantId=${tenantId}` + return this.http.post(`/api/events/${entityId.entityType}/${entityId.id}/${eventType}/clear&tenantId=${tenantId}` +
(startTime ? `&startTime=${startTime}` : ``) + (endTime ? `&endTime=${endTime}` : ``), {...filters, eventType}, `${pageLink.toQuery()}`, {...filters, eventType},
defaultHttpOptionsFromConfig(config)); defaultHttpOptionsFromConfig(config));
} }
} }

2
ui-ngx/src/app/modules/home/components/entity/entities-table.component.html
View File

@ -84,7 +84,7 @@
[fxShow]="actionDescriptor.isEnabled()" *ngFor="let actionDescriptor of headerActionDescriptors" [fxShow]="actionDescriptor.isEnabled()" *ngFor="let actionDescriptor of headerActionDescriptors"
matTooltip="{{ actionDescriptor.name }}" matTooltip="{{ actionDescriptor.name }}"
matTooltipPosition="above" matTooltipPosition="above"
(click)="actionDescriptor.onAction($event, entitiesTableConfig)"> (click)="actionDescriptor.onAction($event, entitiesTableConfig, pageLink)">
<mat-icon *ngIf="actionDescriptor.isMdiIcon" [svgIcon]="actionDescriptor.icon"></mat-icon> <mat-icon *ngIf="actionDescriptor.isMdiIcon" [svgIcon]="actionDescriptor.icon"></mat-icon>
<mat-icon *ngIf="!actionDescriptor.isMdiIcon">{{actionDescriptor.icon}}</mat-icon> <mat-icon *ngIf="!actionDescriptor.isMdiIcon">{{actionDescriptor.icon}}</mat-icon>
</button> </button>

4
ui-ngx/src/app/modules/home/components/event/event-table-config.ts
View File

@ -140,8 +140,8 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
name: this.translate.instant('event.clean-events'), name: this.translate.instant('event.clean-events'),
icon: 'delete', icon: 'delete',
isEnabled: () => true, isEnabled: () => true,
onAction: ($event, entity) => { onAction: ($event, entity, pageLink: TimePageLink) => {
this.eventService.clearEvents(entity.entityId, entity.eventType, entity.filterParams, entity.tenantId, , ).subscribe(); this.eventService.clearEvents(entity.entityId, entity.eventType, entity.filterParams, entity.tenantId, pageLink).subscribe();
} }
}); });
} }

2
ui-ngx/src/app/modules/home/models/entity/entities-table-config.models.ts
View File

@ -75,7 +75,7 @@ export interface HeaderActionDescriptor {
icon: string; icon: string;
isMdiIcon?: boolean; isMdiIcon?: boolean;
isEnabled: () => boolean; isEnabled: () => boolean;
onAction: ($event: MouseEvent, entity?) => void; onAction: ($event: MouseEvent, entity?, pageLink?) => void;
} }
export type EntityTableColumnType = 'content' | 'action'; export type EntityTableColumnType = 'content' | 'action';