From f0450ef62158cf02fe8575afa4037d2f9ff3d49e Mon Sep 17 00:00:00 2001 From: t-samples Date: Thu, 26 Jan 2023 12:45:07 -0600 Subject: [PATCH] PRDONE-170 - Adding support for passing in custom ScriptUtls for scripts. --- .../scripts/RunAssociatedScriptAction.java | 6 +++++ .../scripts/RunAssociatedScriptInput.java | 23 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/RunAssociatedScriptAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/RunAssociatedScriptAction.java index ae108115..3f1d2c8a 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/RunAssociatedScriptAction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/RunAssociatedScriptAction.java @@ -70,6 +70,12 @@ public class RunAssociatedScriptAction { executeCodeInput.getContext().put("output", input.getOutputObject()); } + + if(input.getScriptUtils() != null) + { + executeCodeInput.getContext().put("scriptUtils", input.getScriptUtils()); + } + executeCodeInput.setCodeReference(new QCodeReference().withInlineCode(scriptRevision.getContents()).withCodeType(QCodeType.JAVA_SCRIPT)); // todo - code type as attribute of script!! ///////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/scripts/RunAssociatedScriptInput.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/scripts/RunAssociatedScriptInput.java index 86fdef1c..4da5c558 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/scripts/RunAssociatedScriptInput.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/scripts/RunAssociatedScriptInput.java @@ -40,6 +40,8 @@ public class RunAssociatedScriptInput extends AbstractTableActionInput private Serializable outputObject; + private Serializable scriptUtils; + /******************************************************************************* @@ -152,6 +154,7 @@ public class RunAssociatedScriptInput extends AbstractTableActionInput } + /******************************************************************************* ** Getter for logger *******************************************************************************/ @@ -182,4 +185,24 @@ public class RunAssociatedScriptInput extends AbstractTableActionInput } + + /******************************************************************************* + ** Getter for scriptUtils + ** + *******************************************************************************/ + public Serializable getScriptUtils() + { + return scriptUtils; + } + + + + /******************************************************************************* + ** Setter for scriptUtils + ** + *******************************************************************************/ + public void setScriptUtils(Serializable scriptUtils) + { + this.scriptUtils = scriptUtils; + } }