From 6599125d770daf77b53ad1d6e17eb518f7feac92 Mon Sep 17 00:00:00 2001 From: Ken Maranion <97972790+kmaranionjc@users.noreply.github.com> Date: Thu, 29 Aug 2024 14:03:51 -0700 Subject: [PATCH] fix issue with disabled migrate button (#137) (#138) * fix issue with disabled migrate button (#137) * test button * Update ModuleChangelog.md Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com> * Update ModuleChangelog.md Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com> --------- Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com> --- ModuleChangelog.md | 14 +++++++++++++- jumpcloud-ADMU/JumpCloud.ADMU.psd1 | 2 +- jumpcloud-ADMU/Powershell/Form.ps1 | 10 +++++----- jumpcloud-ADMU/Powershell/ProgressForm.ps1 | 2 +- jumpcloud-ADMU/Powershell/Start-Migration.ps1 | 2 +- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/ModuleChangelog.md b/ModuleChangelog.md index 93d240c0..cb3be2ef 100644 --- a/ModuleChangelog.md +++ b/ModuleChangelog.md @@ -1,9 +1,21 @@ -## 2.7.5 +## 2.7.6 Release Date: August 21, 2024 #### RELEASE NOTES +This fixes an issue with disabled Migrate Button + +#### Bug Fixes: +``` +* Fixed an issue with ADMU UI "Migrate Profile" button where it remained disabled even though all the required fields were satisfied. +``` +## 2.7.5 + +Release Date: August 28, 2024 + +#### RELEASE NOTES + This release reverts changes from 2.7.4 in the UWP app, specifically the xaml form was reverted back to the original windows form to display progress of the Appx/ File Association during first boot. This release adds additional logging to the UWP app. #### Bug Fixes: diff --git a/jumpcloud-ADMU/JumpCloud.ADMU.psd1 b/jumpcloud-ADMU/JumpCloud.ADMU.psd1 index d2db04c0..b550fe96 100644 --- a/jumpcloud-ADMU/JumpCloud.ADMU.psd1 +++ b/jumpcloud-ADMU/JumpCloud.ADMU.psd1 @@ -13,7 +13,7 @@ # Version number of this module. - ModuleVersion = '2.7.5' + ModuleVersion = '2.7.6' # Supported PSEditions # CompatiblePSEditions = @() diff --git a/jumpcloud-ADMU/Powershell/Form.ps1 b/jumpcloud-ADMU/Powershell/Form.ps1 index 0b7c289c..46d41f7e 100644 --- a/jumpcloud-ADMU/Powershell/Form.ps1 +++ b/jumpcloud-ADMU/Powershell/Form.ps1 @@ -153,7 +153,7 @@ function show-mtpSelection { @@ -628,7 +628,7 @@ $cb_autobindjcuser.Add_Checked( { $img_apikey_valid.Visibility = 'Visible' }) $cb_autobindjcuser.Add_Checked( { $cb_bindAsAdmin.IsEnabled = $true }) $cb_bindAsAdmin.Add_Checked( { $script:BindAsAdmin = $true }) $cb_autobindjcuser.Add_Checked( { - Test-Button -tbJumpCloudUserName:($tbJumpCloudUserName) -tbJumpCloudConnectKey:($tbJumpCloudConnectKey) -tbJumpCloudConnectAPIKey:($tbJumpCloudAPIKey) -tbTempPassword:($tbTempPassword) -lvProfileList:($lvProfileList) -tbJumpCloudAPIKey:($tbJumpCloudAPIKey) + Test-Button -tbJumpCloudUserName:($tbJumpCloudUserName) -tbJumpCloudConnectKey:($tbJumpCloudConnectKey) -tbTempPassword:($tbTempPassword) -lvProfileList:($lvProfileList) -tbJumpCloudAPIKey:($tbJumpCloudAPIKey) If (((Test-CharLen -len 40 -testString $tbJumpCloudAPIKey.Password) -and (Test-HasNoSpace $tbJumpCloudAPIKey.Password)) -eq $false) { #$tbJumpCloudAPIKey.Tooltip = "API Key Must be 40chars & Not Contain Spaces" $tbJumpCloudAPIKey.Background = "#FFC6CBCF" @@ -651,7 +651,7 @@ $cb_autobindjcuser.Add_Unchecked( { $cb_bindAsAdmin.IsEnabled = $false }) $cb_autobindjcuser.Add_Unchecked( { $cb_bindAsAdmin.IsChecked = $false }) $cb_bindAsAdmin.Add_Unchecked( { $script:BindAsAdmin = $false }) $cb_autobindjcuser.Add_Unchecked( { - Test-Button -tbJumpCloudUserName:($tbJumpCloudUserName) -tbJumpCloudConnectKey:($tbJumpCloudConnectKey) -tbJumpCloudConnectAPIKey:($tbJumpCloudAPIKey) -tbTempPassword:($tbTempPassword) -lvProfileList:($lvProfileList) -tbJumpCloudAPIKey:($tbJumpCloudAPIKey) + Test-Button -tbJumpCloudUserName:($tbJumpCloudUserName) -tbJumpCloudConnectKey:($tbJumpCloudConnectKey) -tbTempPassword:($tbTempPassword) -lvProfileList:($lvProfileList) -tbJumpCloudAPIKey:($tbJumpCloudAPIKey) If (((Test-CharLen -len 40 -testString $tbJumpCloudAPIKey.Password) -and (Test-HasNoSpace $tbJumpCloudAPIKey.Password) -or ($cb_autobindjcuser.IsEnabled)) -eq $false) { #$tbJumpCloudAPIKey.Tooltip = "API Key Must be 40chars & Not Contain Spaces" $tbJumpCloudAPIKey.Background = "#FFC6CBCF" @@ -720,8 +720,7 @@ $tbJumpCloudConnectKey.Add_PasswordChanged( { }) $tbJumpCloudAPIKey.Add_PasswordChanged( { - Test-Button -tbJumpCloudUserName:($tbJumpCloudUserName) -tbJumpCloudConnectKey:($tbJumpCloudConnectKey) -tbJumpCloudConnectAPIKey:($tbJumpCloudAPIKey) -tbTempPassword:($tbTempPassword) -lvProfileList:($lvProfileList) -tbJumpCloudAPIKey:($tbJumpCloudAPIKey) - + Test-Button -tbJumpCloudUserName:($tbJumpCloudUserName) -tbJumpCloudConnectKey:($tbJumpCloudConnectKey) -tbTempPassword:($tbTempPassword) -lvProfileList:($lvProfileList) -tbJumpCloudAPIKey:($tbJumpCloudAPIKey) If (((Test-CharLen -len 40 -testString $tbJumpCloudAPIKey.Password) -and (Test-HasNoSpace $tbJumpCloudAPIKey.Password)) -eq $false) { $tbJumpCloudAPIKey.Background = "#FFC6CBCF" $tbJumpCloudAPIKey.BorderBrush = "#FFF90000" @@ -740,6 +739,7 @@ $tbJumpCloudAPIKey.Add_PasswordChanged( { $tbJumpCloudAPIKey.BorderBrush = "#FFC6CBCF" $img_apikey_valid.Source = DecodeBase64Image -ImageBase64 $ActiveBase64 $img_apikey_valid.ToolTip = $null + Test-Button -tbJumpCloudUserName:($tbJumpCloudUserName) -tbJumpCloudConnectKey:($tbJumpCloudConnectKey) -tbTempPassword:($tbTempPassword) -lvProfileList:($lvProfileList) -tbJumpCloudAPIKey:($tbJumpCloudAPIKey) } catch { $OrgSelection = "" $lbl_orgName.Text = "" diff --git a/jumpcloud-ADMU/Powershell/ProgressForm.ps1 b/jumpcloud-ADMU/Powershell/ProgressForm.ps1 index 7674ce86..21c3ecec 100644 --- a/jumpcloud-ADMU/Powershell/ProgressForm.ps1 +++ b/jumpcloud-ADMU/Powershell/ProgressForm.ps1 @@ -37,7 +37,7 @@ function New-ProgressForm { diff --git a/jumpcloud-ADMU/Powershell/Start-Migration.ps1 b/jumpcloud-ADMU/Powershell/Start-Migration.ps1 index d94aa9f3..190fcbf9 100644 --- a/jumpcloud-ADMU/Powershell/Start-Migration.ps1 +++ b/jumpcloud-ADMU/Powershell/Start-Migration.ps1 @@ -1883,7 +1883,7 @@ Function Start-Migration { $AGENT_INSTALLER_URL = "https://cdn02.jumpcloud.com/production/jcagent-msi-signed.msi" $AGENT_INSTALLER_PATH = "$windowsDrive\windows\Temp\JCADMU\jcagent-msi-signed.msi" $AGENT_CONF_PATH = "$($AGENT_PATH)\Plugins\Contrib\jcagent.conf" - $admuVersion = '2.7.5' + $admuVersion = '2.7.6' $script:AdminDebug = $AdminDebug $isForm = $PSCmdlet.ParameterSetName -eq "form"