ensure targeted run is executed when user presses run button

also graceful exit when run execution fails (for example when rta is confused by disabled app/channel)
rokucommunity · Oct 30, 2024 · 840b1a2 · 840b1a2
1 parent 630b37b
commit 840b1a2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/viewProviders/RokuAutomationViewViewProvider.ts b/src/viewProviders/RokuAutomationViewViewProvider.ts
@@ -26,7 +26,12 @@ export class RokuAutomationViewViewProvider extends BaseRdbViewProvider {
 
         this.addMessageCommandCallback(ViewProviderCommand.runRokuAutomationConfig, async (message) => {
             const index = message.context.configIndex;
-            await this.runRokuAutomationConfig(index);
+            try {
+                await this.runRokuAutomationConfig(index);
+            } catch (e) {
+                this.updateCurrentRunningStep(-1);
+                throw e;
+            }
             return true;
         });
 

diff --git a/webviews/src/views/RokuAutomationView/RokuAutomationView.svelte b/webviews/src/views/RokuAutomationView/RokuAutomationView.svelte
@@ -17,11 +17,13 @@
 
     $: runs, selectedRun, updateRuns();
 
+    const getRunIndex = () => (runs ?? []).findIndex((r) => r.name === selectedRun);
+
     const updateRuns = () => {
         if (!runs || runs.length === 0) {
             runs = [{ }];
         }
-        if (!selectedRun || runs.findIndex((c) => c.name === selectedRun) === -1) {
+        if (!selectedRun || getRunIndex() === -1) {
             if (!runs[0].name) {
                 runs[0].name = 'DEFAULT';
             }
@@ -128,14 +130,14 @@
 
     function runConfig() {
         intermediary.sendCommand(ViewProviderCommand.runRokuAutomationConfig, {
-            configIndex: this.id
+            configIndex: getRunIndex().toString()
         });
     }
 
     function stopConfig() {
         if (!this) return;
         intermediary.sendCommand(ViewProviderCommand.stopRokuAutomationConfig, {
-            configIndex: this.id
+            configIndex: getRunIndex().toString()
         });
     }