Browse Source

fixes

pull/14513/head
Maksym Tsymbarov 10 months ago
parent
commit
c3cdd11f57
  1. 12
      ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules-table-config.ts
  2. 8
      ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
  3. 2
      ui-ngx/src/app/modules/home/dialogs/events-dialog.component.html
  4. 8
      ui-ngx/src/app/modules/home/dialogs/events-dialog.component.ts
  5. 2
      ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts

12
ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules-table-config.ts

@ -264,25 +264,17 @@ export class AlarmRulesTableConfig extends EntityTableConfig<any> {
} }
private openDebugEventsDialog(calculatedField: CalculatedField): void { private openDebugEventsDialog(calculatedField: CalculatedField): void {
const customCellActionEnabledFn = (event: DebugEvent) => {
return (calculatedField.type === CalculatedFieldType.SCRIPT ||
(calculatedField.type === CalculatedFieldType.PROPAGATION &&
calculatedField.configuration.applyExpressionToResolvedArguments)
) && !!(event as DebugEvent).body.arguments;
};
this.dialog.open<EventsDialogComponent, EventsDialogData, null>(EventsDialogComponent, { this.dialog.open<EventsDialogComponent, EventsDialogData, null>(EventsDialogComponent, {
disableClose: true, disableClose: true,
panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
data: { data: {
title: 'alarm-rule.debugging', title: 'alarm-rule.debugging',
tenantId: this.tenantId, tenantId: this.tenantId,
value: calculatedField.id, entityId: calculatedField.id,
debugEventTypes:[DebugEventType.DEBUG_CALCULATED_FIELD], debugEventTypes:[DebugEventType.DEBUG_CALCULATED_FIELD],
disabledEventTypes:[EventType.LC_EVENT, EventType.ERROR, EventType.STATS], disabledEventTypes:[EventType.LC_EVENT, EventType.ERROR, EventType.STATS],
defaultEventType: DebugEventType.DEBUG_CALCULATED_FIELD, defaultEventType: DebugEventType.DEBUG_CALCULATED_FIELD,
onDebugEventSelected: null, debugActionEnabledFn: () => false
customCellActionEnabledFn: customCellActionEnabledFn
} }
}) })
.afterClosed() .afterClosed()

8
ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts

@ -233,7 +233,7 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
} }
private openDebugEventsDialog(calculatedField: CalculatedField): void { private openDebugEventsDialog(calculatedField: CalculatedField): void {
const customCellActionEnabledFn = (event: DebugEvent) => { const debugActionEnabledFn = (event: DebugEvent) => {
return (calculatedField.type === CalculatedFieldType.SCRIPT || return (calculatedField.type === CalculatedFieldType.SCRIPT ||
(calculatedField.type === CalculatedFieldType.PROPAGATION && (calculatedField.type === CalculatedFieldType.PROPAGATION &&
calculatedField.configuration.applyExpressionToResolvedArguments) calculatedField.configuration.applyExpressionToResolvedArguments)
@ -251,12 +251,12 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
data: { data: {
title: 'calculated-fields.debugging', title: 'calculated-fields.debugging',
tenantId: this.tenantId, tenantId: this.tenantId,
value: calculatedField.id, entityId: calculatedField.id,
debugEventTypes:[DebugEventType.DEBUG_CALCULATED_FIELD], debugEventTypes:[DebugEventType.DEBUG_CALCULATED_FIELD],
disabledEventTypes:[EventType.LC_EVENT, EventType.ERROR, EventType.STATS], disabledEventTypes:[EventType.LC_EVENT, EventType.ERROR, EventType.STATS],
defaultEventType: DebugEventType.DEBUG_CALCULATED_FIELD, defaultEventType: DebugEventType.DEBUG_CALCULATED_FIELD,
onDebugEventSelected: onDebugEventSelected, onDebugEventSelected,
customCellActionEnabledFn: customCellActionEnabledFn debugActionEnabledFn
} }
}) })
.afterClosed() .afterClosed()

2
ui-ngx/src/app/modules/home/dialogs/events-dialog.component.html

@ -32,7 +32,7 @@
[disabledEventTypes]="data.disabledEventTypes ?? []" [disabledEventTypes]="data.disabledEventTypes ?? []"
[active]="true" [active]="true"
[tenantId]="data.tenantId" [tenantId]="data.tenantId"
[entityId]="data.value" [entityId]="data.entityId"
[functionTestButtonLabel]="data.functionTestButtonLabel ?? ''" [functionTestButtonLabel]="data.functionTestButtonLabel ?? ''"
(debugEventSelected)="this.onDebugEventSelected($event)" (debugEventSelected)="this.onDebugEventSelected($event)"
/> />

8
ui-ngx/src/app/modules/home/dialogs/events-dialog.component.ts

@ -28,13 +28,13 @@ import { BaseData, HasId } from '@shared/models/base-data';
export interface EventsDialogData { export interface EventsDialogData {
title: string; title: string;
tenantId: string; tenantId: string;
value: EntityId; entityId: EntityId;
debugEventTypes: Array<DebugEventType>; debugEventTypes: Array<DebugEventType>;
defaultEventType: DebugEventType; defaultEventType: DebugEventType;
disabledEventTypes?: Array<EventType | DebugEventType>; disabledEventTypes?: Array<EventType | DebugEventType>;
functionTestButtonLabel?: string; functionTestButtonLabel?: string;
onDebugEventSelected?: (event: any, dialogRef: MatDialogRef<EventsDialogComponent, string>) => void; onDebugEventSelected?: (event: any, dialogRef: MatDialogRef<EventsDialogComponent, string>) => void;
customCellActionEnabledFn?: (event: BaseData<HasId>) => boolean; debugActionEnabledFn?: (event: BaseData<HasId>) => boolean;
} }
@Component({ @Component({
@ -54,8 +54,8 @@ export class EventsDialogComponent extends DialogComponent<EventsDialogComponent
} }
ngAfterViewInit() { ngAfterViewInit() {
if (this.data.customCellActionEnabledFn && this.eventsTable.entitiesTable.cellActionDescriptors?.length > 0) { if (this.data.debugActionEnabledFn && this.eventsTable.entitiesTable.cellActionDescriptors?.length > 0) {
this.eventsTable.entitiesTable.cellActionDescriptors[0].isEnabled = this.data.customCellActionEnabledFn; this.eventsTable.entitiesTable.cellActionDescriptors[0].isEnabled = this.data.debugActionEnabledFn;
} }
this.eventsTable.entitiesTable.updateData(); this.eventsTable.entitiesTable.updateData();
} }

2
ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts

@ -1682,7 +1682,7 @@ export class RuleChainPageComponent extends PageComponent
debugEventTypes: [DebugEventType.DEBUG_RULE_NODE], debugEventTypes: [DebugEventType.DEBUG_RULE_NODE],
defaultEventType: DebugEventType.DEBUG_RULE_NODE, defaultEventType: DebugEventType.DEBUG_RULE_NODE,
tenantId: this.ruleChain.tenantId.id, tenantId: this.ruleChain.tenantId.id,
value: this.editingRuleNode.ruleNodeId, entityId: this.editingRuleNode.ruleNodeId,
functionTestButtonLabel: this.ruleNodeTestButtonLabel, functionTestButtonLabel: this.ruleNodeTestButtonLabel,
onDebugEventSelected: this.onDebugEventSelected.bind(this) onDebugEventSelected: this.onDebugEventSelected.bind(this)
} }

Loading…
Cancel
Save