Revize 4a133d5e

modified frontend to load graph data using only diagramId (no diagramHash)

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

@@ -28 +28 @@
 	this.HOME_URL = null;
 	/** @prop {object} API Application programming interface paths. */
 	this.API = {
-		loadGraph: 'api/graph-data',
-		loadDiagram: 'api/diagram',
+		loadGraphData: 'api/load-graph-data',
 	};
 
 	/** @prop {float} headerHeight Current height of the application header. */
@@ -62 +61 @@
 	/**
 	 * Loads graph using diagram (if available).
 	 * @param diagramId Diagram identifier.
-	 * @param diagramHash Diagram hash.
 	 */
-	this.diagramLoader = function(diagramId, diagramHash) {
-		return loadGraphData.bind(this, diagramId, diagramHash);
+	this.diagramLoader = function(diagramId) {
+		return loadGraphData.bind(this, diagramId);
 	};
 
 	/**
@@ -288 +286 @@
 	/**
 	 * Loads graph data of a diagram.
 	 * @param {string} diagramId Identifier of the diagram to be loaded.
-	 * @param {string} diagramHash Hash of the diagram to be loaded.
 	 */
-	function loadGraphData(diagramId, diagramHash) {
+	function loadGraphData(diagramId) {
 		var self = this;
 
 		self.loader.enable();
 
-		var loadGraphURL = self.API.loadGraph;
-		var loadDiagramURL = self.API.loadDiagram;
+		var loadGraphDataURL = self.API.loadGraphData;
 
 		if (diagramId !== 'null') {
-			loadGraphURL += '?diagramId=' + diagramId;
-			loadDiagramURL += '?diagramId=' + diagramId;
+			loadGraphDataURL += '?diagramId=' + diagramId;
 		}
 
-		if (diagramHash !== 'null') {
-			loadGraphURL +=  '&diagramHash=' + diagramHash;
-			loadDiagramURL += '&diagramHash=' + diagramHash;
-		}
-
-		// exported data of graph
-		var graphExportData = null;
-
 		// get vertex position data
-		$.getJSON(loadDiagramURL).then(function(data) {
-			graphExportData = JSON.parse(data.vertices_position);
-
-			// get graph data
-			return $.getJSON(loadGraphURL);
-
-		}, function() {
-			// get graph data
-			return $.getJSON(loadGraphURL);
-
-		}).then(function(data) {
+		$.getJSON(loadGraphDataURL).then(function(data) {
 			// construct graph
-			self.graphLoader.run(data, graphExportData);
+			self.graphLoader.run(data);
 
 			self.loader.disable();
 

sources/src/main/webapp/js/graphLoader.js

@@ -6 +6 @@
 	/**
 	 * Loads a new graph using graph data passed as parameters.
 	 * @param {object} data Data of the graph.
-	 * @param {object} graphExportData Export of a previously loaded diagram.
-	 * @throws {InvalidArgumentException} Thrown when either graph data or export data are incomplete.
+	 * @throws {InvalidArgumentException} Thrown when either graph data are incomplete.
 	 */
-	this.run  = function(data, graphExportData) {
+	this.run  = function(data) {
 		if (app.utils.isUndefined(data.vertices) || app.utils.isUndefined(data.edges)) {
 			throw new InvalidArgumentException('Invalid data.');
 		}
 
-		if (graphExportData !== null && (app.utils.isUndefined(data.vertices) || app.utils.isUndefined(data.edges))) {
-			throw new InvalidArgumentException('Invalid graph export data.');
-		}
-
 		var canvasSize = ((data.vertices.length * 75) / Math.round(Math.sqrt(data.vertices.length))) + 1000;
 
 		app.attributeTypeList = data.attributeTypes;
@@ -32 +27 @@
 		data.vertices.forEach(function(component) {
 			var vertex = new Vertex(component);
 
-			var isPositionSet = false;
-			if (graphExportData !== null) {
-				var exportedVertex = graphExportData.vertices.find(function(exportedVertex) {
-					return exportedVertex.name == this;
-				}, vertex.name);
-
-				// vertex is present in exported graph data
-				if (app.utils.isDefined(exportedVertex)) {
-					var coords = new Coordinates(exportedVertex.position.x, exportedVertex.position.y);
-					vertex.setPosition(coords);
-
-					isPositionSet = true;
-				}
-			}
-
-			if (isPositionSet === false) {
-				vertex.setPosition(new Coordinates(
-					Math.floor(Math.random() * canvasSize),
-					Math.floor(Math.random() * canvasSize),
-				));
-			}
+			vertex.setPosition(new Coordinates(
+				Math.floor(Math.random() * canvasSize),
+				Math.floor(Math.random() * canvasSize),
+			));
 
 			app.nodeList.push(vertex);
 			app.vertexList.push(vertex);