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

current tenant fix

Browse Source
This commit is contained in:
mpetrov 2025-02-03 18:21:43 +02:00
parent d5d0094c57
commit c60909b142
1 changed files with 5 additions and 1 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/panel/calculated-field-argument-panel.component.ts
View File

@ -19,7 +19,8 @@ import { TbPopoverComponent } from '@shared/components/popover.component';
import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { charsWithNumRegex, noLeadTrailSpacesRegex } from '@shared/models/regex.constants'; import { charsWithNumRegex, noLeadTrailSpacesRegex } from '@shared/models/regex.constants';
import { import {
ArgumentEntityType, ArgumentEntityTypeParamsMap, ArgumentEntityType,
ArgumentEntityTypeParamsMap,
ArgumentEntityTypeTranslations, ArgumentEntityTypeTranslations,
ArgumentType, ArgumentType,
ArgumentTypeTranslations, ArgumentTypeTranslations,
@ -117,6 +118,9 @@ export class CalculatedFieldArgumentPanelComponent implements OnInit {
saveArgument(): void { saveArgument(): void {
const { refEntityId, ...restConfig } = this.argumentFormGroup.value; const { refEntityId, ...restConfig } = this.argumentFormGroup.value;
const value = (refEntityId.entityType === ArgumentEntityType.Current ? restConfig : { refEntityId, ...restConfig }) as CalculatedFieldArgumentValue; const value = (refEntityId.entityType === ArgumentEntityType.Current ? restConfig : { refEntityId, ...restConfig }) as CalculatedFieldArgumentValue;
if (refEntityId.entityType === ArgumentEntityType.Tenant) {
refEntityId.id = this.tenantId;
}
this.argumentsDataApplied.emit({ value, index: this.index }); this.argumentsDataApplied.emit({ value, index: this.index });
} }