mirror of
https://github.com/rbalsleyMSFT/FFU.git
synced 2026-06-14 02:09:35 -06:00
Refactors UI configuration and state management
Moves UI configuration loading and retrieval logic into a new `FFUUI.Core.Config` module. Removes the `Set-UIValue` helper function from `BuildFFUVM_UI.ps1` and the `Get-UIConfig` function from `FFUUI.Core.psm1`. This centralizes UI-related configuration handling for improved modularity.
This commit is contained in:
@@ -79,125 +79,6 @@ else {
|
||||
WriteLog "LongPathsEnabled is already set to 1."
|
||||
}
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# SECTION: LOAD UI
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
# Helper function to safely set UI properties from config and log the process
|
||||
function Set-UIValue {
|
||||
param(
|
||||
[string]$ControlName,
|
||||
[string]$PropertyName,
|
||||
[object]$ConfigObject,
|
||||
[string]$ConfigKey,
|
||||
[scriptblock]$TransformValue = $null, # Optional scriptblock to transform the value from config
|
||||
[psobject]$State # Pass the $State object
|
||||
)
|
||||
|
||||
$control = $State.Controls[$ControlName]
|
||||
if ($null -eq $control) {
|
||||
WriteLog "LoadConfig Error: Control '$ControlName' not found in the state object."
|
||||
return
|
||||
}
|
||||
|
||||
# Robust check for property existence.
|
||||
$keyExists = $false
|
||||
if ($ConfigObject -is [System.Management.Automation.PSCustomObject] -and $null -ne $ConfigObject.PSObject.Properties) {
|
||||
# Use the Match() method, which returns a collection of matching properties.
|
||||
# If the count is greater than 0, the key exists.
|
||||
try {
|
||||
if (($ConfigObject.PSObject.Properties.Match($ConfigKey)).Count -gt 0) {
|
||||
$keyExists = $true
|
||||
}
|
||||
}
|
||||
catch {
|
||||
WriteLog "ERROR: Exception while trying to Match key '$ConfigKey' on ConfigObject.PSObject.Properties. Error: $($_.Exception.Message)"
|
||||
# $keyExists remains false
|
||||
}
|
||||
}
|
||||
|
||||
if (-not $keyExists) {
|
||||
WriteLog "LoadConfig Info: Key '$ConfigKey' not found in configuration object. Skipping '$ControlName.$PropertyName'."
|
||||
return
|
||||
}
|
||||
|
||||
$valueFromConfig = $ConfigObject.$ConfigKey
|
||||
WriteLog "LoadConfig: Preparing to set '$ControlName.$PropertyName'. Config key: '$ConfigKey', Raw value: '$valueFromConfig'."
|
||||
|
||||
$finalValue = $valueFromConfig
|
||||
if ($null -ne $TransformValue) {
|
||||
try {
|
||||
$finalValue = Invoke-Command -ScriptBlock $TransformValue -ArgumentList $valueFromConfig
|
||||
WriteLog "LoadConfig: Transformed value for '$ControlName.$PropertyName' (from key '$ConfigKey') is: '$finalValue'."
|
||||
}
|
||||
catch {
|
||||
WriteLog "LoadConfig Error: Failed to transform value for '$ControlName.$PropertyName' from key '$ConfigKey'. Error: $($_.Exception.Message)"
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
# Handle ComboBox SelectedItem specifically
|
||||
if ($control -is [System.Windows.Controls.ComboBox] -and $PropertyName -eq 'SelectedItem') {
|
||||
$itemToSelect = $null
|
||||
# Iterate through the Items collection of the ComboBox
|
||||
foreach ($item in $control.Items) {
|
||||
$itemValue = $null
|
||||
if ($item -is [System.Windows.Controls.ComboBoxItem]) {
|
||||
$itemValue = $item.Content
|
||||
}
|
||||
elseif ($item -is [pscustomobject] -and $item.PSObject.Properties['Value']) {
|
||||
$itemValue = $item.Value
|
||||
}
|
||||
elseif ($item -is [pscustomobject] -and $item.PSObject.Properties['Display']) {
|
||||
# Assuming 'Display' might be used if 'Value' isn't
|
||||
$itemValue = $item.Display
|
||||
}
|
||||
else {
|
||||
$itemValue = $item # For simple string items or direct object comparison
|
||||
}
|
||||
|
||||
# Compare, ensuring types are compatible or converting $finalValue if necessary
|
||||
if (($null -ne $itemValue -and $itemValue.ToString() -eq $finalValue.ToString()) -or ($item -eq $finalValue)) {
|
||||
$itemToSelect = $item
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if ($null -ne $itemToSelect) {
|
||||
$control.SelectedItem = $itemToSelect
|
||||
WriteLog "LoadConfig: Successfully set '$ControlName.SelectedItem' by finding matching item for value '$finalValue'."
|
||||
}
|
||||
elseif ($control.IsEditable -and ($finalValue -is [string] -or $finalValue -is [int] -or $finalValue -is [long])) {
|
||||
$control.Text = $finalValue.ToString()
|
||||
WriteLog "LoadConfig: Set '$ControlName.Text' to '$($finalValue.ToString())' as SelectedItem match failed (editable ComboBox)."
|
||||
}
|
||||
else {
|
||||
$itemsString = ""
|
||||
try {
|
||||
# Safer way to get item strings
|
||||
$itemStrings = @()
|
||||
foreach ($cbItem in $control.Items) {
|
||||
if ($null -ne $cbItem) { $itemStrings += $cbItem.ToString() } else { $itemStrings += "[NULL_ITEM]" }
|
||||
}
|
||||
$itemsString = $itemStrings -join "; "
|
||||
}
|
||||
catch { $itemsString = "Error retrieving item strings." }
|
||||
WriteLog "LoadConfig Warning: Could not find or set item matching value '$finalValue' for '$ControlName.SelectedItem'. Current items: [$itemsString]"
|
||||
}
|
||||
}
|
||||
else {
|
||||
# For other properties or controls
|
||||
$control.$PropertyName = $finalValue
|
||||
WriteLog "LoadConfig: Successfully set '$ControlName.$PropertyName' to '$finalValue'."
|
||||
}
|
||||
}
|
||||
catch {
|
||||
WriteLog "LoadConfig Error: Failed to set '$ControlName.$PropertyName' to '$finalValue'. Error: $($_.Exception.Message)"
|
||||
}
|
||||
}
|
||||
|
||||
#Remove old log file if found
|
||||
if (Test-Path -Path $script:uiState.LogFilePath) {
|
||||
Remove-item -Path $script:uiState.LogFilePath -Force
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user