Updates cell settings

kean · Sep 15, 2024 · ed4993b · ed4993b
1 parent 25027fc
commit ed4993b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/Sources/PulseUI/Extensions/Pulse+Extensions.swift b/Sources/PulseUI/Extensions/Pulse+Extensions.swift
@@ -140,9 +140,12 @@ extension NetworkTaskEntity {
         guard let url else {
             return nil
         }
-        let displayed = options.content.components
-        if displayed.count == ConsoleListDisplaySettings.URLComponent.allCases.count {
-            return url
+        return NetworkTaskEntity.formattedURL(url, components:  options.content.components)
+    }
+
+    static func formattedURL(_ url: String, components displayed: Set<ConsoleListDisplaySettings.URLComponent>) -> String? {
+        guard !displayed.isEmpty else {
+            return nil
         }
         guard var components = URLComponents(string: url) else {
             return nil

diff --git a/Sources/PulseUI/Features/Console/Views/ConsoleListDisplaySettings.swift b/Sources/PulseUI/Features/Console/Views/ConsoleListDisplaySettings.swift
@@ -39,6 +39,9 @@ public struct ConsoleListDisplaySettings: Hashable, Codable {
         /// If task description is available, show it instead of the `URL`.
         public var showTaskDescription = false
 
+        /// Show HTTP method when available.
+        public var showMethod = true
+
         /// Defines what components to display in the list. By default, shows
         /// only path.
         public var components: Set<URLComponent> = [.path]
@@ -59,13 +62,11 @@ public struct ConsoleListDisplaySettings: Hashable, Codable {
         public var lineLimit: Int = 1
     }
 
-    public enum URLComponent: String, Identifiable, CaseIterable, Codable {
+    public enum URLComponent: String, CaseIterable, Codable {
         case scheme, user, password, host, port, path, query, fragment
-
-        public var id: URLComponent { self }
     }
 
-    public enum TaskField: Sendable, Codable, Hashable, Identifiable {
+    public enum TaskField: Sendable, Codable, Hashable {
         case method
         case requestSize
         case responseSize
@@ -75,10 +76,8 @@ public struct ConsoleListDisplaySettings: Hashable, Codable {
         case statusCode
         case taskType
         case taskDescription
-        case requestHeaderField(key: String)
-        case responseHeaderField(key: String)
-
-        public var id: TaskField { self }
+        case requestHeaderField(String)
+        case responseHeaderField(String)
     }
 
     public init() {}

diff --git a/Sources/PulseUI/Features/Console/Views/ConsoleTaskCell.swift b/Sources/PulseUI/Features/Console/Views/ConsoleTaskCell.swift
@@ -102,7 +102,7 @@ struct ConsoleTaskCell: View {
 
     private var content: some View {
         var method: Text? {
-            guard let method = task.httpMethod else {
+            guard settings.listDisplayOptions.content.showMethod, let method = task.httpMethod else {
                 return nil
             }
             return Text(method.appending(" "))