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

UI: DeviceConnectivitySettings refactored to ts Record, added responsivness for exstrasmall screens

Browse Source
This commit is contained in:
rusikv 2023-10-25 17:54:32 +03:00
parent 673d28fe92
commit 80c3b35bc1
3 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-ngx/src/app/modules/home/pages/admin/general-settings.component.html
View File

@ -89,7 +89,7 @@
<mat-slide-toggle class="mat-slide" formControlName="enabled"> <mat-slide-toggle class="mat-slide" formControlName="enabled">
{{ 'admin.device-connectivity.' + protocol | translate }} {{ 'admin.device-connectivity.' + protocol | translate }}
</mat-slide-toggle> </mat-slide-toggle>
<div class="tb-form-row no-border no-padding tb-standard-fields"> <div class="tb-form-row column-xs no-border no-padding tb-standard-fields">
<mat-form-field fxFlex> <mat-form-field fxFlex>
<mat-label translate>admin.device-connectivity.host</mat-label> <mat-label translate>admin.device-connectivity.host</mat-label>
<input matInput formControlName="host"/> <input matInput formControlName="host"/>

9
ui-ngx/src/app/modules/home/pages/admin/general-settings.component.ts
View File

@ -20,7 +20,12 @@ import { AppState } from '@core/core.state';
import { PageComponent } from '@shared/components/page.component'; import { PageComponent } from '@shared/components/page.component';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { AdminSettings, DeviceConnectivitySettings, GeneralSettings } from '@shared/models/settings.models'; import {
AdminSettings,
DeviceConnectivityProtocol,
DeviceConnectivitySettings,
GeneralSettings
} from '@shared/models/settings.models';
import { AdminService } from '@core/http/admin.service'; import { AdminService } from '@core/http/admin.service';
import { HasConfirmForm } from '@core/guards/confirm-on-exit.guard'; import { HasConfirmForm } from '@core/guards/confirm-on-exit.guard';
@ -37,7 +42,7 @@ export class GeneralSettingsComponent extends PageComponent implements HasConfir
deviceConnectivitySettingsForm: UntypedFormGroup; deviceConnectivitySettingsForm: UntypedFormGroup;
private deviceConnectivitySettings: AdminSettings<DeviceConnectivitySettings>; private deviceConnectivitySettings: AdminSettings<DeviceConnectivitySettings>;
protocol = 'http'; protocol: DeviceConnectivityProtocol = 'http';
constructor(protected store: Store<AppState>, constructor(protected store: Store<AppState>,
private router: Router, private router: Router,

33
ui-ngx/src/app/shared/models/settings.models.ts
View File

@ -87,39 +87,16 @@ export interface GeneralSettings {
baseUrl: string; baseUrl: string;
} }
export interface DeviceConnectivitySettings { export type DeviceConnectivityProtocol = 'http' | 'https' | 'mqtt' | 'mqtts' | 'coap' | 'coaps';
http: {
export interface DeviceConnectivityInfo {
enabled: boolean; enabled: boolean;
host: string; host: string;
port: number; port: number;
},
https: {
enabled: boolean;
host: string;
port: number;
},
mqtt: {
enabled: boolean;
host: string;
port: number;
},
mqtts: {
enabled: boolean;
host: string;
port: number;
},
coap: {
enabled: boolean;
host: string;
port: number;
},
coaps: {
enabled: boolean;
host: string;
port: number;
}
} }
export type DeviceConnectivitySettings = Record<DeviceConnectivityProtocol, DeviceConnectivityInfo>;
export interface UserPasswordPolicy { export interface UserPasswordPolicy {
minimumLength: number; minimumLength: number;
minimumUppercaseLetters: number; minimumUppercaseLetters: number;