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

UI: Refactoring calculate fields models refactoring

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2025-03-14 11:49:15 +02:00
parent faff769cda
commit 2fec80eef2
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
View File

@ -39,7 +39,6 @@ import { catchError, filter, switchMap, tap } from 'rxjs/operators';
import { import {
ArgumentType, ArgumentType,
CalculatedField, CalculatedField,
CalculatedFieldDebugDialogData,
CalculatedFieldEventArguments, CalculatedFieldEventArguments,
CalculatedFieldType, CalculatedFieldType,
CalculatedFieldTypeTranslations, CalculatedFieldTypeTranslations,
@ -47,7 +46,7 @@ import {
getCalculatedFieldArgumentsHighlights, getCalculatedFieldArgumentsHighlights,
} from '@shared/models/calculated-field.models'; } from '@shared/models/calculated-field.models';
import { import {
CalculatedFieldDebugDialogComponent, CalculatedFieldDebugDialogComponent, CalculatedFieldDebugDialogData,
CalculatedFieldDialogComponent, CalculatedFieldDialogComponent,
CalculatedFieldDialogData, CalculatedFieldDialogData,
CalculatedFieldScriptTestDialogComponent, CalculatedFieldScriptTestDialogComponent,

12
ui-ngx/src/app/modules/home/components/calculated-fields/components/debug-dialog/calculated-field-debug-dialog.component.ts
View File

@ -22,7 +22,17 @@ import { Router } from '@angular/router';
import { DialogComponent } from '@shared/components/dialog.component'; import { DialogComponent } from '@shared/components/dialog.component';
import { CalculatedFieldEventBody, DebugEventType, EventType } from '@shared/models/event.models'; import { CalculatedFieldEventBody, DebugEventType, EventType } from '@shared/models/event.models';
import { EventTableComponent } from '@home/components/event/event-table.component'; import { EventTableComponent } from '@home/components/event/event-table.component';
import { CalculatedFieldDebugDialogData, CalculatedFieldType } from '@shared/models/calculated-field.models'; import {
CalculatedField,
CalculatedFieldTestScriptFn,
CalculatedFieldType
} from '@shared/models/calculated-field.models';
export interface CalculatedFieldDebugDialogData {
tenantId: string;
value: CalculatedField;
getTestScriptDialogFn: CalculatedFieldTestScriptFn;
}
@Component({ @Component({
selector: 'tb-calculated-field-debug-dialog', selector: 'tb-calculated-field-debug-dialog',

6
ui-ngx/src/app/shared/models/calculated-field.models.ts
View File

@ -148,12 +148,6 @@ export interface CalculatedFieldArgumentValue extends CalculatedFieldArgument {
export type CalculatedFieldTestScriptFn = (calculatedField: CalculatedField, argumentsObj?: Record<string, unknown>, closeAllOnSave?: boolean) => Observable<string>; export type CalculatedFieldTestScriptFn = (calculatedField: CalculatedField, argumentsObj?: Record<string, unknown>, closeAllOnSave?: boolean) => Observable<string>;
export interface CalculatedFieldDebugDialogData {
tenantId: string;
value: CalculatedField;
getTestScriptDialogFn: CalculatedFieldTestScriptFn;
}
export interface CalculatedFieldTestScriptInputParams { export interface CalculatedFieldTestScriptInputParams {
arguments: CalculatedFieldEventArguments; arguments: CalculatedFieldEventArguments;
expression: string; expression: string;