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

timewindow align with model

Browse Source
This commit is contained in:
mpetrov 2025-02-18 13:06:53 +02:00
parent e766710b95
commit b5d94fdb0f
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui-ngx/src/app/modules/home/components/calculated-fields/components/test-arguments/calculated-field-test-arguments.component.ts
View File

@ -116,7 +116,7 @@ export class CalculatedFieldTestArgumentsComponent extends PageComponent impleme
}).afterClosed() }).afterClosed()
.pipe(filter(Boolean)) .pipe(filter(Boolean))
.subscribe(result => this.argumentsTypeMap.get(group.get('argumentName').value) === ArgumentType.Rolling .subscribe(result => this.argumentsTypeMap.get(group.get('argumentName').value) === ArgumentType.Rolling
? group.patchValue({ timewindow: (result as CalculatedFieldRollingTelemetryArgumentValue).timewindow, values: (result as CalculatedFieldRollingTelemetryArgumentValue).values }) ? group.patchValue({ timeWindow: (result as CalculatedFieldRollingTelemetryArgumentValue).timeWindow, values: (result as CalculatedFieldRollingTelemetryArgumentValue).values })
: group.patchValue({ ts: (result as CalculatedFieldSingleArgumentValue).ts, value: (result as CalculatedFieldSingleArgumentValue).value }) ); : group.patchValue({ ts: (result as CalculatedFieldSingleArgumentValue).ts, value: (result as CalculatedFieldSingleArgumentValue).value }) );
} }
@ -128,9 +128,9 @@ export class CalculatedFieldTestArgumentsComponent extends PageComponent impleme
}) as FormGroup; }) as FormGroup;
} }
private getRollingArgumentFormGroup({ argumentName, timewindow, values }: CalculatedFieldRollingTelemetryArgumentValue): FormGroup { private getRollingArgumentFormGroup({ argumentName, timeWindow, values }: CalculatedFieldRollingTelemetryArgumentValue): FormGroup {
return this.fb.group({ return this.fb.group({
...timewindow ?? {}, timeWindow: [timeWindow ?? {}],
argumentName: [{ value: argumentName, disabled: true }], argumentName: [{ value: argumentName, disabled: true }],
values: [values] values: [values]
}) as FormGroup; }) as FormGroup;

3
ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.ts
View File

@ -39,7 +39,8 @@ import { CalculatedFieldsService } from '@core/http/calculated-fields.service';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { filter } from 'rxjs/operators'; import { filter } from 'rxjs/operators';
import { import {
ArgumentType, CalculatedFieldEventArguments, ArgumentType,
CalculatedFieldEventArguments,
CalculatedFieldTestScriptDialogData, CalculatedFieldTestScriptDialogData,
TestArgumentTypeMap TestArgumentTypeMap
} from '@shared/models/calculated-field.models'; } from '@shared/models/calculated-field.models';

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

@ -218,7 +218,7 @@ export interface CalculatedFieldLatestTelemetryArgumentValue<ValueType = unknown
} }
export interface CalculatedFieldRollingTelemetryArgumentValue<ValueType = unknown> extends CalculatedFieldArgumentValueBase { export interface CalculatedFieldRollingTelemetryArgumentValue<ValueType = unknown> extends CalculatedFieldArgumentValueBase {
timewindow: { startTs: number; endTs: number; limit: number }; timeWindow: { startTs: number; endTs: number; limit: number };
values: CalculatedFieldSingleArgumentValue<ValueType>[]; values: CalculatedFieldSingleArgumentValue<ValueType>[];
} }