#125, implementation of inheritable relations

src/public/javascripts/services/bundle.js

@@ -23,8 +23,17 @@ async function executeStartupBundles() {
     }
 }
 
+async function executeRelationBundles(note, relationName) {
+    const bundlesToRun = await server.get("script/relation/" + note.noteId + "/" + relationName);
+
+    for (const bundle of bundlesToRun) {
+        await executeBundle(bundle, note);
+    }
+}
+
 export default {
     executeBundle,
     getAndExecuteBundle,
-    executeStartupBundles
+    executeStartupBundles,
+    executeRelationBundles
 }

src/public/javascripts/services/note_detail.js

@@ -190,12 +190,9 @@ async function loadNoteDetail(noteId) {
     const hideChildrenOverview = labels.some(label => label.name === 'hideChildrenOverview');
     await showChildrenOverview(hideChildrenOverview);
 
-    const relations = await loadRelationList();
+    await loadRelationList();
-    const relationsToRun = relations.filter(relation => relation.name === 'runOnNoteView');
 
-    for (const relationToRun of relationsToRun) {
+    await bundleService.executeRelationBundles(getCurrentNote(), 'runOnNoteView');
-        await bundleService.getAndExecuteBundle(relationToRun.targetNoteId, getCurrentNote());
-    }
 }
 
 async function showChildrenOverview(hideChildrenOverview) {

src/public/javascripts/services/note_detail_code.js

@@ -75,9 +75,7 @@ async function executeCurrentNote() {
     const currentNote = noteDetailService.getCurrentNote();
 
     if (currentNote.mime.endsWith("env=frontend")) {
-        const bundle = await server.get('script/bundle/' + noteDetailService.getCurrentNoteId());
+        await bundleService.getAndExecuteBundle(noteDetailService.getCurrentNoteId());
-
-        bundleService.executeBundle(bundle);
     }
 
     if (currentNote.mime.endsWith("env=backend")) {

src/public/javascripts/services/tooltip.js

@@ -12,7 +12,7 @@ function setupTooltip() {
                 notePath = $(this).attr("note-path");
             }
 
-            if (notePath !== null) {
+            if (notePath) {
                 const noteId = treeUtils.getNoteIdFromNotePath(notePath);
 
                 noteDetailService.loadNote(noteId).then(note => callback(note.content));

src/routes/api/script.js

@@ -2,6 +2,7 @@
 
 const labelService = require('../../services/labels');
 const scriptService = require('../../services/script');
+const relationService = require('../../services/relations');
 const repository = require('../../services/repository');
 
 async function exec(req) {
@@ -35,14 +36,32 @@ async function getStartupBundles() {
     return bundles;
 }
 
+async function getRelationBundles(req) {
+    const noteId = req.params.noteId;
+    const relationName = req.params.relationName;
+
+    const relations = await relationService.getEffectiveRelations(noteId);
+    const filtered = relations.filter(relation => relation.name === relationName);
+    const targetNoteIds = filtered.map(relation => relation.targetNoteId);
+    const uniqueNoteIds = Array.from(new Set(targetNoteIds));
+
+    const bundles = [];
+
+    for (const noteId of uniqueNoteIds) {
+        bundles.push(await scriptService.getScriptBundleForNoteId(noteId));
+    }
+
+    return bundles;
+}
+
 async function getBundle(req) {
-    const note = await repository.getNote(req.params.noteId);
+    return await scriptService.getScriptBundleForNoteId(req.params.noteId);
-    return await scriptService.getScriptBundle(note);
 }
 
 module.exports = {
     exec,
     run,
     getStartupBundles,
+    getRelationBundles,
     getBundle
 };

src/routes/routes.js

@@ -185,6 +185,7 @@ function register(app) {
     apiRoute(POST, '/api/script/run/:noteId', scriptRoute.run);
     apiRoute(GET, '/api/script/startup', scriptRoute.getStartupBundles);
     apiRoute(GET, '/api/script/bundle/:noteId', scriptRoute.getBundle);
+    apiRoute(GET, '/api/script/relation/:noteId/:relationName', scriptRoute.getRelationBundles);
 
     route(POST, '/api/sender/login', [], senderRoute.login, apiResultHandler);
     route(POST, '/api/sender/image', [auth.checkSenderToken], senderRoute.uploadImage, apiResultHandler);

src/services/relations.js

@@ -36,9 +36,23 @@ async function createRelation(sourceNoteId, name, targetNoteId) {
     }).save();
 }
 
+async function getEffectiveRelations(noteId) {
+    return await repository.getEntities(`
+        WITH RECURSIVE tree(noteId) AS (
+        SELECT ?
+            UNION
+            SELECT branches.parentNoteId FROM branches
+            JOIN tree ON branches.noteId = tree.noteId
+            JOIN notes ON notes.noteId = branches.parentNoteId
+            WHERE notes.isDeleted = 0 AND branches.isDeleted = 0
+        )
+        SELECT relations.* FROM relations JOIN tree ON relations.sourceNoteId = tree.noteId WHERE relations.isDeleted = 0 AND relations.name IN ('runOnNoteView')`, [noteId]);
+}
+
 module.exports = {
+    BUILTIN_RELATIONS,
     getNotesWithRelation,
     getNoteWithRelation,
     createRelation,
-    BUILTIN_RELATIONS
+    getEffectiveRelations
 };

src/services/script.js

@@ -139,8 +139,14 @@ function sanitizeVariableName(str) {
     return str.replace(/[^a-z0-9_]/gim, "");
 }
 
+async function getScriptBundleForNoteId(noteId) {
+    const note = await repository.getNote(noteId);
+    return await getScriptBundle(note);
+}
+
 module.exports = {
     executeNote,
     executeScript,
-    getScriptBundle
+    getScriptBundle,
+    getScriptBundleForNoteId
 };