|
|
@ -503,17 +503,16 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit, |
|
|
$event.stopPropagation(); |
|
|
$event.stopPropagation(); |
|
|
} |
|
|
} |
|
|
const target = $event.target || $event.srcElement || $event.currentTarget; |
|
|
const target = $event.target || $event.srcElement || $event.currentTarget; |
|
|
const config = new OverlayConfig(); |
|
|
const config = new OverlayConfig({ |
|
|
config.backdropClass = 'cdk-overlay-transparent-backdrop'; |
|
|
panelClass: 'tb-panel-container', |
|
|
config.hasBackdrop = true; |
|
|
backdropClass: 'cdk-overlay-transparent-backdrop', |
|
|
const connectedPosition: ConnectedPosition = { |
|
|
hasBackdrop: true, |
|
|
originX: 'end', |
|
|
height: 'fit-content', |
|
|
originY: 'bottom', |
|
|
maxHeight: '75vh' |
|
|
overlayX: 'end', |
|
|
}); |
|
|
overlayY: 'top' |
|
|
config.positionStrategy = this.overlay.position() |
|
|
}; |
|
|
.flexibleConnectedTo(target as HTMLElement) |
|
|
config.positionStrategy = this.overlay.position().flexibleConnectedTo(target as HTMLElement) |
|
|
.withPositions(DEFAULT_OVERLAY_POSITIONS); |
|
|
.withPositions([connectedPosition]); |
|
|
|
|
|
|
|
|
|
|
|
const overlayRef = this.overlay.create(config); |
|
|
const overlayRef = this.overlay.create(config); |
|
|
overlayRef.backdropClick().subscribe(() => { |
|
|
overlayRef.backdropClick().subscribe(() => { |
|
|
@ -549,9 +548,18 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit, |
|
|
useValue: overlayRef |
|
|
useValue: overlayRef |
|
|
} |
|
|
} |
|
|
]; |
|
|
]; |
|
|
|
|
|
|
|
|
const injector = Injector.create({parent: this.viewContainerRef.injector, providers}); |
|
|
const injector = Injector.create({parent: this.viewContainerRef.injector, providers}); |
|
|
overlayRef.attach(new ComponentPortal(DisplayColumnsPanelComponent, |
|
|
const componentRef = overlayRef.attach(new ComponentPortal(DisplayColumnsPanelComponent, |
|
|
this.viewContainerRef, injector)); |
|
|
this.viewContainerRef, injector)); |
|
|
|
|
|
|
|
|
|
|
|
const resizeWindows$ = fromEvent(window, 'resize').subscribe(() => { |
|
|
|
|
|
overlayRef.updatePosition(); |
|
|
|
|
|
}); |
|
|
|
|
|
componentRef.onDestroy(() => { |
|
|
|
|
|
resizeWindows$.unsubscribe(); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
this.ctx.detectChanges(); |
|
|
this.ctx.detectChanges(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -888,12 +896,21 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit, |
|
|
$event.stopPropagation(); |
|
|
$event.stopPropagation(); |
|
|
} |
|
|
} |
|
|
if (this.alarmsDatasource.selection.hasValue()) { |
|
|
if (this.alarmsDatasource.selection.hasValue()) { |
|
|
const alarmIds = this.alarmsDatasource.selection.selected.filter( |
|
|
const unacknowledgedAlarms = this.alarmsDatasource.selection.selected.filter( |
|
|
(alarmId) => alarmId !== NULL_UUID |
|
|
alarm => alarm.id.id !== NULL_UUID && !alarm.acknowledged |
|
|
); |
|
|
); |
|
|
if (alarmIds.length) { |
|
|
let title = ''; |
|
|
const title = this.translate.instant('alarm.aknowledge-alarms-title', {count: alarmIds.length}); |
|
|
let content = ''; |
|
|
const content = this.translate.instant('alarm.aknowledge-alarms-text', {count: alarmIds.length}); |
|
|
if (!unacknowledgedAlarms.length) { |
|
|
|
|
|
title = this.translate.instant('alarm.selected-alarms', {count: unacknowledgedAlarms.length}); |
|
|
|
|
|
content = this.translate.instant('alarm.selected-alarms-are-acknowledged'); |
|
|
|
|
|
this.dialogService.alert( |
|
|
|
|
|
title, |
|
|
|
|
|
content |
|
|
|
|
|
).subscribe(); |
|
|
|
|
|
} else { |
|
|
|
|
|
title = this.translate.instant('alarm.aknowledge-alarms-title', {count: unacknowledgedAlarms.length}); |
|
|
|
|
|
content = this.translate.instant('alarm.aknowledge-alarms-text', {count: unacknowledgedAlarms.length}); |
|
|
this.dialogService.confirm( |
|
|
this.dialogService.confirm( |
|
|
title, |
|
|
title, |
|
|
content, |
|
|
content, |
|
|
@ -901,16 +918,14 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit, |
|
|
this.translate.instant('action.yes') |
|
|
this.translate.instant('action.yes') |
|
|
).subscribe((res) => { |
|
|
).subscribe((res) => { |
|
|
if (res) { |
|
|
if (res) { |
|
|
if (res) { |
|
|
const tasks: Observable<AlarmInfo>[] = []; |
|
|
const tasks: Observable<AlarmInfo>[] = []; |
|
|
for (const alarm of unacknowledgedAlarms) { |
|
|
for (const alarmId of alarmIds) { |
|
|
tasks.push(this.alarmService.ackAlarm(alarm.id.id)); |
|
|
tasks.push(this.alarmService.ackAlarm(alarmId)); |
|
|
|
|
|
} |
|
|
|
|
|
forkJoin(tasks).subscribe(() => { |
|
|
|
|
|
this.alarmsDatasource.clearSelection(); |
|
|
|
|
|
this.subscription.update(); |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
forkJoin(tasks).subscribe(() => { |
|
|
|
|
|
this.alarmsDatasource.clearSelection(); |
|
|
|
|
|
this.subscription.update(); |
|
|
|
|
|
}); |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
@ -944,12 +959,21 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit, |
|
|
$event.stopPropagation(); |
|
|
$event.stopPropagation(); |
|
|
} |
|
|
} |
|
|
if (this.alarmsDatasource.selection.hasValue()) { |
|
|
if (this.alarmsDatasource.selection.hasValue()) { |
|
|
const alarmIds = this.alarmsDatasource.selection.selected.filter( |
|
|
const activeAlarms = this.alarmsDatasource.selection.selected.filter( |
|
|
(alarmId) => alarmId !== NULL_UUID |
|
|
alarm => alarm.id.id !== NULL_UUID && !alarm.cleared |
|
|
); |
|
|
); |
|
|
if (alarmIds.length) { |
|
|
let title = ''; |
|
|
const title = this.translate.instant('alarm.clear-alarms-title', {count: alarmIds.length}); |
|
|
let content = ''; |
|
|
const content = this.translate.instant('alarm.clear-alarms-text', {count: alarmIds.length}); |
|
|
if (!activeAlarms.length) { |
|
|
|
|
|
title = this.translate.instant('alarm.selected-alarms', {count: activeAlarms.length}); |
|
|
|
|
|
content = this.translate.instant('alarm.selected-alarms-are-cleared'); |
|
|
|
|
|
this.dialogService.alert( |
|
|
|
|
|
title, |
|
|
|
|
|
content |
|
|
|
|
|
).subscribe(); |
|
|
|
|
|
} else { |
|
|
|
|
|
title = this.translate.instant('alarm.clear-alarms-title', {count: activeAlarms.length}); |
|
|
|
|
|
content = this.translate.instant('alarm.clear-alarms-text', {count: activeAlarms.length}); |
|
|
this.dialogService.confirm( |
|
|
this.dialogService.confirm( |
|
|
title, |
|
|
title, |
|
|
content, |
|
|
content, |
|
|
@ -957,16 +981,14 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit, |
|
|
this.translate.instant('action.yes') |
|
|
this.translate.instant('action.yes') |
|
|
).subscribe((res) => { |
|
|
).subscribe((res) => { |
|
|
if (res) { |
|
|
if (res) { |
|
|
if (res) { |
|
|
const tasks: Observable<AlarmInfo>[] = []; |
|
|
const tasks: Observable<AlarmInfo>[] = []; |
|
|
for (const alarm of activeAlarms) { |
|
|
for (const alarmId of alarmIds) { |
|
|
tasks.push(this.alarmService.clearAlarm(alarm.id.id)); |
|
|
tasks.push(this.alarmService.clearAlarm(alarmId)); |
|
|
|
|
|
} |
|
|
|
|
|
forkJoin(tasks).subscribe(() => { |
|
|
|
|
|
this.alarmsDatasource.clearSelection(); |
|
|
|
|
|
this.subscription.update(); |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
forkJoin(tasks).subscribe(() => { |
|
|
|
|
|
this.alarmsDatasource.clearSelection(); |
|
|
|
|
|
this.subscription.update(); |
|
|
|
|
|
}); |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
@ -1124,7 +1146,8 @@ class AlarmsDatasource implements DataSource<AlarmDataInfo> { |
|
|
private alarmsSubject = new BehaviorSubject<AlarmDataInfo[]>([]); |
|
|
private alarmsSubject = new BehaviorSubject<AlarmDataInfo[]>([]); |
|
|
private pageDataSubject = new BehaviorSubject<PageData<AlarmDataInfo>>(emptyPageData<AlarmDataInfo>()); |
|
|
private pageDataSubject = new BehaviorSubject<PageData<AlarmDataInfo>>(emptyPageData<AlarmDataInfo>()); |
|
|
|
|
|
|
|
|
public selection = new SelectionModel<string>(true, [], false); |
|
|
public selection = new SelectionModel<AlarmDataInfo>(true, [], false, |
|
|
|
|
|
(alarm1: AlarmDataInfo, alarm2: AlarmDataInfo) => alarm1.id.id === alarm2.id.id); |
|
|
|
|
|
|
|
|
private selectionModeChanged = new EventEmitter<boolean>(); |
|
|
private selectionModeChanged = new EventEmitter<boolean>(); |
|
|
|
|
|
|
|
|
@ -1202,7 +1225,7 @@ class AlarmsDatasource implements DataSource<AlarmDataInfo> { |
|
|
} |
|
|
} |
|
|
if (this.selection.hasValue()) { |
|
|
if (this.selection.hasValue()) { |
|
|
const alarmIds = alarms.map((alarm) => alarm.id.id); |
|
|
const alarmIds = alarms.map((alarm) => alarm.id.id); |
|
|
const toRemove = this.selection.selected.filter(alarmId => alarmIds.indexOf(alarmId) === -1); |
|
|
const toRemove = this.selection.selected.filter(alarm => alarmIds.indexOf(alarm.id.id) === -1); |
|
|
this.selection.deselect(...toRemove); |
|
|
this.selection.deselect(...toRemove); |
|
|
if (this.selection.isEmpty()) { |
|
|
if (this.selection.isEmpty()) { |
|
|
isEmptySelection = true; |
|
|
isEmptySelection = true; |
|
|
@ -1276,14 +1299,14 @@ class AlarmsDatasource implements DataSource<AlarmDataInfo> { |
|
|
|
|
|
|
|
|
toggleSelection(alarm: AlarmDataInfo) { |
|
|
toggleSelection(alarm: AlarmDataInfo) { |
|
|
const hasValue = this.selection.hasValue(); |
|
|
const hasValue = this.selection.hasValue(); |
|
|
this.selection.toggle(alarm.id.id); |
|
|
this.selection.toggle(alarm); |
|
|
if (hasValue !== this.selection.hasValue()) { |
|
|
if (hasValue !== this.selection.hasValue()) { |
|
|
this.onSelectionModeChanged(this.selection.hasValue()); |
|
|
this.onSelectionModeChanged(this.selection.hasValue()); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
isSelected(alarm: AlarmDataInfo): boolean { |
|
|
isSelected(alarm: AlarmDataInfo): boolean { |
|
|
return this.selection.isSelected(alarm.id.id); |
|
|
return this.selection.isSelected(alarm); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
clearSelection() { |
|
|
clearSelection() { |
|
|
@ -1304,7 +1327,7 @@ class AlarmsDatasource implements DataSource<AlarmDataInfo> { |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
alarms.forEach(row => { |
|
|
alarms.forEach(row => { |
|
|
this.selection.select(row.id.id); |
|
|
this.selection.select(row); |
|
|
}); |
|
|
}); |
|
|
if (numSelected === 0) { |
|
|
if (numSelected === 0) { |
|
|
this.onSelectionModeChanged(true); |
|
|
this.onSelectionModeChanged(true); |
|
|
|
Andrii Shvaika
3 years ago