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

Moved changed to optional assignee id in alarm query constructor to end

Browse Source
This commit is contained in:
rusikv 2023-03-07 18:30:58 +02:00
parent c9b37237c1
commit 411da14083
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts
View File

@ -155,7 +155,7 @@ export class AlarmTableConfig extends EntityTableConfig<AlarmInfo, TimePageLink>
} }
fetchAlarms(pageLink: TimePageLink): Observable<PageData<AlarmInfo>> { fetchAlarms(pageLink: TimePageLink): Observable<PageData<AlarmInfo>> {
const query = new AlarmQuery(this.entityId, pageLink, this.searchStatus, null, null, true); const query = new AlarmQuery(this.entityId, pageLink, this.searchStatus, null, true, null);
return this.alarmService.getAlarms(query); return this.alarmService.getAlarms(query);
} }

4
ui-ngx/src/app/modules/home/models/widget-component.models.ts
View File

@ -416,8 +416,8 @@ export class WidgetContext {
return new TimePageLink(pageSize, page, textSearch, sortOrder, startTime, endTime); return new TimePageLink(pageSize, page, textSearch, sortOrder, startTime, endTime);
} }
alarmQuery(entityId: EntityId, pageLink: TimePageLink, searchStatus: AlarmSearchStatus, status: AlarmStatus, assigneeId: UserId, fetchOriginator: boolean) { alarmQuery(entityId: EntityId, pageLink: TimePageLink, searchStatus: AlarmSearchStatus, status: AlarmStatus, fetchOriginator: boolean, assigneeId: UserId) {
return new AlarmQuery(entityId, pageLink, searchStatus, status, assigneeId, fetchOriginator); return new AlarmQuery(entityId, pageLink, searchStatus, status, fetchOriginator, assigneeId);
} }
} }

11
ui-ngx/src/app/shared/models/alarm.models.ts
View File

@ -263,18 +263,18 @@ export class AlarmQuery {
pageLink: TimePageLink; pageLink: TimePageLink;
searchStatus: AlarmSearchStatus; searchStatus: AlarmSearchStatus;
status: AlarmStatus; status: AlarmStatus;
assigneeId: UserId;
fetchOriginator: boolean; fetchOriginator: boolean;
assigneeId?: UserId;
constructor(entityId: EntityId, pageLink: TimePageLink, constructor(entityId: EntityId, pageLink: TimePageLink,
searchStatus: AlarmSearchStatus, status: AlarmStatus, searchStatus: AlarmSearchStatus, status: AlarmStatus,
assigneeId: UserId, fetchOriginator: boolean) { fetchOriginator: boolean, assigneeId?: UserId) {
this.affectedEntityId = entityId; this.affectedEntityId = entityId;
this.pageLink = pageLink; this.pageLink = pageLink;
this.searchStatus = searchStatus; this.searchStatus = searchStatus;
this.status = status; this.status = status;
this.assigneeId = assigneeId;
this.fetchOriginator = fetchOriginator; this.fetchOriginator = fetchOriginator;
this.assigneeId = assigneeId;
} }
public toQuery(): string { public toQuery(): string {
@ -284,12 +284,13 @@ export class AlarmQuery {
query += `&searchStatus=${this.searchStatus}`; query += `&searchStatus=${this.searchStatus}`;
} else if (this.status) { } else if (this.status) {
query += `&status=${this.status}`; query += `&status=${this.status}`;
} else if (this.assigneeId) {
query += `&assigneeId=${this.assigneeId.id}`;
} }
if (typeof this.fetchOriginator !== 'undefined' && this.fetchOriginator !== null) { if (typeof this.fetchOriginator !== 'undefined' && this.fetchOriginator !== null) {
query += `&fetchOriginator=${this.fetchOriginator}`; query += `&fetchOriginator=${this.fetchOriginator}`;
} }
if (typeof this.assigneeId !== 'undefined' && this.assigneeId !== null) {
query += `&assigneeId=${this.assigneeId.id}`;
}
return query; return query;
} }