Merge pull request #808 from jamesrdf/issues/#640-async-workbench

Use async XMLHttpRequests in workbench

Author: James Leigh

core/http/workbench/src/main/java/org/eclipse/rdf4j/workbench/proxy/WorkbenchServlet.java

@@ -217,6 +217,7 @@ private void service(final String repoID, final HttpServletRequest req, final Ht
 			if (repository == null) {
 				final String noId = config.getInitParameter(NO_REPOSITORY);
 				if (noId == null || !noId.equals(repoID)) {
+					resp.setHeader("Cache-Control", "no-cache, no-store");
 					throw new BadRequestException("No such repository: " + repoID);
 				}
 			}

core/http/workbench/src/main/webapp/scripts/create.js

@@ -24,7 +24,6 @@ function checkOverwrite() {
     var id = workbench.create.id.val();
     $.ajax({
         url: '../' + id + '/info',
-        async: false,
         success: function () {
             submit = confirm('WARNING: You are about to overwrite the ' +
                 'configuration of an existing repository!');
@@ -33,15 +32,17 @@ function checkOverwrite() {
             500: function () {
                 submit = true;
             }
+        },
+		complete : function(xhr, status) {
+            if (submit && !id.match(/^[a-z0-9._-]+$/)) {
+                submit = confirm('WARNING: There are potentially incompatible ' +
+                    'characters in the repository id.');
+            }
+            if (submit) {
+                $("form[action='create']").submit();
+            }
         }
     });
-    if (submit && !id.match(/^[a-z0-9._-]+$/)) {
-        submit = confirm('WARNING: There are potentially incompatible ' +
-            'characters in the repository id.');
-    }
-    if (submit) {
-        $("form[action='create']").submit();
-    }
 }
 
 workbench.addLoad(function createPageLoaded() {

core/http/workbench/src/main/webapp/scripts/create.js.map

@@ -10,15 +10,15 @@
  * DeleteServlet whether the given ID has been proxied, giving a chance to back
  * out if it is.
  */
-function checkIsSafeToDelete() {
+function checkIsSafeToDelete(event) {
+	event.preventDefault();
 	var id = $('#id').val();
 	var submitForm = false;
-    var feedback = $('#delete-feedback');
+	var feedback = $('#delete-feedback');
 	$
 			.ajax({
 				dataType : 'json',
 				url : 'delete',
-				async : false,
 				timeout : 5000,
 				data : {
 					checkSafe : id
@@ -36,12 +36,14 @@ function checkIsSafeToDelete() {
 					}
 				},
 				success : function(data) {
-                    feedback.text('');
+					feedback.text('');
 					submitForm = data.safe;
 					if (!submitForm) {
 						submitForm = confirm('WARNING: You are about to delete a repository that has been proxied by another repository!');
 					}
+					if (submitForm) {
+						$(event.target).closest('form')[0].submit();
+					}
 				}
 			});
-	return submitForm;
 }

core/http/workbench/src/main/webapp/scripts/delete.js

@@ -12,7 +12,7 @@
 	<xsl:include href="template.xsl" />
 
 	<xsl:template match="sparql:sparql">
-		<form action="delete" method="post" onsubmit="return checkIsSafeToDelete();">
+		<form action="delete" method="post" onsubmit="checkIsSafeToDelete(event);">
 			<table class="dataentry">
 				<tbody>
 					<tr>