Revize c5dff586

preset diagram name for saved diagrams

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/api/GetDiagram.java

@@ +1 @@
+package cz.zcu.kiv.offscreen.servlets.api;
+
+import com.google.common.base.Strings;
+import cz.zcu.kiv.offscreen.servlets.BaseServlet;
+import cz.zcu.kiv.offscreen.user.DB;
+import cz.zcu.kiv.offscreen.user.Diagram;
+import org.json.JSONObject;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class GetDiagram extends BaseServlet {
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        String diagramId = request.getParameter("diagramId");
+
+        if (Strings.isNullOrEmpty(diagramId)) {
+            response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+            return;
+        }
+
+        DB db = new DB(getServletContext());
+        Diagram diagram = new Diagram(db, Integer.parseInt(diagramId));
+
+        JSONObject json = null;
+
+        if (diagram.isPublic()) {
+            json = new JSONObject(diagram.getDiagram());
+
+        } else {
+            if (isLoggedIn(request)) {
+                int loggedUserId = getUserId(request);
+
+                if (diagram.getUserId() == loggedUserId) {
+                    json = new JSONObject(diagram.getDiagram());
+                }
+            }
+        }
+
+        if (json == null) {
+            response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+        } else {
+            response.setContentType("application/json");
+            response.setCharacterEncoding("UTF-8");
+            response.setStatus(HttpServletResponse.SC_OK);
+            response.getWriter().write(json.toString());
+            response.getWriter().flush();
+        }
+    }
+}

sources/src/main/webapp/WEB-INF/web.xml

@@ -60 +60 @@
 		<servlet-name>Logout</servlet-name>
 		<servlet-class>cz.zcu.kiv.offscreen.servlets.api.Logout</servlet-class>
 	</servlet>
+	<servlet>
+		<servlet-name>GetDiagram</servlet-name>
+		<servlet-class>cz.zcu.kiv.offscreen.servlets.api.GetDiagram</servlet-class>
+	</servlet>
 	<servlet>
 		<servlet-name>SaveDiagram</servlet-name>
 		<servlet-class>cz.zcu.kiv.offscreen.servlets.api.SaveDiagram</servlet-class>
@@ -96 +100 @@
 		<servlet-name>Logout</servlet-name>
 		<url-pattern>/api/log-out</url-pattern>
 	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>GetDiagram</servlet-name>
+		<url-pattern>/api/get-diagram</url-pattern>
+	</servlet-mapping>
 	<servlet-mapping>
 		<servlet-name>SaveDiagram</servlet-name>
 		<url-pattern>/api/save-diagram</url-pattern>

sources/src/main/webapp/js/app.js

@@ -31 +31 @@
 	/** @prop {object} API Application programming interface paths. */
 	this.API = {
 		loadGraphData: 'api/load-graph-data',
+		getDiagram: 'api/get-diagram',
 		saveDiagram: 'api/save-diagram',
 		removeDiagram: 'api/remove-diagram',
 	};
@@ -52 +53 @@
 	/** @prop {array<Group>} groupList */
 	this.groupList = [];
 
+	/** TODO: jsDoc */
+	this.diagram = null;
+
 	/** TODO: jsDoc */
 	this.archetype = {
 		vertex: [],
@@ -311 +315 @@
 				var diagramId = app.utils.getQueryVariable('diagramId');
 				if (diagramId === false) diagramId = null;
 
-				var diagramName = prompt('Enter new diagram name:');
+				var diagramName = prompt('Enter new diagram name:', self.diagram !== null ? self.diagram.name : '');
 				if (diagramName === null || diagramName === '') return false;
 
 				$.ajax({
 					'type': 'POST',
 					'url': app.API.saveDiagram,
 					'data': {
-						'diagram_id': diagramId,
+						'diagramId': diagramId,
 						'name': diagramName,
-						'graph_json': JSON.stringify(self.graphExporter.run()),
+						'graphJson': JSON.stringify(self.graphExporter.run()),
 						'public': 0,
 					},
 					'success': function() {
@@ -357 +361 @@
 
 		self.loader.enable();
 
-		var loadGraphDataURL = self.API.loadGraphData;
+		var loadGraphDataPromise;
+
+		if (diagramId === '') {
+			loadGraphDataPromise = $.getJSON(self.API.loadGraphData);
 
-		if (diagramId !== '') {
-			loadGraphDataURL += '?diagramId=' + diagramId;
+		} else {
+			getDiagramPromise = $.getJSON(self.API.getDiagram + '?diagramId=' + diagramId);
+
+			loadGraphDataPromise = getDiagramPromise.then(function(data) {
+				self.diagram = {
+					id: data.id,
+					name: data.name,
+				};
+
+				return $.getJSON(self.API.loadGraphData + '?diagramId=' + diagramId);
+			});
 		}
 
 		// get vertex position data
-		$.getJSON(loadGraphDataURL).then(function(data) {
+		loadGraphDataPromise.then(function(data) {
 			// construct graph
 			self.graphLoader.run(data);