Supporting button action confirmation and when-done redirects.

rapidoid · Apr 11, 2016 · 501c5a9 · 501c5a9
1 parent a9358bc
commit 501c5a9
Show file tree

Hide file tree

Showing 8 changed files with 176 additions and 66 deletions.
diff --git a/assets/angular/emit.js b/assets/angular/emit.js
@@ -1,6 +1,33 @@
 Rapidoid.initializer(function($scope) {
 
-    $scope._emit = function(eventId, eventArgs) {
+    $scope._emit = function(event, eventId, eventArgs) {
+
+        var btn = $(event.currentTarget);
+        var confirm = btn.data("confirm");
+
+        if (confirm) {
+            swal({
+              title: "Are you sure?",
+              text: confirm,
+              type: "warning",
+              showCancelButton: true,
+              confirmButtonColor: "#DD6B55",
+              confirmButtonText: "Yes!",
+              closeOnConfirm: true
+            }, function(){
+               doEmit(event, eventId, eventArgs);
+            });
+
+        } else {
+            doEmit(event, eventId, eventArgs);
+        }
+
+    };
+
+    function doEmit(event, eventId, eventArgs) {
+
+        var btn = $(event.currentTarget);
+        var go = btn.data("go");
 
         eventId = eventId || 'bind';
         eventArgs = eventArgs || [];
@@ -45,14 +72,19 @@ Rapidoid.initializer(function($scope) {
 
         $.post(window.location.href, inputs).done(function(data) {
 
+            if (go) {
+                Rapidoid.goAt(go);
+                return;
+            }
+
             if (typeof data === 'string' || data instanceof String) {
                 $scope.ajaxBodyContent = data;
                 $scope.$apply();
                 return;
             }
 
             if (data._redirect_) {
-                _goAt(data._redirect_);
+                Rapidoid.goAt(data._redirect_);
                 return;
             }
 
@@ -75,6 +107,7 @@ Rapidoid.initializer(function($scope) {
                         }
                     }
                 }
+
             } else {
                 if (data._sel_ === undefined) {
                     swal("Application error!", "The command couldn't be executed!", "error");
@@ -90,10 +123,11 @@ Rapidoid.initializer(function($scope) {
                     }
                 }
             }
+
         }).fail(function(data) {
             swal("Communication error!", "Couldn't connect to the server!", "error");
             console.log(data);
         });
-    };
+    }
 
 });
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/UTILS.java b/rapidoid-commons/src/main/java/org/rapidoid/util/UTILS.java
@@ -739,21 +739,25 @@ public static void logProperties(Properties props) {
 		}
 	}
 
-	public static String uriFor(Object entity) {
-		if (!JPA.isEntity(entity)) {
+	public static String uriFor(Object target) {
+		if (!JPA.isEntity(target)) {
 			return "";
 		}
 
-		Object id = JPA.getIdentifier(entity);
-
-		if (id != null) {
-			String name = Str.camelToSnake(English.plural(Cls.entityName(entity)));
-			String frm = Conf.ROOT.is("generate") ? "%s%s.html" : "/%s/%s/view";
-			return U.frmt(frm, name, id);
+		return uriFor(typeUri(target.getClass()), target);
+	}
 
-		} else {
+	public static String uriFor(String baseUri, Object target) {
+		if (!JPA.isEntity(target)) {
 			return "";
 		}
+
+		Object id = JPA.getIdentifier(target);
+		return id != null ? uri(baseUri, id + "") : "";
+	}
+
+	public static String typeUri(Class<?> entityType) {
+		return "/" + English.plural(Str.uncapitalized(entityType.getSimpleName()));
 	}
 
 }
diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/Btn.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/Btn.java
@@ -35,18 +35,20 @@ public class Btn extends AbstractCommand<Btn> {
 
 	private String kind = "default";
 
-	private String href;
+	private String go;
 
 	private String class_;
 
+	private String confirm;
+
 	@Override
 	protected Tag render() {
 		handleEventIfMatching();
 
 		String cls = U.or(class_, "btn btn-" + kind);
 
-		if (href != null) {
-			return a(contents).href(href).class_(cls);
+		if (go != null && handler == null && confirm() == null) {
+			return a(contents).href(go).class_(cls);
 		}
 
 		ButtonTag btn = button(contents).type("button").class_(cls);
@@ -55,6 +57,14 @@ protected Tag render() {
 			btn = btn.cmd(command(), cmdArgs());
 		}
 
+		if (confirm() != null) {
+			btn = btn.attr("data-confirm", confirm());
+		}
+
+		if (go() != null) {
+			btn = btn.attr("data-go", go());
+		}
+
 		return btn;
 	}
 
@@ -101,12 +111,12 @@ public Btn kind(String kind) {
 		return this;
 	}
 
-	public String href() {
-		return href;
+	public String go() {
+		return go;
 	}
 
-	public Btn href(String linkTo) {
-		this.href = linkTo;
+	public Btn go(String linkTo) {
+		this.go = linkTo;
 		return this;
 	}
 
@@ -124,4 +134,12 @@ public Btn onClick(Runnable onClickHandler) {
 		return this;
 	}
 
+	public String confirm() {
+		return confirm;
+	}
+
+	public Btn confirm(String confirm) {
+		this.confirm = confirm;
+		return this;
+	}
 }
diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/base/AbstractCommand.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/base/AbstractCommand.java
@@ -35,7 +35,7 @@ public abstract class AbstractCommand<W extends AbstractCommand<?>> extends Abst
 
 	private String[] cmdArgs;
 
-	private Runnable handler;
+	protected Runnable handler;
 
 	private boolean handled;
 

diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/base/BootstrapWidgets.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/base/BootstrapWidgets.java
@@ -373,7 +373,7 @@ public static Btn cmd(String cmd, Object... args) {
 
 	public static Btn navigate(String cmd) {
 		String caption = Str.capitalized(cmd);
-		return btn(caption).href(cmd);
+		return btn(caption).go(cmd);
 	}
 
 	public static Btn[] cmds(String... commands) {
@@ -513,11 +513,11 @@ public static Tag[] mediaList(List<Object> found) {
 
 		for (Object result : found) {
 			Object id = Beany.getId(result);
-			String url = UTILS.uriFor(result);
+			String uri = UTILS.uriFor(result);
 
 			Tag left = h6("(ID", NBSP, "=", NBSP, id, ")");
 			Object header = span(result.getClass().getSimpleName());
-			items[ind++] = media(left, header, small(Beany.beanToNiceText(result, true)), url);
+			items[ind++] = media(left, header, small(Beany.beanToNiceText(result, true)), uri);
 		}
 
 		return items;

diff --git a/rapidoid-html/src/main/java/org/rapidoid/html/impl/TagRenderer.java b/rapidoid-html/src/main/java/org/rapidoid/html/impl/TagRenderer.java
@@ -46,7 +46,7 @@ public class TagRenderer {
 
 	private static final byte[] COMMA_SEP = ", ".getBytes();
 	private static final byte[] INDENT = "  ".getBytes();
-	private static final byte[] EMIT = "_emit('".getBytes();
+	private static final byte[] EMIT = "_emit($event, '".getBytes();
 	private static final byte[] EMIT_SEP = "', [".getBytes();
 	private static final byte[] EMIT_CLOSE = "])".getBytes();
 	private static final byte[] _H = " _h=\"".getBytes();

diff --git a/rapidoid-html/src/main/resources/default/static/rapidoid.min.js b/rapidoid-html/src/main/resources/default/static/rapidoid.min.js