Added dialog for creation latest telemetry key value

This commit is contained in:
rusikv 2023-07-27 18:07:50 +03:00
parent 91b0b0aead
commit 0f5841e9cb
5 changed files with 23 additions and 13 deletions

View File

@ -17,7 +17,7 @@
--> -->
<form [formGroup]="attributeFormGroup" (ngSubmit)="add()" style="min-width: 400px;"> <form [formGroup]="attributeFormGroup" (ngSubmit)="add()" style="min-width: 400px;">
<mat-toolbar color="primary"> <mat-toolbar color="primary">
<h2>{{ 'attribute.add' | translate }}</h2> <h2>{{ title | translate }}</h2>
<span fxFlex></span> <span fxFlex></span>
<button mat-icon-button <button mat-icon-button
(click)="cancel()" (click)="cancel()"

View File

@ -19,16 +19,17 @@ import { ErrorStateMatcher } from '@angular/material/core';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state'; import { AppState } from '@core/core.state';
import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms'; import { FormGroupDirective, NgForm, UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
import { EntityId } from '@shared/models/id/entity-id'; import { EntityId } from '@shared/models/id/entity-id';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { DialogComponent } from '@app/shared/components/dialog.component'; import { DialogComponent } from '@app/shared/components/dialog.component';
import { AttributeData, AttributeScope } from '@shared/models/telemetry/telemetry.models'; import { AttributeData, AttributeScope, LatestTelemetry, TelemetryType } from '@shared/models/telemetry/telemetry.models';
import { AttributeService } from '@core/http/attribute.service'; import { AttributeService } from '@core/http/attribute.service';
import { Observable } from 'rxjs';
export interface AddAttributeDialogData { export interface AddAttributeDialogData {
entityId: EntityId; entityId: EntityId;
attributeScope: AttributeScope; attributeScope: TelemetryType;
} }
@Component({ @Component({
@ -44,6 +45,8 @@ export class AddAttributeDialogComponent extends DialogComponent<AddAttributeDia
submitted = false; submitted = false;
title = '';
constructor(protected store: Store<AppState>, constructor(protected store: Store<AppState>,
protected router: Router, protected router: Router,
@Inject(MAT_DIALOG_DATA) public data: AddAttributeDialogData, @Inject(MAT_DIALOG_DATA) public data: AddAttributeDialogData,
@ -59,6 +62,8 @@ export class AddAttributeDialogComponent extends DialogComponent<AddAttributeDia
key: ['', [Validators.required, Validators.maxLength(255)]], key: ['', [Validators.required, Validators.maxLength(255)]],
value: [null, [Validators.required]] value: [null, [Validators.required]]
}); });
this.title = this.data.attributeScope === LatestTelemetry.LATEST_TELEMETRY ?
'attribute.add-telemetry' : 'attribute.add'
} }
isErrorState(control: UntypedFormControl | null, form: FormGroupDirective | NgForm | null): boolean { isErrorState(control: UntypedFormControl | null, form: FormGroupDirective | NgForm | null): boolean {
@ -78,11 +83,15 @@ export class AddAttributeDialogComponent extends DialogComponent<AddAttributeDia
key: this.attributeFormGroup.get('key').value.trim(), key: this.attributeFormGroup.get('key').value.trim(),
value: this.attributeFormGroup.get('value').value value: this.attributeFormGroup.get('value').value
}; };
this.attributeService.saveEntityAttributes(this.data.entityId, let task: Observable<any>;
this.data.attributeScope, [attribute]).subscribe( if (this.data.attributeScope === LatestTelemetry.LATEST_TELEMETRY) {
() => { task = this.attributeService.saveEntityTimeseries(this.data.entityId,
this.dialogRef.close(true); this.data.attributeScope, [attribute]);
} }
); if (this.data.attributeScope in AttributeScope) {
task = this.attributeService.saveEntityAttributes(this.data.entityId,
this.data.attributeScope as AttributeScope, [attribute]);
}
task.subscribe(() => this.dialogRef.close(true));
} }
} }

View File

@ -34,7 +34,7 @@
</div> </div>
<span fxFlex></span> <span fxFlex></span>
<button mat-icon-button <button mat-icon-button
*ngIf="!isClientSideTelemetryTypeMap.get(attributeScope)" *ngIf="!isClientSideTelemetryTypeMap.get(attributeScope) || attributeScope === latestTelemetryTypes.LATEST_TELEMETRY"
[disabled]="isLoading$ | async" [disabled]="isLoading$ | async"
(click)="addAttribute($event)" (click)="addAttribute($event)"
matTooltip="{{ 'action.add' | translate }}" matTooltip="{{ 'action.add' | translate }}"

View File

@ -313,7 +313,7 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
data: { data: {
entityId: this.entityIdValue, entityId: this.entityIdValue,
attributeScope: this.attributeScope as AttributeScope attributeScope: this.attributeScope
} }
}).afterClosed().subscribe( }).afterClosed().subscribe(
(res) => { (res) => {

View File

@ -718,7 +718,8 @@
"no-attributes-text": "No attributes found", "no-attributes-text": "No attributes found",
"no-telemetry-text": "No telemetry found", "no-telemetry-text": "No telemetry found",
"copy-key": "Copy key", "copy-key": "Copy key",
"copy-value": "Copy value" "copy-value": "Copy value",
"add-telemetry": "Add telemetry"
}, },
"api-usage": { "api-usage": {
"api-features": "API features", "api-features": "API features",