From 95ff5829c1010f50ae7b389717c3426d963861c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magdalena=20Grodzi=C5=84ska?= Date: Sun, 24 Nov 2019 20:58:41 +0100 Subject: Add query uninstall backend --- .../mimuw/cloudatlas/client/ClientController.java | 31 +++++++++++++++++++--- .../cloudatlas/client/templates/queryForm.html | 4 +-- 2 files changed, 30 insertions(+), 5 deletions(-) (limited to 'src/main') diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/client/ClientController.java b/src/main/java/pl/edu/mimuw/cloudatlas/client/ClientController.java index 80a331e..fe958ae 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/client/ClientController.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/client/ClientController.java @@ -61,8 +61,8 @@ public class ClientController { return "queryForm"; } - @PostMapping("/query") - public String submitQuery(@ModelAttribute Query queryObject, Model model) { + @PostMapping("/installQuery") + public String installQuery(@ModelAttribute Query queryObject, Model model) { boolean success = true; try { @@ -76,7 +76,32 @@ public class ClientController { if (success) { model.addAttribute( "homeMessage", - "Query submitted successfully"); + "Query installed successfully"); + } else { + model.addAttribute( + "homeMessage", + "Query submission failed with a remote exception"); + } + + return "home"; + } + + @PostMapping("/uninstallQuery") + public String uninstallQuery(@ModelAttribute Query queryObject, Model model) { + boolean success = true; + + try { + this.api.uninstallQuery(queryObject.getName()); + } catch (Exception e) { + success = false; + System.err.println("Client exception:"); + e.printStackTrace(); + } + + if (success) { + model.addAttribute( + "homeMessage", + "Query uninstalled successfully"); } else { model.addAttribute( "homeMessage", diff --git a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/queryForm.html b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/queryForm.html index 08b4e89..f31ef6b 100644 --- a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/queryForm.html +++ b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/queryForm.html @@ -12,7 +12,7 @@

Install query

-
+
@@ -27,7 +27,7 @@

Uninstall query

- +
-- cgit v1.2.3