Merge pull request #593 from zaucker/RT59213_RPC_Error_Handling

Fix RPC error handling
oposs · Dec 5, 2024 · 9a5e339 · 9a5e339
2 parents 405f0cd + 2c5577e
commit 9a5e339
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 69 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+- 6.4.2, 2024-12-04, [email protected]
+  - Fix RPC error handling (RT 59213)
+
 - 6.4.1, 2024-11-22, [email protected]
   - New Self Service for account creation and password reset
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.4.1
+6.4.2
diff --git a/frontend/compile.json b/frontend/compile.json
@@ -53,28 +53,28 @@
       "class": "agrammon.Application",
       "theme": "qx.theme.Indigo",
       "bootPath": "source/boot"
-    },
-    {
-      "class": "qxl.testtapper.Application",
-      "name": "testtapper",
-      "theme": "qx.theme.Indigo",
-      "title": "Qooxdoo TestTAPper",
-      "environment": {
-        "qx.icontheme": "Tango",
-//        "qx.test.delay.scale" : 1000,
-        "testtapper.testNameSpace": "agrammon.test"
-      },
-      "include": [
-        "agrammon.test.*",
-        "qx.*",
-        "iconfont.fontawesome5.Load",
-        "iconfont.material.Load"
-      ],
-      "exclude": [
-        "qx.test.*",
-        "qx.module.Blocker",
-        "qx.module.Placement"
-      ]
-    }    
+    }
+//    {
+//      "class": "qxl.testtapper.Application",
+//      "name": "testtapper",
+//      "theme": "qx.theme.Indigo",
+//      "title": "Qooxdoo TestTAPper",
+//      "environment": {
+//        "qx.icontheme": "Tango",
+////        "qx.test.delay.scale" : 1000,
+//        "testtapper.testNameSpace": "agrammon.test"
+//      },
+//      "include": [
+//        "agrammon.test.*",
+//        "qx.*",
+//        "iconfont.fontawesome5.Load",
+//        "iconfont.material.Load"
+//      ],
+//      "exclude": [
+//        "qx.test.*",
+//        "qx.module.Blocker",
+//        "qx.module.Placement"
+//      ]
+//    }    
   ]
 }
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/source/class/agrammon/io/remote/Rpc.js b/frontend/source/class/agrammon/io/remote/Rpc.js
@@ -88,7 +88,7 @@ qx.Class.define('agrammon.io.remote.Rpc', {
             let response = req.getResponse();
             let status = req.getStatus();
             let statusText = req.getStatusText();
-            console.log('Rpc.callAsync('+methodName+'): status=', status, ':', statusText, ', response=', response);
+            // console.error('Rpc.callAsync('+methodName+'): status=', status, ':', statusText, ', response=', response, ', error=', response.error);
             let username = agrammon.Info.getInstance().getUserName();
             if (response && response.error) {
                 let params = [
@@ -104,6 +104,7 @@ qx.Class.define('agrammon.io.remote.Rpc', {
                     qx.event.message.Bus.dispatchByName('agrammon.Output.invalidate');
                 }
                 qx.event.message.Bus.dispatchByName('error', params);
+                return;
             }
             else {
                 let retry = true;

diff --git a/frontend/source/translation/de.po b/frontend/source/translation/de.po
@@ -958,43 +958,43 @@ msgstr "%1: Sitzung abgelaufen, bitte neu anmelden"
 msgid "No valid lines found in uploaded file."
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "Validation error"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "The following validation errors must be resolved before approval:"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "instance"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "is mandatory"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "Warning"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "Some inputs must have changed while you tried to finish the module."
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "Please reload the module and try again."
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "storeInput error"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "failed"
 msgstr "fehlgeschlagen"
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "Error in communication with server"
 msgstr "Fehler in der Kommunikation mit dem Server"
 

diff --git a/frontend/source/translation/en.po b/frontend/source/translation/en.po
@@ -30,7 +30,7 @@ msgstr ""
 msgid "Returning from %1 to %2"
 msgstr ""
 
-#: agrammon/io/remote/Rpc.js
+#: agrammon/Application.js
 msgid "Please authenticate yourself"
 msgstr ""
 
@@ -970,43 +970,43 @@ msgstr ""
 msgid "No valid lines found in uploaded file."
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "Validation error"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "The following validation errors must be resolved before approval:"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "instance"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "is mandatory"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "Warning"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "Some inputs must have changed while you tried to finish the module."
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "Please reload the module and try again."
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "storeInput error"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "failed"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "Error in communication with server"
 msgstr ""
 

diff --git a/frontend/source/translation/fr.po b/frontend/source/translation/fr.po
@@ -975,43 +975,43 @@ msgstr ""
 msgid "No valid lines found in uploaded file."
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "Validation error"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "The following validation errors must be resolved before approval:"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "instance"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "is mandatory"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "Warning"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "Some inputs must have changed while you tried to finish the module."
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "Please reload the module and try again."
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "storeInput error"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "failed"
 msgstr ""
 
-#: agrammon/io/remote/Rest.js
+#. NO LONGER USED
 msgid "Error in communication with server"
 msgstr ""
 

diff --git a/lib/Agrammon/Web/Routes.rakumod b/lib/Agrammon/Web/Routes.rakumod
@@ -479,7 +479,6 @@ sub dataset-routes(Agrammon::Web::Service $ws) {
                 my $data = $ws.send-datasets($user, @datasets, $recipient, $language);
                 content 'application/json', $data;
                 CATCH {
-                    .note;
                     when X::Agrammon::DB::User::UnknownUser {
                         conflict 'application/json', %( error => .message );
                     }