From b4dff7134cceb3e230205163e5ac18de1a6985df Mon Sep 17 00:00:00 2001 From: Mike Date: Thu, 17 Oct 2024 11:11:24 -0700 Subject: [PATCH] fix: profile now handles direct connection mode correctly --- .../profile-detail.component.ts | 44 +++++++++++-------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/src/app/profiles/profile-detail/profile-detail.component.ts b/src/app/profiles/profile-detail/profile-detail.component.ts index 66fefb23d..62dfb12a3 100644 --- a/src/app/profiles/profile-detail/profile-detail.component.ts +++ b/src/app/profiles/profile-detail/profile-detail.component.ts @@ -392,27 +392,33 @@ export class ProfileDetailComponent implements OnInit { } connectionModeChange(value: string): void { - if (this.cloudMode) { - if (value === this.connectionMode.tls) { - this.profileForm.controls.ciraConfigName.clearValidators() - this.profileForm.controls.ciraConfigName.setValue(null) - this.profileForm.controls.tlsMode.setValidators(Validators.required) - // set a default value if not set already - if (!this.profileForm.controls.tlsSigningAuthority.value) { - this.profileForm.controls.tlsSigningAuthority.setValue(this.tlsDefaultSigningAuthority) - } - this.profileForm.controls.tlsSigningAuthority.setValidators(Validators.required) - } else if (value === this.connectionMode.cira) { - this.profileForm.controls.tlsMode.clearValidators() - this.profileForm.controls.tlsMode.setValue(null) - this.profileForm.controls.tlsSigningAuthority.clearValidators() - this.profileForm.controls.tlsSigningAuthority.setValue(null) - this.profileForm.controls.ciraConfigName.setValidators(Validators.required) + if (value === this.connectionMode.tls) { + this.profileForm.controls.ciraConfigName.clearValidators() + this.profileForm.controls.ciraConfigName.setValue(null) + this.profileForm.controls.tlsMode.setValidators(Validators.required) + // set a default value if not set already + if (!this.profileForm.controls.tlsSigningAuthority.value) { + this.profileForm.controls.tlsSigningAuthority.setValue(this.tlsDefaultSigningAuthority) } - this.profileForm.controls.ciraConfigName.updateValueAndValidity() - this.profileForm.controls.tlsMode.updateValueAndValidity() - this.profileForm.controls.tlsSigningAuthority.updateValueAndValidity() + this.profileForm.controls.tlsSigningAuthority.setValidators(Validators.required) + } else if (value === this.connectionMode.cira) { + this.profileForm.controls.tlsMode.clearValidators() + this.profileForm.controls.tlsMode.setValue(null) + this.profileForm.controls.tlsSigningAuthority.clearValidators() + this.profileForm.controls.tlsSigningAuthority.setValue(null) + this.profileForm.controls.ciraConfigName.setValidators(Validators.required) + } else if (value === this.connectionMode.direct) { + this.profileForm.controls.ciraConfigName.clearValidators() + this.profileForm.controls.ciraConfigName.setValue(null) + this.profileForm.controls.tlsMode.clearValidators() + this.profileForm.controls.tlsMode.setValue(null) + this.profileForm.controls.tlsSigningAuthority.clearValidators() + this.profileForm.controls.tlsSigningAuthority.setValue(null) } + + this.profileForm.controls.ciraConfigName.updateValueAndValidity() + this.profileForm.controls.tlsMode.updateValueAndValidity() + this.profileForm.controls.tlsSigningAuthority.updateValueAndValidity() } selectWifiProfile(event: MatAutocompleteSelectedEvent): void {