Browse Source

UI: Fixed help link for alarm rule and fixed propagate test script function

pull/14815/head
ArtemDzhereleiko 9 months ago
committed by Vladyslav Prykhodko
parent
commit
072c785922
  1. 4
      ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules-table-config.ts
  2. 2
      ui-ngx/src/app/modules/home/components/calculated-fields/calculated-field.component.ts

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

@ -109,7 +109,9 @@ export class AlarmRulesTableConfig extends EntityTableConfig<AlarmRuleTableEntit
} }
this.tableTitle = this.pageMode ? '' : this.translate.instant('alarm-rule.alarm-rules'); this.tableTitle = this.pageMode ? '' : this.translate.instant('alarm-rule.alarm-rules');
this.detailsPanelEnabled = this.pageMode; this.detailsPanelEnabled = this.pageMode;
this.entityResources = entityTypeResources.get(EntityType.CALCULATED_FIELD); this.entityResources = {
helpLinkId: 'alarmRules'
};
this.entityType = EntityType.CALCULATED_FIELD; this.entityType = EntityType.CALCULATED_FIELD;
this.entityTranslations = { this.entityTranslations = {
type: 'alarm-rule.alarm-rule', type: 'alarm-rule.alarm-rule',

2
ui-ngx/src/app/modules/home/components/calculated-fields/calculated-field.component.ts

@ -131,7 +131,7 @@ export class CalculatedFieldComponent extends EntityComponent<CalculatedFieldsTa
onTestScript(expression?: string): Observable<string> { onTestScript(expression?: string): Observable<string> {
return this.cfFormService.testScript( return this.cfFormService.testScript(
this.entity?.id?.id, this.entity?.id?.id,
this.entityFormValue(), this.entityValue,
this.entitiesTableConfig.getTestScriptDialog.bind(this.entitiesTableConfig), this.entitiesTableConfig.getTestScriptDialog.bind(this.entitiesTableConfig),
this.destroyRef, this.destroyRef,
expression expression

Loading…
Cancel
Save