|
|
@ -14,13 +14,18 @@ |
|
|
/// limitations under the License.
|
|
|
/// limitations under the License.
|
|
|
///
|
|
|
///
|
|
|
|
|
|
|
|
|
import { Component, OnInit } from '@angular/core'; |
|
|
import { Component } 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 { Router } from '@angular/router'; |
|
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; |
|
|
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; |
|
|
import { AdminSettings, 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'; |
|
|
|
|
|
|
|
|
@ -29,26 +34,27 @@ import { HasConfirmForm } from '@core/guards/confirm-on-exit.guard'; |
|
|
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 OnInit, HasConfirmForm { |
|
|
export class GeneralSettingsComponent extends PageComponent implements HasConfirmForm { |
|
|
|
|
|
|
|
|
generalSettings: UntypedFormGroup; |
|
|
generalSettings: UntypedFormGroup; |
|
|
adminSettings: AdminSettings<GeneralSettings>; |
|
|
private adminSettings: AdminSettings<GeneralSettings>; |
|
|
|
|
|
|
|
|
|
|
|
deviceConnectivitySettingsForm: UntypedFormGroup; |
|
|
|
|
|
private deviceConnectivitySettings: AdminSettings<DeviceConnectivitySettings>; |
|
|
|
|
|
|
|
|
|
|
|
protocol: DeviceConnectivityProtocol = 'http'; |
|
|
|
|
|
|
|
|
constructor(protected store: Store<AppState>, |
|
|
constructor(protected store: Store<AppState>, |
|
|
private router: Router, |
|
|
private router: Router, |
|
|
private adminService: AdminService, |
|
|
private adminService: AdminService, |
|
|
public fb: UntypedFormBuilder) { |
|
|
public fb: UntypedFormBuilder) { |
|
|
super(store); |
|
|
super(store); |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
ngOnInit() { |
|
|
|
|
|
this.buildGeneralServerSettingsForm(); |
|
|
this.buildGeneralServerSettingsForm(); |
|
|
this.adminService.getAdminSettings<GeneralSettings>('general').subscribe( |
|
|
this.adminService.getAdminSettings<GeneralSettings>('general') |
|
|
(adminSettings) => { |
|
|
.subscribe(adminSettings => this.processGeneralSettings(adminSettings)); |
|
|
this.adminSettings = adminSettings; |
|
|
this.buildDeviceConnectivitySettingsForm(); |
|
|
this.generalSettings.reset(this.adminSettings.jsonValue); |
|
|
this.adminService.getAdminSettings<DeviceConnectivitySettings>('connectivity') |
|
|
} |
|
|
.subscribe(deviceConnectivitySettings => this.processDeviceConnectivitySettings(deviceConnectivitySettings)); |
|
|
); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
buildGeneralServerSettingsForm() { |
|
|
buildGeneralServerSettingsForm() { |
|
|
@ -58,18 +64,73 @@ export class GeneralSettingsComponent extends PageComponent implements OnInit, H |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
buildDeviceConnectivitySettingsForm() { |
|
|
|
|
|
this.deviceConnectivitySettingsForm = this.fb.group({ |
|
|
|
|
|
http: this.fb.group({ |
|
|
|
|
|
enabled: [false, []], |
|
|
|
|
|
host: ['', []], |
|
|
|
|
|
port: [null, [Validators.min(1), Validators.max(65535), Validators.pattern('[0-9]*')]] |
|
|
|
|
|
}), |
|
|
|
|
|
https: this.fb.group({ |
|
|
|
|
|
enabled: [false, []], |
|
|
|
|
|
host: ['', []], |
|
|
|
|
|
port: [null, [Validators.min(1), Validators.max(65535), Validators.pattern('[0-9]*')]] |
|
|
|
|
|
}), |
|
|
|
|
|
mqtt: this.fb.group({ |
|
|
|
|
|
enabled: [false, []], |
|
|
|
|
|
host: ['', []], |
|
|
|
|
|
port: [null, [Validators.min(1), Validators.max(65535), Validators.pattern('[0-9]*')]] |
|
|
|
|
|
}), |
|
|
|
|
|
mqtts: this.fb.group({ |
|
|
|
|
|
enabled: [false, []], |
|
|
|
|
|
host: ['', []], |
|
|
|
|
|
port: [null, [Validators.min(1), Validators.max(65535), Validators.pattern('[0-9]*')]] |
|
|
|
|
|
}), |
|
|
|
|
|
coap: this.fb.group({ |
|
|
|
|
|
enabled: [false, []], |
|
|
|
|
|
host: ['', []], |
|
|
|
|
|
port: [null, [Validators.min(1), Validators.max(65535), Validators.pattern('[0-9]*')]] |
|
|
|
|
|
}), |
|
|
|
|
|
coaps: this.fb.group({ |
|
|
|
|
|
enabled: [false, []], |
|
|
|
|
|
host: ['', []], |
|
|
|
|
|
port: [null, [Validators.min(1), Validators.max(65535), Validators.pattern('[0-9]*')]] |
|
|
|
|
|
}), |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
save(): void { |
|
|
save(): void { |
|
|
this.adminSettings.jsonValue = {...this.adminSettings.jsonValue, ...this.generalSettings.value}; |
|
|
this.adminSettings.jsonValue = {...this.adminSettings.jsonValue, ...this.generalSettings.value}; |
|
|
this.adminService.saveAdminSettings(this.adminSettings).subscribe( |
|
|
this.adminService.saveAdminSettings(this.adminSettings) |
|
|
(adminSettings) => { |
|
|
.subscribe(adminSettings => this.processGeneralSettings(adminSettings)); |
|
|
this.adminSettings = adminSettings; |
|
|
} |
|
|
this.generalSettings.reset(this.adminSettings.jsonValue); |
|
|
|
|
|
} |
|
|
saveDeviceConnectivitySettings(): void { |
|
|
); |
|
|
this.deviceConnectivitySettings.jsonValue = {...this.deviceConnectivitySettings.jsonValue, ...this.deviceConnectivitySettingsForm.value}; |
|
|
|
|
|
this.adminService.saveAdminSettings<DeviceConnectivitySettings>(this.deviceConnectivitySettings) |
|
|
|
|
|
.subscribe(deviceConnectivitySettings => this.processDeviceConnectivitySettings(deviceConnectivitySettings)); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
discardGeneralSettings(): void { |
|
|
|
|
|
this.generalSettings.reset(this.adminSettings.jsonValue); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
discardDeviceConnectivitySettings(): void { |
|
|
|
|
|
this.deviceConnectivitySettingsForm.reset(this.deviceConnectivitySettings.jsonValue); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private processGeneralSettings(generalSettings: AdminSettings<GeneralSettings>): void { |
|
|
|
|
|
this.adminSettings = generalSettings; |
|
|
|
|
|
this.generalSettings.reset(this.adminSettings.jsonValue); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private processDeviceConnectivitySettings(deviceConnectivitySettings: AdminSettings<DeviceConnectivitySettings>): void { |
|
|
|
|
|
this.deviceConnectivitySettings = deviceConnectivitySettings; |
|
|
|
|
|
this.deviceConnectivitySettingsForm.reset(this.deviceConnectivitySettings.jsonValue); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
confirmForm(): UntypedFormGroup { |
|
|
confirmForm(): UntypedFormGroup { |
|
|
return this.generalSettings; |
|
|
return this.generalSettings.dirty ? this.generalSettings : this.deviceConnectivitySettingsForm; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
Vladyslav
3 years ago
GitHub