Skip to content

Commit 3179167

Browse files
committed
fix: remove dead code, restore Redis default, add Codable backward compat
1 parent 7a47c52 commit 3179167

2 files changed

Lines changed: 18 additions & 9 deletions

File tree

Plugins/TableProPluginKit/ConnectionField.swift

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,20 @@ public struct ConnectionField: Codable, Sendable {
104104
self.section = section
105105
self.hidesPassword = hidesPassword
106106
}
107+
108+
public init(from decoder: Decoder) throws {
109+
let container = try decoder.container(keyedBy: CodingKeys.self)
110+
id = try container.decode(String.self, forKey: .id)
111+
label = try container.decode(String.self, forKey: .label)
112+
placeholder = try container.decodeIfPresent(String.self, forKey: .placeholder) ?? ""
113+
isRequired = try container.decodeIfPresent(Bool.self, forKey: .isRequired) ?? false
114+
defaultValue = try container.decodeIfPresent(String.self, forKey: .defaultValue)
115+
fieldType = try container.decode(FieldType.self, forKey: .fieldType)
116+
section = try container.decodeIfPresent(FieldSection.self, forKey: .section) ?? .advanced
117+
hidesPassword = try container.decodeIfPresent(Bool.self, forKey: .hidesPassword) ?? false
118+
}
119+
120+
private enum CodingKeys: String, CodingKey {
121+
case id, label, placeholder, isRequired, defaultValue, fieldType, section, hidesPassword
122+
}
107123
}

TablePro/Views/Connection/ConnectionFormView.swift

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,6 @@ struct ConnectionFormView: View {
105105
additionalFieldValues["usePgpass"] == "true"
106106
}
107107

108-
private var usePgpassBinding: Binding<Bool> {
109-
Binding(
110-
get: { additionalFieldValues["usePgpass"] == "true" },
111-
set: { additionalFieldValues["usePgpass"] = $0 ? "true" : "false" }
112-
)
113-
}
114-
115108
// Pre-connect script
116109
@State private var preConnectScript: String = ""
117110

@@ -939,7 +932,7 @@ struct ConnectionFormView: View {
939932
groupId: selectedGroupId,
940933
safeModeLevel: safeModeLevel,
941934
aiPolicy: aiPolicy,
942-
redisDatabase: Int(additionalFieldValues["redisDatabase"] ?? ""),
935+
redisDatabase: Int(additionalFieldValues["redisDatabase"] ?? "0"),
943936
startupCommands: startupCommands.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
944937
? nil : startupCommands,
945938
additionalFields: finalAdditionalFields.isEmpty ? nil : finalAdditionalFields
@@ -1088,7 +1081,7 @@ struct ConnectionFormView: View {
10881081
color: connectionColor,
10891082
tagId: selectedTagId,
10901083
groupId: selectedGroupId,
1091-
redisDatabase: Int(additionalFieldValues["redisDatabase"] ?? ""),
1084+
redisDatabase: Int(additionalFieldValues["redisDatabase"] ?? "0"),
10921085
startupCommands: startupCommands.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
10931086
? nil : startupCommands,
10941087
additionalFields: finalAdditionalFields.isEmpty ? nil : finalAdditionalFields

0 commit comments

Comments
 (0)