@@ -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;
         $this->configuration = $configuration;
     }
 
@@ -1,5 +1,5 @@
 <template>
-  <vue-form-renderer @submit="submit" v-model="formData" :config="screen" :computed="computed" :custom-css="customCss" @update="onUpdate" />
+  <vue-form-renderer @submit="submit" v-model="formData" :config="screen" :computed="computed" :custom-css="customCss" :watchers="watchers" @update="onUpdate" />
 </template>
 
 <script>
@@ -14,7 +14,7 @@ export default {
     VueFormRenderer
   },
   mixins: [ProcessRequestChannel],
-  props: ["processId", "instanceId", "tokenId", "screen", "data", "computed", "customCss", "listenProcessEvents"],
+  props: ["processId", "instanceId", "tokenId", "screen", "data", "computed", "customCss", "watchers", "listenProcessEvents"],
   data() {
     return {
       formData: this.data
 
@@ -2,6 +2,7 @@
   " overdue ": " overdue ",
   " pending": " pending",
   ":user has completed the task :task_name": ":user has completed the task :task_name",
+  "{{variable}} is running.": "{{variable}} is running.",
   "? Any services using it will no longer have access.": "? Any services using it will no longer have access.",
   "[Select Active Process]": "[Select Active Process]",
   "# Processes": "# Processes",
@@ -653,6 +654,7 @@
   "Should records be editable/removable and can new records be added": "Should records be editable/removable and can new records be added",
   "Should the checkbox be checked by default": "Should the checkbox be checked by default",
   "Show in Json Format": "Show in Json Format",
+  "Something has gone wrong.": "Something has gone wrong.",
   "Something went wrong. Try refreshing the application": "Something went wrong. Try refreshing the application",
   "Sorry, this request doesn't contain any information.": "Sorry, this request doesn't contain any information.",
   "Sorry! API failed to load": "Sorry! API failed to load",
@@ -800,6 +802,7 @@
   "This Request is currently in progress.": "This Request is currently in progress.",
   "This screen has validation errors.": "This screen has validation errors.",
   "This screen will be populated once the Request is completed.": "This screen will be populated once the Request is completed.",
+  "This window will automatically close when complete.": "This window will automatically close when complete.",
   "Time expression": "Time expression",
   "Time when the task will due (hours)": "Time when the task will due (hours)",
   "Time Zone": "Time Zone",
@@ -820,6 +823,7 @@
   "Unable to import": "Unable to import",
   "Unauthorized - ProcessMaker": "Unauthorized - ProcessMaker",
   "Undo": "Undo",
+  "Unfortunately this screen has had an issue. We've notified the administrator.": "Unfortunately this screen has had an issue. We've notified the administrator.",
   "Unread Notifications": "Unread Notifications",
   "Update Group Successfully": "Update Group Successfully",
   "Upload Avatar": "Upload Avatar",
 
@@ -59,6 +59,7 @@ class="nav-link">{{__('Data')}}</a></li>
                                             :screen="{{json_encode($task->getScreen()->config)}}"
                                             :computed="{{json_encode($task->getScreen()->computed)}}"
                                             :custom-css="{{json_encode(strval($task->getScreen()->custom_css))}}"
+                                            :watchers="{{json_encode($task->getScreen()->watchers)}}"
                                             :data="{{$task->processRequest->data ? json_encode($task->processRequest->data) : '{}'}}">
                                         </task-screen>
                                     @else
@@ -90,6 +91,7 @@ class="nav-link">{{__('Data')}}</a></li>
                                     :screen="{{json_encode($screenInterstitial->config)}}"
                                     :computed="{{json_encode($screenInterstitial->computed)}}"
                                     :custom-css="{{json_encode(strval($screenInterstitial->custom_css))}}"
+                                    :watchers="{{json_encode($screenInterstitial->watchers)}}"
                                     :data="{{$task->processRequest->data ? json_encode($task->processRequest->data) : '{}'}}"
                                     @activity-assigned="redirectToNextAssignedTask"
                                     @process-completed="redirectWhenProcessCompleted"
@@ -232,8 +234,8 @@ class="d-inline-flex pull-left align-items-center"
 @section('js')
   <script>
     window.ProcessMaker.EventBus.$on("screen-renderer-init", (screen) => {
-      if (screen.watchers) {
-        screen.watchers.api.execute = @json(route('api.scripts.execute', ['script' => 'script_id']));
+      if (screen.watchers_config) {
+        screen.watchers_config.api.execute = @json(route('api.scripts.execute', ['script' => 'script_id']));
       } else {
         console.warn('Screen builder version does not have watchers');
       }
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`	`$this->configuration = $configuration;`
`47`	`48`	`}`