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

Merge pull request #22 from kalutkaz/updateRelationFilter

Browse Source 
Updated relation filter
This commit is contained in:
Shvaika Dmytro 2023-05-16 15:36:03 +03:00 committed by GitHub
commit 00f65469cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ui-ngx/src/app/modules/home/components/relation/relation-filters.component.html
View File

@ -17,28 +17,23 @@
--> -->
<div class="tb-relation-filters" [formGroup]="relationFiltersFormGroup"> <div class="tb-relation-filters" [formGroup]="relationFiltersFormGroup">
<div class="container"> <div class="container">
<div class="header" [fxShow]="relationFiltersFormArray.length">
<div fxLayout="row" fxLayoutAlign="start center">
<span class="cell" style="width: 200px; min-width: 200px;" translate>relation.type</span>
<span class="cell" fxFlex translate>entity.entity-types</span>
<span class="cell" style="width: 40px; min-width: 40px;">&nbsp;</span>
</div>
</div>
<div class="body" [fxShow]="relationFiltersFormArray.length"> <div class="body" [fxShow]="relationFiltersFormArray.length">
<div class="row" fxFlex fxLayout="row" <div style="margin-bottom: 10px;" class="row" fxFlex fxLayout="row"
fxLayoutAlign="start center" formArrayName="relationFilters" fxLayoutAlign="start center" formArrayName="relationFilters"
*ngFor="let relationFilterControl of relationFiltersFormArray.controls; let $index = index"> *ngFor="let relationFilterControl of relationFiltersFormArray.controls; let $index = index">
<div class="mat-elevation-z1" fxFlex fxLayout="row" fxLayoutAlign="start center" style="padding: 8px 0;"> <div fxFlex fxLayout="row" fxLayoutAlign="start center">
<div class="input-block" fxFlex fxLayout="row" fxLayoutAlign="start center">
<tb-relation-type-autocomplete <tb-relation-type-autocomplete
class="cell" style="width: 200px; min-width: 200px;" style="width: 200px; min-width: 200px;"
subscriptSizing="dynamic" subscriptSizing="dynamic"
[formControl]="relationFilterControl.get('relationType')"> [formControl]="relationFilterControl.get('relationType')">
</tb-relation-type-autocomplete> </tb-relation-type-autocomplete>
<tb-entity-type-list class="cell" fxFlex <tb-entity-type-list style="margin-left: 30px" fxFlex
subscriptSizing="dynamic" subscriptSizing="dynamic"
[allowedEntityTypes]="allowedEntityTypes" [allowedEntityTypes]="allowedEntityTypes"
[formControl]="relationFilterControl.get('entityTypes')"> [formControl]="relationFilterControl.get('entityTypes')">
</tb-entity-type-list> </tb-entity-type-list>
</div>
<button mat-icon-button color="primary" <button mat-icon-button color="primary"
type="button" type="button"
(click)="removeFilter($index)" (click)="removeFilter($index)"

9
ui-ngx/src/app/modules/home/components/relation/relation-filters.component.scss
View File

@ -36,17 +36,12 @@
.input-block { .input-block {
border: 1px solid #E0E0E0; border: 1px solid #E0E0E0;
width: 100%;
border-radius: 6px; border-radius: 6px;
padding: 24px 24px 2px 24px; padding: 24px;
align-items: center; align-items: center;
margin: 0px 8px 15px 0px;
} }
} }
.cell {
padding-right: 5px;
padding-left: 5px;
}
} }
.any-filter{ .any-filter{

2
ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.html
View File

@ -54,7 +54,7 @@
</tb-rule-node-config> </tb-rule-node-config>
<div formGroupName="additionalInfo" fxLayout="column"> <div formGroupName="additionalInfo" fxLayout="column">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>rulenode.description</mat-label> <mat-label translate>rulenode.rule-node-description</mat-label>
<textarea matInput formControlName="description" rows="2"></textarea> <textarea matInput formControlName="description" rows="2"></textarea>
</mat-form-field> </mat-form-field>
</div> </div>

10
ui-ngx/src/assets/locale/locale.constant-en_US.json
View File

@ -1271,13 +1271,13 @@
"password": "Password", "password": "Password",
"secret": "Secret", "secret": "Secret",
"secret-required": "Secret is required.", "secret-required": "Secret is required.",
"device-type": "Device type", "device-type": "Device profile",
"device-type-required": "Device type is required.", "device-type-required": "Device type is required.",
"select-device-type": "Select device type", "select-device-type": "Select device type",
"enter-device-type": "Enter device type", "enter-device-type": "Enter device profile",
"any-device": "Any device", "any-device": "Any device",
"no-device-types-matching": "No device types matching '{{entitySubtype}}' were found.", "no-device-types-matching": "No device profiles matching '{{entitySubtype}}' were found.",
"device-type-list-empty": "No device types selected.", "device-type-list-empty": "No device profiles selected!",
"device-types": "Device types", "device-types": "Device types",
"name": "Name", "name": "Name",
"name-required": "Name is required.", "name-required": "Name is required.",
@ -3322,7 +3322,7 @@
"name-required": "Name is required.", "name-required": "Name is required.",
"name-max-length": "Name should be less than 256", "name-max-length": "Name should be less than 256",
"type": "Type", "type": "Type",
"description": "Description", "rule-node-description": "Rule node description",
"delete": "Delete rule node", "delete": "Delete rule node",
"select-all-objects": "Select all nodes and connections", "select-all-objects": "Select all nodes and connections",
"deselect-all-objects": "Deselect all nodes and connections", "deselect-all-objects": "Deselect all nodes and connections",