tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #11057 from maxunbearable/fix/3903-username-field-static-height 

General Config - Security: added static height for username field
pull/11071/head
Vladyslav Prykhodko 2 years ago
committed by GitHub
parent
43e3e3e44f d63168ceeb
commit
d050297b67
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
1 changed files with 35 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 67
      ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.html

67
ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.html
View File

@ -67,36 +67,38 @@
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>
<div class="tb-form-panel"> </div>
<div translate class="tb-form-panel-title">security.security</div> <div class="tb-form-panel">
<ng-container formGroupName="security"> <div translate class="tb-form-panel-title">security.security</div>
<tb-toggle-select class="toggle-group" formControlName="type"> <ng-container formGroupName="security">
<tb-toggle-option *ngFor="let securityType of securityTypes | keyvalue" <tb-toggle-select class="toggle-group" formControlName="type">
[value]="securityType.key">{{ securityType.value | translate }}</tb-toggle-option> <tb-toggle-option *ngFor="let securityType of securityTypes | keyvalue"
</tb-toggle-select> [value]="securityType.key">{{ securityType.value | translate }}</tb-toggle-option>
<mat-form-field appearance="outline" </tb-toggle-select>
*ngIf="gatewayConfigGroup.get('thingsboard.security.type').value.toLowerCase().includes('accesstoken')"> <mat-form-field appearance="outline"
<mat-label translate>security.access-token</mat-label> *ngIf="gatewayConfigGroup.get('thingsboard.security.type').value.toLowerCase().includes('accesstoken')">
<input matInput formControlName="accessToken"/> <mat-label translate>security.access-token</mat-label>
<mat-error *ngIf="gatewayConfigGroup.get('thingsboard.security.accessToken').hasError('required')"> <input matInput formControlName="accessToken"/>
{{ 'security.access-token-required' | translate }} <mat-error *ngIf="gatewayConfigGroup.get('thingsboard.security.accessToken').hasError('required')">
</mat-error> {{ 'security.access-token-required' | translate }}
<tb-copy-button </mat-error>
matSuffix <tb-copy-button
miniButton="false" matSuffix
*ngIf="gatewayConfigGroup.get('thingsboard.security.accessToken').value" miniButton="false"
[copyText]="gatewayConfigGroup.get('thingsboard.security.accessToken').value" *ngIf="gatewayConfigGroup.get('thingsboard.security.accessToken').value"
tooltipText="{{ 'device.copy-access-token' | translate }}" [copyText]="gatewayConfigGroup.get('thingsboard.security.accessToken').value"
tooltipPosition="above" tooltipText="{{ 'device.copy-access-token' | translate }}"
icon="content_copy"> tooltipPosition="above"
</tb-copy-button> icon="content_copy">
<mat-icon matIconSuffix style="cursor:pointer;" </tb-copy-button>
matTooltip="{{ 'gateway.hints.token' | translate }}">info_outlined <mat-icon matIconSuffix style="cursor:pointer;"
</mat-icon> matTooltip="{{ 'gateway.hints.token' | translate }}">info_outlined
</mat-form-field> </mat-icon>
</mat-form-field>
<section>
<div class="tb-form-row no-border no-padding tb-standard-fields" <div class="tb-form-row no-border no-padding tb-standard-fields"
*ngIf="gatewayConfigGroup.get('thingsboard.security.type').value === 'usernamePassword'"> *ngIf="gatewayConfigGroup.get('thingsboard.security.type').value === 'usernamePassword'">
<mat-form-field appearance="outline" class="flex" subscriptSizing="dynamic"> <mat-form-field appearance="outline" class="flex">
<mat-label translate>security.clientId</mat-label> <mat-label translate>security.clientId</mat-label>
<input matInput formControlName="clientId"/> <input matInput formControlName="clientId"/>
<mat-error *ngIf="gatewayConfigGroup.get('thingsboard.security.clientId').hasError('required')"> <mat-error *ngIf="gatewayConfigGroup.get('thingsboard.security.clientId').hasError('required')">
@ -115,7 +117,7 @@
matTooltip="{{ 'gateway.hints.client-id' | translate }}">info_outlined matTooltip="{{ 'gateway.hints.client-id' | translate }}">info_outlined
</mat-icon> </mat-icon>
</mat-form-field> </mat-form-field>
<mat-form-field appearance="outline" class="flex" subscriptSizing="dynamic"> <mat-form-field appearance="outline" class="flex">
<mat-label translate>security.username</mat-label> <mat-label translate>security.username</mat-label>
<input matInput formControlName="username"/> <input matInput formControlName="username"/>
<mat-error *ngIf="gatewayConfigGroup.get('thingsboard.security.username').hasError('required')"> <mat-error *ngIf="gatewayConfigGroup.get('thingsboard.security.username').hasError('required')">
@ -152,9 +154,10 @@
matTooltip="{{ 'gateway.hints.password' | translate }}">info_outlined matTooltip="{{ 'gateway.hints.password' | translate }}">info_outlined
</mat-icon> </mat-icon>
</mat-form-field> </mat-form-field>
<tb-error style="margin-top: -12px; display: block;" fxFlex="100" </section>
*ngIf="gatewayConfigGroup.get('thingsboard.security.type').value === 'usernamePassword'" <tb-error style="margin-top: -12px; display: block;" fxFlex="100"
[error]="gatewayConfigGroup.get('thingsboard.security').hasError('atLeastOne') ? *ngIf="gatewayConfigGroup.get('thingsboard.security.type').value === 'usernamePassword'"
[error]="gatewayConfigGroup.get('thingsboard.security').hasError('atLeastOne') ?
('device.client-id-or-user-name-necessary' | translate) : ''"></tb-error> ('device.client-id-or-user-name-necessary' | translate) : ''"></tb-error>
<tb-file-input <tb-file-input
fxFlex="100" fxFlex="100"

Write Preview
Loading…
Cancel
Save