macos: Display server message

Changes

2 changed files (+48/-0)

• macos/plac/DataModels/BrowsingDataModel.swift
  • @@ -132,6 +132,7 @@ final class BrowsingDataModel {
    var rootPage: BrowsePage? = nil var pages: [BrowseService.Item: BrowsePage] = [:] + var message: String? = nil @ObservationIgnored private let conn: Communicatable
  • @@ -173,6 +174,10 @@ final class BrowsingDataModel {
    ) ) + if let msg = browse.message { + message = msg + } + guard browse.action == .list else { throw LoadError.nonListResponse }
  • @@ -233,6 +238,10 @@ final class BrowsingDataModel {
    ) ) + if let msg = browse.message { + message = msg + } + switch browse.action { case .list: guard let list = browse.list else {
  • @@ -311,6 +320,10 @@ final class BrowsingDataModel {
    ) ) + if let msg = browse.message { + message = msg + } + guard browse.action == .list else { logger.info( "Only list action is supported for now: got \(browse.action.rawValue)"
• macos/plac/Views/ConnectedScreen.swift
  • @@ -47,6 +47,12 @@ struct ConnectedScreen: View {
    ) var body: some View { + let shouldDisplayMessage = Binding { + return browsing.message != nil + } set: { _ in + browsing.message = nil + } + VStack(spacing: 0) { NavigationSplitView { List(hierarchies, id: \.self, selection: $browsing.hierarchy) {
  • @@ -82,6 +88,17 @@ struct ConnectedScreen: View {
    } } } + .alert( + "Message from server", + isPresented: shouldDisplayMessage, + presenting: browsing.message + ) { _ in + Button("Close") { + browsing.message = nil + } + } message: { message in + Text(message) + } Divider()
  • @@ -216,6 +233,23 @@ extension MockServer: Communicatable {
    ) } + var rootAction: MockPage { + .init( + browse: """ + { + "action": "list", + "list": { + "title": "Mock Page", + "subtitle": "Various responses", + "level": 0 + }, + "message": "You performed an action." + } + """, + load: root.load + ) + } + var list: MockPage { .init( browse: """
  • @@ -312,6 +346,7 @@ extension MockServer: Communicatable {
    try await Task.sleep(for: .milliseconds(300)) print("Got action: \(itemKey)") stack = [] + return try rootAction.browseMsg() case "mock-list-action": try await Task.sleep(for: .milliseconds(300)) print("Got action: \(itemKey)")