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

Merge branch 'feature/queue-entity' of github.com:YevhenBondarenko/thingsboard into feature/queue-entity

Browse Source
This commit is contained in:
YevhenBondarenko 2022-05-06 21:23:03 +02:00
commit 4120705956
3 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.ts
View File

@ -130,12 +130,8 @@ export class TenantProfileQueuesComponent implements ControlValueAccessor, Valid
});
}
public trackByQueue(index: number, queueControl: AbstractControl): string {
if (queueControl) {
return queueControl.value.id;
} else {
return null;
}
public trackByQueue(index: number, queueControl: AbstractControl) {
return queueControl;
}
public removeQueue(index: number) {

60
ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.html
View File

@ -68,35 +68,37 @@
<div class="tb-hint">{{'tenant.isolated-tb-rule-engine-details' | translate}}</div>
</mat-checkbox>
</div>
<mat-accordion formGroupName="profileData" multi>
<mat-expansion-panel [expanded]="true" *ngIf="entityForm.get('isolatedTbRuleEngine').value">
<mat-expansion-panel-header>
<mat-panel-title>
{{'tenant-profile.queues-with-count' | translate:
{count: entityForm.get('profileData').get('queueConfiguration').value ?
entityForm.get('profileData').get('queueConfiguration').value.length : 0} }}
</mat-panel-title>
</mat-expansion-panel-header>
<ng-template matExpansionPanelContent>
<tb-tenant-profile-queues
formControlName="queueConfiguration"
></tb-tenant-profile-queues>
</ng-template>
</mat-expansion-panel>
<mat-expansion-panel [expanded]="true">
<mat-expansion-panel-header>
<mat-panel-title>
<div translate>tenant-profile.profile-configuration</div>
</mat-panel-title>
</mat-expansion-panel-header>
<ng-template matExpansionPanelContent>
<tb-tenant-profile-data
formControlName="configuration"
required>
</tb-tenant-profile-data>
</ng-template>
</mat-expansion-panel>
</mat-accordion>
<div class="expansion-panel-block">
<mat-accordion formGroupName="profileData" multi>
<mat-expansion-panel [expanded]="true" *ngIf="entityForm.get('isolatedTbRuleEngine').value">
<mat-expansion-panel-header>
<mat-panel-title>
{{'tenant-profile.queues-with-count' | translate:
{count: entityForm.get('profileData').get('queueConfiguration').value ?
entityForm.get('profileData').get('queueConfiguration').value.length : 0} }}
</mat-panel-title>
</mat-expansion-panel-header>
<ng-template matExpansionPanelContent>
<tb-tenant-profile-queues
formControlName="queueConfiguration"
></tb-tenant-profile-queues>
</ng-template>
</mat-expansion-panel>
<mat-expansion-panel [expanded]="true">
<mat-expansion-panel-header>
<mat-panel-title>
<div translate>tenant-profile.profile-configuration</div>
</mat-panel-title>
</mat-expansion-panel-header>
<ng-template matExpansionPanelContent>
<tb-tenant-profile-data
formControlName="configuration"
required>
</tb-tenant-profile-data>
</ng-template>
</mat-expansion-panel>
</mat-accordion>
</div>
<mat-form-field class="mat-block">
<mat-label translate>tenant-profile.description</mat-label>
<textarea matInput formControlName="description" rows="2"></textarea>

3
ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.scss
View File

@ -35,4 +35,7 @@
width: fit-content;
}
}
.expansion-panel-block {
padding-bottom: 16px;
}
}