diff --git a/CHANGELOG.md b/CHANGELOG.md index f14683e6..19375b55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +- 6.4.2, 2024-12-04, fritz.zaucker@oetiker.ch + - Fix RPC error handling (RT 59213) + - 6.4.1, 2024-11-22, fritz.zaucker@oetiker.ch - New Self Service for account creation and password reset diff --git a/VERSION b/VERSION index 4c77920f..a4c853ea 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.4.1 +6.4.2 diff --git a/frontend/compile.json b/frontend/compile.json index 596da10e..28c726cd 100644 --- 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 index 786b2457..d335a469 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -6990,7 +6990,7 @@ }, "node_modules/@qooxdoo/compiler/node_modules/through": { "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", "dev": true }, @@ -8058,13 +8058,24 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001286", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz", - "integrity": "sha512-zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ==", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - } + "version": "1.0.30001686", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001686.tgz", + "integrity": "sha512-Y7deg0Aergpa24M3qLC5xjNklnKnhsmSyR/V89dLZ1n0ucJIFNs7PgR2Yfa/Zf6W79SbBicgtGxZr2juHkEUIA==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "CC-BY-4.0" }, "node_modules/caseless": { "version": "0.12.0", @@ -17039,7 +17050,7 @@ }, "through": { "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", "dev": true }, @@ -18055,9 +18066,9 @@ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" }, "caniuse-lite": { - "version": "1.0.30001286", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz", - "integrity": "sha512-zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ==" + "version": "1.0.30001686", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001686.tgz", + "integrity": "sha512-Y7deg0Aergpa24M3qLC5xjNklnKnhsmSyR/V89dLZ1n0ucJIFNs7PgR2Yfa/Zf6W79SbBicgtGxZr2juHkEUIA==" }, "caseless": { "version": "0.12.0", diff --git a/frontend/source/class/agrammon/io/remote/Rpc.js b/frontend/source/class/agrammon/io/remote/Rpc.js index be99e9e2..05cc98eb 100644 --- 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 index 3d686732..c054c0d3 100644 --- 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 index a32ccea7..1bf0170f 100644 --- 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 index 1b136f2d..fcf6ca73 100644 --- 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 index 17aae2c3..35c33257 100644 --- 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 ); }