JsCallback always terminate with success

atk4 · Mar 31, 2024 · 0453b60 · 0453b60
1 parent b3a08e5
commit 0453b60
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/src/JsCallback.php b/src/JsCallback.php
@@ -102,17 +102,13 @@ public function set($fx = null, $args = null)
     /**
      * A proper way to finish execution of AJAX response. Generates JSON
      * which is returned to frontend.
-     *
-     * @param ($success is true ? null : string) $msg     General message, typically won't be displayed
-     * @param bool                               $success Was request successful or not
      */
-    public function terminateAjaxIfCanTerminate(JsBlock $ajaxec, $msg = null, bool $success = true): void
+    public function terminateAjaxIfCanTerminate(JsBlock $ajaxec): void
     {
-        $data = ['success' => $success];
-        if (!$success) {
-            $data['message'] = $msg;
-        }
-        $data['atkjs'] = $ajaxec->jsRender();
+        $data = [
+            'success' => true,
+            'atkjs' => $ajaxec->jsRender(),
+        ];
 
         if ($this->canTerminate()) {
             $this->getApp()->terminateJson($data);

diff --git a/src/JsSse.php b/src/JsSse.php
@@ -83,13 +83,13 @@ protected function initSse(): void
     /**
      * Sending an SSE action.
      */
-    public function send(JsExpressionable $action, bool $success = true): void
+    public function send(JsExpressionable $action): void
     {
         $ajaxec = $this->getAjaxec($action);
         $this->sendEvent(
             '',
             $this->getApp()->encodeJson([
-                'success' => $success,
+                'success' => true,
                 'atkjs' => $ajaxec->jsRender(),
             ]),
             'atkSseAction'
@@ -100,14 +100,14 @@ public function send(JsExpressionable $action, bool $success = true): void
      * @return never
      */
     #[\Override]
-    public function terminateAjaxIfCanTerminate(JsBlock $ajaxec, $msg = null, bool $success = true): void
+    public function terminateAjaxIfCanTerminate(JsBlock $ajaxec): void
     {
         $ajaxecStr = $ajaxec->jsRender();
         if ($ajaxecStr !== '') {
             $this->sendEvent(
                 '',
                 $this->getApp()->encodeJson([
-                    'success' => $success,
+                    'success' => true,
                     'atkjs' => $ajaxecStr,
                 ]),
                 'atkSseAction'