@@ -185,11 +185,12 @@ public function preview(Request $request, Script $script)
      *     ),
      * )
      */
-    public function execute(Request $request, Script $script)
+    public function execute(Request $request, $script)
     {
+        $script = is_numeric($script) ? Script::find($script) : Script::where('key', $script)->first();
         $data = json_decode($request->get('data'), true) ?: [];
         $config = json_decode($request->get('config'), true) ?: [];
-        $watcher = json_decode($request->get('watcher'), true) ?: [];
+        $watcher = $request->get('watcher');
         $code = $script->code;
 
         ExecuteScript::dispatch($script, $request->user(), $code, $data, $watcher, $config);
 
@@ -42,6 +42,7 @@ public function __construct(Script $script, User $current_user, $code, array $da
         $this->current_user = $current_user;
         $this->code = $code;
         $this->data = $data;
+        $this->configuration = $configuration;
         $this->watcher = $watcher;
     }
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ public function __construct(Script $script, User $current_user, $code, array $da`
`42`	`42`	`$this->current_user = $current_user;`
`43`	`43`	`$this->code = $code;`
`44`	`44`	`$this->data = $data;`
	`45`	`+ $this->configuration = $configuration;`
`45`	`46`	`$this->watcher = $watcher;`
`46`	`47`	`}`
`47`	`48`