From 965dbcbc9a8ed8397b179b9fb8f14ac69a667eaf Mon Sep 17 00:00:00 2001 From: azivner Date: Fri, 10 Aug 2018 13:30:20 +0200 Subject: [PATCH] renamed workEntity to originEntity --- src/public/javascripts/services/bundle.js | 8 ++++---- src/public/javascripts/services/script_api.js | 8 ++++---- .../javascripts/services/script_context.js | 4 ++-- src/routes/api/script.js | 2 +- src/scripts/Edited files on day.tar | Bin 4096 -> 4100 bytes src/services/handlers.js | 4 ++-- src/services/script.js | 14 +++++++------- src/services/script_context.js | 8 ++++---- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/public/javascripts/services/bundle.js b/src/public/javascripts/services/bundle.js index c12e29c21..e4f1819c8 100644 --- a/src/public/javascripts/services/bundle.js +++ b/src/public/javascripts/services/bundle.js @@ -1,14 +1,14 @@ import ScriptContext from "./script_context.js"; import server from "./server.js"; -async function getAndExecuteBundle(noteId, workEntity = null) { +async function getAndExecuteBundle(noteId, originEntity = null) { const bundle = await server.get('script/bundle/' + noteId); - await executeBundle(bundle, workEntity); + await executeBundle(bundle, originEntity); } -async function executeBundle(bundle, workEntity) { - const apiContext = ScriptContext(bundle.note, bundle.allNotes, workEntity); +async function executeBundle(bundle, originEntity) { + const apiContext = ScriptContext(bundle.note, bundle.allNotes, originEntity); return await (function () { return eval(`const apiContext = this; (async function() { ${bundle.script}\r\n})()`); diff --git a/src/public/javascripts/services/script_api.js b/src/public/javascripts/services/script_api.js index a727d3e8b..0e59b645e 100644 --- a/src/public/javascripts/services/script_api.js +++ b/src/public/javascripts/services/script_api.js @@ -4,7 +4,7 @@ import utils from './utils.js'; import infoService from './info.js'; import linkService from './link.js'; -function ScriptApi(startNote, currentNote, workEntity = null) { +function ScriptApi(startNote, currentNote, originEntity = null) { const $pluginButtons = $("#plugin-buttons"); async function activateNote(notePath) { @@ -44,8 +44,8 @@ function ScriptApi(startNote, currentNote, workEntity = null) { params: prepareParams(params), startNoteId: startNote.noteId, currentNoteId: currentNote.noteId, - workEntityName: workEntity ? workEntity.constructor.tableName() : null - workEntityId: workEntity ? workEntity.noteId : null + originEntityName: originEntity ? originEntity.constructor.tableName() : null, + originEntityId: originEntity ? originEntity.noteId : null }); return ret.executionResult; @@ -54,7 +54,7 @@ function ScriptApi(startNote, currentNote, workEntity = null) { return { startNote: startNote, currentNote: currentNote, - workEntity: workEntity, + originEntity: originEntity, addButtonToToolbar, activateNote, getInstanceName: () => window.glob.instanceName, diff --git a/src/public/javascripts/services/script_context.js b/src/public/javascripts/services/script_context.js index ce9d44e69..6b797b9ed 100644 --- a/src/public/javascripts/services/script_context.js +++ b/src/public/javascripts/services/script_context.js @@ -1,13 +1,13 @@ import ScriptApi from './script_api.js'; import utils from './utils.js'; -function ScriptContext(startNote, allNotes, workEntity = null) { +function ScriptContext(startNote, allNotes, originEntity = null) { const modules = {}; return { modules: modules, notes: utils.toObject(allNotes, note => [note.noteId, note]), - apis: utils.toObject(allNotes, note => [note.noteId, ScriptApi(startNote, note, workEntity)]), + apis: utils.toObject(allNotes, note => [note.noteId, ScriptApi(startNote, note, originEntity)]), require: moduleNoteIds => { return moduleName => { const candidates = allNotes.filter(note => moduleNoteIds.includes(note.noteId)); diff --git a/src/routes/api/script.js b/src/routes/api/script.js index 6c3d50465..da3d5a554 100644 --- a/src/routes/api/script.js +++ b/src/routes/api/script.js @@ -6,7 +6,7 @@ const repository = require('../../services/repository'); async function exec(req) { const result = await scriptService.executeScript(req.body.script, req.body.params, req.body.startNoteId, - req.body.currentNoteId, req.body.workEntityName, req.body.workEntityId); + req.body.currentNoteId, req.body.originEntityName, req.body.originEntityId); return { executionResult: result }; } diff --git a/src/scripts/Edited files on day.tar b/src/scripts/Edited files on day.tar index 895581469eb668a31e2f38cea1cebae5b7735d93..b923cda5ac6a3891dbc6b6ce274502a3eb4a5f91 100644 GIT binary patch delta 31 gcmZorXi?Y@!N!(fl$oBHw>gH5i3!F|;+V${0HojwN&o-= delta 27 ecmZosXi(S?!NyXaUzEK$j*W>4!b; relation.type === 'relation' && relation.name === relationName); for (const relation of runRelations) { const scriptNote = await relation.getTargetNote(); - await scriptService.executeNote(scriptNote, scriptNote, workEntity); + await scriptService.executeNote(scriptNote, scriptNote, originEntity); } } diff --git a/src/services/script.js b/src/services/script.js index bc521468f..78f69335c 100644 --- a/src/services/script.js +++ b/src/services/script.js @@ -4,17 +4,17 @@ const repository = require('./repository'); const cls = require('./cls'); const sourceIdService = require('./source_id'); -async function executeNote(note, workEntity) { +async function executeNote(note, originEntity) { if (!note.isJavaScript()) { return; } const bundle = await getScriptBundle(note); - await executeBundle(bundle, note, workEntity); + await executeBundle(bundle, note, originEntity); } -async function executeBundle(bundle, startNote, workEntity = null) { +async function executeBundle(bundle, startNote, originEntity = null) { if (!startNote) { // this is the default case, the only exception is when we want to preserve frontend startNote startNote = bundle.note; @@ -23,7 +23,7 @@ async function executeBundle(bundle, startNote, workEntity = null) { // last \r\n is necessary if script contains line comment on its last line const script = "async function() {\r\n" + bundle.script + "\r\n}"; - const ctx = new ScriptContext(startNote, bundle.allNotes, workEntity); + const ctx = new ScriptContext(startNote, bundle.allNotes, originEntity); if (await bundle.note.hasLabel('manualTransactionHandling')) { return await execute(ctx, script, ''); @@ -37,10 +37,10 @@ async function executeBundle(bundle, startNote, workEntity = null) { * This method preserves frontend startNode - that's why we start execution from currentNote and override * bundle's startNote. */ -async function executeScript(script, params, startNoteId, currentNoteId, workEntityName, workEntityId) { +async function executeScript(script, params, startNoteId, currentNoteId, originEntityName, originEntityId) { const startNote = await repository.getNote(startNoteId); const currentNote = await repository.getNote(currentNoteId); - const workEntity = await repository.getEntityFromName(workEntityName, workEntityId); + const originEntity = await repository.getEntityFromName(originEntityName, originEntityId); currentNote.content = `return await (${script}\r\n)(${getParams(params)})`; currentNote.type = 'code'; @@ -48,7 +48,7 @@ async function executeScript(script, params, startNoteId, currentNoteId, workEnt const bundle = await getScriptBundle(currentNote); - return await executeBundle(bundle, startNote, workEntity); + return await executeBundle(bundle, startNote, originEntity); } async function execute(ctx, script, paramsStr) { diff --git a/src/services/script_context.js b/src/services/script_context.js index bfbaf1390..f430d7cd7 100644 --- a/src/services/script_context.js +++ b/src/services/script_context.js @@ -10,10 +10,10 @@ const config = require('./config'); const repository = require('./repository'); const axios = require('axios'); -function ScriptContext(startNote, allNotes, workEntity = null) { +function ScriptContext(startNote, allNotes, originEntity = null) { this.modules = {}; this.notes = utils.toObject(allNotes, note => [note.noteId, note]); - this.apis = utils.toObject(allNotes, note => [note.noteId, new ScriptApi(startNote, note, workEntity)]); + this.apis = utils.toObject(allNotes, note => [note.noteId, new ScriptApi(startNote, note, originEntity)]); this.require = moduleNoteIds => { return moduleName => { const candidates = allNotes.filter(note => moduleNoteIds.includes(note.noteId)); @@ -28,10 +28,10 @@ function ScriptContext(startNote, allNotes, workEntity = null) { }; } -function ScriptApi(startNote, currentNote, workEntity) { +function ScriptApi(startNote, currentNote, originEntity) { this.startNote = startNote; this.currentNote = currentNote; - this.workEntity = workEntity; + this.originEntity = originEntity; this.axios = axios;