github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(apple): Disable advanced settings if overridden (#9108)

Browse Source 
If `authURL`, `apiURL`, or `logFilter` are set in the managed
configuration, we disable each of these fields respectively from user
editing.

If all of them are overridden, we disable the `Apply` and `Reset to
Defaults` buttons.

Related #4505
This commit is contained in:
Jamil
2025-05-12 21:06:05 -07:00
committed by GitHub
parent c93a3d710a
commit ae224384be
2 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
swift/apple/FirezoneKit/Sources/FirezoneKit/Models/Configuration.swift
View File

@@ -80,7 +80,7 @@ public class Configuration: Codable {
}
}
func isOverridden(key: String) -> Bool {
func isOverridden(_ key: String) -> Bool {
return overriddenKeys.contains(key)
}
}

42
swift/apple/FirezoneKit/Sources/FirezoneKit/Views/SettingsView.swift
View File

@@ -72,6 +72,11 @@ class SettingsViewModel: ObservableObject {
@Published var authURLString: String
@Published var apiURLString: String
@Published var logFilterString: String
@Published private(set) var isAuthURLOverridden = false
@Published private(set) var isApiURLOverridden = false
@Published private(set) var isLogFilterOverridden = false
@Published private(set) var shouldDisableApplyButton = false
@Published private(set) var shouldDisableResetButton = false
@Published private(set) var areSettingsDefault = true
@Published private(set) var areSettingsValid = true
@Published private(set) var areSettingsSaved = true
@@ -85,6 +90,7 @@ class SettingsViewModel: ObservableObject {
updateDerivedState()
// Update our state from our text fields
Publishers.CombineLatest3($authURLString, $apiURLString, $logFilterString)
.receive(on: RunLoop.main)
.sink { [weak self] (_, _, _) in
@@ -93,6 +99,18 @@ class SettingsViewModel: ObservableObject {
self.updateDerivedState()
}
.store(in: &cancellables)
// Update our state from configuration updates
store.$configuration
.receive(on: RunLoop.main)
.sink { [weak self] newConfiguration in
self?.isAuthURLOverridden = newConfiguration?.isOverridden(Configuration.Keys.authURL) ?? false
self?.isApiURLOverridden = newConfiguration?.isOverridden(Configuration.Keys.apiURL) ?? false
self?.isLogFilterOverridden = newConfiguration?.isOverridden(Configuration.Keys.logFilter) ?? false
self?.updateDerivedState()
}
.store(in: &cancellables)
}
private func updateDerivedState() {
@@ -119,6 +137,14 @@ class SettingsViewModel: ObservableObject {
self.areSettingsDefault = (self.authURLString == Configuration.defaultAuthURL.absoluteString &&
self.apiURLString == Configuration.defaultApiURL.absoluteString &&
self.logFilterString == Configuration.defaultLogFilter)
self.shouldDisableApplyButton = (
isAuthURLOverridden && isApiURLOverridden && isLogFilterOverridden
) || areSettingsSaved || !areSettingsValid
self.shouldDisableResetButton = (
isAuthURLOverridden && isApiURLOverridden && isLogFilterOverridden
) || areSettingsDefault
}
func applySettingsToStore() async throws {
@@ -237,9 +263,7 @@ public struct SettingsView: View {
withErrorHandler { try await action.performAction(on: self) }
}
}
.disabled(
(viewModel.areSettingsSaved || !viewModel.areSettingsValid)
)
.disabled(viewModel.shouldDisableApplyButton)
}
ToolbarItem(placement: .navigationBarLeading) {
Button("Cancel") {
@@ -315,18 +339,21 @@ public struct SettingsView: View {
text: $viewModel.authURLString,
prompt: Text(PlaceholderText.authBaseURL)
)
.disabled(viewModel.isAuthURLOverridden)
TextField(
"API URL:",
text: $viewModel.apiURLString,
prompt: Text(PlaceholderText.apiURL)
)
.disabled(viewModel.isApiURLOverridden)
TextField(
"Log Filter:",
text: $viewModel.logFilterString,
prompt: Text(PlaceholderText.logFilter)
)
.disabled(viewModel.isLogFilterOverridden)
Text(FootnoteText.forAdvanced ?? "")
.foregroundStyle(.secondary)
@@ -344,7 +371,7 @@ public struct SettingsView: View {
}
}
)
.disabled(viewModel.areSettingsSaved || !viewModel.areSettingsValid)
.disabled(viewModel.shouldDisableApplyButton)
Button(
"Reset to Defaults",
@@ -352,7 +379,7 @@ public struct SettingsView: View {
viewModel.revertToDefaultSettings()
}
)
.disabled(viewModel.areSettingsDefault)
.disabled(viewModel.shouldDisableResetButton)
}
.padding(.top, 5)
}
@@ -383,6 +410,7 @@ public struct SettingsView: View {
.autocorrectionDisabled()
.textInputAutocapitalization(.never)
.submitLabel(.done)
.disabled(viewModel.isAuthURLOverridden)
}
VStack(alignment: .leading, spacing: 2) {
Text("API URL")
@@ -395,6 +423,7 @@ public struct SettingsView: View {
.autocorrectionDisabled()
.textInputAutocapitalization(.never)
.submitLabel(.done)
.disabled(viewModel.isApiURLOverridden)
}
VStack(alignment: .leading, spacing: 2) {
Text("Log Filter")
@@ -407,6 +436,7 @@ public struct SettingsView: View {
.autocorrectionDisabled()
.textInputAutocapitalization(.never)
.submitLabel(.done)
.disabled(viewModel.isLogFilterOverridden)
}
HStack {
Spacer()
@@ -416,7 +446,7 @@ public struct SettingsView: View {
viewModel.revertToDefaultSettings()
}
)
.disabled(viewModel.areSettingsDefault)
.disabled(viewModel.shouldDisableResetButton)
Spacer()
}
},