Refactor EventView and EventList to remove eventHistory dependency, s…

…implifying event handling
kasianov-mikhail · Nov 29, 2024 · a62bee1 · a62bee1
1 parent 048a7b9
commit a62bee1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 28 deletions.
diff --git a/Sources/Scout/UI/Event.swift b/Sources/Scout/UI/Event.swift
@@ -163,20 +163,6 @@ struct EventQuery {
     }
 }
 
-// MARK: - EventQuery
-
-// TODO: Remove. Use the bool property directly.
-struct EventHistory: EnvironmentKey {
-    static let defaultValue = true
-}
-
-extension EnvironmentValues {
-    var eventHistory: Bool {
-        get { self[EventHistory.self] }
-        set { self[EventHistory.self] = newValue }
-    }
-}
-
 // MARK: -
 
 extension EventQuery: CustomStringConvertible {

diff --git a/Sources/Scout/UI/EventList.swift b/Sources/Scout/UI/EventList.swift
@@ -12,7 +12,6 @@ struct EventList: View {
     let timeline = Date()
 
     @ObservedObject var provider: EventProvider
-    @Environment(\.eventHistory) var showHistory: Bool
     @EnvironmentObject var database: DatabaseController
 
     let dateFormatter: RelativeDateTimeFormatter = {
@@ -74,7 +73,7 @@ struct EventList: View {
             }
 
             NavigationLink {
-                EventView(event: event, showHistory: true)
+                EventView(event: event)
             } label: {
                 EmptyView()
             }

diff --git a/Sources/Scout/UI/EventView.swift b/Sources/Scout/UI/EventView.swift
@@ -10,15 +10,9 @@ import SwiftUI
 
 struct EventView: View {
     let event: Event
-    let showHistory: Bool
 
     @EnvironmentObject var tint: Tint
 
-    init(event: Event, showHistory: Bool) {
-        self.event = event
-        self.showHistory = showHistory
-    }
-
     var body: some View {
         let color = event.level?.color
 
@@ -33,10 +27,7 @@ struct EventView: View {
             }
 
             StatSection(eventName: event.name)
-
-            if showHistory {
-                HistorySection(event: event)
-            }
+            HistorySection(event: event)
         }
         .onAppear {
             tint.value = color
@@ -223,7 +214,7 @@ extension EventView {
             userID: UUID(),
             sessionID: UUID()
         )
-        EventView(event: event, showHistory: true)
+        EventView(event: event)
     }
     .environmentObject(Tint())
     .environmentObject(DatabaseController())

diff --git a/Sources/Scout/UI/HistoryView.swift b/Sources/Scout/UI/HistoryView.swift
@@ -31,7 +31,6 @@ struct HistoryView: View {
 
             EventList(provider: provider)
                 .frame(maxHeight: .infinity)
-                .environment(\.eventHistory, false)
         }
         .toolbar {
             ToolbarItem(placement: .topBarTrailing) {