mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-05-01 09:49:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improved UI/UX with optional_installs containing a stage_os_installer item

Browse Source
This commit is contained in:
Greg Neagle
2022-09-13 13:35:30 -07:00
parent efecd466cc
commit 5a3b232bf2
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/apps/Managed Software Center/Managed Software Center/Controllers/MSCAlertController.swift
+4 -1
View File
@@ -405,7 +405,10 @@ class MSCAlertController: NSObject {
// Returns true if there is staged macOS upgrade and the user
// declines to install it
if (!shouldFilterStagedOSUpdate() && updateListContainsStagedOSUpdate() && getEffectiveUpdateList().count > 1 ) {
if (shouldFilterStagedOSUpdate() || !updateListContainsStagedOSUpdate()) {
return false
}
if (getEffectiveUpdateList().count > 1 || getAppleUpdates().count > 0) {
let alert = NSAlert()
alert.messageText = NSLocalizedString(
"macOS Install Pending",
code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift
+2
View File
@@ -689,12 +689,14 @@ class MainWindowController: NSWindowController, NSWindowDelegate, WKNavigationDe
if alert_controller.alertedToNotVolumeOwner() {
clearMunkiItemsCache()
setFilterStagedOSUpdate(true)
setFilterAppleUpdates(false)
loadUpdatesPage(self)
return
}
if alert_controller.alertedToStagedOSUpgradeAndCancelled() {
clearMunkiItemsCache()
setFilterStagedOSUpdate(true)
setFilterAppleUpdates(false)
loadUpdatesPage(self)
return
}
code/apps/Managed Software Center/Managed Software Center/MunkiItems.swift
+13 -2
View File
@@ -1095,10 +1095,18 @@ func getOptionalInstallItems() -> [OptionalItem] {
}
if !Cache.shared.keys.contains("optional_install_items") {
let optional_items = cachedInstallInfo()["optional_installs"] as? [[String : Any]] ?? [[String : Any]]()
let optional_install_items = optional_items.map({ OptionalItem($0) })
var optional_install_items = optional_items.map({ OptionalItem($0) })
let featured_items = cachedInstallInfo()["featured_items"] as? [String] ?? [String]()
let staged_os_installer = getStagedOSUpdate()
let staged_os_installer_name = staged_os_installer["name"] as? String ?? ""
for index in 0..<optional_install_items.count {
if let name = optional_install_items[index]["name"] as? String {
if (staged_os_installer_name != "" && staged_os_installer_name == name) {
// replace the item with its staged version
optional_install_items[index] = OptionalItem(staged_os_installer)
optional_install_items[index]["status"] = "will-be-installed"
optional_install_items[index]["updatecheck_needed"] = false
}
if featured_items.contains(name) {
optional_install_items[index]["featured"] = true
}
@@ -1216,6 +1224,8 @@ func _build_update_list() -> [UpdateItem] {
stagedOSupdate["status"] = "will-be-installed"
stagedOSupdate["staged_osinstaller"] = true
update_items.append(stagedOSupdate)
// don't show Apple updates if we have a pending staged OS upgrade
setFilterAppleUpdates(true)
} else {
if munkiUpdatesContainAppleItems() {
// don't show any Apple updates if there are Munki items that are Apple items
@@ -1352,7 +1362,8 @@ func getMyItemsList() -> [OptionalItem] {
// to install or to remove
let self_service = SelfService()
let install_list = getOptionalInstallItems().filter(
{ self_service.installs.contains($0["name"] as? String ?? "") })
{ self_service.installs.contains($0["name"] as? String ?? "") }
)
let uninstall_list = getOptionalInstallItems().filter(
{
(self_service.uninstalls.contains($0["name"] as? String ?? "") &&