From 1adf9d9d5887074ad7a2e4fd2c46175f5e33d888 Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Fri, 4 Oct 2024 18:28:42 -0700
Subject: [PATCH] Delete for traceroutes

---
 .../contents                                  |  2 +-
 Meshtastic/Views/Nodes/TraceRouteLog.swift    | 15 ++++-
 .../Views/Settings/Logs/LogDetail.swift       | 61 +++++++++++--------
 3 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV 45.xcdatamodel/contents b/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV 45.xcdatamodel/contents
index 65a05ff9..2a5e4a56 100644
--- a/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV 45.xcdatamodel/contents	
+++ b/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV 45.xcdatamodel/contents	
@@ -421,7 +421,7 @@
         <attribute name="sent" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
         <attribute name="snr" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
         <attribute name="time" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="hops" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="TraceRouteHopEntity" inverseName="traceRoute" inverseEntity="TraceRouteHopEntity"/>
+        <relationship name="hops" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="TraceRouteHopEntity" inverseName="traceRoute" inverseEntity="TraceRouteHopEntity"/>
         <relationship name="node" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="NodeInfoEntity" inverseName="traceRoutes" inverseEntity="NodeInfoEntity"/>
     </entity>
     <entity name="TraceRouteHopEntity" representedClassName="TraceRouteHopEntity" syncable="YES" codeGenerationType="class">
diff --git a/Meshtastic/Views/Nodes/TraceRouteLog.swift b/Meshtastic/Views/Nodes/TraceRouteLog.swift
index f32cbc81..f0828192 100644
--- a/Meshtastic/Views/Nodes/TraceRouteLog.swift
+++ b/Meshtastic/Views/Nodes/TraceRouteLog.swift
@@ -7,6 +7,7 @@
 
 import SwiftUI
 import CoreData
+import OSLog
 #if canImport(MapKit)
 import MapKit
 #endif
@@ -45,6 +46,18 @@ struct TraceRouteLog: View {
 							Image(systemName: route.response ? (route.hops?.count == 0 && route.response ? "person.line.dotted.person" : "point.3.connected.trianglepath.dotted") : "person.slash")
 								.symbolRenderingMode(.hierarchical)
 						}
+						.swipeActions {
+							Button(role: .destructive) {
+								context.delete(route)
+								do {
+									try context.save()
+								} catch let error as NSError {
+									Logger.data.error("\(error.localizedDescription)")
+								}
+							} label: {
+								Label("delete", systemImage: "trash")
+							}
+						}
 					}
 					.listStyle(.plain)
 				}
@@ -208,7 +221,7 @@ struct TraceRouteLog: View {
 	@ViewBuilder func contents(animation: Animation? = nil) -> some View {
 		ForEach(0..<indexes, id: \.self) { idx in
 			TraceRouteComponent(animation: animation) {
-				let hops = selectedRoute?.hops?.array as? [TraceRouteHopEntity] ?? [] // getTraceRouteHops(context: PersistenceController.preview.container.viewContext)//
+				let hops = getTraceRouteHops(context: context)// selectedRoute?.hops?.array as? [TraceRouteHopEntity] ?? [] // getTraceRouteHops(context: PersistenceController.preview.container.viewContext)//
 				if idx % 2 == 0 {
 					let i = idx / 2
 					let snrColor = getSnrColor(snr: hops[i].snr, preset: modemPreset)
diff --git a/Meshtastic/Views/Settings/Logs/LogDetail.swift b/Meshtastic/Views/Settings/Logs/LogDetail.swift
index 8006127e..ca5d17d6 100644
--- a/Meshtastic/Views/Settings/Logs/LogDetail.swift
+++ b/Meshtastic/Views/Settings/Logs/LogDetail.swift
@@ -37,11 +37,13 @@ struct LogDetail: View {
 					List {
 						/// Time
 						Label {
-							Text("log.time".localized + ":")
-								.font(idiom == .phone ? .caption : .title)
-								.frame(width: idiom == .phone ? 115 : 190, alignment: .trailing)
-							Text(log.date.formatted(dateFormatStyle))
-								.font(idiom == .phone ? .caption : .title)
+							HStack {
+								Text("log.time".localized + ":")
+									.font(idiom == .phone ? .caption : .title)
+									.frame(width: idiom == .phone ? 115 : 190, alignment: .trailing)
+								Text(log.date.formatted(dateFormatStyle))
+									.font(idiom == .phone ? .caption : .title)
+							}
 						} icon: {
 							Image(systemName: "timer")
 								.symbolRenderingMode(.hierarchical)
@@ -53,11 +55,13 @@ struct LogDetail: View {
 						.listSectionSeparator(.visible, edges: .bottom)
 						/// Subsystem
 						Label {
-							Text("log.subsystem".localized + ":")
-								.font(idiom == .phone ? .caption : .title)
-								.frame(width: idiom == .phone ? 115 : 190, alignment: .trailing)
-							Text(log.subsystem)
-								.font(idiom == .phone ? .caption : .title)
+							HStack {
+								Text("log.subsystem".localized + ":")
+									.font(idiom == .phone ? .caption : .title)
+									.frame(width: idiom == .phone ? 115 : 190, alignment: .trailing)
+								Text(log.subsystem)
+									.font(idiom == .phone ? .caption : .title)
+							}
 						} icon: {
 							Image(systemName: "gear")
 								.symbolRenderingMode(.hierarchical)
@@ -68,11 +72,13 @@ struct LogDetail: View {
 						.listRowSeparator(.visible)
 						/// Process
 						Label {
-							Text("log.process".localized + ":")
-								.font(idiom == .phone ? .caption : .title)
-								.frame(width: idiom == .phone ? 115 : 190, alignment: .trailing)
-							Text(log.process)
-								.font(idiom == .phone ? .caption : .title)
+							HStack {
+								Text("log.process".localized + ":")
+									.font(idiom == .phone ? .caption : .title)
+									.frame(width: idiom == .phone ? 115 : 190, alignment: .trailing)
+								Text(log.process)
+									.font(idiom == .phone ? .caption : .title)
+							}
 						} icon: {
 							Image(systemName: "tag")
 								.symbolRenderingMode(.hierarchical)
@@ -83,12 +89,13 @@ struct LogDetail: View {
 						.listRowSeparator(.visible)
 						/// Level
 						Label {
-							Text("log.level".localized + ":")
-								.font(idiom == .phone ? .caption : .title)
-								.frame(width: idiom == .phone ? 115 : 190, alignment: .trailing)
-							Text(log.level.description)
-								.font(idiom == .phone ? .caption : .title)
-								.foregroundStyle(log.level.color)
+							HStack {
+								Text("log.level".localized + ":")
+									.font(idiom == .phone ? .caption : .title)
+									.frame(width: idiom == .phone ? 115 : 190, alignment: .trailing)
+								Text(log.level.description)
+									.font(idiom == .phone ? .caption : .title)
+								.foregroundStyle(log.level.color) }
 						} icon: {
 							Image(systemName: "stairs")
 								.symbolRenderingMode(.hierarchical)
@@ -99,11 +106,13 @@ struct LogDetail: View {
 						.listRowSeparator(.visible)
 						/// Category
 						Label {
-							Text("log.category".localized + ":")
-								.font(idiom == .phone ? .caption : .title)
-								.frame(width: idiom == .phone ? 115 : 190, alignment: .trailing)
-							Text(log.category)
-								.font(idiom == .phone ? .caption : .title)
+							HStack {
+								Text("log.category".localized + ":")
+									.font(idiom == .phone ? .caption : .title)
+									.frame(width: idiom == .phone ? 115 : 190, alignment: .trailing)
+								Text(log.category)
+									.font(idiom == .phone ? .caption : .title)
+							}
 						} icon: {
 							Image(systemName: "square.grid.2x2")
 								.symbolRenderingMode(.hierarchical)