Save text (#632)

This commit is contained in:
Max Goedjen
2025-08-24 20:19:29 -07:00
committed by GitHub
parent 828c61cb2f
commit f0a6f2e43b
6 changed files with 53 additions and 32 deletions

View File

@@ -8,6 +8,7 @@ struct DeleteSecretView<StoreType: SecretStoreModifiable>: View {
var dismissalBlock: (Bool) -> ()
@State private var confirm = ""
@State var errorText: String?
var body: some View {
VStack {
@@ -31,6 +32,11 @@ struct DeleteSecretView<StoreType: SecretStoreModifiable>: View {
}
}
}
if let errorText {
Text(verbatim: errorText)
.foregroundStyle(.red)
.font(.callout)
}
HStack {
Spacer()
Button(.deleteConfirmationDeleteButton, action: delete)
@@ -50,8 +56,12 @@ struct DeleteSecretView<StoreType: SecretStoreModifiable>: View {
func delete() {
Task {
try! await store.delete(secret: secret)
dismissalBlock(true)
do {
try await store.delete(secret: secret)
dismissalBlock(true)
} catch {
errorText = error.localizedDescription
}
}
}

View File

@@ -9,6 +9,7 @@ struct EditSecretView<StoreType: SecretStoreModifiable>: View {
@State private var name: String
@State private var publicKeyAttribution: String
@State var errorText: String?
init(store: StoreType, secret: StoreType.SecretType, dismissalBlock: @escaping (Bool) -> ()) {
self.store = store
@@ -30,6 +31,11 @@ struct EditSecretView<StoreType: SecretStoreModifiable>: View {
.foregroundStyle(.secondary)
}
}
if let errorText {
Text(verbatim: errorText)
.foregroundStyle(.red)
.font(.callout)
}
}
HStack {
Button(.editSaveButton, action: rename)
@@ -37,7 +43,8 @@ struct EditSecretView<StoreType: SecretStoreModifiable>: View {
.keyboardShortcut(.return)
Button(.editCancelButton) {
dismissalBlock(false)
}.keyboardShortcut(.cancelAction)
}
.keyboardShortcut(.cancelAction)
}
.padding()
}
@@ -50,8 +57,12 @@ struct EditSecretView<StoreType: SecretStoreModifiable>: View {
attributes.publicKeyAttribution = publicKeyAttribution
}
Task {
try? await store.update(secret: secret, name: name, attributes: attributes)
dismissalBlock(true)
do {
try await store.update(secret: secret, name: name, attributes: attributes)
dismissalBlock(true)
} catch {
errorText = error.localizedDescription
}
}
}
}