Browse Source

Refactoring

pull/12650/head
mpetrov 2 years ago
parent
commit
2833164968
  1. 2
      ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
  2. 2
      ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.ts
  3. 2
      ui-ngx/src/app/shared/models/calculated-field.models.ts

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

@ -203,7 +203,7 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
tenantId: this.tenantId, tenantId: this.tenantId,
entityName: this.entityName, entityName: this.entityName,
additionalDebugActionConfig: this.additionalDebugActionConfig, additionalDebugActionConfig: this.additionalDebugActionConfig,
testScriptFn: this.getTestScriptDialog.bind(this), getTestScriptDialogFn: this.getTestScriptDialog.bind(this),
isDirty isDirty
} }
}) })

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

@ -121,7 +121,7 @@ export class CalculatedFieldDialogComponent extends DialogComponent<CalculatedFi
} }
onTestScript(): void { onTestScript(): void {
this.data.testScriptFn(this.fromGroupValue) this.data.getTestScriptDialogFn(this.fromGroupValue)
.pipe(filter(Boolean)).subscribe((expression: string) => { .pipe(filter(Boolean)).subscribe((expression: string) => {
this.configFormGroup.get('expressionSCRIPT').setValue(expression); this.configFormGroup.get('expressionSCRIPT').setValue(expression);
this.configFormGroup.get('expressionSCRIPT').markAsDirty(); this.configFormGroup.get('expressionSCRIPT').markAsDirty();

2
ui-ngx/src/app/shared/models/calculated-field.models.ts

@ -137,7 +137,7 @@ export interface CalculatedFieldDialogData {
tenantId: string; tenantId: string;
entityName?: string; entityName?: string;
additionalDebugActionConfig: AdditionalDebugActionConfig<(calculatedField: CalculatedField) => void>; additionalDebugActionConfig: AdditionalDebugActionConfig<(calculatedField: CalculatedField) => void>;
testScriptFn: CalculatedFieldTestScriptFn; getTestScriptDialogFn: CalculatedFieldTestScriptFn;
isDirty?: boolean; isDirty?: boolean;
} }

Loading…
Cancel
Save