From 9d42b010c145a81b26ad1b9e831f6229c9e38f74 Mon Sep 17 00:00:00 2001 From: Dietrich Date: Thu, 20 May 2021 16:18:06 +0200 Subject: [PATCH] fix delete message --- Cargo.lock | 8 -------- app/src/pages/list_links.rs | 5 ++++- pslink/Cargo.toml | 2 +- pslink/sqlx-data.json | 38 ++++++++++++++++++------------------- 4 files changed, 24 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1d1d8f9..4b2430c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1170,9 +1170,6 @@ name = "either" version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -dependencies = [ - "serde", -] [[package]] name = "enclose" @@ -3516,7 +3513,6 @@ version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" dependencies = [ - "indexmap", "itoa", "ryu", "serde", @@ -3743,7 +3739,6 @@ dependencies = [ "parking_lot", "percent-encoding", "rustls", - "serde", "sha2", "smallvec", "sqlformat", @@ -3767,12 +3762,9 @@ dependencies = [ "either", "futures 0.3.15", "heck", - "hex", "lazy_static", "proc-macro2 1.0.26", "quote 1.0.9", - "serde", - "serde_json", "sha2", "sqlx-core", "sqlx-rt", diff --git a/app/src/pages/list_links.rs b/app/src/pages/list_links.rs index 2cf3870..400d770 100644 --- a/app/src/pages/list_links.rs +++ b/app/src/pages/list_links.rs @@ -301,7 +301,10 @@ pub fn process_edit_messages(msg: EditMsg, model: &mut Model, orders: &mut impl log!("Failed to delete Link"); } EditMsg::DeletedLink(message) => { - log!("Deleted link", message); + model.last_message = Some(message); + model.edit_link = None; + model.question = None; + orders.send_msg(Msg::Query(QueryMsg::Fetch)); } } } diff --git a/pslink/Cargo.toml b/pslink/Cargo.toml index 36a627f..9528745 100644 --- a/pslink/Cargo.toml +++ b/pslink/Cargo.toml @@ -51,7 +51,7 @@ features = ["tera"] version = "0.6" [dependencies.sqlx] -features = ["sqlite", "macros", "runtime-actix-rustls", "chrono", "migrate", "offline"] +features = ["sqlite", "macros", "runtime-actix-rustls", "chrono", "migrate"] version = "0.4" [dependencies.tracing] diff --git a/pslink/sqlx-data.json b/pslink/sqlx-data.json index 5409d4a..796893c 100644 --- a/pslink/sqlx-data.json +++ b/pslink/sqlx-data.json @@ -116,8 +116,18 @@ ] } }, - "193ebdfd8bdb96da45f5054f83a6a5e23eaa311e3e5c4139095a3455f4764c64": { - "query": "Select * from users", + "3ad5584fcb0c2685339e471320e8d0c091b684ffe86912a1f2540eee1444889d": { + "query": "Insert into clicks (\n link,\n created_at) VALUES (?,?)", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + } + }, + "5624dec3d87f37ae3f77fb265ace3075b8e46bdcc0af273e0f28d4e1a89b6e9e": { + "query": "Select * from links where id = ? ", "describe": { "columns": [ { @@ -126,33 +136,33 @@ "type_info": "Int64" }, { - "name": "username", + "name": "title", "ordinal": 1, "type_info": "Text" }, { - "name": "email", + "name": "target", "ordinal": 2, "type_info": "Text" }, { - "name": "password", + "name": "code", "ordinal": 3, "type_info": "Text" }, { - "name": "role", + "name": "author", "ordinal": 4, "type_info": "Int64" }, { - "name": "language", + "name": "created_at", "ordinal": 5, - "type_info": "Text" + "type_info": "Datetime" } ], "parameters": { - "Right": 0 + "Right": 1 }, "nullable": [ false, @@ -164,16 +174,6 @@ ] } }, - "3ad5584fcb0c2685339e471320e8d0c091b684ffe86912a1f2540eee1444889d": { - "query": "Insert into clicks (\n link,\n created_at) VALUES (?,?)", - "describe": { - "columns": [], - "parameters": { - "Right": 2 - }, - "nullable": [] - } - }, "5919b8824209c31a76178f30b3d52f385931ee0f3aa17e65f8647ad15a3595d8": { "query": "Insert into links (\n title,\n target,\n code,\n author,\n created_at) VALUES (?,?,?,?,?)", "describe": {