phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-08-07 12:00:09 +02:00
Code Releases Activity

👌 Cleanup dependencies for site isolation

Browse Source
This commit is contained in:
Nico Verbruggen
2024-04-03 14:50:05 +02:00
parent 06bc4ddb9a
commit 79f6a60a16
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpmon/Domain/SwiftUI/Domains/VersionPopoverView.swift
View File

@ -41,25 +41,21 @@ struct VersionPopoverView: View {
color: Color("AppColor") color: Color("AppColor")
) )
if prefersIsolationSuggestions { if prefersIsolationSuggestions {
// SITE ISOLATION (preferred)
LazyVGrid(columns: self.rows, alignment: .leading, spacing: 5, content: { LazyVGrid(columns: self.rows, alignment: .leading, spacing: 5, content: {
ForEach(validPhpVersions, id: \.self) { version in ForEach(validPhpVersions, id: \.self) { version in
Button("site_link.isolate_php".localized(version.short), action: { Button("site_link.isolate_php".localized(version.short), action: {
Task { App.shared.domainListWindowController?.contentVC
// Applies isolation .isolateSite(site: site, version: version.short)
App.shared.domainListWindowController?.contentVC.setUIBusy()
try? await site.isolate(version: version.short)
App.shared.domainListWindowController?.pressedReload(nil)
App.shared.domainListWindowController?.contentVC.setUINotBusy()
}
parent?.close() parent?.close()
}).padding(EdgeInsets(top: 3, leading: 0, bottom: 3, trailing: 0)) }).padding(EdgeInsets(top: 3, leading: 0, bottom: 3, trailing: 0))
} }
}).padding(EdgeInsets(top: 5, leading: 0, bottom: 0, trailing: 0)) }).padding(EdgeInsets(top: 5, leading: 0, bottom: 0, trailing: 0))
} else { } else {
// GLOBAL SWITCHER
LazyVGrid(columns: self.rows, alignment: .leading, spacing: 5, content: { LazyVGrid(columns: self.rows, alignment: .leading, spacing: 5, content: {
ForEach(validPhpVersions, id: \.self) { version in ForEach(validPhpVersions, id: \.self) { version in
Button("site_link.switch_to_php".localized(version.short), action: { Button("site_link.switch_to_php".localized(version.short), action: {
// Uses the global switcher
MainMenu.shared.switchToPhpVersion(version.short) MainMenu.shared.switchToPhpVersion(version.short)
parent?.close() parent?.close()
}).padding(EdgeInsets(top: 3, leading: 0, bottom: 3, trailing: 0)) }).padding(EdgeInsets(top: 3, leading: 0, bottom: 3, trailing: 0))

26
phpmon/Modules/Domain List/UI/DomainListVC+Actions.swift
View File

@ -126,17 +126,17 @@ extension DomainListVC {
} }
} }
@objc func isolateSite(sender: PhpMenuItem) { public func isolateSite(site: ValetSite, version: String) {
guard let site = selectedSite else {
return
}
waitAndExecute { waitAndExecute {
do { do {
// Instruct Valet to isolate a given PHP version // Instruct Valet to isolate a given PHP version
try await site.isolate(version: sender.version) try await site.isolate(version: version)
// Reload the UI // Reload the UI if it's the same site
self.reloadSelectedRow() if self.selectedSite?.absolutePath == site.absolutePath {
self.reloadSelectedRow()
} else {
await self.reloadDomains()
}
} catch { } catch {
// Notify the user about a failed command // Notify the user about a failed command
let error = error as! ValetInteractionError let error = error as! ValetInteractionError
@ -145,7 +145,15 @@ extension DomainListVC {
} }
} }
@objc func removeIsolatedSite() { @objc func isolateSiteViaMenuItem(sender: PhpMenuItem) {
guard let site = selectedSite else {
return
}
self.isolateSite(site: site, version: sender.version)
}
@objc func removeIsolatedSiteViaMenuItem() {
guard let site = selectedSite else { guard let site = selectedSite else {
return return
} }

4
phpmon/Modules/Domain List/UI/DomainListVC+ContextMenu.swift
View File

@ -121,7 +121,7 @@ extension DomainListVC {
for version in PhpEnvironments.shared.availablePhpVersions.reversed() { for version in PhpEnvironments.shared.availablePhpVersions.reversed() {
let item = PhpMenuItem( let item = PhpMenuItem(
title: "domain_list.always_use_php".localized(version), title: "domain_list.always_use_php".localized(version),
action: #selector(self.isolateSite), action: #selector(self.isolateSiteViaMenuItem),
keyEquivalent: "" keyEquivalent: ""
) )
if site.servingPhpVersion == version && site.isolatedPhpVersion != nil { if site.servingPhpVersion == version && site.isolatedPhpVersion != nil {
@ -137,7 +137,7 @@ extension DomainListVC {
items.append(NSMenuItem.separator()) items.append(NSMenuItem.separator())
items.append(NSMenuItem( items.append(NSMenuItem(
title: "domain_list.remove_isolation".localized, title: "domain_list.remove_isolation".localized,
action: #selector(self.removeIsolatedSite) action: #selector(self.removeIsolatedSiteViaMenuItem)
)) ))
} }