Commit 6cfc79215608b3c08e09f653e76c647eb4f455be
1 parent
c8814f7c
Lwm2m: front: refactoring <mat-expansion-panel-header>
Showing
2 changed files
with
40 additions
and
29 deletions
| @@ -60,7 +60,8 @@ | @@ -60,7 +60,8 @@ | ||
| 60 | <mat-form-field fxFlex> | 60 | <mat-form-field fxFlex> |
| 61 | <mat-label>{{ 'device-profile.lwm2m.lifetime' | translate }}</mat-label> | 61 | <mat-label>{{ 'device-profile.lwm2m.lifetime' | translate }}</mat-label> |
| 62 | <input matInput type="number" formControlName="lifetime" required> | 62 | <input matInput type="number" formControlName="lifetime" required> |
| 63 | - <mat-error *ngIf="lwm2mDeviceProfileTransportConfFormGroup.get('lifetime').hasError('required')"> | 63 | + <mat-error |
| 64 | + *ngIf="lwm2mDeviceProfileTransportConfFormGroup.get('lifetime').hasError('required')"> | ||
| 64 | {{ 'device-profile.lwm2m.lifetime' | translate }} | 65 | {{ 'device-profile.lwm2m.lifetime' | translate }} |
| 65 | <strong>{{ 'device-profile.lwm2m.required' | translate }}</strong> | 66 | <strong>{{ 'device-profile.lwm2m.required' | translate }}</strong> |
| 66 | </mat-error> | 67 | </mat-error> |
| @@ -102,13 +103,15 @@ | @@ -102,13 +103,15 @@ | ||
| 102 | class="tb-panel-title">{{ 'device-profile.lwm2m.bootstrap-server' | translate | uppercase }}</div> | 103 | class="tb-panel-title">{{ 'device-profile.lwm2m.bootstrap-server' | translate | uppercase }}</div> |
| 103 | </mat-panel-title> | 104 | </mat-panel-title> |
| 104 | </mat-expansion-panel-header> | 105 | </mat-expansion-panel-header> |
| 105 | - <div class="mat-padding"> | ||
| 106 | - <tb-profile-lwm2m-device-config-server | ||
| 107 | - [required]="required" | ||
| 108 | - formControlName="bootstrapServer" | ||
| 109 | - [bootstrapServerIs]=true> | ||
| 110 | - </tb-profile-lwm2m-device-config-server> | ||
| 111 | - </div> | 106 | + <ng-template matExpansionPanelContent> |
| 107 | + <div class="mat-padding"> | ||
| 108 | + <tb-profile-lwm2m-device-config-server | ||
| 109 | + [required]="required" | ||
| 110 | + formControlName="bootstrapServer" | ||
| 111 | + [bootstrapServerIs]=true> | ||
| 112 | + </tb-profile-lwm2m-device-config-server> | ||
| 113 | + </div> | ||
| 114 | + </ng-template> | ||
| 112 | </mat-expansion-panel> | 115 | </mat-expansion-panel> |
| 113 | </mat-accordion> | 116 | </mat-accordion> |
| 114 | <mat-accordion multi="true" class="mat-body-1"> | 117 | <mat-accordion multi="true" class="mat-body-1"> |
| @@ -118,13 +121,15 @@ | @@ -118,13 +121,15 @@ | ||
| 118 | <div class="tb-panel-title">{{ 'device-profile.lwm2m.lwm2m-server' | translate | uppercase }}</div> | 121 | <div class="tb-panel-title">{{ 'device-profile.lwm2m.lwm2m-server' | translate | uppercase }}</div> |
| 119 | </mat-panel-title> | 122 | </mat-panel-title> |
| 120 | </mat-expansion-panel-header> | 123 | </mat-expansion-panel-header> |
| 121 | - <div class="mat-padding"> | ||
| 122 | - <tb-profile-lwm2m-device-config-server | ||
| 123 | - [required]="required" | ||
| 124 | - formControlName="lwm2mServer" | ||
| 125 | - [bootstrapServerIs]=false> | ||
| 126 | - </tb-profile-lwm2m-device-config-server> | ||
| 127 | - </div> | 124 | + <ng-template matExpansionPanelContent> |
| 125 | + <div class="mat-padding"> | ||
| 126 | + <tb-profile-lwm2m-device-config-server | ||
| 127 | + [required]="required" | ||
| 128 | + formControlName="lwm2mServer" | ||
| 129 | + [bootstrapServerIs]=false> | ||
| 130 | + </tb-profile-lwm2m-device-config-server> | ||
| 131 | + </div> | ||
| 132 | + </ng-template> | ||
| 128 | </mat-expansion-panel> | 133 | </mat-expansion-panel> |
| 129 | </mat-accordion> | 134 | </mat-accordion> |
| 130 | </div> | 135 | </div> |
| @@ -83,13 +83,15 @@ | @@ -83,13 +83,15 @@ | ||
| 83 | <mat-error *ngIf="lwm2mConfigFormGroup.get('clientKey').hasError('pattern')"> | 83 | <mat-error *ngIf="lwm2mConfigFormGroup.get('clientKey').hasError('pattern')"> |
| 84 | {{ 'device.lwm2m-security-config.client-key' | translate }} | 84 | {{ 'device.lwm2m-security-config.client-key' | translate }} |
| 85 | <strong>{{ translate.get('device.lwm2m-security-config.pattern_hex_dec', { | 85 | <strong>{{ translate.get('device.lwm2m-security-config.pattern_hex_dec', { |
| 86 | - count: 0 }) | async }}</strong> | 86 | + count: 0 |
| 87 | + }) | async }}</strong> | ||
| 87 | </mat-error> | 88 | </mat-error> |
| 88 | <mat-error *ngIf="(lwm2mConfigFormGroup.get('clientKey').hasError('maxlength') || | 89 | <mat-error *ngIf="(lwm2mConfigFormGroup.get('clientKey').hasError('maxlength') || |
| 89 | lwm2mConfigFormGroup.get('clientKey').hasError('minlength'))"> | 90 | lwm2mConfigFormGroup.get('clientKey').hasError('minlength'))"> |
| 90 | {{ 'device.lwm2m-security-config.client-key' | translate }} | 91 | {{ 'device.lwm2m-security-config.client-key' | translate }} |
| 91 | <strong>{{ translate.get('device.lwm2m-security-config.pattern_hex_dec', { | 92 | <strong>{{ translate.get('device.lwm2m-security-config.pattern_hex_dec', { |
| 92 | - count: lenMaxKeyClient }) | async }}</strong> | 93 | + count: lenMaxKeyClient |
| 94 | + }) | async }}</strong> | ||
| 93 | </mat-error> | 95 | </mat-error> |
| 94 | </mat-form-field> | 96 | </mat-form-field> |
| 95 | </div> | 97 | </div> |
| @@ -112,12 +114,14 @@ | @@ -112,12 +114,14 @@ | ||
| 112 | class="tb-panel-title">{{ 'device.lwm2m-security-config.bootstrap-server' | translate | uppercase }}</div> | 114 | class="tb-panel-title">{{ 'device.lwm2m-security-config.bootstrap-server' | translate | uppercase }}</div> |
| 113 | </mat-panel-title> | 115 | </mat-panel-title> |
| 114 | </mat-expansion-panel-header> | 116 | </mat-expansion-panel-header> |
| 115 | - <div class="mat-padding"> | ||
| 116 | - <tb-security-config-server-lwm2m | ||
| 117 | - [formControlName]="bootstrapServer" | ||
| 118 | - [serverFormGroup]="bootstrapFormGroup"> | ||
| 119 | - </tb-security-config-server-lwm2m> | ||
| 120 | - </div> | 117 | + <ng-template matExpansionPanelContent> |
| 118 | + <div class="mat-padding"> | ||
| 119 | + <tb-security-config-server-lwm2m | ||
| 120 | + [formControlName]="bootstrapServer" | ||
| 121 | + [serverFormGroup]="bootstrapFormGroup"> | ||
| 122 | + </tb-security-config-server-lwm2m> | ||
| 123 | + </div> | ||
| 124 | + </ng-template> | ||
| 121 | </mat-expansion-panel> | 125 | </mat-expansion-panel> |
| 122 | </mat-accordion> | 126 | </mat-accordion> |
| 123 | <mat-accordion multi="true" class="mat-body-1"> | 127 | <mat-accordion multi="true" class="mat-body-1"> |
| @@ -128,12 +132,14 @@ | @@ -128,12 +132,14 @@ | ||
| 128 | class="tb-panel-title">{{ 'device.lwm2m-security-config.lwm2m-server' | translate | uppercase }}</div> | 132 | class="tb-panel-title">{{ 'device.lwm2m-security-config.lwm2m-server' | translate | uppercase }}</div> |
| 129 | </mat-panel-title> | 133 | </mat-panel-title> |
| 130 | </mat-expansion-panel-header> | 134 | </mat-expansion-panel-header> |
| 131 | - <div class="mat-padding"> | ||
| 132 | - <tb-security-config-server-lwm2m | ||
| 133 | - [formControlName]="lwm2mServer" | ||
| 134 | - [serverFormGroup]="lwm2mServerFormGroup"> | ||
| 135 | - </tb-security-config-server-lwm2m> | ||
| 136 | - </div> | 135 | + <ng-template matExpansionPanelContent> |
| 136 | + <div class="mat-padding"> | ||
| 137 | + <tb-security-config-server-lwm2m | ||
| 138 | + [formControlName]="lwm2mServer" | ||
| 139 | + [serverFormGroup]="lwm2mServerFormGroup"> | ||
| 140 | + </tb-security-config-server-lwm2m> | ||
| 141 | + </div> | ||
| 142 | + </ng-template> | ||
| 137 | </mat-expansion-panel> | 143 | </mat-expansion-panel> |
| 138 | </mat-accordion> | 144 | </mat-accordion> |
| 139 | </div> | 145 | </div> |