|
|
@ -14,12 +14,11 @@ |
|
|
/// limitations under the License.
|
|
|
/// limitations under the License.
|
|
|
///
|
|
|
///
|
|
|
|
|
|
|
|
|
import { Component } from '@angular/core'; |
|
|
import { Component, OnDestroy } from '@angular/core'; |
|
|
import { Store } from '@ngrx/store'; |
|
|
import { Store } from '@ngrx/store'; |
|
|
import { AppState } from '@core/core.state'; |
|
|
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 { FormBuilder, FormGroup, Validators } from '@angular/forms'; |
|
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; |
|
|
|
|
|
import { |
|
|
import { |
|
|
AdminSettings, |
|
|
AdminSettings, |
|
|
DeviceConnectivityProtocol, |
|
|
DeviceConnectivityProtocol, |
|
|
@ -28,26 +27,29 @@ import { |
|
|
} from '@shared/models/settings.models'; |
|
|
} 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'; |
|
|
|
|
|
import { Subject } from 'rxjs'; |
|
|
|
|
|
import { takeUntil } from 'rxjs/operators'; |
|
|
|
|
|
|
|
|
@Component({ |
|
|
@Component({ |
|
|
selector: 'tb-general-settings', |
|
|
selector: 'tb-general-settings', |
|
|
templateUrl: './general-settings.component.html', |
|
|
templateUrl: './general-settings.component.html', |
|
|
styleUrls: ['./general-settings.component.scss', './settings-card.scss'] |
|
|
styleUrls: ['./general-settings.component.scss', './settings-card.scss'] |
|
|
}) |
|
|
}) |
|
|
export class GeneralSettingsComponent extends PageComponent implements HasConfirmForm { |
|
|
export class GeneralSettingsComponent extends PageComponent implements HasConfirmForm, OnDestroy { |
|
|
|
|
|
|
|
|
generalSettings: UntypedFormGroup; |
|
|
generalSettings: FormGroup; |
|
|
private adminSettings: AdminSettings<GeneralSettings>; |
|
|
deviceConnectivitySettingsForm: FormGroup; |
|
|
|
|
|
|
|
|
|
|
|
protocol: DeviceConnectivityProtocol = 'http'; |
|
|
|
|
|
|
|
|
deviceConnectivitySettingsForm: UntypedFormGroup; |
|
|
private adminSettings: AdminSettings<GeneralSettings>; |
|
|
private deviceConnectivitySettings: AdminSettings<DeviceConnectivitySettings>; |
|
|
private deviceConnectivitySettings: AdminSettings<DeviceConnectivitySettings>; |
|
|
|
|
|
|
|
|
protocol: DeviceConnectivityProtocol = 'http'; |
|
|
private readonly destroy$ = new Subject<void>(); |
|
|
|
|
|
|
|
|
constructor(protected store: Store<AppState>, |
|
|
constructor(protected store: Store<AppState>, |
|
|
private router: Router, |
|
|
|
|
|
private adminService: AdminService, |
|
|
private adminService: AdminService, |
|
|
public fb: UntypedFormBuilder) { |
|
|
public fb: FormBuilder) { |
|
|
super(store); |
|
|
super(store); |
|
|
this.buildGeneralServerSettingsForm(); |
|
|
this.buildGeneralServerSettingsForm(); |
|
|
this.adminService.getAdminSettings<GeneralSettings>('general') |
|
|
this.adminService.getAdminSettings<GeneralSettings>('general') |
|
|
@ -57,46 +59,48 @@ export class GeneralSettingsComponent extends PageComponent implements HasConfir |
|
|
.subscribe(deviceConnectivitySettings => this.processDeviceConnectivitySettings(deviceConnectivitySettings)); |
|
|
.subscribe(deviceConnectivitySettings => this.processDeviceConnectivitySettings(deviceConnectivitySettings)); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
buildGeneralServerSettingsForm() { |
|
|
ngOnDestroy() { |
|
|
|
|
|
super.ngOnDestroy(); |
|
|
|
|
|
this.destroy$.next(); |
|
|
|
|
|
this.destroy$.complete(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private buildGeneralServerSettingsForm() { |
|
|
this.generalSettings = this.fb.group({ |
|
|
this.generalSettings = this.fb.group({ |
|
|
baseUrl: ['', [Validators.required]], |
|
|
baseUrl: ['', [Validators.required]], |
|
|
prohibitDifferentUrl: ['',[]] |
|
|
prohibitDifferentUrl: ['',[]] |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
buildDeviceConnectivitySettingsForm() { |
|
|
private buildDeviceConnectivitySettingsForm() { |
|
|
this.deviceConnectivitySettingsForm = this.fb.group({ |
|
|
this.deviceConnectivitySettingsForm = this.fb.group({ |
|
|
http: this.fb.group({ |
|
|
http: this.buildDeviceConnectivityInfoForm(), |
|
|
enabled: [false, []], |
|
|
https: this.buildDeviceConnectivityInfoForm(), |
|
|
host: ['', []], |
|
|
mqtt: this.buildDeviceConnectivityInfoForm(), |
|
|
port: [null, [Validators.min(1), Validators.max(65535), Validators.pattern('[0-9]*')]] |
|
|
mqtts: this.buildDeviceConnectivityInfoForm(), |
|
|
}), |
|
|
coap: this.buildDeviceConnectivityInfoForm(), |
|
|
https: this.fb.group({ |
|
|
coaps: this.buildDeviceConnectivityInfoForm() |
|
|
enabled: [false, []], |
|
|
}); |
|
|
host: ['', []], |
|
|
} |
|
|
port: [null, [Validators.min(1), Validators.max(65535), Validators.pattern('[0-9]*')]] |
|
|
|
|
|
}), |
|
|
private buildDeviceConnectivityInfoForm(): FormGroup { |
|
|
mqtt: this.fb.group({ |
|
|
const formGroup = this.fb.group({ |
|
|
enabled: [false, []], |
|
|
enabled: [false, []], |
|
|
host: ['', []], |
|
|
host: [{value: '', disabled: true}], |
|
|
port: [null, [Validators.min(1), Validators.max(65535), Validators.pattern('[0-9]*')]] |
|
|
port: [{value: null, disabled: true}, [Validators.min(1), Validators.max(65535), Validators.pattern('[0-9]*')]] |
|
|
}), |
|
|
}); |
|
|
mqtts: this.fb.group({ |
|
|
formGroup.get('enabled').valueChanges.pipe( |
|
|
enabled: [false, []], |
|
|
takeUntil(this.destroy$) |
|
|
host: ['', []], |
|
|
).subscribe(value => { |
|
|
port: [null, [Validators.min(1), Validators.max(65535), Validators.pattern('[0-9]*')]] |
|
|
if (value) { |
|
|
}), |
|
|
formGroup.get('host').enable({emitEvent: false}); |
|
|
coap: this.fb.group({ |
|
|
formGroup.get('port').enable({emitEvent: false}); |
|
|
enabled: [false, []], |
|
|
} else { |
|
|
host: ['', []], |
|
|
formGroup.get('host').disable({emitEvent: false}); |
|
|
port: [null, [Validators.min(1), Validators.max(65535), Validators.pattern('[0-9]*')]] |
|
|
formGroup.get('port').disable({emitEvent: false}); |
|
|
}), |
|
|
} |
|
|
coaps: this.fb.group({ |
|
|
|
|
|
enabled: [false, []], |
|
|
|
|
|
host: ['', []], |
|
|
|
|
|
port: [null, [Validators.min(1), Validators.max(65535), Validators.pattern('[0-9]*')]] |
|
|
|
|
|
}), |
|
|
|
|
|
}); |
|
|
}); |
|
|
|
|
|
return formGroup; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
save(): void { |
|
|
save(): void { |
|
|
@ -106,7 +110,10 @@ export class GeneralSettingsComponent extends PageComponent implements HasConfir |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
saveDeviceConnectivitySettings(): void { |
|
|
saveDeviceConnectivitySettings(): void { |
|
|
this.deviceConnectivitySettings.jsonValue = {...this.deviceConnectivitySettings.jsonValue, ...this.deviceConnectivitySettingsForm.value}; |
|
|
this.deviceConnectivitySettings.jsonValue = { |
|
|
|
|
|
...this.deviceConnectivitySettings.jsonValue, |
|
|
|
|
|
...this.deviceConnectivitySettingsForm.value |
|
|
|
|
|
}; |
|
|
this.adminService.saveAdminSettings<DeviceConnectivitySettings>(this.deviceConnectivitySettings) |
|
|
this.adminService.saveAdminSettings<DeviceConnectivitySettings>(this.deviceConnectivitySettings) |
|
|
.subscribe(deviceConnectivitySettings => this.processDeviceConnectivitySettings(deviceConnectivitySettings)); |
|
|
.subscribe(deviceConnectivitySettings => this.processDeviceConnectivitySettings(deviceConnectivitySettings)); |
|
|
} |
|
|
} |
|
|
@ -129,7 +136,7 @@ export class GeneralSettingsComponent extends PageComponent implements HasConfir |
|
|
this.deviceConnectivitySettingsForm.reset(this.deviceConnectivitySettings.jsonValue); |
|
|
this.deviceConnectivitySettingsForm.reset(this.deviceConnectivitySettings.jsonValue); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
confirmForm(): UntypedFormGroup { |
|
|
confirmForm(): FormGroup { |
|
|
return this.generalSettings.dirty ? this.generalSettings : this.deviceConnectivitySettingsForm; |
|
|
return this.generalSettings.dirty ? this.generalSettings : this.deviceConnectivitySettingsForm; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
Vladyslav_Prykhodko
3 years ago