Move try catch block to correct place, make sure onRequestDone is cal…

…led in case of callDittoREST method error thrown Signed-off-by: Vasil Vasilev <vasil.vasilev@bosch.com>
eclipse-ditto · Nov 7, 2023 · 4237843 · 4237843
1 parent ec3a108
commit 4237843
Showing 1 changed file with 28 additions and 26 deletions.
diff --git a/ui/modules/piggyback/piggyback.ts b/ui/modules/piggyback/piggyback.ts
@@ -204,40 +204,42 @@ async function submitPiggybackCommand() {
     if (isCommandValid()) {
         dom.responseStatus.innerHTML = REQUEST_IN_PROGRESS_MESSAGE;
         Utils.setEditorValue(aceResponse, '');
-        try {
-            let path = buildPath(
-                dom.serviceSelector.value,
-                dom.instanceSelector.value,
-                dom.timeout.value
-            );
-
-            let piggybackCommandBody = Templates.buildPiggybackCommand(
-                dom.targetActorSelection.value,
-                JSON.parse(aceHeadersEditor.getValue()),
-                JSON.parse(aceCommandEditor.getValue())
-            );
-
-            let promise = new Promise((resolve, reject) => {
-                onRequestInProgress(reject);
+        let path = buildPath(
+            dom.serviceSelector.value,
+            dom.instanceSelector.value,
+            dom.timeout.value
+        );
+
+        let piggybackCommandBody = Templates.buildPiggybackCommand(
+            dom.targetActorSelection.value,
+            JSON.parse(aceHeadersEditor.getValue()),
+            JSON.parse(aceCommandEditor.getValue())
+        );
+
+        let promise = new Promise((resolve, reject) => {
+            onRequestInProgress(reject);
+            try {
                 API.callDittoREST('POST', path, piggybackCommandBody, null, true, true)
                     .then(result => resolve(result))
                     .catch(err => reject(err));
-            });
-            promise.then((result: any) => {
-                onRequestDone();
-                result.json().then(resultJson => {
-                    Utils.setEditorValue(aceResponse, stringifyPretty(resultJson));
-                    dom.responseStatus.innerHTML = result.status;
-                });
-            }).catch(err => {
+            } catch (err) {
                 onRequestDone();
                 Utils.setEditorValue(aceResponse, err.message);
                 dom.responseStatus.innerHTML = REQUEST_ERROR_MESSAGE;
+            }
+        });
+        promise.then((result: any) => {
+            onRequestDone();
+            result.json().then(resultJson => {
+                Utils.setEditorValue(aceResponse, stringifyPretty(resultJson));
+                dom.responseStatus.innerHTML = result.status;
             });
-        } catch (err) {
-            Utils.showError(`Error when executing piggyback command${err}`);
+        }).catch(err => {
+            onRequestDone();
+            Utils.setEditorValue(aceResponse, err.message);
             dom.responseStatus.innerHTML = REQUEST_ERROR_MESSAGE;
-        }
+        });
+
     }
 
     function isCommandValid() {