mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-08 07:29:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure sidebar_items are 'loaded' before checkForUpdates is called; more changes to support using munki:// urls in custom sidebar items

Browse Source
This commit is contained in:
Greg Neagle
2025-07-07 10:12:14 -07:00
parent 73fe99cc46
commit 237bdc19ee
1 changed files with 55 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift
View File

@@ -42,12 +42,7 @@ class MainWindowController: NSWindowController {
let page: SidebarPage
}
lazy var sidebar_items: [SidebarItem] = [
SidebarItem(title: "Software", icon: "AllItemsTemplate", page: .function(loadAllSoftwarePage, id: "loadAllSoftwarePage")),
SidebarItem(title: "Categories", icon: "CategoriesTemplate", page: .function(loadCategoriesPage, id: "loadCategoriesPage")),
SidebarItem(title: "My Items", icon: "MyStuffTemplate", page: .function(loadMyItemsPage, id: "loadMyItemsPage")),
SidebarItem(title: "Updates", icon: "UpdatesTemplate", page: .function(loadUpdatesPage, id: "loadUpdatesPage"))
]
lazy var sidebar_items: [SidebarItem] = getSidebarItems()
// status properties
var _status_title = ""
@@ -111,6 +106,49 @@ class MainWindowController: NSWindowController {
window.setFrame(originalFrame, display: true)
}
}
func getSidebarItems() -> [SidebarItem] {
// enable custom sidebar items if 11.0 or later
// because SF Symbols only supported on 11.0 or later
var sidebarItems: [SidebarItem] = []
if #available(macOS 11.0, *) {
if let configItems = pref("CustomSidebarItems") as? [[String: String]] {
for item in configItems {
guard let title = item["title"],
let icon = item["icon"],
let page = item["page"] else {
continue
}
if page.starts(with: "munki://") || page.starts(with: "http") || page.hasSuffix(".html") {
sidebarItems.append(SidebarItem(title: title, icon: icon, page: .url(page)))
} else {
switch page {
case "loadAllSoftwarePage":
sidebarItems.append(SidebarItem(title: title, icon: icon, page: .function(loadAllSoftwarePage, id: "loadAllSoftwarePage")))
case "loadCategoriesPage":
sidebarItems.append(SidebarItem(title: title, icon: icon, page: .function(loadCategoriesPage, id: "loadCategoriesPage")))
case "loadMyItemsPage":
sidebarItems.append(SidebarItem(title: title, icon: icon, page: .function(loadMyItemsPage, id: "loadMyItemsPage")))
case "loadUpdatesPage":
sidebarItems.append(SidebarItem(title: title, icon: icon, page: .function(loadUpdatesPage, id: "loadUpdatesPage")))
default:
continue
}
}
}
}
}
// set to default if needed
if sidebarItems.isEmpty {
sidebarItems = [
SidebarItem(title: "Software", icon: "AllItemsTemplate", page: .function(loadAllSoftwarePage, id: "loadAllSoftwarePage")),
SidebarItem(title: "Categories", icon: "CategoriesTemplate", page: .function(loadCategoriesPage, id: "loadCategoriesPage")),
SidebarItem(title: "My Items", icon: "MyStuffTemplate", page: .function(loadMyItemsPage, id: "loadMyItemsPage")),
SidebarItem(title: "Updates", icon: "UpdatesTemplate", page: .function(loadUpdatesPage, id: "loadUpdatesPage"))
]
}
return sidebarItems
}
@objc func onItemClicked() {
let row = sidebarList.clickedRow
@@ -315,44 +353,8 @@ class MainWindowController: NSWindowController {
}
}
func loadInitialView() {
// Called by app delegate from applicationDidFinishLaunching:
// enable custom sidebar items if 11.0 or later // SF Symbols only supported on 11.0 or later
if #available(macOS 11.0, *) {
if let configItems = pref("CustomSidebarItems") as? [[String: String]] {
var newSidebarItems: [SidebarItem] = []
for item in configItems {
guard let title = item["title"],
let icon = item["icon"],
let page = item["page"] else {
continue
}
if page.starts(with: "munki://") || page.starts(with: "http") || page.hasSuffix(".html") {
newSidebarItems.append(SidebarItem(title: title, icon: icon, page: .url(page)))
} else {
switch page {
case "loadAllSoftwarePage":
newSidebarItems.append(SidebarItem(title: title, icon: icon, page: .function(loadAllSoftwarePage, id: "loadAllSoftwarePage")))
case "loadCategoriesPage":
newSidebarItems.append(SidebarItem(title: title, icon: icon, page: .function(loadCategoriesPage, id: "loadCategoriesPage")))
case "loadMyItemsPage":
newSidebarItems.append(SidebarItem(title: title, icon: icon, page: .function(loadMyItemsPage, id: "loadMyItemsPage")))
case "loadUpdatesPage":
newSidebarItems.append(SidebarItem(title: title, icon: icon, page: .function(loadUpdatesPage, id: "loadUpdatesPage")))
default:
continue
}
}
}
if !newSidebarItems.isEmpty {
sidebar_items = newSidebarItems
}
self.sidebarList.reloadData()
}
}
if optionalInstallsExist() {
loadAllSoftwarePage(self)
} else {
@@ -917,6 +919,7 @@ class MainWindowController: NSWindowController {
func displayUpdatesProgressSpinner(_ shouldDisplay: Bool) {
// check if update sidebar item avalible
/*
guard let index = sidebar_items.firstIndex(where: {
if case .function(_, let id) = $0.page {
return id == "loadUpdatesPage"
@@ -925,6 +928,16 @@ class MainWindowController: NSWindowController {
}) else {
return
}
*/
guard let index = sidebar_items.firstIndex(where: {
if case .url(let urlString) = $0.page {
return urlString == "munki://updates"
}
return false
}) else {
return
}
guard let rowView = sidebarList.rowView(atRow: index, makeIfNecessary: false),
let cellView = rowView.view(atColumn: 0) as? MSCTableCellView else {