Add an aid param when redirect activities

Author: Lionel Laské

js/modules/journal.js

@@ -166,6 +166,22 @@ define(["sugar-web/datastore"], function(datastore) {
 		return entries.filter((entry) => entry.metadata.activity == activity);
 	}
 
+	// Get entries by objectId
+	journal.getByObjectId = function(objectId) {
+		if (!objectId) return null;
+		for (var i = 0 ; i < entries.length ; i++) {
+			if (entries[i].objectId == objectId) {
+				return entries[i];
+			}
+		}
+		return null;
+	}
+
+	// Generate UUID
+	journal.generateUUID = function() {
+		return datastore.createUUID();
+	}
+
 	// Copy & Duplicate Operations
 	journal.copyToLocal = async function(entry, journalId) {
 		const { metadata, text } = await journal.loadEntry(entry, journalId);

js/screens/mainscreen.js

@@ -258,17 +258,16 @@ const MainScreen = {
 				if (activityExist) {
 					let objectId = redirectUrl.searchParams.get("o");
 					if (objectId) {
-						let data = datastore.find(activityId).filter(function(o) {
-							return o.objectId == objectId;
-						});
-						if (data.length == 0) {
+						let data = sugarizer.modules.journal.getByObjectId(objectId);
+						if (!data) {
 							redirectUrl.searchParams.delete("o");
 							redirectUrl.searchParams.set("n", sugarizer.modules.activities.getById(activityId).name);
 							console.log("Redirect object not found"); 
 						}
 					} else {
 						redirectUrl.searchParams.set("n", sugarizer.modules.activities.getById(activityId).name);
 					}
+					redirectUrl.searchParams.set("aid", sugarizer.modules.journal.generateUUID());
 					window.location = decodeURIComponent(redirectUrl.href);
 					return;
 				} else {

main.js

@@ -71,6 +71,15 @@ function LoadFile(event, file) {
 	});
 }
 
+// Generate a fake UUID v4
+function uuidv4() {
+	return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+		var r = Math.random() * 16 | 0,
+			v = c === 'x' ? r : (r & 0x3 | 0x8);
+		return v.toString(16);
+	});
+}
+
 function createWindow() {
 	// Process argument
 	for (var i = 0; i < process.argv.length; i++) {
@@ -98,7 +107,9 @@ function createWindow() {
 							"/index.html?n=" +
 							activities[j].name +
 							"&a=" +
-							process.argv[i + 1];
+							process.argv[i + 1] +
+							"&aid=" +
+							uuidv4();
 						break;
 					}
 				}