Fix incorrect 'start-failed' notifications

FlowFuse · Jul 19, 2023 · 32e149b · 32e149b
1 parent 0edbce6
commit 32e149b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 21 deletions.
diff --git a/frontend/src/pages/application/index.vue b/frontend/src/pages/application/index.vue
@@ -230,30 +230,28 @@ export default {
         async instanceStart (instance) {
             const mutator = new InstanceStateMutator(instance)
             mutator.setStateOptimistically('starting')
-
-            const err = await InstanceApi.startInstance(instance)
-            if (err) {
+            try {
+                await InstanceApi.startInstance(instance)
+                mutator.setStateAsPendingFromServer()
+            } catch (err) {
                 console.warn('Instance start failed.', err)
                 alerts.emit('Instance start failed.', 'warning')
 
                 mutator.restoreState()
-            } else {
-                mutator.setStateAsPendingFromServer()
             }
         },
 
         async instanceRestart (instance) {
             const mutator = new InstanceStateMutator(instance)
             mutator.setStateOptimistically('restarting')
-
-            const err = await InstanceApi.restartInstance(instance)
-            if (err) {
+            try {
+                await InstanceApi.restartInstance(instance)
+                mutator.setStateAsPendingFromServer()
+            } catch (err) {
                 console.warn('Instance restart failed.', err)
                 alerts.emit('Instance restart failed.', 'warning')
 
                 mutator.restoreState()
-            } else {
-                mutator.setStateAsPendingFromServer()
             }
         },
 

diff --git a/frontend/src/pages/instance/index.vue b/frontend/src/pages/instance/index.vue
@@ -234,27 +234,24 @@ export default {
         async startInstance () {
             this.instanceStateMutator.setStateOptimistically('starting')
 
-            const err = await InstanceApi.startInstance(this.instance)
-            if (err) {
+            try {
+                await InstanceApi.startInstance(this.instance)
+                this.instanceStateMutator.setStateAsPendingFromServer()
+            } catch (err) {
                 console.warn('Instance start failed.', err)
                 alerts.emit('Instance start failed.', 'warning')
-
                 this.instanceStateMutator.restoreState()
-            } else {
-                this.instanceStateMutator.setStateAsPendingFromServer()
             }
         },
         async restartInstance () {
             this.instanceStateMutator.setStateOptimistically('restarting')
-
-            const err = await InstanceApi.restartInstance(this.instance)
-            if (err) {
+            try {
+                await InstanceApi.restartInstance(this.instance)
+                this.instanceStateMutator.setStateAsPendingFromServer()
+            } catch (err) {
                 console.warn('Instance restart failed.', err)
                 alerts.emit('Instance restart failed.', 'warning')
-
                 this.instanceStateMutator.restoreState()
-            } else {
-                this.instanceStateMutator.setStateAsPendingFromServer()
             }
         },
         showConfirmDeleteDialog () {